Fix comment, add Assert.

tglsfdc · tglsfdc · commit 936114a019f6 · 2001-09-04T19:12:05.000Z
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.208 2001/08/26 16:55:59 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.209 2001/09/04 19:12:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1069,8 +1069,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,
 											  FreezeLimit))
 					{
 						tuple.t_data->t_xmin = FrozenTransactionId;
-						tuple.t_data->t_infomask &= ~HEAP_XMIN_INVALID;
-						tuple.t_data->t_infomask |= HEAP_XMIN_COMMITTED;
+						/* infomask should be okay already */
+						Assert(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED);
 						pgchanged = true;
 					}
 					break;
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
@@ -31,7 +31,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.5 2001/08/26 16:55:59 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuumlazy.c,v 1.6 2001/09/04 19:12:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -318,14 +318,21 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
 					/*
 					 * Tuple is good.  Consider whether to replace its xmin
 					 * value with FrozenTransactionId.
+					 *
+					 * NB: Since we hold only a shared buffer lock here,
+					 * we are assuming that TransactionId read/write
+					 * is atomic.  This is not the only place that makes
+					 * such an assumption.  It'd be possible to avoid the
+					 * assumption by momentarily acquiring exclusive lock,
+					 * but for the moment I see no need to.
 					 */
 					if (TransactionIdIsNormal(tuple.t_data->t_xmin) &&
 						TransactionIdPrecedes(tuple.t_data->t_xmin,
 											  FreezeLimit))
 					{
 						tuple.t_data->t_xmin = FrozenTransactionId;
-						tuple.t_data->t_infomask &= ~HEAP_XMIN_INVALID;
-						tuple.t_data->t_infomask |= HEAP_XMIN_COMMITTED;
+						/* infomask should be okay already */
+						Assert(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED);
 						pgchanged = true;
 					}
 					break;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.208 2001/08/26 16:55:59 tgl Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.209 2001/09/04 19:12:05 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -1069,8 +1069,8 @@ scan_heap(VRelStats *vacrelstats, Relation onerel,`
`1069`	`1069`	`FreezeLimit))`
`1070`	`1070`	`{`
`1071`	`1071`	`tuple.t_data->t_xmin = FrozenTransactionId;`
`1072`		`- tuple.t_data->t_infomask &= ~HEAP_XMIN_INVALID;`
`1073`		`- tuple.t_data->t_infomask \|= HEAP_XMIN_COMMITTED;`
	`1072`	`+ /* infomask should be okay already */`
	`1073`	`+ Assert(tuple.t_data->t_infomask & HEAP_XMIN_COMMITTED);`
`1074`	`1074`	`pgchanged = true;`
`1075`	`1075`	`}`
`1076`	`1076`	`break;`