Update regression tests-4

Update the MX tests. Similar to the previous commits, prevent CTE
inlining in some cases to prevent divergent test outputs.

src/test/regress/expected/multi_mx_function_call_delegation.out

@@ -403,13 +403,12 @@ DETAIL:  A distributed function is created. To make sure subsequent commands see
 
 (1 row)
 
+\set VERBOSITY terse
 select mx_call_func_raise(2);
 DEBUG:  pushing down the function call
 DEBUG:  warning
-DETAIL:  WARNING from localhost:xxxxx
 ERROR:  error
-CONTEXT:  while executing command on localhost:xxxxx
+\set VERBOSITY default
-PL/pgSQL function multi_mx_function_call_delegation.mx_call_func_raise(integer) line 4 at RAISE
 -- Don't push-down when doing INSERT INTO ... SELECT func();
 SET client_min_messages TO ERROR;
 CREATE TABLE test (x int primary key);
@@ -468,9 +467,10 @@ WITH r AS (
 ), t AS (
     SELECT count(*) c FROM r
 ) SELECT * FROM test, t WHERE t.c=0;
+DEBUG:  CTE t is going to be inlined via distributed planning
 DEBUG:  generating subplan XXX_1 for CTE r: SELECT multi_mx_function_call_delegation.delegated_function(10) AS delegated_function
 DEBUG:  not pushing down function calls in CTEs or Subqueries
-DEBUG:  generating subplan XXX_2 for CTE t: SELECT count(*) AS c FROM (SELECT intermediate_result.delegated_function FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(delegated_function integer)) r
+DEBUG:  generating subplan XXX_2 for subquery SELECT count(*) AS c FROM (SELECT intermediate_result.delegated_function FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(delegated_function integer)) r
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT test.x, t.c FROM multi_mx_function_call_delegation.test, (SELECT intermediate_result.c FROM read_intermediate_result('XXX_2'::text, 'binary'::citus_copy_format) intermediate_result(c bigint)) t WHERE (t.c OPERATOR(pg_catalog.=) 0)
  x | c
 ---------------------------------------------------------------------
@@ -483,11 +483,13 @@ WITH r AS (
 ), t AS (
     SELECT count(*) c FROM s
 ) SELECT * FROM test, r, t WHERE t.c=0;
-DEBUG:  generating subplan XXX_1 for CTE r: SELECT count(*) AS count FROM multi_mx_function_call_delegation.test
+DEBUG:  CTE r is going to be inlined via distributed planning
-DEBUG:  generating subplan XXX_2 for CTE s: SELECT multi_mx_function_call_delegation.delegated_function(13) AS delegated_function
+DEBUG:  CTE t is going to be inlined via distributed planning
+DEBUG:  generating subplan XXX_1 for CTE s: SELECT multi_mx_function_call_delegation.delegated_function(13) AS delegated_function
 DEBUG:  not pushing down function calls in CTEs or Subqueries
-DEBUG:  generating subplan XXX_3 for CTE t: SELECT count(*) AS c FROM (SELECT intermediate_result.delegated_function FROM read_intermediate_result('XXX_2'::text, 'binary'::citus_copy_format) intermediate_result(delegated_function integer)) s
+DEBUG:  generating subplan XXX_2 for subquery SELECT count(*) AS count FROM multi_mx_function_call_delegation.test
-DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT test.x, r.count, t.c FROM multi_mx_function_call_delegation.test, (SELECT intermediate_result.count FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(count bigint)) r, (SELECT intermediate_result.c FROM read_intermediate_result('XXX_3'::text, 'binary'::citus_copy_format) intermediate_result(c bigint)) t WHERE (t.c OPERATOR(pg_catalog.=) 0)
+DEBUG:  generating subplan XXX_3 for subquery SELECT count(*) AS c FROM (SELECT intermediate_result.delegated_function FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(delegated_function integer)) s
+DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT test.x, r.count, t.c FROM multi_mx_function_call_delegation.test, (SELECT intermediate_result.count FROM read_intermediate_result('XXX_2'::text, 'binary'::citus_copy_format) intermediate_result(count bigint)) r, (SELECT intermediate_result.c FROM read_intermediate_result('XXX_3'::text, 'binary'::citus_copy_format) intermediate_result(c bigint)) t WHERE (t.c OPERATOR(pg_catalog.=) 0)
  x | count | c
 ---------------------------------------------------------------------
 (0 rows)

src/test/regress/expected/multi_mx_router_planner.out

@@ -2,6 +2,9 @@
 -- test router planner functionality for single shard select queries
 -- ===================================================================
 -- run all the router queries from the one of the workers
+-- prevent PG 11 - PG 12 outputs to diverge
+-- and CTE inlining is not relevant to router plannery anyway
+SET citus.enable_cte_inlining TO false;
 \c - - - :worker_1_port
 -- this table is used in a CTE test
 CREATE TABLE authors_hash_mx ( name text, id bigint );
@@ -226,6 +229,7 @@ DEBUG:  Plan is router executable
 -- queries with CTEs are supported
 WITH first_author AS ( SELECT id FROM articles_hash_mx WHERE author_id = 1)
 SELECT * FROM first_author;
+DEBUG:  CTE first_author is going to be inlined via distributed planning
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
 DETAIL:  distribution column value: 1
@@ -257,6 +261,8 @@ DETAIL:  distribution column value: 1
 WITH id_author AS ( SELECT id, author_id FROM articles_hash_mx WHERE author_id = 1),
 id_title AS (SELECT id, title from articles_hash_mx WHERE author_id = 1)
 SELECT * FROM id_author, id_title WHERE id_author.id = id_title.id;
+DEBUG:  CTE id_author is going to be inlined via distributed planning
+DEBUG:  CTE id_title is going to be inlined via distributed planning
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
 DETAIL:  distribution column value: 1
@@ -272,6 +278,8 @@ DETAIL:  distribution column value: 1
 WITH id_author AS ( SELECT id, author_id FROM articles_hash_mx WHERE author_id = 1),
 id_title AS (SELECT id, title from articles_hash_mx WHERE author_id = 3)
 SELECT * FROM id_author, id_title WHERE id_author.id = id_title.id;
+DEBUG:  CTE id_author is going to be inlined via distributed planning
+DEBUG:  CTE id_title is going to be inlined via distributed planning
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
  id | author_id | id | title
@@ -282,18 +290,17 @@ DEBUG:  Plan is router executable
 WITH id_author AS ( SELECT id, author_id FROM articles_hash_mx WHERE author_id = 1),
 id_title AS (SELECT id, title from articles_hash_mx WHERE author_id = 2)
 SELECT * FROM id_author, id_title WHERE id_author.id = id_title.id;
+DEBUG:  CTE id_author is going to be inlined via distributed planning
+DEBUG:  CTE id_title is going to be inlined via distributed planning
 DEBUG:  cannot run command which targets multiple shards
-DEBUG:  generating subplan XXX_1 for CTE id_author: SELECT id, author_id FROM public.articles_hash_mx WHERE (author_id OPERATOR(pg_catalog.=) 1)
-DEBUG:  Creating router plan
-DEBUG:  Plan is router executable
-DETAIL:  distribution column value: 1
-DEBUG:  generating subplan XXX_2 for CTE id_title: SELECT id, title FROM public.articles_hash_mx WHERE (author_id OPERATOR(pg_catalog.=) 2)
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
 DETAIL:  distribution column value: 2
-DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT id_author.id, id_author.author_id, id_title.id, id_title.title FROM (SELECT intermediate_result.id, intermediate_result.author_id FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(id bigint, author_id bigint)) id_author, (SELECT intermediate_result.id, intermediate_result.title FROM read_intermediate_result('XXX_2'::text, 'binary'::citus_copy_format) intermediate_result(id bigint, title character varying(20))) id_title WHERE (id_author.id OPERATOR(pg_catalog.=) id_title.id)
+DEBUG:  generating subplan XXX_1 for subquery SELECT id, title FROM public.articles_hash_mx WHERE (author_id OPERATOR(pg_catalog.=) 2)
+DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT id_author.id, id_author.author_id, id_title.id, id_title.title FROM (SELECT articles_hash_mx.id, articles_hash_mx.author_id FROM public.articles_hash_mx WHERE (articles_hash_mx.author_id OPERATOR(pg_catalog.=) 1)) id_author, (SELECT intermediate_result.id, intermediate_result.title FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(id bigint, title character varying(20))) id_title WHERE (id_author.id OPERATOR(pg_catalog.=) id_title.id)
 DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
+DETAIL:  distribution column value: 1
  id | author_id | id | title
 ---------------------------------------------------------------------
 (0 rows)
@@ -610,24 +617,17 @@ DETAIL:  distribution column value: 10
 -- following join is not router plannable since there are no
 -- workers containing both shards, but will work through recursive
 -- planning
+SET client_min_messages TO INFO;
 WITH single_shard as (SELECT * FROM articles_single_shard_hash_mx)
 SELECT a.author_id as first_author, b.word_count as second_word_count
 	FROM articles_hash_mx a, single_shard b
 	WHERE a.author_id = 2 and a.author_id = b.author_id
 	LIMIT 3;
-DEBUG:  Found no worker with all shard placements
-DEBUG:  found no worker with all shard placements
-DEBUG:  generating subplan XXX_1 for CTE single_shard: SELECT id, author_id, title, word_count FROM public.articles_single_shard_hash_mx
-DEBUG:  Creating router plan
-DEBUG:  Plan is router executable
-DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT a.author_id AS first_author, b.word_count AS second_word_count FROM public.articles_hash_mx a, (SELECT intermediate_result.id, intermediate_result.author_id, intermediate_result.title, intermediate_result.word_count FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(id bigint, author_id bigint, title character varying(20), word_count integer)) b WHERE ((a.author_id OPERATOR(pg_catalog.=) 2) AND (a.author_id OPERATOR(pg_catalog.=) b.author_id)) LIMIT 3
-DEBUG:  Creating router plan
-DEBUG:  Plan is router executable
-DETAIL:  distribution column value: 2
  first_author | second_word_count
 ---------------------------------------------------------------------
 (0 rows)
 
+SET client_min_messages TO DEBUG;
 -- single shard select with limit is router plannable
 SELECT *
 	FROM articles_hash_mx

src/test/regress/sql/multi_mx_function_call_delegation.sql

@@ -164,8 +164,9 @@ BEGIN
     RAISE EXCEPTION 'error';
 END;$$;
 select create_distributed_function('mx_call_func_raise(int)', '$1', 'mx_call_dist_table_1');
+\set VERBOSITY terse
 select mx_call_func_raise(2);
-
+\set VERBOSITY default
 -- Don't push-down when doing INSERT INTO ... SELECT func();
 SET client_min_messages TO ERROR;
 CREATE TABLE test (x int primary key);

src/test/regress/sql/multi_mx_router_planner.sql

@@ -6,6 +6,10 @@
 
 -- run all the router queries from the one of the workers
 
+-- prevent PG 11 - PG 12 outputs to diverge
+-- and CTE inlining is not relevant to router plannery anyway
+SET citus.enable_cte_inlining TO false;
+
 \c - - - :worker_1_port
 -- this table is used in a CTE test
 CREATE TABLE authors_hash_mx ( name text, id bigint );
@@ -273,11 +277,13 @@ SELECT a.author_id as first_author, b.word_count as second_word_count
 -- following join is not router plannable since there are no
 -- workers containing both shards, but will work through recursive
 -- planning
+SET client_min_messages TO INFO;
 WITH single_shard as (SELECT * FROM articles_single_shard_hash_mx)
 SELECT a.author_id as first_author, b.word_count as second_word_count
 	FROM articles_hash_mx a, single_shard b
 	WHERE a.author_id = 2 and a.author_id = b.author_id
 	LIMIT 3;
+SET client_min_messages TO DEBUG;
 
 -- single shard select with limit is router plannable
 SELECT *