Continue fixing multi tests

src/test/regress/expected/forcedelegation_functions.out

@@ -284,6 +284,7 @@ INSERT INTO test_nested VALUES (200,'twohundred');
 INSERT INTO test_nested VALUES (300,'threehundred');
 INSERT INTO test_nested VALUES (400,'fourhundred');
 INSERT INTO test_nested VALUES (512,'fivetwelve');
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION inner_force_delegation_function(int)
 RETURNS NUMERIC AS $$
 DECLARE ret_val NUMERIC;
@@ -293,6 +294,7 @@ BEGIN
         RETURN ret_val;
 END;
 $$  LANGUAGE plpgsql;
+RESET citus.enable_metadata_sync;
 CREATE OR REPLACE FUNCTION func_calls_forcepush_func()
 RETURNS NUMERIC AS $$
 DECLARE incremented_val NUMERIC;
@@ -350,6 +352,7 @@ PL/pgSQL function func_calls_forcepush_func() line XX at SQL statement
                        101
 (1 row)
 
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION get_val()
 RETURNS INT AS $$
 BEGIN
@@ -363,7 +366,6 @@ $$  LANGUAGE plpgsql;
 --   select res into var from fn();
 -- }
 --
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION func_calls_forcepush_func_infrom()
 RETURNS NUMERIC AS $$
 DECLARE incremented_val NUMERIC;

src/test/regress/expected/multi_function_in_join.out

@@ -67,6 +67,7 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT table1.id, ta
 (1 row)
 
 -- a function that returns a set of integers
+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)
@@ -75,6 +76,7 @@ BEGIN
   RETURN QUERY SELECT x FROM generate_series(first_value, first_value+k-1) f(x);
 END;
 $$ LANGUAGE plpgsql;
+RESET citus.enable_metadata_sync;
 SELECT *
 FROM table1 JOIN next_k_integers(3,2) next_integers ON (id = next_integers.result)
 ORDER BY id ASC;
@@ -219,8 +221,10 @@ SELECT raise_failed_execution_func_join($$
 $$);
 ERROR:  Task failed to execute
 -- a user-defined immutable function
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION the_answer_to_life()
   RETURNS INTEGER IMMUTABLE AS 'SELECT 42' LANGUAGE SQL;
+RESET citus.enable_metadata_sync;
 SELECT raise_failed_execution_func_join($$
   SELECT * FROM table1 JOIN the_answer_to_life() the_answer ON (id = the_answer);
 $$);

src/test/regress/expected/multi_insert_select.out

@@ -127,6 +127,7 @@ WHERE
   user_id < 0;
 NOTICE:  evaluating on master
 -- make sure we don't evaluate stable functions with column arguments
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION evaluate_on_master(x int)
 RETURNS int LANGUAGE plpgsql STABLE
 AS $function$
@@ -135,6 +136,7 @@ BEGIN
   RETURN x;
 END;
 $function$;
+RESET citus.enable_metadata_sync;
 INSERT INTO raw_events_second (user_id, value_1)
 SELECT
   user_id, evaluate_on_master(value_1)

src/test/regress/expected/pg13.out

@@ -142,12 +142,14 @@ SELECT * FROM text_table ORDER BY 1;
 
 -- Test that we don't propagate base types
 CREATE TYPE myvarchar;
+SET citus.enable_metadata_sync TO OFF;
 CREATE FUNCTION myvarcharin(cstring, oid, integer) RETURNS myvarchar
 LANGUAGE internal IMMUTABLE PARALLEL SAFE STRICT AS 'varcharin';
 NOTICE:  return type myvarchar is only a shell
 CREATE FUNCTION myvarcharout(myvarchar) RETURNS cstring
 LANGUAGE internal IMMUTABLE PARALLEL SAFE STRICT AS 'varcharout';
 NOTICE:  argument type myvarchar is only a shell
+RESET citus.enable_metadata_sync;
 CREATE TYPE myvarchar (
     input = myvarcharin,
     output = myvarcharout,

src/test/regress/sql/forcedelegation_functions.sql

@@ -159,6 +159,7 @@ INSERT INTO test_nested VALUES (300,'threehundred');
 INSERT INTO test_nested VALUES (400,'fourhundred');
 INSERT INTO test_nested VALUES (512,'fivetwelve');
 
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION inner_force_delegation_function(int)
 RETURNS NUMERIC AS $$
 DECLARE ret_val NUMERIC;
@@ -168,6 +169,7 @@ BEGIN
         RETURN ret_val;
 END;
 $$  LANGUAGE plpgsql;
+RESET citus.enable_metadata_sync;
 
 CREATE OR REPLACE FUNCTION func_calls_forcepush_func()
 RETURNS NUMERIC AS $$
@@ -189,6 +191,7 @@ COMMIT;
 
 SELECT func_calls_forcepush_func();
 
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION get_val()
 RETURNS INT AS $$
 BEGIN
@@ -203,7 +206,6 @@ $$  LANGUAGE plpgsql;
 --   select res into var from fn();
 -- }
 --
-SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION func_calls_forcepush_func_infrom()
 RETURNS NUMERIC AS $$
 DECLARE incremented_val NUMERIC;

src/test/regress/sql/multi_function_in_join.sql

@@ -46,6 +46,7 @@ $$ LANGUAGE plpgsql;
 SELECT * FROM table1 JOIN increment(2) val ON (id = val) ORDER BY id ASC;
 
 -- a function that returns a set of integers
+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;
+RESET citus.enable_metadata_sync;
 SELECT *
 FROM table1 JOIN next_k_integers(3,2) next_integers ON (id = next_integers.result)
 ORDER BY id ASC;
@@ -148,8 +150,10 @@ SELECT raise_failed_execution_func_join($$
 $$);
 
 -- a user-defined immutable function
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION the_answer_to_life()
   RETURNS INTEGER IMMUTABLE AS 'SELECT 42' LANGUAGE SQL;
+RESET citus.enable_metadata_sync;
 
 SELECT raise_failed_execution_func_join($$
   SELECT * FROM table1 JOIN the_answer_to_life() the_answer ON (id = the_answer);

src/test/regress/sql/multi_insert_select.sql

@@ -106,6 +106,7 @@ WHERE
   user_id < 0;
 
 -- make sure we don't evaluate stable functions with column arguments
+SET citus.enable_metadata_sync TO OFF;
 CREATE OR REPLACE FUNCTION evaluate_on_master(x int)
 RETURNS int LANGUAGE plpgsql STABLE
 AS $function$
@@ -114,6 +115,7 @@ BEGIN
   RETURN x;
 END;
 $function$;
+RESET citus.enable_metadata_sync;
 
 INSERT INTO raw_events_second (user_id, value_1)
 SELECT

src/test/regress/sql/pg13.sql

@@ -74,10 +74,12 @@ SELECT * FROM text_table ORDER BY 1;
 
 -- Test that we don't propagate base types
 CREATE TYPE myvarchar;
+SET citus.enable_metadata_sync TO OFF;
 CREATE FUNCTION myvarcharin(cstring, oid, integer) RETURNS myvarchar
 LANGUAGE internal IMMUTABLE PARALLEL SAFE STRICT AS 'varcharin';
 CREATE FUNCTION myvarcharout(myvarchar) RETURNS cstring
 LANGUAGE internal IMMUTABLE PARALLEL SAFE STRICT AS 'varcharout';
+RESET citus.enable_metadata_sync;
 CREATE TYPE myvarchar (
     input = myvarcharin,
     output = myvarcharout,