Fix bug in KnownAssignedXidsMany(). I saw this when looking at the

hlinnaka · hlinnaka · commit e0f9e2b648c8 · 2010-03-11T09:26:59.000Z
assertion failure reported by Erik Rijkers, but this alone doesn't explain
the failure.
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.60 2010/02/26 02:01:00 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.61 2010/03/11 09:26:59 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -448,6 +448,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 	/*
 	 * Remove stale transactions, if any.
 	 */
+	Assert(TransactionIdIsValid(running->oldestRunningXid));
 	ExpireOldKnownAssignedTransactionIds(running->oldestRunningXid);
 	StandbyReleaseOldLocks(running->oldestRunningXid);
 
@@ -2518,7 +2519,7 @@ KnownAssignedXidsRemoveMany(TransactionId xid, bool keepPreparedXacts)
 
 		if (!TransactionIdIsValid(xid) || TransactionIdPrecedes(removeXid, xid))
 		{
-			if (keepPreparedXacts && StandbyTransactionIdIsPrepared(xid))
+			if (keepPreparedXacts && StandbyTransactionIdIsPrepared(removeXid))
 				continue;
 			else
 			{

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.60 2010/02/26 02:01:00 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.61 2010/03/11 09:26:59 heikki Exp $`
`41`	`41`	`*`
`42`	`42`	`*-------------------------------------------------------------------------`
`43`	`43`	`*/`
`@@ -448,6 +448,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)`
`448`	`448`	`/*`
`449`	`449`	`* Remove stale transactions, if any.`
`450`	`450`	`*/`
	`451`	`+ Assert(TransactionIdIsValid(running->oldestRunningXid));`
`451`	`452`	`ExpireOldKnownAssignedTransactionIds(running->oldestRunningXid);`
`452`	`453`	`StandbyReleaseOldLocks(running->oldestRunningXid);`
`453`	`454`
`@@ -2518,7 +2519,7 @@ KnownAssignedXidsRemoveMany(TransactionId xid, bool keepPreparedXacts)`
`2518`	`2519`
`2519`	`2520`	`if (!TransactionIdIsValid(xid) \|\| TransactionIdPrecedes(removeXid, xid))`
`2520`	`2521`	`{`
`2521`		`- if (keepPreparedXacts && StandbyTransactionIdIsPrepared(xid))`
	`2522`	`+ if (keepPreparedXacts && StandbyTransactionIdIsPrepared(removeXid))`
`2522`	`2523`	`continue;`
`2523`	`2524`	`else`
`2524`	`2525`	`{`