Fix flaky multi_schema_support (#6991)

Dropping a leftover table, delete some unnecessary command, add some ORDER BY to avoid flakiness in `multi_schema_support`
citusdata · Jun 9, 2023 · 2f13b37 · 2f13b37
1 parent 50e6c50
commit 2f13b37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/test/regress/expected/multi_schema_support.out b/src/test/regress/expected/multi_schema_support.out
@@ -868,7 +868,7 @@ SELECT create_distributed_table('old_schema.table_set_schema', 'id');
 CREATE SCHEMA new_schema;
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
  Distributed Schemas
 ---------------------------------------------------------------------
  old_schema
@@ -890,7 +890,7 @@ SELECT table_schema AS "Shards' Schema"
 ALTER TABLE old_schema.table_set_schema SET SCHEMA new_schema;
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
  Distributed Schemas
 ---------------------------------------------------------------------
  old_schema
@@ -994,7 +994,7 @@ SELECT create_distributed_table('table_set_schema', 'id');
 CREATE SCHEMA new_schema;
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
  Distributed Schemas
 ---------------------------------------------------------------------
  old_schema
@@ -1018,7 +1018,7 @@ SET search_path TO old_schema;
 ALTER TABLE table_set_schema SET SCHEMA new_schema;
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
  Distributed Schemas
 ---------------------------------------------------------------------
  old_schema
@@ -1160,7 +1160,6 @@ NOTICE:  schema "schema_with_user" does not exist, skipping
 CONTEXT:  SQL statement "SELECT citus_drop_all_shards(v_obj.objid, v_obj.schema_name, v_obj.object_name, drop_shards_metadata_only := false)"
 PL/pgSQL function citus_drop_trigger() line XX at PERFORM
 DROP USER "test-user";
-DROP FUNCTION run_command_on_coordinator_and_workers(p_sql text);
 -- test run_command_on_* UDFs with schema
 CREATE SCHEMA run_test_schema;
 CREATE TABLE run_test_schema.test_table(id int);
@@ -1399,3 +1398,4 @@ SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.p
 ---------------------------------------------------------------------
 (0 rows)
 
+DROP TABLE public.nation_local CASCADE;
diff --git a/src/test/regress/sql/multi_schema_support.sql b/src/test/regress/sql/multi_schema_support.sql
@@ -671,7 +671,7 @@ CREATE SCHEMA new_schema;
 
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
 \c - - - :worker_1_port
 SELECT table_schema AS "Shards' Schema"
     FROM information_schema.tables
@@ -684,7 +684,7 @@ ALTER TABLE old_schema.table_set_schema SET SCHEMA new_schema;
 
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
 \c - - - :worker_1_port
 SELECT table_schema AS "Shards' Schema"
     FROM information_schema.tables
@@ -742,7 +742,7 @@ CREATE SCHEMA new_schema;
 
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
 \c - - - :worker_1_port
 SELECT table_schema AS "Shards' Schema", COUNT(*) AS "Counts"
     FROM information_schema.tables
@@ -756,7 +756,7 @@ ALTER TABLE table_set_schema SET SCHEMA new_schema;
 
 SELECT objid::oid::regnamespace as "Distributed Schemas"
     FROM pg_catalog.pg_dist_object
-    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema');
+    WHERE objid::oid::regnamespace IN ('old_schema', 'new_schema') ORDER BY objid::oid::regnamespace;
 \c - - - :worker_1_port
 SELECT table_schema AS "Shards' Schema", COUNT(*) AS "Counts"
     FROM information_schema.tables
@@ -844,8 +844,6 @@ SET citus.next_shard_id TO 1197000;
 DROP OWNED BY "test-user" CASCADE;
 DROP USER "test-user";
 
-DROP FUNCTION run_command_on_coordinator_and_workers(p_sql text);
-
 -- test run_command_on_* UDFs with schema
 CREATE SCHEMA run_test_schema;
 CREATE TABLE run_test_schema.test_table(id int);
@@ -991,3 +989,4 @@ DROP SCHEMA run_test_schema, test_schema_support_join_1, test_schema_support_joi
 -- verify that the dropped schema is removed from worker's pg_dist_object
 SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM pg_catalog.pg_dist_object
     WHERE classid=2615 and objid IN (select oid from pg_namespace where nspname='run_test_schema');
+DROP TABLE public.nation_local CASCADE;