Commitcd0ceba

committed

Always SnapshotResetXmin() during ClearTransaction()

Avoid corner cases during 2PC with6bad580

1 parent3217327 commitcd0cebaCopy full SHA for cd0ceba

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2640,7 +2640,7 @@ CleanupTransaction(void)`
`2640`	`2640`	`* do abort cleanup processing`
`2641`	`2641`	`*/`
`2642`	`2642`	`AtCleanup_Portals();/* now safe to release portal memory */`
`2643`		`-AtEOXact_Snapshot(false,false);/* and release the transaction's snapshots */`
	`2643`	`+AtEOXact_Snapshot(false,true);/* and release the transaction's snapshots */`
`2644`	`2644`
`2645`	`2645`	`CurrentResourceOwner=NULL;/* and resource owner */`
`2646`	`2646`	`if (TopTransactionResourceOwner)`

Lines changed: 7 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1051,7 +1051,7 @@ AtSubAbort_Snapshot(int level)`
`1051`	`1051`	`*Snapshot manager's cleanup function for end of transaction`
`1052`	`1052`	`*/`
`1053`	`1053`	`void`
`1054`		`-AtEOXact_Snapshot(boolisCommit,boolisPrepare)`
	`1054`	`+AtEOXact_Snapshot(boolisCommit,boolresetXmin)`
`1055`	`1055`	`{`
`1056`	`1056`	`/*`
`1057`	`1057`	`* In transaction-snapshot mode we must release our privately-managed`
`@@ -1137,16 +1137,15 @@ AtEOXact_Snapshot(bool isCommit, bool isPrepare)`
`1137`	`1137`	`FirstSnapshotSet= false;`
`1138`	`1138`
`1139`	`1139`	`/*`
`1140`		`- * During normal commit and abort processing, we call`
`1141`		`- * ProcArrayEndTransaction() or ProcArrayClearTransaction() to`
`1142`		`- * reset the PgXact->xmin. That call happens prior to the call to`
`1143`		`- * AtEOXact_Snapshot(), so we need not touch xmin here at all,`
`1144`		`- * accept when we are preparing a transaction.`
	`1140`	`+ * During normal commit processing, we call`
	`1141`	`+ * ProcArrayEndTransaction() to reset the PgXact->xmin. That call`
	`1142`	`+ * happens prior to the call to AtEOXact_Snapshot(), so we need`
	`1143`	`+ * not touch xmin here at all.`
`1145`	`1144`	`*/`
`1146`		`-if (isPrepare)`
	`1145`	`+if (resetXmin)`
`1147`	`1146`	`SnapshotResetXmin();`
`1148`	`1147`
`1149`		`-Assert(isPrepare\|\|MyPgXact->xmin==0);`
	`1148`	`+Assert(resetXmin\|\|MyPgXact->xmin==0);`
`1150`	`1149`	`}`
`1151`	`1150`
`1152`	`1151`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ extern void UnregisterSnapshotFromOwner(Snapshot snapshot, ResourceOwner owner);`
`85`	`85`
`86`	`86`	`externvoidAtSubCommit_Snapshot(intlevel);`
`87`	`87`	`externvoidAtSubAbort_Snapshot(intlevel);`
`88`		`-externvoidAtEOXact_Snapshot(boolisCommit,boolisPrepare);`
	`88`	`+externvoidAtEOXact_Snapshot(boolisCommit,boolresetXmin);`
`89`	`89`
`90`	`90`	`externvoidImportSnapshot(constchar*idstr);`
`91`	`91`	`externboolXactHasExportedSnapshots(void);`

Comments

(0)