Fix handling pending deletes for ATX

knizhnik · knizhnik · commit d4cd07dcbd64 · 2017-11-03T13:08:46.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -1856,6 +1856,7 @@ typedef struct {
 	void *SPIState;
 	void *SnapshotState;
 	void *PredicateState;
+	void *StorageState;
 	struct TransInvalidationInfo* InvalidationInfo;
 
 	List *on_commit_actions;
@@ -2197,19 +2198,16 @@ CommitTransaction(void)
 						 RESOURCE_RELEASE_AFTER_LOCKS,
 						 true, 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);
-	}
+	/*
+	 * 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);
 
 	AtCommit_Notify();
 	AtEOXact_GUC(true, s->gucNestLevel);
@@ -3532,7 +3530,8 @@ void SuspendTransaction(void)
 
 		sus->SnapshotState = SuspendSnapshot(); /* only before the resource-owner stuff */
 		sus->PredicateState = SuspendPredicate();
-		
+		sus->StorageState = SuspendStorage();
+
 		if (HasCatcacheInvalidationMessages()) 
 		{
 			ResetCatalogCaches();
@@ -3655,6 +3654,7 @@ bool ResumeTransaction(void)
 
 		ResumeSnapshot(sus->SnapshotState); /* only after the resource-owner stuff */
 		ResumePredicate(sus->PredicateState);
+		ResumeStorage(sus->StorageState);
 		ResumeInvalidationInfo(sus->InvalidationInfo);
 		if (xactHasCatcacheInvalidationMessages) 
 		{
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
@@ -563,3 +563,15 @@ smgr_redo(XLogReaderState *record)
 	else
 		elog(PANIC, "smgr_redo: unknown op code %u", info);
 }
+
+void* SuspendStorage(void)
+{
+	PendingRelDelete* pending = pendingDeletes;
+	pendingDeletes = NULL;
+	return pending;
+}
+
+void ResumeStorage(void* ctx)
+{
+	pendingDeletes = (PendingRelDelete*)ctx;
+}
diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h
@@ -33,4 +33,7 @@ extern void AtSubCommit_smgr(void);
 extern void AtSubAbort_smgr(void);
 extern void PostPrepare_smgr(void);
 
+extern void* SuspendStorage(void);
+extern void ResumeStorage(void* ctx);
+
 #endif   /* STORAGE_H */
