Revert "Remove pointless HeapTupleHeaderIndicatesMovedPartitions calls"

alvherre · alvherre · commit 93f84d59f80d · 2020-10-15T15:16:11.000-03:00
This reverts commit 85adb5e. It was not intended for commit just yet.
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -2618,7 +2618,8 @@ heap_delete(Relation relation, ItemPointer tid,
 			HEAP_XMAX_IS_LOCKED_ONLY(tp.t_data->t_infomask) ||
 			HeapTupleHeaderIsOnlyLocked(tp.t_data))
 			result = TM_Ok;
-		else if (!ItemPointerEquals(&tp.t_self, &tp.t_data->t_ctid))
+		else if (!ItemPointerEquals(&tp.t_self, &tp.t_data->t_ctid) ||
+				 HeapTupleHeaderIndicatesMovedPartitions(tp.t_data))
 			result = TM_Updated;
 		else
 			result = TM_Deleted;
@@ -3247,7 +3248,8 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 
 		if (can_continue)
 			result = TM_Ok;
-		else if (!ItemPointerEquals(&oldtup.t_self, &oldtup.t_data->t_ctid))
+		else if (!ItemPointerEquals(&oldtup.t_self, &oldtup.t_data->t_ctid) ||
+				 HeapTupleHeaderIndicatesMovedPartitions(oldtup.t_data))
 			result = TM_Updated;
 		else
 			result = TM_Deleted;
@@ -4483,7 +4485,8 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
 			HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_data->t_infomask) ||
 			HeapTupleHeaderIsOnlyLocked(tuple->t_data))
 			result = TM_Ok;
-		else if (!ItemPointerEquals(&tuple->t_self, &tuple->t_data->t_ctid))
+		else if (!ItemPointerEquals(&tuple->t_self, &tuple->t_data->t_ctid) ||
+				 HeapTupleHeaderIndicatesMovedPartitions(tuple->t_data))
 			result = TM_Updated;
 		else
 			result = TM_Deleted;
@@ -5056,7 +5059,8 @@ test_lockmode_for_conflict(MultiXactStatus status, TransactionId xid,
 								LOCKMODE_from_mxstatus(wantedstatus)))
 		{
 			/* bummer */
-			if (!ItemPointerEquals(&tup->t_self, &tup->t_data->t_ctid))
+			if (!ItemPointerEquals(&tup->t_self, &tup->t_data->t_ctid) ||
+				HeapTupleHeaderIndicatesMovedPartitions(tup->t_data))
 				return TM_Updated;
 			else
 				return TM_Deleted;
diff --git a/src/backend/access/heap/heapam_visibility.c b/src/backend/access/heap/heapam_visibility.c
@@ -607,7 +607,8 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
 	{
 		if (HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask))
 			return TM_Ok;
-		if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid))
+		if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid) ||
+			HeapTupleHeaderIndicatesMovedPartitions(tuple))
 			return TM_Updated;	/* updated by other */
 		else
 			return TM_Deleted;	/* deleted by other */
@@ -652,7 +653,8 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
 
 		if (TransactionIdDidCommit(xmax))
 		{
-			if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid))
+			if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid) ||
+				HeapTupleHeaderIndicatesMovedPartitions(tuple))
 				return TM_Updated;
 			else
 				return TM_Deleted;
@@ -712,7 +714,8 @@ HeapTupleSatisfiesUpdate(HeapTuple htup, CommandId curcid,
 
 	SetHintBits(tuple, buffer, HEAP_XMAX_COMMITTED,
 				HeapTupleHeaderGetRawXmax(tuple));
-	if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid))
+	if (!ItemPointerEquals(&htup->t_self, &tuple->t_ctid) ||
+		HeapTupleHeaderIndicatesMovedPartitions(tuple))
 		return TM_Updated;		/* updated by other */
 	else
 		return TM_Deleted;		/* deleted by other */
