From 7214673a9f1849607006420c167d6fe01a9c24fc Mon Sep 17 00:00:00 2001 From: Ahmet Gedemenli Date: Mon, 12 Jul 2021 14:12:55 +0300 Subject: [PATCH] Fix test output for cherry-picked commits for 10.0 --- .../regress/expected/multi_partitioning.out | 22 +------------------ src/test/regress/sql/multi_partitioning.sql | 6 +---- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/test/regress/expected/multi_partitioning.out b/src/test/regress/expected/multi_partitioning.out index 6cfe80365..e45e62d99 100644 --- a/src/test/regress/expected/multi_partitioning.out +++ b/src/test/regress/expected/multi_partitioning.out @@ -2016,27 +2016,7 @@ ALTER TABLE partitioning_test DETACH PARTITION partitioning_test_2010; ALTER TABLE partitioning_test DETACH PARTITION partitioning_test_2011; ALTER TABLE partitioning_test DETACH PARTITION partitioning_test_2013; DROP TABLE partitioning_test_2008, partitioning_test_2009, partitioning_test_2010, - partitioning_test_2011, partitioning_test_2013, reference_table_2; --- verify this doesn't crash and gives a debug message for dropped table -SET client_min_messages TO DEBUG1; -DROP TABLE partitioning_test, reference_table; -DEBUG: switching to sequential query execution mode -DETAIL: Table "" is modified, which might lead to data inconsistencies or distributed deadlocks via parallel accesses to hash distributed tables due to foreign keys. Any parallel modification to those hash distributed tables in the same transaction can only be executed in sequential query execution mode -CONTEXT: SQL statement "SELECT citus_drop_all_shards(v_obj.objid, v_obj.schema_name, v_obj.object_name)" -PL/pgSQL function citus_drop_trigger() line 16 at PERFORM -DEBUG: drop cascades to 2 other objects -DETAIL: drop cascades to constraint partitioning_reference_fkey_1660179 on table partitioning_schema.partitioning_test_1660179 -drop cascades to constraint partitioning_reference_fkey_1660181 on table partitioning_schema.partitioning_test_1660181 -DETAIL: from localhost:xxxxx -CONTEXT: SQL statement "SELECT citus_drop_all_shards(v_obj.objid, v_obj.schema_name, v_obj.object_name)" -PL/pgSQL function citus_drop_trigger() line 16 at PERFORM -DEBUG: drop cascades to 2 other objects -DETAIL: drop cascades to constraint partitioning_reference_fkey_1660180 on table partitioning_schema.partitioning_test_1660180 -drop cascades to constraint partitioning_reference_fkey_1660182 on table partitioning_schema.partitioning_test_1660182 -DETAIL: from localhost:xxxxx -CONTEXT: SQL statement "SELECT citus_drop_all_shards(v_obj.objid, v_obj.schema_name, v_obj.object_name)" -PL/pgSQL function citus_drop_trigger() line 16 at PERFORM -RESET client_min_messages; + partitioning_test_2011, partitioning_test_2013, reference_table_2, partitioning_test, reference_table; RESET SEARCH_PATH; -- not timestamp partitioned CREATE TABLE not_time_partitioned (x int, y int) PARTITION BY RANGE (x); diff --git a/src/test/regress/sql/multi_partitioning.sql b/src/test/regress/sql/multi_partitioning.sql index 85f5a98a2..c2740a470 100644 --- a/src/test/regress/sql/multi_partitioning.sql +++ b/src/test/regress/sql/multi_partitioning.sql @@ -1192,11 +1192,7 @@ ALTER TABLE partitioning_test DETACH PARTITION partitioning_test_2011; ALTER TABLE partitioning_test DETACH PARTITION partitioning_test_2013; DROP TABLE partitioning_test_2008, partitioning_test_2009, partitioning_test_2010, - partitioning_test_2011, partitioning_test_2013, reference_table_2; --- verify this doesn't crash and gives a debug message for dropped table -SET client_min_messages TO DEBUG1; -DROP TABLE partitioning_test, reference_table; -RESET client_min_messages; + partitioning_test_2011, partitioning_test_2013, reference_table_2, partitioning_test, reference_table; RESET SEARCH_PATH;