Merge pull request #5611 from citusdata/onderkalaci-patch-1

Enable MX for rebalancer tests

src/test/regress/expected/shard_rebalancer.out

@@ -21,6 +21,7 @@ CREATE TABLE postgres_table_test(a int primary key);
 -- reference tables are replicated to the coordinator
 SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0);
 NOTICE:  Replicating reference table "ref_table_test" to the node localhost:xxxxx
+NOTICE:  localhost:xxxxx is the coordinator and already contains metadata, skipping syncing the metadata
  ?column?
 ---------------------------------------------------------------------
         1
@@ -1438,6 +1439,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -1459,6 +1461,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -1562,6 +1565,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -1583,6 +1587,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -1657,6 +1662,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -1682,6 +1688,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;

src/test/regress/operations_schedule

@@ -2,9 +2,7 @@ test: multi_test_helpers multi_test_helpers_superuser
 test: multi_cluster_management
 test: multi_test_catalog_views
 test: shard_rebalancer_unit
-test: turn_mx_off
 test: shard_rebalancer
-test: turn_mx_on
 test: foreign_key_to_reference_shard_rebalance
 test: multi_move_mx
 test: shard_move_deferred_delete

src/test/regress/sql/shard_rebalancer.sql

@@ -860,6 +860,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -875,6 +876,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -921,6 +923,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -936,6 +939,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -962,6 +966,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;
@@ -977,6 +982,7 @@ SELECT table_schema, table_name, row_estimate, total_bytes
           FROM pg_class c
           LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
           WHERE relkind = 'r'
+          AND c.oid NOT IN (SELECT logicalrelid FROM pg_dist_partition)
   ) a
 WHERE table_schema = 'public'
 ) a ORDER BY table_name;