Manually delete physical files for ENR entries when leaving scope.

src/backend/access/transam/xact.c

@@ -2356,7 +2356,7 @@ CommitTransaction(void)
 	 * Other backends will observe the attendant catalog changes and not
 	 * attempt to access affected files.
 	 */
-	smgrDoPendingDeletes(true);
+	smgrDoPendingDeletes(true, false);
 
 	/*
 	 * Send out notification signals to other backends (and do other
@@ -2871,7 +2871,7 @@ AbortTransaction(void)
 		ResourceOwnerRelease(TopTransactionResourceOwner,
 							 RESOURCE_RELEASE_AFTER_LOCKS,
 							 false, true);
-		smgrDoPendingDeletes(false);
+		smgrDoPendingDeletes(false, false);
 
 		AtEOXact_GUC(false, 1);
 		AtEOXact_SPI(false);

src/backend/catalog/storage.c

@@ -74,6 +74,7 @@ typedef struct PendingRelSync
 } PendingRelSync;
 
 static PendingRelDelete *pendingDeletes = NULL; /* head of linked list */
+static PendingRelDelete *pendingENRDeletes = NULL;
 static HTAB *pendingSyncHash = NULL;
 
 
@@ -248,6 +249,59 @@ RelationDropStorage(Relation rel)
 	RelationCloseSmgr(rel);
 }
 
+/*
+ * ENRDropStorage
+ *		Schedule unlinking of physical storage at transaction commit.
+ * 
+ * This is copied from RelationDropStorage, with references to pendingDeletes
+ * changed to pendingENRDeletes.
+ */
+void
+ENRDropStorage(Relation rel)
+{
+	PendingRelDelete *pending;
+
+	/* Add the relation to the list of stuff to delete at commit */
+	pending = (PendingRelDelete *)
+		MemoryContextAlloc(TopMemoryContext, sizeof(PendingRelDelete));
+	pending->rlocator = rel->rd_locator;
+	pending->backend = rel->rd_backend;
+	pending->atCommit = true;	/* delete if commit */
+	pending->nestLevel = GetCurrentTransactionNestLevel();
+	pending->next = pendingENRDeletes;
+	pendingENRDeletes = pending;
+
+	/*
+	 * BBF Table Variables were not registered in pendingDeletes in RelationCreateStorage().
+	 * This allows us to skip files from being unlinked automatically during AbortTransaction().
+	 * However, we need to unlink the files on explicit DROP TABLE command regardless
+	 * if the transaction state is committing or aborting.
+	 */
+	if (sql_dialect == SQL_DIALECT_TSQL && RelationIsBBFTableVariable(rel))
+	{
+		pending = (PendingRelDelete *)
+		MemoryContextAlloc(TopMemoryContext, sizeof(PendingRelDelete));
+		pending->rlocator = rel->rd_locator;
+		pending->backend = rel->rd_backend;
+		pending->atCommit = false;
+		pending->nestLevel = GetCurrentTransactionNestLevel();
+		pending->next = pendingENRDeletes;
+		pendingENRDeletes = pending;
+	}
+
+	/*
+	 * NOTE: if the relation was created in this transaction, it will now be
+	 * present in the pending-delete list twice, once with atCommit true and
+	 * once with atCommit false.  Hence, it will be physically deleted at end
+	 * of xact in either case (and the other entry will be ignored by
+	 * smgrDoPendingDeletes, so no error will occur).  We could instead remove
+	 * the existing list entry and delete the physical file immediately, but
+	 * for now I'll keep the logic simple.
+	 */
+
+	RelationCloseSmgr(rel);
+}
+
 /*
  * RelationPreserveStorage
  *		Mark a relation as not to be deleted after all.
@@ -664,9 +718,14 @@ RestorePendingSyncs(char *startAddress)
  * no physical storage in any fork. In particular, it's possible that we're
  * cleaning up an old temporary relation for which RemovePgTempFiles has
  * already recovered the physical storage.
+ * 
+ * Second Note: Since TSQL ENR entries (table variables and temp tables) need to 
+ * be cleaned up at end of scope rather than end of transaction, we also maintain 
+ * a separate list of pendingENRDeletes which can be separately processed by 
+ * calling this function with forENR=true.
  */
 void
-smgrDoPendingDeletes(bool isCommit)
+smgrDoPendingDeletes(bool isCommit, bool forENR)
 {
 	int			nestLevel = GetCurrentTransactionNestLevel();
 	PendingRelDelete *pending;
@@ -677,7 +736,7 @@ smgrDoPendingDeletes(bool isCommit)
 	SMgrRelation *srels = NULL;
 
 	prev = NULL;
-	for (pending = pendingDeletes; pending != NULL; pending = next)
+	for (pending = (forENR ? pendingENRDeletes : pendingDeletes); pending != NULL; pending = next)
 	{
 		next = pending->next;
 		if (pending->nestLevel < nestLevel)
@@ -691,7 +750,12 @@ smgrDoPendingDeletes(bool isCommit)
 			if (prev)
 				prev->next = next;
 			else
-				pendingDeletes = next;
+			{
+				if (forENR)
+					pendingENRDeletes = next;
+				else
+					pendingDeletes = next;
+			}
 			/* do deletion if called for */
 			if (pending->atCommit == isCommit)
 			{
@@ -970,7 +1034,7 @@ AtSubCommit_smgr(void)
 void
 AtSubAbort_smgr(void)
 {
-	smgrDoPendingDeletes(false);
+	smgrDoPendingDeletes(false, false);
 }
 
 void

src/backend/utils/misc/queryenvironment.c

@@ -41,6 +41,7 @@
 #include "catalog/pg_attrdef.h"
 #include "catalog/pg_shdepend.h"
 #include "catalog/pg_index_d.h"
+#include "catalog/storage.h"
 #include "parser/parser.h"      /* only needed for GUC variables */
 #include "utils/inval.h"
 #include "utils/guc.h"
@@ -1543,6 +1544,17 @@ bool useTempOidBufferForOid(Oid relId)
 		&& get_ENR_withoid(currentQueryEnv, relId, ENR_TSQL_TEMP);
 }
 
+/*
+ * Helper function to drop physical storage for an ENR entry.
+ */
+static void
+ENRDelete(Oid relid)
+{
+	Relation rel = relation_open(relid, AccessExclusiveLock);
+	ENRDropStorage(rel);
+	relation_close(rel, NoLock);
+}
+
 /*
  * Drop all the temp tables registered as ENR in the given query environment.
  */
@@ -1572,6 +1584,10 @@ ENRDropTempTables(QueryEnvironment *queryEnv)
 		object.objectSubId = 0;
 		object.objectId = enr->md.reliddesc;
 		add_exact_object_address(&object, objects);
+		/*
+		 * Also register the physical file to be deleted at the end of scope.
+		 */
+		ENRDelete(enr->md.reliddesc);
 	}
 
 	/*

src/include/catalog/storage.h

@@ -26,6 +26,7 @@ extern SMgrRelation RelationCreateStorage(RelFileLocator rlocator,
 										  char relpersistence,
 										  bool register_delete);
 extern void RelationDropStorage(Relation rel);
+extern void ENRDropStorage(Relation rel);
 extern void RelationPreserveStorage(RelFileLocator rlocator, bool atCommit);
 extern void RelationPreTruncate(Relation rel);
 extern void RelationTruncate(Relation rel, BlockNumber nblocks);
@@ -40,7 +41,7 @@ extern void RestorePendingSyncs(char *startAddress);
  * These functions used to be in storage/smgr/smgr.c, which explains the
  * naming
  */
-extern void smgrDoPendingDeletes(bool isCommit);
+extern void smgrDoPendingDeletes(bool isCommit, bool forENR);
 extern void smgrDoPendingSyncs(bool isCommit, bool isParallelWorker);
 extern int	smgrGetPendingDeletes(bool forCommit, RelFileLocator **ptr);
 extern void AtSubCommit_smgr(void);