From 890526f11061b2907d2c0341281bc7ee813f8bae Mon Sep 17 00:00:00 2001 From: naisila Date: Wed, 22 Jan 2025 12:20:10 +0300 Subject: [PATCH 1/2] Fix pg17 test --- src/test/regress/expected/pg17.out | 6 ++---- src/test/regress/sql/pg17.sql | 7 +++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/test/regress/expected/pg17.out b/src/test/regress/expected/pg17.out index 5e4460be1ce..53837aae122 100644 --- a/src/test/regress/expected/pg17.out +++ b/src/test/regress/expected/pg17.out @@ -2701,6 +2701,7 @@ MERGE INTO non_dist_table_12345 AS target_0 USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; +DROP TABLE non_dist_table_12345; -- Step 3: Switch back to the coordinator for distributed table operations \c postgresql://postgres@localhost::master_port/regression?application_name=psql SET search_path TO pg17; @@ -2718,10 +2719,7 @@ USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; ERROR: MERGE INTO an distributed table from Postgres table is not yet supported --- Step 5: Cleanup -DROP TABLE non_dist_table_12345; -ERROR: table "non_dist_table_12345" does not exist -DROP TABLE dist_table_67890 CASCADE; +\c - - - :master_port -- End of Issue #7846 \set VERBOSITY terse SET client_min_messages TO WARNING; diff --git a/src/test/regress/sql/pg17.sql b/src/test/regress/sql/pg17.sql index ef73715514c..31dee46e7cd 100644 --- a/src/test/regress/sql/pg17.sql +++ b/src/test/regress/sql/pg17.sql @@ -1465,6 +1465,8 @@ USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; +DROP TABLE non_dist_table_12345; + -- Step 3: Switch back to the coordinator for distributed table operations \c postgresql://postgres@localhost::master_port/regression?application_name=psql SET search_path TO pg17; @@ -1479,10 +1481,7 @@ USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; --- Step 5: Cleanup -DROP TABLE non_dist_table_12345; -DROP TABLE dist_table_67890 CASCADE; - +\c - - - :master_port -- End of Issue #7846 \set VERBOSITY terse From 134ae500e5eae62ac7843e52d2b37f6ac0a20faf Mon Sep 17 00:00:00 2001 From: naisila Date: Wed, 22 Jan 2025 12:28:31 +0300 Subject: [PATCH 2/2] More fixes --- citus-tools | 1 - src/test/regress/expected/pg17.out | 1 - src/test/regress/sql/pg17.sql | 2 -- 3 files changed, 4 deletions(-) delete mode 160000 citus-tools diff --git a/citus-tools b/citus-tools deleted file mode 160000 index 3376bd6845f..00000000000 --- a/citus-tools +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf diff --git a/src/test/regress/expected/pg17.out b/src/test/regress/expected/pg17.out index 53837aae122..c6deb41aaa8 100644 --- a/src/test/regress/expected/pg17.out +++ b/src/test/regress/expected/pg17.out @@ -2701,7 +2701,6 @@ MERGE INTO non_dist_table_12345 AS target_0 USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; -DROP TABLE non_dist_table_12345; -- Step 3: Switch back to the coordinator for distributed table operations \c postgresql://postgres@localhost::master_port/regression?application_name=psql SET search_path TO pg17; diff --git a/src/test/regress/sql/pg17.sql b/src/test/regress/sql/pg17.sql index 31dee46e7cd..f55d50d172a 100644 --- a/src/test/regress/sql/pg17.sql +++ b/src/test/regress/sql/pg17.sql @@ -1465,8 +1465,6 @@ USING pg_catalog.pg_class AS ref_0 ON target_0.id = ref_0.relpages WHEN NOT MATCHED THEN DO NOTHING; -DROP TABLE non_dist_table_12345; - -- Step 3: Switch back to the coordinator for distributed table operations \c postgresql://postgres@localhost::master_port/regression?application_name=psql SET search_path TO pg17;