Fix multi-1 tests

src/backend/distributed/metadata/node_metadata.c

@@ -1136,8 +1136,7 @@ ActivateNode(char *nodeName, int nodePort)
 		 */
 		if (ReplicateReferenceTablesOnActivate)
 		{
-			ReplicateAllReferenceTablesToNode(workerNode->workerName,
+			ReplicateAllReferenceTablesToNode(workerNode);
-											  workerNode->workerPort);
 		}
 
 		/*

src/backend/distributed/utils/reference_table_utils.c

@@ -553,7 +553,7 @@ ReferenceTableReplicationFactor(void)
  * reference table to prevent unnecessary data transfer.
  */
 void
-ReplicateAllReferenceTablesToNode(char *nodeName, int nodePort)
+ReplicateAllReferenceTablesToNode(WorkerNode *workerNode)
 {
 	List *referenceTableList = CitusTableTypeIdList(REFERENCE_TABLE);
 
@@ -589,7 +589,9 @@ ReplicateAllReferenceTablesToNode(char *nodeName, int nodePort)
 
 			LockShardDistributionMetadata(shardId, ExclusiveLock);
 
-			ReplicateReferenceTableShardToNode(shardInterval, nodeName, nodePort);
+			ReplicateReferenceTableShardToNode(shardInterval, 
+											   workerNode->workerName,
+											   workerNode->workerPort);
 		}
 
 		/* create foreign constraints between reference tables */
@@ -599,7 +601,8 @@ ReplicateAllReferenceTablesToNode(char *nodeName, int nodePort)
 
 			/* send commands to new workers, the current user should be a superuser */
 			Assert(superuser());
-			SendMetadataCommandListToWorkerInCoordinatedTransaction(nodeName, nodePort,
+			SendMetadataCommandListToWorkerInCoordinatedTransaction(workerNode->workerName,
+																	workerNode->workerPort,
 																	CurrentUserName(),
 																	commandList);
 		}

src/include/distributed/reference_table_utils.h

@@ -25,6 +25,6 @@ extern void DeleteAllReplicatedTablePlacementsFromNodeGroup(int32 groupId,
 															bool localOnly);
 extern int CompareOids(const void *leftElement, const void *rightElement);
 extern int ReferenceTableReplicationFactor(void);
-extern void ReplicateAllReferenceTablesToNode(char *nodeName, int nodePort);
+extern void ReplicateAllReferenceTablesToNode(WorkerNode *workerNode);
 
 #endif /* REFERENCE_TABLE_UTILS_H_ */

src/test/regress/expected/master_copy_shard_placement.out

@@ -110,6 +110,8 @@ SELECT count(*) FROM history;
 -- test we can replicate MX tables
 SET citus.shard_replication_factor TO 1;
 -- metadata sync will succeed even if we have rep > 1 tables
+INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'public.articles'::regclass::oid, 0);
+INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'public.articles_single_shard'::regclass::oid, 0);
 SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
  start_metadata_sync_to_node
 ---------------------------------------------------------------------

src/test/regress/expected/multi_replicate_reference_table.out

@@ -464,7 +464,11 @@ SELECT create_reference_table('replicate_reference_table_insert');
 BEGIN;
 INSERT INTO replicate_reference_table_insert VALUES(1);
 SELECT 1 FROM master_add_node('localhost', :worker_2_port);
-ERROR:  cannot open new connections after the first modification command within a transaction
+ ?column?
+---------------------------------------------------------------------
+        1
+(1 row)
+
 ROLLBACK;
 DROP TABLE replicate_reference_table_insert;
 -- test COPY then adding a new node in a transaction
@@ -479,7 +483,11 @@ SET citus.enable_local_execution = 'off';
 BEGIN;
 COPY replicate_reference_table_copy FROM STDIN;
 SELECT 1 FROM master_add_node('localhost', :worker_2_port);
-ERROR:  cannot open new connections after the first modification command within a transaction
+ ?column?
+---------------------------------------------------------------------
+        1
+(1 row)
+
 ROLLBACK;
 RESET citus.enable_local_execution;
 DROP TABLE replicate_reference_table_copy;
@@ -494,7 +502,11 @@ SELECT create_reference_table('replicate_reference_table_ddl');
 BEGIN;
 ALTER TABLE replicate_reference_table_ddl ADD column2 int;
 SELECT 1 FROM master_add_node('localhost', :worker_2_port);
-ERROR:  cannot open new connections after the first modification command within a transaction
+ ?column?
+---------------------------------------------------------------------
+        1
+(1 row)
+
 ROLLBACK;
 DROP TABLE replicate_reference_table_ddl;
 -- test DROP table after adding new node in a transaction

src/test/regress/input/multi_copy.source

@@ -506,8 +506,6 @@ INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::re
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'packed_numbers_hash'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'super_packed_numbers_hash'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'table_to_distribute'::regclass::oid, 0);
-INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'articles'::regclass::oid, 0);
-INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'articles_single_shard'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'second_dustbunnies'::regclass::oid, 0);
 
 SELECT 1 FROM master_activate_node('localhost', :worker_1_port);

src/test/regress/output/multi_copy.source

@@ -633,8 +633,6 @@ INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::re
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'packed_numbers_hash'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'super_packed_numbers_hash'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'table_to_distribute'::regclass::oid, 0);
-INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'articles'::regclass::oid, 0);
-INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'articles_single_shard'::regclass::oid, 0);
 INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'second_dustbunnies'::regclass::oid, 0);
 SELECT 1 FROM master_activate_node('localhost', :worker_1_port);
  ?column?

src/test/regress/sql/master_copy_shard_placement.sql

@@ -93,6 +93,8 @@ SELECT count(*) FROM history;
 SET citus.shard_replication_factor TO 1;
 
 -- metadata sync will succeed even if we have rep > 1 tables
+INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'public.articles'::regclass::oid, 0);
+INSERT INTO citus.pg_dist_object(classid, objid, objsubid) values('pg_class'::regclass::oid, 'public.articles_single_shard'::regclass::oid, 0);
 SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
 
 CREATE TABLE mx_table(a int);