Now that TransactionIdDidAbort doesn't think it should try to modify

tglsfdc · tglsfdc · commit f78ecbf20ec4 · 2004-08-28T22:04:12.000Z
pg_clog, there's no reason to do abort marking of subtransactions in a
nonintuitive order.
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.180 2004/08/28 20:31:43 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.181 2004/08/28 22:04:12 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -920,12 +920,12 @@ RecordTransactionAbort(void)
 		 * necessary but we may as well do it while we are here.
 		 *
 		 * The ordering here isn't critical but it seems best to mark the
-		 * parent last.  That reduces the chance that concurrent
-		 * TransactionIdDidAbort calls will decide they need to do redundant
-		 * work.
+		 * parent first.  This assures an atomic transition of all the
+		 * subtransactions to aborted state from the point of view of
+		 * concurrent TransactionIdDidAbort calls.
 		 */
-		TransactionIdAbortTree(nchildren, children);
 		TransactionIdAbort(xid);
+		TransactionIdAbortTree(nchildren, children);
 
 		END_CRIT_SECTION();
 	}
@@ -1062,8 +1062,8 @@ RecordSubTransactionAbort(void)
 		 * Mark the transaction aborted in clog.  This is not absolutely
 		 * necessary but we may as well do it while we are here.
 		 */
-		TransactionIdAbortTree(nchildren, children);
 		TransactionIdAbort(xid);
+		TransactionIdAbortTree(nchildren, children);
 
 		END_CRIT_SECTION();
 	}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.180 2004/08/28 20:31:43 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.181 2004/08/28 22:04:12 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -920,12 +920,12 @@ RecordTransactionAbort(void)`
`920`	`920`	`* necessary but we may as well do it while we are here.`
`921`	`921`	`*`
`922`	`922`	`* The ordering here isn't critical but it seems best to mark the`
`923`		`- * parent last. That reduces the chance that concurrent`
`924`		`- * TransactionIdDidAbort calls will decide they need to do redundant`
`925`		`- * work.`
	`923`	`+ * parent first. This assures an atomic transition of all the`
	`924`	`+ * subtransactions to aborted state from the point of view of`
	`925`	`+ * concurrent TransactionIdDidAbort calls.`
`926`	`926`	`*/`
`927`		`- TransactionIdAbortTree(nchildren, children);`
`928`	`927`	`TransactionIdAbort(xid);`
	`928`	`+ TransactionIdAbortTree(nchildren, children);`
`929`	`929`
`930`	`930`	`END_CRIT_SECTION();`
`931`	`931`	`}`
`@@ -1062,8 +1062,8 @@ RecordSubTransactionAbort(void)`
`1062`	`1062`	`* Mark the transaction aborted in clog. This is not absolutely`
`1063`	`1063`	`* necessary but we may as well do it while we are here.`
`1064`	`1064`	`*/`
`1065`		`- TransactionIdAbortTree(nchildren, children);`
`1066`	`1065`	`TransactionIdAbort(xid);`
	`1066`	`+ TransactionIdAbortTree(nchildren, children);`
`1067`	`1067`
`1068`	`1068`	`END_CRIT_SECTION();`
`1069`	`1069`	`}`