From 3dd4735e6eaa99801b29890e66e8ffcc9e69c725 Mon Sep 17 00:00:00 2001
From: gindibay <gindibay@microsoft.com>
Date: Tue, 21 Nov 2023 19:40:44 +0300
Subject: [PATCH] Fixes runtime errors

---
 src/backend/distributed/commands/database.c   |  1 -
 .../distributed/metadata/metadata_sync.c      | 42 -------------------
 src/include/distributed/commands.h            |  1 -
 3 files changed, 44 deletions(-)

diff --git a/src/backend/distributed/commands/database.c b/src/backend/distributed/commands/database.c
index ec3e47518..6f1a702c7 100644
--- a/src/backend/distributed/commands/database.c
+++ b/src/backend/distributed/commands/database.c
@@ -77,7 +77,6 @@ typedef struct DatabaseCollationInfo
 #endif
 } DatabaseCollationInfo;
 
-static void EnsureSupportedCreateDatabaseCommand(CreatedbStmt *stmt);
 static char * GenerateCreateDatabaseStatementFromPgDatabase(Form_pg_database
 															databaseForm);
 static DatabaseCollationInfo GetDatabaseCollation(Oid dbOid);
diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c
index ea6fd6dea..41ce232cd 100644
--- a/src/backend/distributed/metadata/metadata_sync.c
+++ b/src/backend/distributed/metadata/metadata_sync.c
@@ -155,7 +155,6 @@ static char * RemoteSchemaIdExpressionByName(char *schemaName);
 static char * RemoteTypeIdExpression(Oid typeId);
 static char * RemoteCollationIdExpression(Oid colocationId);
 static char * RemoteTableIdExpression(Oid relationId);
-static void SendDatabaseGrantSyncCommands(MetadataSyncContext *context);
 
 
 PG_FUNCTION_INFO_V1(start_metadata_sync_to_all_nodes);
@@ -4666,13 +4665,6 @@ PropagateNodeWideObjectsCommandList(void)
 		ddlCommands = list_concat(ddlCommands, alterRoleSetCommands);
 	}
 
-	if (EnableCreateDatabasePropagation)
-	{
-		/* get commands for database creation */
-		List *createDatabaseCommands = GenerateCreateDatabaseCommandList();
-		ddlCommands = list_concat(ddlCommands, createDatabaseCommands);
-	}
-
 	return ddlCommands;
 }
 
@@ -4745,12 +4737,7 @@ SyncDistributedObjects(MetadataSyncContext *context)
 	 */
 	SendInterTableRelationshipCommands(context);
 
-	/*
-	 * After creation of databases and roles, send the grant database commands
-	 * to the workers.
-	 */
 
-	SendDatabaseGrantSyncCommands(context);
 }
 
 
@@ -4775,35 +4762,6 @@ SendNodeWideObjectsSyncCommands(MetadataSyncContext *context)
 	SendOrCollectCommandListToActivatedNodes(context, commandList);
 }
 
-
-/*
- * SendDatabaseGrantSyncCommands sends database grants to roles to workers with
- * transactional or nontransactional mode according to transactionMode inside
- * metadataSyncContext in case of EnableCreateDatabasePropagation GUC set.
- * This function is called after SendNodeWideObjectsSyncCommands and SendDependencyCreationCommands
- * because we need both databases and roles to be created on the worker.
- *
- */
-static void
-SendDatabaseGrantSyncCommands(MetadataSyncContext *context)
-{
-	if (EnableCreateDatabasePropagation)
-	{
-		/* propagate node wide objects. It includes only roles for now. */
-		List *commandList = GenerateGrantDatabaseCommandList();
-
-		if (commandList == NIL)
-		{
-			return;
-		}
-
-		commandList = lcons(DISABLE_DDL_PROPAGATION, commandList);
-		commandList = lappend(commandList, ENABLE_DDL_PROPAGATION);
-		SendOrCollectCommandListToActivatedNodes(context, commandList);
-	}
-}
-
-
 /*
  * SendShellTableDeletionCommands sends sequence, and shell table deletion
  * commands to workers with transactional or nontransactional mode according to
diff --git a/src/include/distributed/commands.h b/src/include/distributed/commands.h
index 615585de4..760c92e87 100644
--- a/src/include/distributed/commands.h
+++ b/src/include/distributed/commands.h
@@ -243,7 +243,6 @@ extern List * DropDatabaseStmtObjectAddress(Node *node, bool missingOk,
 											bool isPostprocess);
 extern List * CreateDatabaseStmtObjectAddress(Node *node, bool missingOk,
 											  bool isPostprocess);
-extern List * GenerateCreateDatabaseCommandList(void);
 extern List * GenerateGrantDatabaseCommandList(void);