Move table related part out from metadata

src/backend/distributed/commands/citus_add_local_table_to_metadata.c

@@ -1242,11 +1242,12 @@ FinalizeCitusLocalTableCreation(Oid relationId, List *dependentSequenceList)
 	if (ShouldSyncTableMetadata(relationId))
 	{
 		CreateShellTableOnWorkers(relationId);
-		CreateTableMetadataOnWorkers(relationId);
-
 		ObjectAddress relationAddress = { 0 };
 		ObjectAddressSet(relationAddress, RelationRelationId, relationId);
 		MarkObjectDistributed(&relationAddress);
+
+		CreateTableMetadataOnWorkers(relationId);
+		CreateInterTableRelationshipOfRelationOnWorkers(relationId);
 	}
 
 	/*

src/backend/distributed/commands/create_distributed_table.c

@@ -539,6 +539,7 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 		CreateShellTableOnWorkers(relationId);
 		MarkObjectDistributed(&tableAddress);
 		CreateTableMetadataOnWorkers(relationId);
+		CreateInterTableRelationshipOfRelationOnWorkers(relationId);
 	}
 
 	/*
@@ -601,7 +602,6 @@ void
 EnsureSequenceTypeSupported(Oid seqOid, Oid seqTypId)
 {
 	List *citusTableIdList = CitusTableTypeIdList(ANY_CITUS_TABLE_TYPE);
-
 	Oid citusTableId = InvalidOid;
 	foreach_oid(citusTableId, citusTableIdList)
 	{

src/backend/distributed/commands/dependencies.c

@@ -374,7 +374,8 @@ GetCitusTableDDLCommandList(Oid relationId)
 List *
 ReplicateAllDependenciesToNodeCommandList(const char *nodeName, int nodePort)
 {
-	List *ddlCommands = NIL;
+	/* since we are executing ddl commands disable propagation first, primarily for mx */
+	List *ddlCommands = list_make1(DISABLE_DDL_PROPAGATION);
 
 	/*
 	 * collect all dependencies in creation order and get their ddl commands
@@ -412,8 +413,6 @@ ReplicateAllDependenciesToNodeCommandList(const char *nodeName, int nodePort)
 								  GetDependencyCreateDDLCommands(dependency));
 	}
 
-	/* since we are executing ddl commands lets disable propagation, primarily for mx */
-	ddlCommands = lcons(DISABLE_DDL_PROPAGATION, ddlCommands);
 	ddlCommands = lappend(ddlCommands, ENABLE_DDL_PROPAGATION);
 
 	return ddlCommands;

src/backend/distributed/metadata/metadata_sync.c

@@ -637,8 +637,7 @@ DistributedObjectMetadataSyncCommandList(void)
 
 /*
  * GetDistributedTableMetadataEvents returns the full set of DDL commands necessary to
- * create the given distributed table metadata on a worker. The list includes setting up
+ * create the given distributed table metadata on a worker.
- * any shard metadata, setting the truncate trigger and foreign key constraints.
  */
 static List *
 GetDistributedTableMetadataEvents(Oid relationId)
@@ -647,41 +646,15 @@ GetDistributedTableMetadataEvents(Oid relationId)
 
 	List *commandList = NIL;
 
-	/* if the table is owned by an extension we only propagate pg_dist_* records */
-	bool tableOwnedByExtension = IsTableOwnedByExtension(relationId);
-
 	/* command to insert pg_dist_partition entry */
 	char *metadataCommand = DistributionCreateCommand(cacheEntry);
 	commandList = lappend(commandList, metadataCommand);
 
-	/* commands to create the truncate trigger of the table */
-	if (!IsForeignTable(relationId))
-	{
-		char *truncateTriggerCreateCommand = TruncateTriggerCreateCommand(relationId);
-		commandList = lappend(commandList, truncateTriggerCreateCommand);
-	}
-
 	/* commands to insert pg_dist_shard & pg_dist_placement entries */
 	List *shardIntervalList = LoadShardIntervalList(relationId);
 	List *shardMetadataInsertCommandList = ShardListInsertCommand(shardIntervalList);
 	commandList = list_concat(commandList, shardMetadataInsertCommandList);
 
-	if (!tableOwnedByExtension)
-	{
-		/* commands to create foreign key constraints */
-		List *foreignConstraintCommands =
-			GetReferencingForeignConstaintCommands(relationId);
-		commandList = list_concat(commandList, foreignConstraintCommands);
-
-		/* commands to create partitioning hierarchy */
-		if (PartitionTable(relationId))
-		{
-			char *alterTableAttachPartitionCommands =
-				GenerateAlterTableAttachPartitionCommand(relationId);
-			commandList = lappend(commandList, alterTableAttachPartitionCommands);
-		}
-	}
-
 	return commandList;
 }
 
@@ -1857,7 +1830,48 @@ HasMetadataWorkers(void)
 
 
 /*
- * CreateShellTableOnWorkers creates the shell table on each worker node with metadata.
+ * CreateInterTableRelationshipOfRelationOnWorkers create inter table relationship
+ * for the the given relation id.
+ */
+void
+CreateInterTableRelationshipOfRelationOnWorkers(Oid relationId)
+{
+	/* if the table is owned by an extension we don't create */
+	bool tableOwnedByExtension = IsTableOwnedByExtension(relationId);
+	if (tableOwnedByExtension)
+	{
+		return;
+	}
+
+	List *commandList = NIL;
+
+	/* commands to create foreign key constraints */
+	List *foreignConstraintCommands =
+		GetReferencingForeignConstaintCommands(relationId);
+	commandList = list_concat(commandList, foreignConstraintCommands);
+
+	/* commands to create partitioning hierarchy */
+	if (PartitionTable(relationId))
+	{
+		char *alterTableAttachPartitionCommands =
+			GenerateAlterTableAttachPartitionCommand(relationId);
+		commandList = lappend(commandList, alterTableAttachPartitionCommands);
+	}
+
+	/* prevent recursive propagation */
+	SendCommandToWorkersWithMetadata(DISABLE_DDL_PROPAGATION);
+
+	const char *command = NULL;
+	foreach_ptr(command, commandList)
+	{
+		SendCommandToWorkersWithMetadata(command);
+	}
+}
+
+
+/*
+ * CreateShellTableOnWorkers creates the shell table on each worker node with metadata
+ * including sequence dependency and truncate triggers.
  */
 void
 CreateShellTableOnWorkers(Oid relationId)
@@ -1885,6 +1899,13 @@ CreateShellTableOnWorkers(Oid relationId)
 	List *sequenceDependencyCommandList = SequenceDependencyCommandList(relationId);
 	commandList = list_concat(commandList, sequenceDependencyCommandList);
 
+	/* commands to create the truncate trigger of the table */
+	if (!IsForeignTable(relationId))
+	{
+		char *truncateTriggerCreateCommand = TruncateTriggerCreateCommand(relationId);
+		commandList = lappend(commandList, truncateTriggerCreateCommand);
+	}
+
 	/* prevent recursive propagation */
 	SendCommandToWorkersWithMetadata(DISABLE_DDL_PROPAGATION);
 
@@ -1898,9 +1919,9 @@ CreateShellTableOnWorkers(Oid relationId)
 
 /*
  * CreateTableMetadataOnWorkers creates the list of commands needed to create the
- * given distributed table and sends these commands to all metadata workers i.e. workers
+ * metadata of the given distributed table and sends these commands to all metadata
- * with hasmetadata=true. Before sending the commands, in order to prevent recursive
+ * workers i.e. workers with hasmetadata=true. Before sending the commands, in order
- * propagation, DDL propagation on workers are disabled with a
+ * to prevent recursive propagation, DDL propagation on workers are disabled with a
  * `SET citus.enable_ddl_propagation TO off;` command.
  */
 void

src/include/distributed/metadata_sync.h

@@ -54,6 +54,7 @@ extern List * GrantOnSchemaDDLCommands(Oid schemaId);
 extern char * PlacementUpsertCommand(uint64 shardId, uint64 placementId, int shardState,
 									 uint64 shardLength, int32 groupId);
 extern char * TruncateTriggerCreateCommand(Oid relationId);
+extern void CreateInterTableRelationshipOfRelationOnWorkers(Oid relationId);
 extern void CreateShellTableOnWorkers(Oid relationId);
 extern void CreateTableMetadataOnWorkers(Oid relationId);
 extern List * DetachPartitionCommandList(void);