From 58417444b080a16fc08472ff109c9bbea7f641e2 Mon Sep 17 00:00:00 2001
From: gurkanindibay <gindibay@microsoft.com>
Date: Thu, 22 Feb 2024 14:58:13 +0300
Subject: [PATCH] Fixes merge errors

---
 .../distributed/commands/utility_hook.c       | 24 +++++++++----------
 ...ut => role_operations_from_non_maindb.out} |  0
 src/test/regress/multi_schedule               |  2 +-
 ...ql => role_operations_from_non_maindb.sql} |  2 --
 4 files changed, 13 insertions(+), 15 deletions(-)
 rename src/test/regress/expected/{role_operations_2pc.out => role_operations_from_non_maindb.out} (100%)
 rename src/test/regress/sql/{role_operations_2pc.sql => role_operations_from_non_maindb.sql} (99%)

diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c
index 9c67d4343..a6715462a 100644
--- a/src/backend/distributed/commands/utility_hook.c
+++ b/src/backend/distributed/commands/utility_hook.c
@@ -1914,12 +1914,12 @@ GetMarkObjectDistributedParams(Node *parsetree)
 	if (IsA(parsetree, CreateRoleStmt))
 	{
 		CreateRoleStmt *stmt = castNode(CreateRoleStmt, parsetree);
-		MarkObjectDistributedParams params = {
-			.name = stmt->role,
-			.catalogRelId = AuthIdRelationId,
-			.id = get_role_oid(stmt->role, false)
-		};
-		paramsList = lappend(paramsList, &params);
+		MarkObjectDistributedParams *params = (MarkObjectDistributedParams *) palloc(sizeof(MarkObjectDistributedParams));
+		params->name = stmt->role;
+		params->catalogRelId = AuthIdRelationId;
+		params->id = get_role_oid(stmt->role, false);
+
+		paramsList = lappend(paramsList, params);
 	}
 	else if (IsA(parsetree, DropRoleStmt))
 	{
@@ -1927,12 +1927,12 @@ GetMarkObjectDistributedParams(Node *parsetree)
 		RoleSpec *roleSpec;
 		foreach_ptr(roleSpec, stmt->roles)
 		{
-			MarkObjectDistributedParams params = {
-				.name = roleSpec->rolename,
-				.catalogRelId = AuthIdRelationId,
-				.id = get_role_oid(roleSpec->rolename, false)
-			};
-			paramsList = lappend(paramsList, &params);
+			MarkObjectDistributedParams *params = (MarkObjectDistributedParams *) palloc(sizeof(MarkObjectDistributedParams));
+			params->name = roleSpec->rolename;
+			params->catalogRelId = AuthIdRelationId;
+			params->id = get_role_oid(roleSpec->rolename, false);
+
+			paramsList = lappend(paramsList, params);
 		}
 	}
 	/* Add else if branches for other statement types */
diff --git a/src/test/regress/expected/role_operations_2pc.out b/src/test/regress/expected/role_operations_from_non_maindb.out
similarity index 100%
rename from src/test/regress/expected/role_operations_2pc.out
rename to src/test/regress/expected/role_operations_from_non_maindb.out
diff --git a/src/test/regress/multi_schedule b/src/test/regress/multi_schedule
index cf9b54267..943c61f1e 100644
--- a/src/test/regress/multi_schedule
+++ b/src/test/regress/multi_schedule
@@ -109,7 +109,7 @@ test: undistribute_table
 test: run_command_on_all_nodes
 test: background_task_queue_monitor
 test: other_databases grant_role_from_non_maindb
-test: role_operations_2pc
+test: role_operations_from_non_maindb
 test: citus_internal_access
 
 # Causal clock test
diff --git a/src/test/regress/sql/role_operations_2pc.sql b/src/test/regress/sql/role_operations_from_non_maindb.sql
similarity index 99%
rename from src/test/regress/sql/role_operations_2pc.sql
rename to src/test/regress/sql/role_operations_from_non_maindb.sql
index b34acb601..4b5939da9 100644
--- a/src/test/regress/sql/role_operations_2pc.sql
+++ b/src/test/regress/sql/role_operations_from_non_maindb.sql
@@ -1,5 +1,4 @@
 -- Create a new database
-
 set citus.enable_create_database_propagation to on;
 
 CREATE DATABASE test_db;
@@ -9,7 +8,6 @@ SET citus.superuser TO 'postgres';
 \c test_db
 -- Test CREATE ROLE with various options
 CREATE ROLE test_role1 WITH LOGIN PASSWORD 'password1';
-
 \c test_db - - :worker_1_port
 
 CREATE USER "test_role2-needs\!escape"