From 18e3924530d442b246a00fc855a3b8048b764fc1 Mon Sep 17 00:00:00 2001
From: gurkanindibay <gindibay@microsoft.com>
Date: Thu, 28 Mar 2024 12:49:08 +0300
Subject: [PATCH] Fixes review comments

---
 .../non_main_db_distribute_object_ops.c       | 23 +------------------
 .../isolation_enable_ddl_propagation.out      | 18 +++++++--------
 .../isolation_enable_ddl_propagation.spec     | 18 +++++++--------
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/src/backend/distributed/commands/non_main_db_distribute_object_ops.c b/src/backend/distributed/commands/non_main_db_distribute_object_ops.c
index 23e8ea3ac..0d22d12fa 100644
--- a/src/backend/distributed/commands/non_main_db_distribute_object_ops.c
+++ b/src/backend/distributed/commands/non_main_db_distribute_object_ops.c
@@ -73,7 +73,6 @@ static bool CreateDbStmtCheckSupportedObjectType(Node *node);
 static bool DropDbStmtCheckSupportedObjectType(Node *node);
 static bool GrantStmtCheckSupportedObjectType(Node *node);
 static bool SecLabelStmtCheckSupportedObjectType(Node *node);
-static bool AlterDbStmtCheckSupportedObjectType(Node *node);
 static bool AlterDbRenameCheckSupportedObjectType(Node *node);
 static bool AlterDbOwnerCheckSupportedObjectType(Node *node);
 static bool CannotBeExecutedInTransaction_True(Node *node);
@@ -114,7 +113,7 @@ static const NonMainDbDistributeObjectOps *const OperationArray[] = {
 	},
 	[T_AlterDatabaseStmt] = &(NonMainDbDistributeObjectOps) {
 		.cannotBeExecutedInTransaction = AlterDbCannotBeExecutedInTransaction,
-		.checkSupportedObjectType = AlterDbStmtCheckSupportedObjectType
+		.checkSupportedObjectType = NULL
 	},
 #if PG_VERSION_NUM >= PG_VERSION_15
 	[T_AlterDatabaseRefreshCollStmt] = &(NonMainDbDistributeObjectOps) {
@@ -363,26 +362,6 @@ DropDbStmtCheckSupportedObjectType(Node *node)
 }
 
 
-static bool
-AlterDbStmtCheckSupportedObjectType(Node *node)
-{
-	/*
-	 * We don't try to send the query to the main database if the ALTER
-	 * DATABASE command is for the main database itself, this is a very
-	 * rare case but it's exercised by our test suite.
-	 */
-	AlterDatabaseStmt *stmt = castNode(AlterDatabaseStmt, node);
-	if (!IsSetTablespaceStatement(stmt))
-	{
-		return true;
-	}
-	else
-	{
-		return strcmp(stmt->dbname, MainDb) != 0;
-	}
-}
-
-
 static bool
 AlterDbRenameCheckSupportedObjectType(Node *node)
 {
diff --git a/src/test/regress/expected/isolation_enable_ddl_propagation.out b/src/test/regress/expected/isolation_enable_ddl_propagation.out
index d04e68f61..d5cea0b6f 100644
--- a/src/test/regress/expected/isolation_enable_ddl_propagation.out
+++ b/src/test/regress/expected/isolation_enable_ddl_propagation.out
@@ -1,16 +1,16 @@
 Parsed test spec with 1 sessions
 
-starting permutation: s1-begin s1-commit
-result
+starting permutation: s1a
+all_ok
 ---------------------------------------------------------------------
 t
-t
-t
-(3 rows)
+(1 row)
 
-step s1-begin:
- BEGIN;
+step s1a:
+ SELECT 1;
 
-step s1-commit:
- COMMIT;
+?column?
+---------------------------------------------------------------------
+       1
+(1 row)
 
diff --git a/src/test/regress/spec/isolation_enable_ddl_propagation.spec b/src/test/regress/spec/isolation_enable_ddl_propagation.spec
index e94578088..cd2b0bf12 100644
--- a/src/test/regress/spec/isolation_enable_ddl_propagation.spec
+++ b/src/test/regress/spec/isolation_enable_ddl_propagation.spec
@@ -1,18 +1,16 @@
+// The code we care about is in the setup stage, because it needs to be executed outside of a transaction.
+// For the setup stage to be executed we need at least one permutation though.
+// Therefore, we added s1a as a non-functional step, just make the setup step to work.
 setup
 {
-	SELECT result from run_command_on_all_nodes('ALTER SYSTEM SET citus.enable_ddl_propagation TO ON');
-	SELECT result from run_command_on_all_nodes('SELECT pg_reload_conf()');
+	SELECT bool_and(result='ALTER SYSTEM') AS all_ok FROM  run_command_on_all_nodes('ALTER SYSTEM SET citus.enable_ddl_propagation TO ON');
+	SELECT bool_and(result='t') AS all_ok FROM run_command_on_all_nodes('SELECT pg_reload_conf()');
 }
 
 session "s1"
-step "s1-begin"
+step "s1a"
 {
-	BEGIN;
+	SELECT 1;
 }
 
-step "s1-commit"
-{
-	COMMIT;
-}
-
-permutation "s1-begin" "s1-commit"
+permutation "s1a"