Fix temporary tablespaces for shared filesets some more.

tglsfdc · tglsfdc · commit 79ed1d99d7ce · 2020-07-03T17:01:34.000-04:00
Commit ecd9e9f fixed the problem in the wrong place, causing unwanted side-effects on the behavior of GetNextTempTableSpace(). Instead, let's make SharedFileSetInit() responsible for subbing in the value of MyDatabaseTableSpace when the default tablespace is called for. The convention about what is in the tempTableSpaces[] array is evidently insufficiently documented, so try to improve that. It also looks like SharedFileSetInit() is doing the wrong thing in the case where temp_tablespaces is empty. It was hard-wiring use of the pg_default tablespace, but it seems like using MyDatabaseTableSpace is more consistent with what happens for other temp files. Back-patch the reversion of PrepareTempTablespaces()'s behavior to 9.5, as ecd9e9f was. The changes in SharedFileSetInit() go back to v11 where that was introduced. (Note there is net zero code change before v11 from these two patch sets, so nothing to release-note.) Magnus Hagander and Tom Lane Discussion: https://postgr.es/m/CABUevExg5YEsOvqMxrjoNvb3ApVyH+9jggWGKwTDFyFCVWczGQ@mail.gmail.com
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
@@ -1151,6 +1151,7 @@ GetDefaultTablespace(char relpersistence)
 
 typedef struct
 {
+	/* Array of OIDs to be passed to SetTempTablespaces() */
 	int			numSpcs;
 	Oid			tblSpcs[FLEXIBLE_ARRAY_MEMBER];
 } temp_tablespaces_extra;
@@ -1200,6 +1201,7 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
 			/* Allow an empty string (signifying database default) */
 			if (curname[0] == '\0')
 			{
+				/* InvalidOid signifies database's default tablespace */
 				tblSpcs[numSpcs++] = InvalidOid;
 				continue;
 			}
@@ -1226,6 +1228,7 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
 			 */
 			if (curoid == MyDatabaseTableSpace)
 			{
+				/* InvalidOid signifies database's default tablespace */
 				tblSpcs[numSpcs++] = InvalidOid;
 				continue;
 			}
@@ -1336,6 +1339,7 @@ PrepareTempTablespaces(void)
 		/* Allow an empty string (signifying database default) */
 		if (curname[0] == '\0')
 		{
+			/* InvalidOid signifies database's default tablespace */
 			tblSpcs[numSpcs++] = InvalidOid;
 			continue;
 		}
@@ -1354,7 +1358,8 @@ PrepareTempTablespaces(void)
 		 */
 		if (curoid == MyDatabaseTableSpace)
 		{
-			tblSpcs[numSpcs++] = curoid;
+			/* InvalidOid signifies database's default tablespace */
+			tblSpcs[numSpcs++] = InvalidOid;
 			continue;
 		}
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -261,8 +261,10 @@ static AllocateDesc *allocatedDescs = NULL;
 static long tempFileCounter = 0;
 
 /*
- * Array of OIDs of temp tablespaces.  When numTempTableSpaces is -1,
- * this has not been set in the current transaction.
+ * Array of OIDs of temp tablespaces.  (Some entries may be InvalidOid,
+ * indicating that the current database's default tablespace should be used.)
+ * When numTempTableSpaces is -1, this has not been set in the current
+ * transaction.
  */
 static Oid *tempTableSpaces = NULL;
 static int	numTempTableSpaces = -1;
@@ -2822,6 +2824,9 @@ closeAllVfds(void)
  * unless this function is called again before then.  It is caller's
  * responsibility that the passed-in array has adequate lifespan (typically
  * it'd be allocated in TopTransactionContext).
+ *
+ * Some entries of the array may be InvalidOid, indicating that the current
+ * database's default tablespace should be used.
  */
 void
 SetTempTablespaces(Oid *tableSpaces, int numSpaces)
@@ -2861,7 +2866,10 @@ TempTablespacesAreSet(void)
  * GetTempTablespaces
  *
  * Populate an array with the OIDs of the tablespaces that should be used for
- * temporary files.  Return the number that were copied into the output array.
+ * temporary files.  (Some entries may be InvalidOid, indicating that the
+ * current database's default tablespace should be used.)  At most numSpaces
+ * entries will be filled.
+ * Returns the number of OIDs that were copied into the output array.
  */
 int
 GetTempTablespaces(Oid *tableSpaces, int numSpaces)
diff --git a/src/backend/storage/file/sharedfileset.c b/src/backend/storage/file/sharedfileset.c
@@ -61,9 +61,25 @@ SharedFileSetInit(SharedFileSet *fileset, dsm_segment *seg)
 						   lengthof(fileset->tablespaces));
 	if (fileset->ntablespaces == 0)
 	{
-		fileset->tablespaces[0] = DEFAULTTABLESPACE_OID;
+		/* If the GUC is empty, use current database's default tablespace */
+		fileset->tablespaces[0] = MyDatabaseTableSpace;
 		fileset->ntablespaces = 1;
 	}
+	else
+	{
+		int			i;
+
+		/*
+		 * An entry of InvalidOid means use the default tablespace for the
+		 * current database.  Replace that now, to be sure that all users of
+		 * the SharedFileSet agree on what to do.
+		 */
+		for (i = 0; i < fileset->ntablespaces; i++)
+		{
+			if (fileset->tablespaces[i] == InvalidOid)
+				fileset->tablespaces[i] = MyDatabaseTableSpace;
+		}
+	}
 
 	/* Register our cleanup callback. */
 	on_dsm_detach(seg, SharedFileSetOnDetach, PointerGetDatum(fileset));

Original file line number	Diff line number	Diff line change
`@@ -1151,6 +1151,7 @@ GetDefaultTablespace(char relpersistence)`
`1151`	`1151`
`1152`	`1152`	`typedef struct`
`1153`	`1153`	`{`
	`1154`	`+ /* Array of OIDs to be passed to SetTempTablespaces() */`
`1154`	`1155`	`int numSpcs;`
`1155`	`1156`	`Oid tblSpcs[FLEXIBLE_ARRAY_MEMBER];`
`1156`	`1157`	`} temp_tablespaces_extra;`
`@@ -1200,6 +1201,7 @@ check_temp_tablespaces(char newval, void extra, GucSource source)`
`1200`	`1201`	`/* Allow an empty string (signifying database default) */`
`1201`	`1202`	`if (curname[0] == '\0')`
`1202`	`1203`	`{`
	`1204`	`+ /* InvalidOid signifies database's default tablespace */`
`1203`	`1205`	`tblSpcs[numSpcs++] = InvalidOid;`
`1204`	`1206`	`continue;`
`1205`	`1207`	`}`
`@@ -1226,6 +1228,7 @@ check_temp_tablespaces(char newval, void extra, GucSource source)`
`1226`	`1228`	`*/`
`1227`	`1229`	`if (curoid == MyDatabaseTableSpace)`
`1228`	`1230`	`{`
	`1231`	`+ /* InvalidOid signifies database's default tablespace */`
`1229`	`1232`	`tblSpcs[numSpcs++] = InvalidOid;`
`1230`	`1233`	`continue;`
`1231`	`1234`	`}`
`@@ -1336,6 +1339,7 @@ PrepareTempTablespaces(void)`
`1336`	`1339`	`/* Allow an empty string (signifying database default) */`
`1337`	`1340`	`if (curname[0] == '\0')`
`1338`	`1341`	`{`
	`1342`	`+ /* InvalidOid signifies database's default tablespace */`
`1339`	`1343`	`tblSpcs[numSpcs++] = InvalidOid;`
`1340`	`1344`	`continue;`
`1341`	`1345`	`}`
`@@ -1354,7 +1358,8 @@ PrepareTempTablespaces(void)`
`1354`	`1358`	`*/`
`1355`	`1359`	`if (curoid == MyDatabaseTableSpace)`
`1356`	`1360`	`{`
`1357`		`- tblSpcs[numSpcs++] = curoid;`
	`1361`	`+ /* InvalidOid signifies database's default tablespace */`
	`1362`	`+ tblSpcs[numSpcs++] = InvalidOid;`
`1358`	`1363`	`continue;`
`1359`	`1364`	`}`
`1360`	`1365`