Merge pull request #5499 from citusdata/fix_enterprise_fails

Fix enterprise fails

src/test/regress/bin/normalize.sed

@@ -251,3 +251,5 @@ s/CREATE TABLESPACE test_tablespace LOCATION.*/CREATE TABLESPACE test_tablespace
 
 # columnar log for var correlation
 s/(.*absolute correlation \()([0,1]\.[0-9]+)(\) of var attribute [0-9]+ is smaller than.*)/\1X\.YZ\3/g
+
+s/NOTICE:  issuing WITH placement_data\(shardid, shardstate, shardlength, groupid, placementid\)  AS \(VALUES \([0-9]+, [0-9]+, [0-9]+, [0-9]+, [0-9]+\)\)/NOTICE:  issuing WITH placement_data\(shardid, shardstate, shardlength, groupid, placementid\)  AS \(VALUES \(xxxxxx, xxxxxx, xxxxxx, xxxxxx, xxxxxx\)\)/g

src/test/regress/expected/drop_partitioned_table.out

@@ -147,18 +147,16 @@ SET search_path = drop_partitioned_table;
 SET citus.next_shard_id TO 723000;
 -- CASE 3
 -- DROP OWNED BY role1; Only parent is owned by role1, children are owned by another owner
-SET client_min_messages TO warning;
+SET client_min_messages TO ERROR;
-SET citus.enable_ddl_propagation TO off;
 CREATE ROLE role1;
-RESET client_min_messages;
+SELECT 1 FROM run_command_on_workers('CREATE ROLE role1');
-RESET citus.enable_ddl_propagation;
+ ?column?
-SELECT run_command_on_workers('CREATE ROLE role1');
-      run_command_on_workers
 ---------------------------------------------------------------------
- (localhost,57637,t,"CREATE ROLE")
+        1
- (localhost,57638,t,"CREATE ROLE")
+        1
 (2 rows)
 
+RESET client_min_messages;
 GRANT ALL ON SCHEMA drop_partitioned_table TO role1;
 SET ROLE role1;
 CREATE TABLE drop_partitioned_table.parent (x text, t timestamptz DEFAULT now()) PARTITION BY RANGE (t);

src/test/regress/expected/multi_fix_partition_shard_index_names.out

@@ -682,9 +682,9 @@ NOTICE:  issuing WITH shard_data(relationname, shardid, storagetype, shardminval
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing WITH shard_data(relationname, shardid, storagetype, shardminvalue, shardmaxvalue)  AS (VALUES ('fix_idx_names.p2'::regclass, 915002, 't'::"char", '-2147483648', '2147483647')) SELECT citus_internal_add_shard_metadata(relationname, shardid, storagetype, shardminvalue, shardmaxvalue) FROM shard_data;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing WITH placement_data(shardid, shardstate, shardlength, groupid, placementid)  AS (VALUES (915002, 1, 0, 1, 3380)) SELECT citus_internal_add_placement_metadata(shardid, shardstate, shardlength, groupid, placementid) FROM placement_data;
+NOTICE:  issuing WITH placement_data(shardid, shardstate, shardlength, groupid, placementid)  AS (VALUES (xxxxxx, xxxxxx, xxxxxx, xxxxxx, xxxxxx)) SELECT citus_internal_add_placement_metadata(shardid, shardstate, shardlength, groupid, placementid) FROM placement_data;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
-NOTICE:  issuing WITH placement_data(shardid, shardstate, shardlength, groupid, placementid)  AS (VALUES (915002, 1, 0, 1, 3380)) SELECT citus_internal_add_placement_metadata(shardid, shardstate, shardlength, groupid, placementid) FROM placement_data;
+NOTICE:  issuing WITH placement_data(shardid, shardstate, shardlength, groupid, placementid)  AS (VALUES (xxxxxx, xxxxxx, xxxxxx, xxxxxx, xxxxxx)) SELECT citus_internal_add_placement_metadata(shardid, shardstate, shardlength, groupid, placementid) FROM placement_data;
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx
 NOTICE:  issuing SET citus.enable_ddl_propagation TO 'off'
 DETAIL:  on server postgres@localhost:xxxxx connectionId: xxxxxxx

src/test/regress/sql/drop_partitioned_table.sql

@@ -117,12 +117,10 @@ SET citus.next_shard_id TO 723000;
 
 -- CASE 3
 -- DROP OWNED BY role1; Only parent is owned by role1, children are owned by another owner
-SET client_min_messages TO warning;
+SET client_min_messages TO ERROR;
-SET citus.enable_ddl_propagation TO off;
 CREATE ROLE role1;
+SELECT 1 FROM run_command_on_workers('CREATE ROLE role1');
 RESET client_min_messages;
-RESET citus.enable_ddl_propagation;
-SELECT run_command_on_workers('CREATE ROLE role1');
 GRANT ALL ON SCHEMA drop_partitioned_table TO role1;
 SET ROLE role1;
 CREATE TABLE drop_partitioned_table.parent (x text, t timestamptz DEFAULT now()) PARTITION BY RANGE (t);