Fixing tests

src/test/regress/expected/aggregate_support.out

@@ -875,6 +875,7 @@ BEGIN
 RETURN $1 * $1;
 END;
 $function$;
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION square_func(int)
 RETURNS int
 LANGUAGE plpgsql
@@ -883,6 +884,7 @@ BEGIN
 RETURN $1 * $1;
 END;
 $function$;
+RESET citus.enable_metadata_sync;
 SELECT const_function(1), string_agg(a::character, ',') FROM t1;
 NOTICE:  stable_fn called
 CONTEXT:  PL/pgSQL function const_function(integer) line XX at RAISE

src/test/regress/expected/multi_function_in_join.out

@@ -49,13 +49,15 @@ SELECT * FROM table1 JOIN add(3,5) sum ON (id = sum) ORDER BY id ASC;
 
 -- Check join of plpgsql functions
 -- a function returning a single integer
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION increment(i integer) RETURNS integer AS $$
 BEGIN
   RETURN i + 1;
 END;
 $$ LANGUAGE plpgsql;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT * FROM table1 JOIN increment(2) val ON (id = val) ORDER BY id ASC;
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT val FROM functions_in_joins.increment(2) val(val)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, val.val FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.val FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(val integer)) val ON ((table1.id OPERATOR(pg_catalog.=) val.val))) ORDER BY table1.id
  id | data | val
@@ -72,9 +74,12 @@ BEGIN
   RETURN QUERY SELECT x FROM generate_series(first_value, first_value+k-1) f(x);
 END;
 $$ LANGUAGE plpgsql;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT *
 FROM table1 JOIN next_k_integers(3,2) next_integers ON (id = next_integers.result)
 ORDER BY id ASC;
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT result FROM functions_in_joins.next_k_integers(3, 2) next_integers(result)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, next_integers.result FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.result FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(result integer)) next_integers ON ((table1.id OPERATOR(pg_catalog.=) next_integers.result))) ORDER BY table1.id
  id | data | result
@@ -88,7 +93,10 @@ CREATE FUNCTION get_set_of_records() RETURNS SETOF RECORD AS $cmd$
 SELECT x, x+1 FROM generate_series(0,4) f(x)
 $cmd$
 LANGUAGE SQL;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT * FROM table1 JOIN get_set_of_records() AS t2(x int, y int) ON (id = x) ORDER BY id ASC;
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT x, y FROM functions_in_joins.get_set_of_records() t2(x integer, y integer)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, t2.x, t2.y FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.x, intermediate_result.y FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(x integer, y integer)) t2 ON ((table1.id OPERATOR(pg_catalog.=) t2.x))) ORDER BY table1.id
  id | data | x | y
@@ -103,7 +111,10 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, ta
 CREATE FUNCTION dup(int) RETURNS TABLE(f1 int, f2 text)
 AS $$ SELECT $1, CAST($1 AS text) || ' is text' $$
 LANGUAGE SQL;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT f.* FROM table1 t JOIN dup(32) f ON (f1 = id);
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT f1, f2 FROM functions_in_joins.dup(32) f(f1, f2)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT f.f1, f.f2 FROM (functions_in_joins.table1 t JOIN (SELECT intermediate_result.f1, intermediate_result.f2 FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(f1 integer, f2 text)) f ON ((f.f1 OPERATOR(pg_catalog.=) t.id)))
  f1 |     f2
@@ -114,8 +125,10 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT f.f1, f.f2 FR
 -- a stable function
 CREATE OR REPLACE FUNCTION the_minimum_id()
   RETURNS INTEGER STABLE AS 'SELECT min(id) FROM table1' LANGUAGE SQL;
-RESET citus.enable_metadata_sync;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT * FROM table1 JOIN the_minimum_id() min_id ON (id = min_id);
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT min_id FROM functions_in_joins.the_minimum_id() min_id(min_id)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, min_id.min_id FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.min_id FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(min_id integer)) min_id ON ((table1.id OPERATOR(pg_catalog.=) min_id.min_id)))
  id | data | min_id
@@ -167,7 +180,6 @@ CREATE TYPE min_and_max AS (
   maximum INT
 );
 SET client_min_messages TO DEBUG1;
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION max_and_min () RETURNS
   min_and_max AS $$
 DECLARE
@@ -177,8 +189,10 @@ begin
   return result;
 end;
 $$ language plpgsql;
-RESET citus.enable_metadata_sync;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data) ORDER BY 1,2,3,4;
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT minimum, maximum FROM functions_in_joins.max_and_min() m(minimum, maximum)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, m.minimum, m.maximum FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.minimum, intermediate_result.maximum FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(minimum integer, maximum integer)) m ON (((m.maximum OPERATOR(pg_catalog.=) table1.data) OR (m.minimum OPERATOR(pg_catalog.=) table1.data)))) ORDER BY table1.id, table1.data, m.minimum, m.maximum
  id  | data  | minimum | maximum

src/test/regress/expected/multi_function_in_join_0.out

@@ -51,13 +51,15 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, ta
 
 -- Check join of plpgsql functions
 -- a function returning a single integer
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION increment(i integer) RETURNS integer AS $$
 BEGIN
   RETURN i + 1;
 END;
 $$ LANGUAGE plpgsql;
+DEBUG:  switching to sequential query execution mode
+DETAIL:  A command for a distributed function is run. To make sure subsequent commands see the function correctly we need to make sure to use only one connection for all future commands
 SELECT * FROM table1 JOIN increment(2) val ON (id = val) ORDER BY id ASC;
+DEBUG:  function does not have co-located tables
 DEBUG:  generating subplan XXX_1 for subquery SELECT val FROM functions_in_joins.increment(2) val(val)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, val.val FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.val FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(val integer)) val ON ((table1.id OPERATOR(pg_catalog.=) val.val))) ORDER BY table1.id
  id | data | val
@@ -66,6 +68,8 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, ta
 (1 row)
 
 -- a function that returns a set of integers
+-- Block distributing function as we have tests below to test it locally
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION next_k_integers(IN first_value INTEGER,
                                            IN k INTEGER DEFAULT 3,
                                            OUT result INTEGER)
@@ -74,6 +78,7 @@ BEGIN
   RETURN QUERY SELECT x FROM generate_series(first_value, first_value+k-1) f(x);
 END;
 $$ LANGUAGE plpgsql;
+SET citus.enable_metadata_sync TO OFF;
 SELECT *
 FROM table1 JOIN next_k_integers(3,2) next_integers ON (id = next_integers.result)
 ORDER BY id ASC;
@@ -116,7 +121,6 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT f.f1, f.f2 FR
 -- a stable function
 CREATE OR REPLACE FUNCTION the_minimum_id()
   RETURNS INTEGER STABLE AS 'SELECT min(id) FROM table1' LANGUAGE SQL;
-RESET citus.enable_metadata_sync;
 SELECT * FROM table1 JOIN the_minimum_id() min_id ON (id = min_id);
 DEBUG:  generating subplan XXX_1 for subquery SELECT min_id FROM functions_in_joins.the_minimum_id() min_id(min_id)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, min_id.min_id FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.min_id FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(min_id integer)) min_id ON ((table1.id OPERATOR(pg_catalog.=) min_id.min_id)))
@@ -169,7 +173,6 @@ CREATE TYPE min_and_max AS (
   maximum INT
 );
 SET client_min_messages TO DEBUG1;
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION max_and_min () RETURNS
   min_and_max AS $$
 DECLARE
@@ -179,7 +182,6 @@ begin
   return result;
 end;
 $$ language plpgsql;
-RESET citus.enable_metadata_sync;
 SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data) ORDER BY 1,2,3,4;
 DEBUG:  generating subplan XXX_1 for subquery SELECT minimum, maximum FROM functions_in_joins.max_and_min() m(minimum, maximum)
 DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, table1.data, m.minimum, m.maximum FROM (functions_in_joins.table1 JOIN (SELECT intermediate_result.minimum, intermediate_result.maximum FROM read_intermediate_result('XXX_1'::text, 'binary'::citus_copy_format) intermediate_result(minimum integer, maximum integer)) m ON (((m.maximum OPERATOR(pg_catalog.=) table1.data) OR (m.minimum OPERATOR(pg_catalog.=) table1.data)))) ORDER BY table1.id, table1.data, m.minimum, m.maximum

src/test/regress/sql/aggregate_support.sql

@@ -459,6 +459,7 @@ RETURN $1 * $1;
 END;
 $function$;
 
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION square_func(int)
 RETURNS int
 LANGUAGE plpgsql
@@ -467,6 +468,7 @@ BEGIN
 RETURN $1 * $1;
 END;
 $function$;
+RESET citus.enable_metadata_sync;
 
 SELECT const_function(1), string_agg(a::character, ',') FROM t1;
 SELECT const_function(1), count(b) FROM t1;

src/test/regress/sql/multi_function_in_join.sql

@@ -37,7 +37,6 @@ SELECT * FROM table1 JOIN add(3,5) sum ON (id = sum) ORDER BY id ASC;
 
 -- Check join of plpgsql functions
 -- a function returning a single integer
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION increment(i integer) RETURNS integer AS $$
 BEGIN
   RETURN i + 1;
@@ -46,6 +45,8 @@ $$ LANGUAGE plpgsql;
 SELECT * FROM table1 JOIN increment(2) val ON (id = val) ORDER BY id ASC;
 
 -- a function that returns a set of integers
+-- Block distributing function as we have tests below to test it locally
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION next_k_integers(IN first_value INTEGER,
                                            IN k INTEGER DEFAULT 3,
                                            OUT result INTEGER)
@@ -54,6 +55,7 @@ BEGIN
   RETURN QUERY SELECT x FROM generate_series(first_value, first_value+k-1) f(x);
 END;
 $$ LANGUAGE plpgsql;
+SET citus.enable_metadata_sync TO OFF;
 SELECT *
 FROM table1 JOIN next_k_integers(3,2) next_integers ON (id = next_integers.result)
 ORDER BY id ASC;
@@ -75,7 +77,6 @@ SELECT f.* FROM table1 t JOIN dup(32) f ON (f1 = id);
 -- a stable function
 CREATE OR REPLACE FUNCTION the_minimum_id()
   RETURNS INTEGER STABLE AS 'SELECT min(id) FROM table1' LANGUAGE SQL;
-RESET citus.enable_metadata_sync;
 SELECT * FROM table1 JOIN the_minimum_id() min_id ON (id = min_id);
 
 -- a built-in immutable function
@@ -103,7 +104,6 @@ CREATE TYPE min_and_max AS (
 );
 SET client_min_messages TO DEBUG1;
 
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION max_and_min () RETURNS
   min_and_max AS $$
 DECLARE
@@ -113,7 +113,6 @@ begin
   return result;
 end;
 $$ language plpgsql;
-RESET citus.enable_metadata_sync;
 
 SELECT * FROM table1 JOIN max_and_min() m ON (m.maximum = data OR m.minimum = data) ORDER BY 1,2,3,4;