From bc09288651bbda0cfca1a4909a4a5c0ca4e3e55f Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 16 Jun 2021 12:23:43 +0300 Subject: [PATCH 1/3] Get ready for Improve index backed constraint creation for online rebalancer See: https://github.com/citusdata/citus-enterprise/issues/616 --- .../distributed/operations/node_protocol.c | 32 +++++++++++-------- .../distributed/coordinator_protocol.h | 6 ++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/backend/distributed/operations/node_protocol.c b/src/backend/distributed/operations/node_protocol.c index c52f6efcf..f0ff1c82b 100644 --- a/src/backend/distributed/operations/node_protocol.c +++ b/src/backend/distributed/operations/node_protocol.c @@ -799,28 +799,32 @@ GatherIndexAndConstraintDefinitionList(Form_pg_index indexForm, List **indexDDLE int indexFlags) { Oid indexId = indexForm->indexrelid; - char *statementDef = NULL; - bool indexImpliedByConstraint = IndexImpliedByAConstraint(indexForm); /* get the corresponding constraint or index statement */ if (indexImpliedByConstraint) { - Oid constraintId = get_index_constraint(indexId); - Assert(constraintId != InvalidOid); + if (indexFlags & INCLUDE_CREATE_CONSTRAINT_STATEMENTS) + { + Oid constraintId = get_index_constraint(indexId); + Assert(constraintId != InvalidOid); - statementDef = pg_get_constraintdef_command(constraintId); + /* include constraints backed by indexes only when explicitly asked */ + char *statementDef = pg_get_constraintdef_command(constraintId); + *indexDDLEventList = + lappend(*indexDDLEventList, + makeTableDDLCommandString(statementDef)); + } } - else + else if (indexFlags & INCLUDE_CREATE_INDEX_STATEMENTS) { - statementDef = pg_get_indexdef_string(indexId); - } - - /* append found constraint or index definition to the list */ - if (indexFlags & INCLUDE_CREATE_INDEX_STATEMENTS) - { - *indexDDLEventList = lappend(*indexDDLEventList, makeTableDDLCommandString( - statementDef)); + /* + * Include indexes that are not backing constraints only when + * explicitly asked. + */ + char *statementDef = pg_get_indexdef_string(indexId); + *indexDDLEventList = lappend(*indexDDLEventList, + makeTableDDLCommandString(statementDef)); } /* if table is clustered on this index, append definition to the list */ diff --git a/src/include/distributed/coordinator_protocol.h b/src/include/distributed/coordinator_protocol.h index ab5490fca..7f43138d2 100644 --- a/src/include/distributed/coordinator_protocol.h +++ b/src/include/distributed/coordinator_protocol.h @@ -101,9 +101,11 @@ typedef enum TableDDLCommandType typedef enum IndexDefinitionDeparseFlags { INCLUDE_CREATE_INDEX_STATEMENTS = 1 << 0, - INCLUDE_INDEX_CLUSTERED_STATEMENTS = 1 << 1, - INCLUDE_INDEX_STATISTICS_STATEMENTTS = 1 << 2, + INCLUDE_CREATE_CONSTRAINT_STATEMENTS = 1 << 1, + INCLUDE_INDEX_CLUSTERED_STATEMENTS = 1 << 2, + INCLUDE_INDEX_STATISTICS_STATEMENTTS = 1 << 3, INCLUDE_INDEX_ALL_STATEMENTS = INCLUDE_CREATE_INDEX_STATEMENTS | + INCLUDE_CREATE_CONSTRAINT_STATEMENTS | INCLUDE_INDEX_CLUSTERED_STATEMENTS | INCLUDE_INDEX_STATISTICS_STATEMENTTS } IndexDefinitionDeparseFlags; From 3edef11a9f5545e879a4e424b4cbf79b456f4851 Mon Sep 17 00:00:00 2001 From: SaitTalhaNisanci Date: Thu, 17 Jun 2021 13:40:05 +0300 Subject: [PATCH 2/3] Fix a test in hyperscale schedule (#5042) --- src/test/regress/multi_schedule_hyperscale | 2 +- src/test/regress/multi_schedule_hyperscale_superuser | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/multi_schedule_hyperscale b/src/test/regress/multi_schedule_hyperscale index 661436102..1a7089fd4 100644 --- a/src/test/regress/multi_schedule_hyperscale +++ b/src/test/regress/multi_schedule_hyperscale @@ -63,7 +63,7 @@ test: hyperscale_tutorial test: multi_basic_queries multi_complex_expressions multi_subquery_complex_queries multi_subquery_behavioral_analytics test: multi_subquery_complex_reference_clause multi_subquery_window_functions multi_sql_function test: multi_function_in_join row_types -test: multi_subquery_in_where_reference_clause join adaptive_executor propagate_set_commands +test: multi_subquery_in_where_reference_clause join_pushdown adaptive_executor propagate_set_commands test: rollback_to_savepoint insert_select_into_local_table undistribute_table test: multi_subquery_union multi_subquery_in_where_clause multi_subquery_misc test: multi_limit_clause_approximate multi_single_relation_subquery set_role_in_transaction diff --git a/src/test/regress/multi_schedule_hyperscale_superuser b/src/test/regress/multi_schedule_hyperscale_superuser index 4d62fbed4..91d7f388e 100644 --- a/src/test/regress/multi_schedule_hyperscale_superuser +++ b/src/test/regress/multi_schedule_hyperscale_superuser @@ -69,7 +69,7 @@ test: hyperscale_tutorial test: multi_basic_queries multi_subquery multi_subquery_complex_queries multi_subquery_behavioral_analytics test: multi_subquery_complex_reference_clause multi_subquery_window_functions multi_sql_function test: multi_function_in_join row_types materialized_view -test: multi_subquery_in_where_reference_clause join adaptive_executor propagate_set_commands +test: multi_subquery_in_where_reference_clause join_pushdown adaptive_executor propagate_set_commands test: multi_subquery_union multi_subquery_in_where_clause multi_subquery_misc test: multi_agg_distinct multi_limit_clause_approximate multi_outer_join_reference test: multi_select_for_update relation_access_tracking pg13_with_ties From c4f50185e0f29b011a79222b88c3a74825fc7c37 Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Thu, 17 Jun 2021 14:11:17 +0300 Subject: [PATCH 3/3] Ignore pl/pgsql line numbers in regression outputs (#4411) --- src/test/regress/bin/normalize.sed | 3 + .../regress/expected/aggregate_support.out | 14 +-- .../alter_table_set_access_method.out | 2 +- .../regress/expected/columnar_trigger.out | 26 ++--- .../expected/multi_cluster_management.out | 4 +- .../expected/multi_deparse_function.out | 98 +++++++++---------- src/test/regress/expected/multi_extension.out | 4 +- .../expected/multi_function_evaluation.out | 6 +- .../regress/expected/multi_mx_metadata.out | 12 +-- .../multi_null_minmax_value_pruning.out | 16 +-- .../regress/expected/multi_simple_queries.out | 2 +- ...licate_reference_tables_to_coordinator.out | 2 +- .../regress/expected/subquery_and_cte.out | 2 +- src/test/regress/expected/values.out | 2 +- 14 files changed, 98 insertions(+), 95 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 384fb04c2..fb9a10a56 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -224,3 +224,6 @@ s/^(DEBUG: the index name on the shards of the partition is too long, switching # normalize errors for not being able to connect to a non-existing host s/could not translate host name "foobar" to address: .*$/could not translate host name "foobar" to address: /g + +# ignore PL/pgSQL line numbers that differ on Mac builds +s/(CONTEXT: PL\/pgSQL function .* line )([0-9]+)/\1XX/g diff --git a/src/test/regress/expected/aggregate_support.out b/src/test/regress/expected/aggregate_support.out index 0311ca031..40f240558 100644 --- a/src/test/regress/expected/aggregate_support.out +++ b/src/test/regress/expected/aggregate_support.out @@ -872,7 +872,7 @@ END; $function$; SELECT const_function(1), string_agg(a::character, ',') FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE const_function | string_agg --------------------------------------------------------------------- 1 | @@ -880,7 +880,7 @@ CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE SELECT const_function(1), count(b) FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE const_function | count --------------------------------------------------------------------- 1 | 0 @@ -888,7 +888,7 @@ CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE SELECT const_function(1), count(b), 10 FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE const_function | count | ?column? --------------------------------------------------------------------- 1 | 0 | 10 @@ -896,9 +896,9 @@ CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE SELECT const_function(1), count(b), const_function(10) FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE const_function | count | const_function --------------------------------------------------------------------- 1 | 0 | 1 @@ -906,7 +906,7 @@ CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE SELECT square_func(5), string_agg(a::character, ','),const_function(1) FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE square_func | string_agg | const_function --------------------------------------------------------------------- 25 | | 1 @@ -914,7 +914,7 @@ CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE SELECT square_func_stable(5), string_agg(a::character, ','),const_function(1) FROM t1; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function const_function(integer) line 3 at RAISE +CONTEXT: PL/pgSQL function const_function(integer) line XX at RAISE square_func_stable | string_agg | const_function --------------------------------------------------------------------- 25 | | 1 diff --git a/src/test/regress/expected/alter_table_set_access_method.out b/src/test/regress/expected/alter_table_set_access_method.out index f117199d0..c81578f5c 100644 --- a/src/test/regress/expected/alter_table_set_access_method.out +++ b/src/test/regress/expected/alter_table_set_access_method.out @@ -191,7 +191,7 @@ SELECT * FROM partitioned_table_6_10 ORDER BY 1, 2; -- try to compress partitions with an integer partition column CALL alter_old_partitions_set_access_method('partitioned_table', '2021-01-01', 'columnar'); ERROR: partition column of partitioned_table cannot be cast to a timestamptz -CONTEXT: PL/pgSQL function alter_old_partitions_set_access_method(regclass,timestamp with time zone,name) line 13 at RAISE +CONTEXT: PL/pgSQL function alter_old_partitions_set_access_method(regclass,timestamp with time zone,name) line XX at RAISE CREATE TABLE time_partitioned (event_time timestamp, event int) partition by range (event_time); SELECT create_distributed_table('time_partitioned', 'event_time'); create_distributed_table diff --git a/src/test/regress/expected/columnar_trigger.out b/src/test/regress/expected/columnar_trigger.out index a515b2375..1e6cab895 100644 --- a/src/test/regress/expected/columnar_trigger.out +++ b/src/test/regress/expected/columnar_trigger.out @@ -50,30 +50,30 @@ ERROR: Foreign keys and AFTER ROW triggers are not supported for columnar table HINT: Consider an AFTER STATEMENT trigger instead. insert into test_tr values(1); NOTICE: BEFORE STATEMENT INSERT -CONTEXT: PL/pgSQL function trs_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trs_before() line XX at RAISE NOTICE: BEFORE ROW INSERT: (1) -CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trr_before() line XX at RAISE NOTICE: AFTER STATEMENT INSERT -CONTEXT: PL/pgSQL function trs_after() line 5 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE NOTICE: (1) -CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE insert into test_tr values(2),(3),(4); NOTICE: BEFORE STATEMENT INSERT -CONTEXT: PL/pgSQL function trs_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trs_before() line XX at RAISE NOTICE: BEFORE ROW INSERT: (2) -CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trr_before() line XX at RAISE NOTICE: BEFORE ROW INSERT: (3) -CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trr_before() line XX at RAISE NOTICE: BEFORE ROW INSERT: (4) -CONTEXT: PL/pgSQL function trr_before() line 3 at RAISE +CONTEXT: PL/pgSQL function trr_before() line XX at RAISE NOTICE: AFTER STATEMENT INSERT -CONTEXT: PL/pgSQL function trs_after() line 5 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE NOTICE: (2) -CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE NOTICE: (3) -CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE NOTICE: (4) -CONTEXT: PL/pgSQL function trs_after() line 14 at RAISE +CONTEXT: PL/pgSQL function trs_after() line XX at RAISE SELECT * FROM test_tr ORDER BY i; i --------------------------------------------------------------------- @@ -146,7 +146,7 @@ create trigger tr_after_stmt_erroring after insert on test_tr -- insert into test_tr values(5); ERROR: error -CONTEXT: PL/pgSQL function trs_after_erroring() line 4 at RAISE +CONTEXT: PL/pgSQL function trs_after_erroring() line XX at RAISE insert into test_tr values(6); SELECT * FROM test_tr ORDER BY i; i diff --git a/src/test/regress/expected/multi_cluster_management.out b/src/test/regress/expected/multi_cluster_management.out index 963894ddd..404a6cf9b 100644 --- a/src/test/regress/expected/multi_cluster_management.out +++ b/src/test/regress/expected/multi_cluster_management.out @@ -766,11 +766,11 @@ SELECT master_remove_node('localhost', 9999); INSERT INTO pg_dist_node (nodename, nodeport, groupid, noderole) VALUES ('localhost', 5000, :worker_1_group, 'primary'); ERROR: there cannot be two primary nodes in a group -CONTEXT: PL/pgSQL function citus_internal.pg_dist_node_trigger_func() line 10 at RAISE +CONTEXT: PL/pgSQL function citus_internal.pg_dist_node_trigger_func() line XX at RAISE UPDATE pg_dist_node SET noderole = 'primary' WHERE groupid = :worker_1_group AND nodeport = 9998; ERROR: there cannot be two primary nodes in a group -CONTEXT: PL/pgSQL function citus_internal.pg_dist_node_trigger_func() line 18 at RAISE +CONTEXT: PL/pgSQL function citus_internal.pg_dist_node_trigger_func() line XX at RAISE -- check that you can't manually add a primary to a non-default cluster INSERT INTO pg_dist_node (nodename, nodeport, groupid, noderole, nodecluster) VALUES ('localhost', 5000, 1000, 'primary', 'olap'); diff --git a/src/test/regress/expected/multi_deparse_function.out b/src/test/regress/expected/multi_deparse_function.out index e1448d5f1..7a7d775c8 100644 --- a/src/test/regress/expected/multi_deparse_function.out +++ b/src/test/regress/expected/multi_deparse_function.out @@ -71,7 +71,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add CALLED ON NULL INPUT $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) CALLED ON NULL INPUT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -84,7 +84,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add RETURNS NULL ON NULL INPUT $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STRICT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -95,7 +95,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add STRICT $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STRICT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -106,7 +106,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add IMMUTABLE $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) IMMUTABLE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -117,7 +117,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add STABLE $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) STABLE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -128,7 +128,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add VOLATILE $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) VOLATILE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -139,7 +139,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add LEAKPROOF $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) LEAKPROOF; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -150,7 +150,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add NOT LEAKPROOF $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) NOT LEAKPROOF; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -163,7 +163,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add EXTERNAL SECURITY INVOKER $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY INVOKER; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -174,7 +174,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SECURITY INVOKER $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY INVOKER; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -185,7 +185,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add EXTERNAL SECURITY DEFINER $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY DEFINER; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -196,7 +196,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SECURITY DEFINER $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SECURITY DEFINER; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -207,7 +207,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add PARALLEL UNSAFE $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL UNSAFE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -218,7 +218,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add PARALLEL RESTRICTED $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL RESTRICTED; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -229,7 +229,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add PARALLEL SAFE $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) PARALLEL SAFE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -241,7 +241,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add COST 1234 $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) COST 1234.000000; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -252,7 +252,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add COST 1234.5 $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) COST 1234.500000; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -263,7 +263,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SET log_min_messages = ERROR $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages = 'error'; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -274,7 +274,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SET log_min_messages TO DEFAULT $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages TO DEFAULT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -285,7 +285,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SET log_min_messages FROM CURRENT $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET log_min_messages FROM CURRENT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -296,7 +296,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET TIME ZONE INTERVAL '-08:00' HOUR TO MINUTE; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET TIME ZONE INTERVAL '@ 8 hours ago'; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -307,7 +307,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET TIME ZONE '-7'; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET timezone = '-7'; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -318,7 +318,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world'; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = 'hello '' world'; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -329,7 +329,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -3.2; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = -3.2; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -340,7 +340,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET "citus.setting;'" TO -32; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = -32; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -353,7 +353,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add(int, int) SET "citus.setting;'" TO 'hello '' world', 'second '' item'; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET "citus.setting;'" = 'hello '' world', 'second '' item'; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,f,"ERROR: SET citus.setting;' takes only one argument") @@ -364,7 +364,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add RESET log_min_messages $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RESET log_min_messages; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -375,7 +375,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add RESET ALL $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RESET ALL; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -387,7 +387,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add RENAME TO summation $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) RENAME TO summation; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -402,7 +402,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION summation RENAME TO add $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.summation(integer, integer) RENAME TO add; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -425,7 +425,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add OWNER TO function_role $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) OWNER TO function_role; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -436,7 +436,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add OWNER TO missing_role $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) OWNER TO missing_role; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,f,"ERROR: role ""missing_role"" does not exist") @@ -448,7 +448,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add SET SCHEMA public $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) SET SCHEMA public; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -461,7 +461,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION public.add SET SCHEMA function_tests $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION public.add(integer, integer) SET SCHEMA function_tests; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -473,7 +473,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add DEPENDS ON EXTENSION citus $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) DEPENDS ON EXTENSION citus; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -485,7 +485,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION pg_catalog.get_shard_id_for_distribution_column(table_name regclass, distribution_value "any") PARALLEL SAFE; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION pg_catalog.get_shard_id_for_distribution_column(pg_catalog.regclass, pg_catalog."any") PARALLEL SAFE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -506,7 +506,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION add volatile leakproof SECURITY DEFINER PARALLEL unsafe; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.add(integer, integer) VOLATILE LEAKPROOF SECURITY DEFINER PARALLEL UNSAFE; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -519,7 +519,7 @@ SELECT deparse_and_run_on_workers($cmd$ DROP FUNCTION missing_function(int, text); $cmd$); INFO: Propagating deparsed query: DROP FUNCTION missing_function(pg_catalog.int4,text); -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,f,"ERROR: function missing_function(integer, text) does not exist") @@ -532,7 +532,7 @@ SELECT deparse_and_run_on_workers($cmd$ DROP FUNCTION IF EXISTS missing_function(int, text); $cmd$); INFO: Propagating deparsed query: DROP FUNCTION IF EXISTS missing_function(pg_catalog.int4,text); -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"DROP FUNCTION") @@ -543,7 +543,7 @@ SELECT deparse_and_run_on_workers($cmd$ DROP FUNCTION IF EXISTS missing_schema.missing_function(int,float); $cmd$); INFO: Propagating deparsed query: DROP FUNCTION IF EXISTS missing_schema.missing_function(pg_catalog.int4,pg_catalog.float8); -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"DROP FUNCTION") @@ -554,7 +554,7 @@ SELECT deparse_and_run_on_workers($cmd$ DROP FUNCTION IF EXISTS missing_func_without_args; $cmd$); INFO: Propagating deparsed query: DROP FUNCTION IF EXISTS missing_func_without_args; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"DROP FUNCTION") @@ -597,7 +597,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION "CiTuS.TeeN"."TeeNFunCT10N.1!?!"() SET SCHEMA "CiTUS.TEEN2" $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION "CiTuS.TeeN"."TeeNFunCT10N.1!?!"() SET SCHEMA "CiTUS.TEEN2"; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -609,7 +609,7 @@ SELECT deparse_and_run_on_workers($cmd$ DROP FUNCTION "CiTUS.TEEN2"."TeeNFunCT10N.1!?!"(),"CiTuS.TeeN"."TeeNFunCT10N.1!?!"(text); $cmd$); INFO: Propagating deparsed query: DROP FUNCTION "CiTUS.TEEN2"."TeeNFunCT10N.1!?!"(), "CiTuS.TeeN"."TeeNFunCT10N.1!?!"(pg_catalog.text); -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"DROP FUNCTION") @@ -630,7 +630,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION func_default_param RENAME TO func_with_default_param; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.func_default_param(integer) RENAME TO func_with_default_param; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -651,7 +651,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION func_out_param RENAME TO func_in_and_out_param; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.func_out_param(integer) RENAME TO func_in_and_out_param; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -675,7 +675,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION square SET search_path TO DEFAULT; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.square(numeric) SET search_path TO DEFAULT; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -706,7 +706,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION sum_avg COST 10000; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.sum_avg(numeric[]) COST 10000.000000; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -728,7 +728,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION func_custom_param RENAME TO func_with_custom_param; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.func_custom_param(function_tests.intpair) RENAME TO func_with_custom_param; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") @@ -750,7 +750,7 @@ SELECT deparse_and_run_on_workers($cmd$ ALTER FUNCTION func_returns_table ROWS 100; $cmd$); INFO: Propagating deparsed query: ALTER FUNCTION function_tests.func_returns_table(integer) ROWS 100.000000; -CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line 6 at RAISE +CONTEXT: PL/pgSQL function deparse_and_run_on_workers(text) line XX at RAISE deparse_and_run_on_workers --------------------------------------------------------------------- (localhost,57637,t,"ALTER FUNCTION") diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 2914db9fd..48cf0298b 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -409,7 +409,7 @@ NOTICE: create_citus_local_table is deprecated in favour of citus_add_local_tab ALTER EXTENSION citus UPDATE TO '9.4-1'; ERROR: citus local tables are introduced in Citus 9.5 HINT: To downgrade Citus to an older version, you should first convert each citus local table to a postgres table by executing SELECT undistribute_table("%s") -CONTEXT: PL/pgSQL function inline_code_block line 11 at RAISE +CONTEXT: PL/pgSQL function inline_code_block line XX at RAISE ROLLBACK; -- now we can downgrade as there is no citus local table ALTER EXTENSION citus UPDATE TO '9.4-1'; @@ -870,7 +870,7 @@ BEGIN END; $$; ERROR: create distributed table failed -CONTEXT: PL/pgSQL function inline_code_block line 6 at RAISE +CONTEXT: PL/pgSQL function inline_code_block line XX at RAISE \c regression \c - - - :master_port DROP DATABASE another; diff --git a/src/test/regress/expected/multi_function_evaluation.out b/src/test/regress/expected/multi_function_evaluation.out index 7d546c15f..1f921b3d2 100644 --- a/src/test/regress/expected/multi_function_evaluation.out +++ b/src/test/regress/expected/multi_function_evaluation.out @@ -131,9 +131,9 @@ END; $function$; INSERT INTO example VALUES (44, (ARRAY[stable_fn(),stable_fn()])[1]); NOTICE: stable_fn called -CONTEXT: PL/pgSQL function stable_fn() line 3 at RAISE +CONTEXT: PL/pgSQL function stable_fn() line XX at RAISE NOTICE: stable_fn called -CONTEXT: PL/pgSQL function stable_fn() line 3 at RAISE +CONTEXT: PL/pgSQL function stable_fn() line XX at RAISE SELECT * FROM example WHERE key = 44; key | value --------------------------------------------------------------------- @@ -143,7 +143,7 @@ SELECT * FROM example WHERE key = 44; -- unnest is a set-returning function, which should not be evaluated UPDATE example SET value = stable_fn() + interval '2 hours' FROM UNNEST(ARRAY[44, 4]) AS k (key) WHERE example.key = k.key; NOTICE: stable_fn called -CONTEXT: PL/pgSQL function stable_fn() line 3 at RAISE +CONTEXT: PL/pgSQL function stable_fn() line XX at RAISE SELECT * FROM example WHERE key = 44; key | value --------------------------------------------------------------------- diff --git a/src/test/regress/expected/multi_mx_metadata.out b/src/test/regress/expected/multi_mx_metadata.out index fe03d35dd..dc2365dda 100644 --- a/src/test/regress/expected/multi_mx_metadata.out +++ b/src/test/regress/expected/multi_mx_metadata.out @@ -314,22 +314,22 @@ SELECT raise_failed_aclcheck($$ DROP TABLE distributed_mx_table; $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE SELECT raise_failed_aclcheck($$ SELECT master_remove_distributed_table_metadata_from_workers('distributed_mx_table'::regclass, 'public', 'distributed_mx_table'); $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE SELECT raise_failed_aclcheck($$ SELECT citus_drop_all_shards('distributed_mx_table'::regclass, 'public', 'distributed_mx_table'); $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE SELECT raise_failed_aclcheck($$ SELECT master_remove_partition_metadata('distributed_mx_table'::regclass, 'public', 'distributed_mx_table'); $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE -- make sure that we can drop unrelated tables/sequences CREATE TABLE unrelated_table(key serial); DROP TABLE unrelated_table; @@ -358,12 +358,12 @@ SELECT raise_failed_aclcheck($$ DROP TABLE distributed_mx_table; $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE SELECT raise_failed_aclcheck($$ SELECT master_remove_distributed_table_metadata_from_workers('distributed_mx_table'::regclass, 'public', 'distributed_mx_table'); $$); ERROR: must be owner of the object -CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line 6 at RAISE +CONTEXT: PL/pgSQL function raise_failed_aclcheck(text) line XX at RAISE SELECT raise_failed_aclcheck($$ SELECT master_drop_sequences(ARRAY['public.distributed_mx_table_some_val_seq']); $$); diff --git a/src/test/regress/expected/multi_null_minmax_value_pruning.out b/src/test/regress/expected/multi_null_minmax_value_pruning.out index 47d9a8d61..eb2617d28 100644 --- a/src/test/regress/expected/multi_null_minmax_value_pruning.out +++ b/src/test/regress/expected/multi_null_minmax_value_pruning.out @@ -29,9 +29,9 @@ EXPLAIN (COSTS FALSE) SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030 or l_orderkey = 1; $Q$); DEBUG: Router planner does not support append-partitioned tables. -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement LOG: join order: [ "lineitem" ] -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement coordinator_plan --------------------------------------------------------------------- Custom Scan (Citus Adaptive) @@ -78,9 +78,9 @@ EXPLAIN (COSTS FALSE) SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030; $Q$); DEBUG: Router planner does not support append-partitioned tables. -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement LOG: join order: [ "lineitem" ] -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement coordinator_plan --------------------------------------------------------------------- Custom Scan (Citus Adaptive) @@ -143,9 +143,9 @@ EXPLAIN (COSTS FALSE) SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030; $Q$); DEBUG: Router planner does not support append-partitioned tables. -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement LOG: join order: [ "lineitem" ] -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement coordinator_plan --------------------------------------------------------------------- Custom Scan (Citus Adaptive) @@ -208,9 +208,9 @@ EXPLAIN (COSTS FALSE) SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030; $Q$); DEBUG: Router planner does not support append-partitioned tables. -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement LOG: join order: [ "lineitem" ] -CONTEXT: PL/pgSQL function coordinator_plan(text) line 3 at FOR over EXECUTE statement +CONTEXT: PL/pgSQL function coordinator_plan(text) line XX at FOR over EXECUTE statement coordinator_plan --------------------------------------------------------------------- Custom Scan (Citus Adaptive) diff --git a/src/test/regress/expected/multi_simple_queries.out b/src/test/regress/expected/multi_simple_queries.out index d518bb408..7cb4072e6 100644 --- a/src/test/regress/expected/multi_simple_queries.out +++ b/src/test/regress/expected/multi_simple_queries.out @@ -308,7 +308,7 @@ DO $sharded_sql$ $sharded_sql$; ERROR: query has no destination for result data HINT: If you want to discard the results of a SELECT, use PERFORM instead. -CONTEXT: PL/pgSQL function inline_code_block line 3 at SQL statement +CONTEXT: PL/pgSQL function inline_code_block line XX at SQL statement -- test cross-shard queries SELECT COUNT(*) FROM articles; count diff --git a/src/test/regress/expected/replicate_reference_tables_to_coordinator.out b/src/test/regress/expected/replicate_reference_tables_to_coordinator.out index 72082810a..53a22f3c6 100644 --- a/src/test/regress/expected/replicate_reference_tables_to_coordinator.out +++ b/src/test/regress/expected/replicate_reference_tables_to_coordinator.out @@ -182,7 +182,7 @@ NOTICE: executing the command locally: SELECT local_table.a, numbers.a FROM (re CONTEXT: SQL statement "SELECT local_table.a, numbers.a FROM local_table NATURAL JOIN numbers ORDER BY 1" PL/pgSQL function test_reference_local_join_plpgsql_func() line 5 at PERFORM ERROR: -CONTEXT: PL/pgSQL function test_reference_local_join_plpgsql_func() line 6 at RAISE +CONTEXT: PL/pgSQL function test_reference_local_join_plpgsql_func() line XX at RAISE SELECT sum(a) FROM local_table; sum --------------------------------------------------------------------- diff --git a/src/test/regress/expected/subquery_and_cte.out b/src/test/regress/expected/subquery_and_cte.out index 04b90447c..4360bb69e 100644 --- a/src/test/regress/expected/subquery_and_cte.out +++ b/src/test/regress/expected/subquery_and_cte.out @@ -717,7 +717,7 @@ RAISE '(%/3) failed to execute one of the tasks', errors_received; END; $$; ERROR: (3/3) failed to execute one of the tasks -CONTEXT: PL/pgSQL function inline_code_block line 31 at RAISE +CONTEXT: PL/pgSQL function inline_code_block line XX at RAISE SET client_min_messages TO DEFAULT; DROP SCHEMA subquery_and_ctes CASCADE; NOTICE: drop cascades to 8 other objects diff --git a/src/test/regress/expected/values.out b/src/test/regress/expected/values.out index 84893c0d7..9e0eede92 100644 --- a/src/test/regress/expected/values.out +++ b/src/test/regress/expected/values.out @@ -589,7 +589,7 @@ CREATE OR REPLACE FUNCTION fixed_volatile_value() RETURNS integer VOLATILE AS $$ $$ LANGUAGE plpgsql; EXECUTE test_values_pushdown(fixed_volatile_value(),2,3); NOTICE: evaluated on the coordinator -CONTEXT: PL/pgSQL function fixed_volatile_value() line 3 at RAISE +CONTEXT: PL/pgSQL function fixed_volatile_value() line XX at RAISE DEBUG: CTE cte_1 is going to be inlined via distributed planning count ---------------------------------------------------------------------