Do not perform AtEOXact for autonomous transactions for SMgr, pending delete, multixacts

knizhnik · knizhnik · commit fd3ce52c3625 · 2017-05-02T17:02:21.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -2013,8 +2013,11 @@ CommitTransaction(void)
 	TransactionState s = CurrentTransactionState;
 	TransactionId latestXid;
 	bool		is_parallel_worker;
+	bool        is_autonomous_transaction;
 
 	is_parallel_worker = (s->blockState == TBLOCK_PARALLEL_INPROGRESS);
+	is_autonomous_transaction = getNestLevelATX() != 0;
+
 
 	/* Enforce parallel mode restrictions during parallel worker commit. */
 	if (is_parallel_worker)
@@ -2048,7 +2051,7 @@ CommitTransaction(void)
 		 * If there weren't any, we are done ... otherwise loop back to check
 		 * if they queued deferred triggers.  Lather, rinse, repeat.
 		 */
-		if (getNestLevelATX() != 0 || !PreCommit_Portals(false))
+		if (is_autonomous_transaction || !PreCommit_Portals(false))
 			break;
 	}
 
@@ -2160,7 +2163,7 @@ CommitTransaction(void)
 						 RESOURCE_RELEASE_BEFORE_LOCKS,
 						 true, true);
 
-	if (getNestLevelATX() == 0)
+	if (!is_autonomous_transaction)
 	{
 		/* Check we've released all buffer pins */
 		AtEOXact_Buffers(true);
@@ -2180,38 +2183,45 @@ CommitTransaction(void)
 	xactHasRelcacheInvalidationMessages = HasRelcacheInvalidationMessages();
 	AtEOXact_Inval(true);
 
-	AtEOXact_MultiXact();
-
+	if (!is_autonomous_transaction)
+	{
+		AtEOXact_MultiXact();
+	}
 	ResourceOwnerRelease(TopTransactionResourceOwner,
 						 RESOURCE_RELEASE_LOCKS,
 						 true, true);
 	ResourceOwnerRelease(TopTransactionResourceOwner,
 						 RESOURCE_RELEASE_AFTER_LOCKS,
 						 true, true);
 
-	/*
-	 * Likewise, dropping of files deleted during the transaction is best done
-	 * after releasing relcache and buffer pins.  (This is not strictly
-	 * necessary during commit, since such pins should have been released
-	 * already, but this ordering is definitely critical during abort.)  Since
-	 * this may take many seconds, also delay until after releasing locks.
-	 * Other backends will observe the attendant catalog changes and not
-	 * attempt to access affected files.
-	 */
-	smgrDoPendingDeletes(true);
+	if (!is_autonomous_transaction) 
+	{
+		/*
+		 * Likewise, dropping of files deleted during the transaction is best done
+		 * after releasing relcache and buffer pins.  (This is not strictly
+		 * necessary during commit, since such pins should have been released
+		 * already, but this ordering is definitely critical during abort.)  Since
+		 * this may take many seconds, also delay until after releasing locks.
+		 * Other backends will observe the attendant catalog changes and not
+		 * attempt to access affected files.
+		 */
+		smgrDoPendingDeletes(true);
+	}
 
 	/* Check we've released all catcache entries */
 	AtEOXact_CatCache(true);
 
 	AtCommit_Notify();
 	AtEOXact_GUC(true, s->gucNestLevel);
-	if (getNestLevelATX() == 0) 
+	if (!is_autonomous_transaction) 
+	{
 		AtEOXact_SPI(true);
+	}
 	AtEOXact_on_commit_actions(true);
 	AtEOXact_Namespace(true, is_parallel_worker);
-	AtEOXact_SMgr();
-	if (getNestLevelATX() == 0) 
+	if (!is_autonomous_transaction) 
 	{
+		AtEOXact_SMgr();
 		AtEOXact_Files();
 		AtEOXact_ComboCid();
 	}
