Fix temporary tablespaces for shared filesets

mhagander · mhagander · commit 28a862e9dcc4 · 2020-07-03T15:10:33.000+02:00
A likely copy/paste error in 98e8b48 from back in 2004 would cause temp tablespace to be reset to InvalidOid if temp_tablespaces was set to the same value as the primary tablespace in the database. This would cause shared filesets (such as for parallel hash joins) to ignore them, putting the temporary files in the default tablespace instead of the configured one. The bug is in the old code, but it appears to have been exposed only once we had shared filesets. Reviewed-By: Daniel Gustafsson Discussion: https://postgr.es/m/CABUevExg5YEsOvqMxrjoNvb3ApVyH+9jggWGKwTDFyFCVWczGQ@mail.gmail.com Backpatch-through: 9.5
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
@@ -1387,7 +1387,7 @@ PrepareTempTablespaces(void)
 		 */
 		if (curoid == MyDatabaseTableSpace)
 		{
-			tblSpcs[numSpcs++] = InvalidOid;
+			tblSpcs[numSpcs++] = curoid;
 			continue;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -1387,7 +1387,7 @@ PrepareTempTablespaces(void)`
`1387`	`1387`	`*/`
`1388`	`1388`	`if (curoid == MyDatabaseTableSpace)`
`1389`	`1389`	`{`
`1390`		`- tblSpcs[numSpcs++] = InvalidOid;`
	`1390`	`+ tblSpcs[numSpcs++] = curoid;`
`1391`	`1391`	`continue;`
`1392`	`1392`	`}`
`1393`	`1393`