From 48c5ce8960b5b5d4690295c57e5ef323eb162831 Mon Sep 17 00:00:00 2001
From: Burak Velioglu <buvelio@microsoft.com>
Date: Thu, 23 Dec 2021 00:16:38 +0300
Subject: [PATCH] Dist table refactor

---
 .../commands/create_distributed_table.c         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/backend/distributed/commands/create_distributed_table.c b/src/backend/distributed/commands/create_distributed_table.c
index 5cb842353..e4acfaccb 100644
--- a/src/backend/distributed/commands/create_distributed_table.c
+++ b/src/backend/distributed/commands/create_distributed_table.c
@@ -450,14 +450,6 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 	ObjectAddressSet(tableAddress, RelationRelationId, relationId);
 	EnsureDependenciesExistOnAllNodes(&tableAddress);
 
-	CreateShellTableOnWorkers(relationId);
-
-	/* TODO: Consider partitioned tables */
-	if (EnableDependencyCreation)
-	{
-		MarkObjectDistributed(&tableAddress);
-	}
-
 	char replicationModel = DecideReplicationModel(distributionMethod,
 												   colocateWithTableName,
 												   viaDeprecatedAPI);
@@ -542,6 +534,15 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 
 	if (ShouldSyncTableMetadata(relationId))
 	{
+		CreateShellTableOnWorkers(relationId);
+
+		/* TODO: Consider partitioned tables */
+		// TODO: Should we really check? or don't allow
+		if (EnableDependencyCreation)
+		{
+			MarkObjectDistributed(&tableAddress);
+		}
+
 		CreateTableMetadataOnWorkers(relationId);
 	}