Allow extension to overwrite about-to-be created TOAST tablespace (#278)

* Allow extension to overwrite about-to-be created TOAST tablespace

* remove abi change

Author: reshke

src/backend/catalog/toasting.c

@@ -37,10 +37,10 @@
 /* Potentially set by contrib/pg_upgrade_support functions */
 Oid			binary_upgrade_next_toast_pg_type_oid = InvalidOid;
 
-static void CheckAndCreateToastTable(Oid relOid, Datum reloptions,
+static void CheckAndCreateToastTable(Oid relOid, Oid tablespaceOid, Datum reloptions,
 						 LOCKMODE lockmode, bool check,
 						 bool is_part_child, bool is_part_parent);
-static bool create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
+static bool create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Oid tablespaceOid,
 				   Datum reloptions, LOCKMODE lockmode, bool check,
 				   bool is_part_child, bool is_part_parent);
 static bool needs_toast_table(Relation rel);
@@ -75,15 +75,15 @@ void
 AlterTableCreateToastTable(Oid relOid, Datum reloptions, LOCKMODE lockmode,
 						   bool is_part_child, bool is_part_parent)
 {
-	CheckAndCreateToastTable(relOid, reloptions, lockmode, true,
+	CheckAndCreateToastTable(relOid, InvalidOid, reloptions, lockmode, true,
 							 is_part_child, is_part_parent);
 }
 
 void
-NewHeapCreateToastTable(Oid relOid, Datum reloptions, LOCKMODE lockmode,
+NewHeapCreateToastTable(Oid relOid, Oid tablespaceOid, Datum reloptions, LOCKMODE lockmode,
 							bool is_part_child, bool is_part_parent)
 {
-	CheckAndCreateToastTable(relOid, reloptions, lockmode, false,
+	CheckAndCreateToastTable(relOid, tablespaceOid, reloptions, lockmode, false,
 							 is_part_child, is_part_parent);
 }
 
@@ -108,20 +108,20 @@ NewRelationCreateToastTable(Oid relOid, Datum reloptions,
 	else
 		lockmode = AccessExclusiveLock;
 
-	CheckAndCreateToastTable(relOid, reloptions, AccessExclusiveLock, false,
+	CheckAndCreateToastTable(relOid, InvalidOid, reloptions, AccessExclusiveLock, false,
 							 is_part_child, is_part_parent);
 }
 
 static void
-CheckAndCreateToastTable(Oid relOid, Datum reloptions, LOCKMODE lockmode, bool check,
+CheckAndCreateToastTable(Oid relOid, Oid tablespaceOid, Datum reloptions, LOCKMODE lockmode, bool check,
 							bool is_part_child, bool is_part_parent)
 {
 	Relation	rel;
 
 	rel = heap_open(relOid, lockmode);
 
 	/* create_toast_table does all the work */
-	(void) create_toast_table(rel, InvalidOid, InvalidOid, reloptions, lockmode, check,
+	(void) create_toast_table(rel, InvalidOid, InvalidOid, tablespaceOid, reloptions, lockmode, check,
 							  is_part_child, is_part_parent);
 
 	heap_close(rel, NoLock);
@@ -147,7 +147,7 @@ BootstrapToastTable(char *relName, Oid toastOid, Oid toastIndexOid)
 						relName)));
 
 	/* create_toast_table does all the work */
-	if (!create_toast_table(rel, toastOid, toastIndexOid, (Datum) 0,
+	if (!create_toast_table(rel, toastOid, toastIndexOid, InvalidOid, (Datum) 0,
 							AccessExclusiveLock, false,
 							false, false))
 		elog(ERROR, "\"%s\" does not require a toast table",
@@ -165,7 +165,7 @@ BootstrapToastTable(char *relName, Oid toastOid, Oid toastIndexOid)
  * bootstrap they can be nonzero to specify hand-assigned OIDs
  */
 static bool
-create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
+create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Oid tablespaceOid,
 				   Datum reloptions, LOCKMODE lockmode, bool check,
 				   bool is_part_child, bool is_part_parent)
 {
@@ -319,7 +319,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 
 	toast_relid = heap_create_with_catalog(toast_relname,
 										   namespaceid,
-										   rel->rd_rel->reltablespace,
+										   tablespaceOid ? tablespaceOid : rel->rd_rel->reltablespace,
 										   toastOid,
 										   toast_typid,
 										   InvalidOid,
@@ -397,7 +397,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 				 indexInfo,
 				 list_make2("chunk_id", "chunk_seq"),
 				 BTREE_AM_OID,
-				 rel->rd_rel->reltablespace,
+				 tablespaceOid ? tablespaceOid : rel->rd_rel->reltablespace,
 				 collationObjectId, classObjectId, coloptions, (Datum) 0,
 				 true, false, false, false,
 				 true, false, false, true, NULL);

src/backend/commands/cluster.c

@@ -664,7 +664,7 @@ rebuild_relation(Relation OldHeap, Oid indexOid, bool verbose)
 	heap_close(OldHeap, NoLock);
 
 	/* Create the transient table that will receive the re-ordered data */
-	OIDNewHeap = make_new_heap(tableOid, tableSpace,false,
+	OIDNewHeap = make_new_heap(tableOid, tableSpace, InvalidOid, false,
 							   AccessExclusiveLock,
 							   true /* createAoBlockDirectory */,
 							   false);
@@ -696,7 +696,7 @@ rebuild_relation(Relation OldHeap, Oid indexOid, bool verbose)
  * data, then call finish_heap_swap to complete the operation.
  */
 Oid
-make_new_heap(Oid OIDOldHeap, Oid NewTableSpace, bool forcetemp,
+make_new_heap(Oid OIDOldHeap, Oid NewTableSpace, Oid newTOASTTableSpace, bool forcetemp,
 			  LOCKMODE lockmode,
 			  bool createAoBlockDirectory,
 			  bool makeCdbPolicy)
@@ -834,7 +834,7 @@ make_new_heap(Oid OIDOldHeap, Oid NewTableSpace, bool forcetemp,
 									 &isNull);
 		if (isNull)
 			reloptions = (Datum) 0;
-		NewHeapCreateToastTable(OIDNewHeap, reloptions, lockmode,
+		NewHeapCreateToastTable(OIDNewHeap, newTOASTTableSpace, reloptions, lockmode,
 								is_part_child, is_part_parent);
 
 		ReleaseSysCache(tuple);

src/backend/commands/matview.c

@@ -345,7 +345,7 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
 	 * it against access by any other process until commit (by which time it
 	 * will be gone).
 	 */
-	OIDNewHeap = make_new_heap(matviewOid, tableSpace, concurrent,
+	OIDNewHeap = make_new_heap(matviewOid, tableSpace, InvalidOid, concurrent,
 							   ExclusiveLock, createAoBlockDirectory, true);
 	LockRelationOid(OIDNewHeap, AccessExclusiveLock);
 	dest = CreateTransientRelDestReceiver(OIDNewHeap, matviewOid, concurrent, stmt->skipData);
@@ -563,7 +563,7 @@ transientrel_init(QueryDesc *queryDesc)
 	 * it against access by any other process until commit (by which time it
 	 * will be gone).
 	 */
-	OIDNewHeap = make_new_heap(matviewOid, tableSpace, concurrent,
+	OIDNewHeap = make_new_heap(matviewOid, tableSpace, InvalidOid, concurrent,
 							   ExclusiveLock, createAoBlockDirectory, false);
 	LockRelationOid(OIDNewHeap, AccessExclusiveLock);
 

src/backend/commands/tablecmds.c

@@ -152,6 +152,7 @@ typedef struct OnCommitItem
 
 static List *on_commits = NIL;
 
+Oid newTOASTTableSpace = InvalidOid;
 
 /*
  * State information for ALTER TABLE
@@ -197,6 +198,7 @@ typedef struct AlteredTableInfo
 	bool		dist_opfamily_changed; /* T if changing datatype of distribution key column and new opclass is in different opfamily than old one */
 	Oid			new_opclass;		/* new opclass, if changing a distribution key column */
 	Oid			newTableSpace;	/* new tablespace; 0 means no change */
+	Oid			newTOASTTableSpace;	/* new TOAST tablespace; 0 means no change */
 	Oid			exchange_relid;	/* for EXCHANGE, the exchanged in rel */
 	/* Objects to rebuild after completing ALTER TYPE operations */
 	List	   *changedConstraintOids;	/* OIDs of constraints to rebuild */
@@ -4350,6 +4352,11 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 	/* Find or create work queue entry for this table */
 	tab = ATGetQueueEntry(wqueue, rel);
 
+	tab->newTOASTTableSpace = newTOASTTableSpace;
+
+	/* Reset it */
+	newTOASTTableSpace = InvalidOid;
+
 	/*
 	 * Copy the original subcommand for each table.  This avoids conflicts
 	 * when different child tables need to make different parse
@@ -5981,6 +5988,7 @@ ATRewriteTables(AlterTableStmt *parsetree, List **wqueue, LOCKMODE lockmode)
 		Relation	OldHeap;
 		Oid			newTableSpace;
 		Oid 		oldTableSpace;
+		Oid			newTOASTTableSpace;
 		bool		hasIndexes;
 
 		/* We will lock the table iff we decide to actually rewrite it */
@@ -5993,6 +6001,7 @@ ATRewriteTables(AlterTableStmt *parsetree, List **wqueue, LOCKMODE lockmode)
 
 		oldTableSpace = OldHeap->rd_rel->reltablespace;
 		newTableSpace = tab->newTableSpace ? tab->newTableSpace : oldTableSpace;
+		newTOASTTableSpace = tab->newTOASTTableSpace ? tab->newTOASTTableSpace : newTableSpace;
 		relstorage    = OldHeap->rd_rel->relstorage;
 		{
 			List	   *indexIds;
@@ -6081,7 +6090,7 @@ ATRewriteTables(AlterTableStmt *parsetree, List **wqueue, LOCKMODE lockmode)
 			 * unlogged anyway.
 			 */
 			/* Create transient table that will receive the modified data */
-			OIDNewHeap = make_new_heap(tab->relid, newTableSpace, false,
+			OIDNewHeap = make_new_heap(tab->relid, newTableSpace, newTOASTTableSpace, false,
 									   lockmode, hasIndexes, false);
 
 			/*

src/include/catalog/toasting.h

@@ -21,7 +21,7 @@
  */
 extern void NewRelationCreateToastTable(Oid relOid, Datum reloptions,
 									   bool is_part_child, bool is_part_parent);
-extern void NewHeapCreateToastTable(Oid relOid, Datum reloptions,
+extern void NewHeapCreateToastTable(Oid relOid, Oid tablespaceOid, Datum reloptions,
 									LOCKMODE lockmode,
 									bool is_part_child, bool is_part_parent);
 extern void AlterTableCreateToastTable(Oid relOid, Datum reloptions,

src/include/commands/cluster.h

@@ -25,7 +25,7 @@ extern void check_index_is_clusterable(Relation OldHeap, Oid indexOid,
 						   bool recheck, LOCKMODE lockmode);
 extern void mark_index_clustered(Relation rel, Oid indexOid, bool is_internal);
 
-extern Oid make_new_heap(Oid OIDOldHeap, Oid NewTableSpace, bool forcetemp,
+extern Oid make_new_heap(Oid OIDOldHeap, Oid NewTableSpace, Oid newTOASTTableSpace, bool forcetemp,
 			  LOCKMODE lockmode,
 			  bool createAoBlockDirectory,
 			  bool makeCdbPolicy);

src/include/nodes/parsenodes.h

@@ -1549,6 +1549,11 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 } AlterTableCmd;
 
 
+/* XXX: OGPDB: Hacky global variable to overwrite TOAST tablespaceoid of about-to-be 
+* created (or rewrited) relation. The main usage scenario is for ALTER 
+* TABLE with rewrite, when extension want more control of kenrel logic */
+extern Oid	newTOASTTableSpace;
+
 typedef struct SetDistributionCmd
 {
 	NodeTag		type;