Add C comments that HEAP_MOVED_* define usage is only for pre-9.0 binary

bmomjian · bmomjian · commit dfc902854aa0 · 2010-02-08T14:10:21.000Z
upgrades.
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -50,7 +50,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.116 2010/02/08 04:33:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.117 2010/02/08 14:10:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -91,7 +91,7 @@ static bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
  * code in heapam.c relies on that!)
  *
  * Also, if we are cleaning up HEAP_MOVED_IN or HEAP_MOVED_OFF entries, then
- * we can always set the hint bits, since old-style VACUUM FULL always used
+ * we can always set the hint bits, since pre-9.0 VACUUM FULL always used
  * synchronous commits and didn't move tuples that weren't previously
  * hinted.  (This is not known by this subroutine, but is applied by its
  * callers.)  Note: old-style VACUUM FULL is gone, but we have to keep this
@@ -167,6 +167,7 @@ HeapTupleSatisfiesSelf(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return false;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -185,6 +186,7 @@ HeapTupleSatisfiesSelf(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -338,6 +340,7 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return false;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -356,6 +359,7 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -502,6 +506,7 @@ HeapTupleSatisfiesToast(HeapTupleHeader tuple, Snapshot snapshot,
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return false;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -520,6 +525,7 @@ HeapTupleSatisfiesToast(HeapTupleHeader tuple, Snapshot snapshot,
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -581,6 +587,7 @@ HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return HeapTupleInvisible;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -599,6 +606,7 @@ HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -748,6 +756,7 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple, Snapshot snapshot,
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return false;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -766,6 +775,7 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple, Snapshot snapshot,
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -907,6 +917,7 @@ HeapTupleSatisfiesMVCC(HeapTupleHeader tuple, Snapshot snapshot,
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return false;
 
+		/* Used by pre-9.0 binary upgrades */
 		if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -925,6 +936,7 @@ HeapTupleSatisfiesMVCC(HeapTupleHeader tuple, Snapshot snapshot,
 							InvalidTransactionId);
 			}
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -1066,6 +1078,7 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 	{
 		if (tuple->t_infomask & HEAP_XMIN_INVALID)
 			return HEAPTUPLE_DEAD;
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_OFF)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
@@ -1083,6 +1096,7 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,
 			SetHintBits(tuple, buffer, HEAP_XMIN_COMMITTED,
 						InvalidTransactionId);
 		}
+		/* Used by pre-9.0 binary upgrades */
 		else if (tuple->t_infomask & HEAP_MOVED_IN)
 		{
 			TransactionId xvac = HeapTupleHeaderGetXvac(tuple);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.111 2010/02/08 04:33:54 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.112 2010/02/08 14:10:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -176,9 +176,11 @@ typedef HeapTupleHeaderData *HeapTupleHeader;
 #define HEAP_XMAX_IS_MULTI		0x1000	/* t_xmax is a MultiXactId */
 #define HEAP_UPDATED			0x2000	/* this is UPDATEd version of row */
 #define HEAP_MOVED_OFF			0x4000	/* moved to another place by
-										 * old-style VACUUM FULL */
+										 * pre-9.0 VACUUM FULL; kept
+										 * for binary upgrade support */
 #define HEAP_MOVED_IN			0x8000	/* moved from another place by
-										 * old-style VACUUM FULL */
+										 * pre-9.0 VACUUM FULL; kept
+										 * for binary upgrade support */
 #define HEAP_MOVED (HEAP_MOVED_OFF | HEAP_MOVED_IN)
 
 #define HEAP_XACT_MASK			0xFFE0	/* visibility-related bits */

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`* Portions Copyright (c) 1994, Regents of the University of California`
`51`	`51`	`*`
`52`	`52`	`* IDENTIFICATION`
`53`		`- * $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.116 2010/02/08 04:33:54 tgl Exp $`
	`53`	`+ * $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.117 2010/02/08 14:10:21 momjian Exp $`
`54`	`54`	`*`
`55`	`55`	`*-------------------------------------------------------------------------`
`56`	`56`	`*/`
`@@ -91,7 +91,7 @@ static bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);`
`91`	`91`	`* code in heapam.c relies on that!)`
`92`	`92`	`*`
`93`	`93`	`* Also, if we are cleaning up HEAP_MOVED_IN or HEAP_MOVED_OFF entries, then`
`94`		`- * we can always set the hint bits, since old-style VACUUM FULL always used`
	`94`	`+ * we can always set the hint bits, since pre-9.0 VACUUM FULL always used`
`95`	`95`	`* synchronous commits and didn't move tuples that weren't previously`
`96`	`96`	`* hinted. (This is not known by this subroutine, but is applied by its`
`97`	`97`	`* callers.) Note: old-style VACUUM FULL is gone, but we have to keep this`
`@@ -167,6 +167,7 @@ HeapTupleSatisfiesSelf(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)`
`167`	`167`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`168`	`168`	`return false;`
`169`	`169`
	`170`	`+ /* Used by pre-9.0 binary upgrades */`
`170`	`171`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`171`	`172`	`{`
`172`	`173`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -185,6 +186,7 @@ HeapTupleSatisfiesSelf(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)`
`185`	`186`	`InvalidTransactionId);`
`186`	`187`	`}`
`187`	`188`	`}`
	`189`	`+ /* Used by pre-9.0 binary upgrades */`
`188`	`190`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`189`	`191`	`{`
`190`	`192`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -338,6 +340,7 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)`
`338`	`340`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`339`	`341`	`return false;`
`340`	`342`
	`343`	`+ /* Used by pre-9.0 binary upgrades */`
`341`	`344`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`342`	`345`	`{`
`343`	`346`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -356,6 +359,7 @@ HeapTupleSatisfiesNow(HeapTupleHeader tuple, Snapshot snapshot, Buffer buffer)`
`356`	`359`	`InvalidTransactionId);`
`357`	`360`	`}`
`358`	`361`	`}`
	`362`	`+ /* Used by pre-9.0 binary upgrades */`
`359`	`363`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`360`	`364`	`{`
`361`	`365`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -502,6 +506,7 @@ HeapTupleSatisfiesToast(HeapTupleHeader tuple, Snapshot snapshot,`
`502`	`506`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`503`	`507`	`return false;`
`504`	`508`
	`509`	`+ /* Used by pre-9.0 binary upgrades */`
`505`	`510`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`506`	`511`	`{`
`507`	`512`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -520,6 +525,7 @@ HeapTupleSatisfiesToast(HeapTupleHeader tuple, Snapshot snapshot,`
`520`	`525`	`InvalidTransactionId);`
`521`	`526`	`}`
`522`	`527`	`}`
	`528`	`+ /* Used by pre-9.0 binary upgrades */`
`523`	`529`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`524`	`530`	`{`
`525`	`531`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -581,6 +587,7 @@ HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,`
`581`	`587`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`582`	`588`	`return HeapTupleInvisible;`
`583`	`589`
	`590`	`+ /* Used by pre-9.0 binary upgrades */`
`584`	`591`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`585`	`592`	`{`
`586`	`593`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -599,6 +606,7 @@ HeapTupleSatisfiesUpdate(HeapTupleHeader tuple, CommandId curcid,`
`599`	`606`	`InvalidTransactionId);`
`600`	`607`	`}`
`601`	`608`	`}`
	`609`	`+ /* Used by pre-9.0 binary upgrades */`
`602`	`610`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`603`	`611`	`{`
`604`	`612`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -748,6 +756,7 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple, Snapshot snapshot,`
`748`	`756`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`749`	`757`	`return false;`
`750`	`758`
	`759`	`+ /* Used by pre-9.0 binary upgrades */`
`751`	`760`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`752`	`761`	`{`
`753`	`762`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -766,6 +775,7 @@ HeapTupleSatisfiesDirty(HeapTupleHeader tuple, Snapshot snapshot,`
`766`	`775`	`InvalidTransactionId);`
`767`	`776`	`}`
`768`	`777`	`}`
	`778`	`+ /* Used by pre-9.0 binary upgrades */`
`769`	`779`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`770`	`780`	`{`
`771`	`781`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -907,6 +917,7 @@ HeapTupleSatisfiesMVCC(HeapTupleHeader tuple, Snapshot snapshot,`
`907`	`917`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`908`	`918`	`return false;`
`909`	`919`
	`920`	`+ /* Used by pre-9.0 binary upgrades */`
`910`	`921`	`if (tuple->t_infomask & HEAP_MOVED_OFF)`
`911`	`922`	`{`
`912`	`923`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -925,6 +936,7 @@ HeapTupleSatisfiesMVCC(HeapTupleHeader tuple, Snapshot snapshot,`
`925`	`936`	`InvalidTransactionId);`
`926`	`937`	`}`
`927`	`938`	`}`
	`939`	`+ /* Used by pre-9.0 binary upgrades */`
`928`	`940`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`929`	`941`	`{`
`930`	`942`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -1066,6 +1078,7 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,`
`1066`	`1078`	`{`
`1067`	`1079`	`if (tuple->t_infomask & HEAP_XMIN_INVALID)`
`1068`	`1080`	`return HEAPTUPLE_DEAD;`
	`1081`	`+ /* Used by pre-9.0 binary upgrades */`
`1069`	`1082`	`else if (tuple->t_infomask & HEAP_MOVED_OFF)`
`1070`	`1083`	`{`
`1071`	`1084`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`
`@@ -1083,6 +1096,7 @@ HeapTupleSatisfiesVacuum(HeapTupleHeader tuple, TransactionId OldestXmin,`
`1083`	`1096`	`SetHintBits(tuple, buffer, HEAP_XMIN_COMMITTED,`
`1084`	`1097`	`InvalidTransactionId);`
`1085`	`1098`	`}`
	`1099`	`+ /* Used by pre-9.0 binary upgrades */`
`1086`	`1100`	`else if (tuple->t_infomask & HEAP_MOVED_IN)`
`1087`	`1101`	`{`
`1088`	`1102`	`TransactionId xvac = HeapTupleHeaderGetXvac(tuple);`