Update CONTEXT: lines in expected output.

They are ignored by gpdiff, but it's nice to keep them up-to-date anyway,
because if a test fails, these differences alre also printed in
regression.diffs, even though they're not causing the failure.

There are some more CONTEXTs that in more complicated cases that are not
always the same from run to run, but this is a good start.

src/test/regress/expected/bfv_dd_multicolumn.out

@@ -32,9 +32,9 @@ INFO:  Distributed transaction command 'Distributed Prepare' to SINGLE content
 INFO:  Distributed transaction command 'Distributed Commit Prepared' to SINGLE content
 analyze dd_multicol_1;
 INFO:  Dispatch command to ALL contents
-CONTEXT:  SQL statement "select sum(gp_statistics_estimate_reltuples_relpages_oid(c.oid))::float4[] from gp_dist_random('pg_class') c where c.oid=29535"
+CONTEXT:  SQL statement "select pg_catalog.sum(pg_catalog.gp_statistics_estimate_reltuples_relpages_oid(c.oid))::pg_catalog.float4[] from pg_catalog.gp_dist_random('pg_catalog.pg_class') c where c.oid=1216913"
 INFO:  Dispatch command to ALL contents
-CONTEXT:  SQL statement "select Ta.a, Ta.b from public.dd_multicol_1 as Ta  limit 7500 "
+CONTEXT:  SQL statement "select Ta.a , Ta.b  from public.dd_multicol_1 as Ta  limit 30000 "
 insert into dd_multicol_2 select g, g%2 from generate_series(1, 100) g;
 INFO:  Dispatch command to ALL contents
 INFO:  Dispatch command to ALL contents

src/test/regress/expected/dml_in_udf.out

@@ -215,34 +215,34 @@ LANGUAGE PLPGSQL;
 CREATE TABLE dml_plpgsql_t1(a char) distributed by (a);
 SELECT dml_indata(1,10);
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
 NOTICE:  Error in data
-CONTEXT:  SQL statement "SELECT  dml_insertvalue(100)"
+CONTEXT:  SQL statement "SELECT dml_insertvalue(100)"
 PL/pgSQL function "dml_indata" line 6 at PERFORM
  dml_indata 
 ------------

src/test/regress/expected/function_extensions.out

@@ -165,7 +165,7 @@ end
 $$ language plpgsql stable modifies sql data;
 select * from func1_mod_int_stb(5) order by 1;
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "update bar set d = d+1 where c =  $1 "
+CONTEXT:  SQL statement "update bar set d = d+1 where c = $1"
 PL/pgSQL function "func1_mod_int_stb" line 2 at SQL statement
 drop function func2(anyelement, anyelement, bool);
 drop function func3();

src/test/regress/expected/function_extensions_optimizer.out

@@ -165,7 +165,7 @@ end
 $$ language plpgsql stable modifies sql data;
 select * from func1_mod_int_stb(5) order by 1;
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "update bar set d = d+1 where c =  $1 "
+CONTEXT:  SQL statement "update bar set d = d+1 where c = $1"
 PL/pgSQL function "func1_mod_int_stb" line 2 at SQL statement
 drop function func2(anyelement, anyelement, bool);
 drop function func3();

src/test/regress/expected/qp_functions_in_from.out

@@ -154,7 +154,7 @@ rollback;
 begin;
 SELECT * FROM func1_mod_setint_stb(5) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_join_0.sql
@@ -3091,7 +3091,7 @@ begin;
 SELECT * FROM func1_mod_setint_vol(func2_nosql_vol(5)), foo order by 1,2,3; 
 ERROR:  query plan with multiple segworker groups is not supported
 HINT:  likely caused by a function that reads or modifies data in a distributed table
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_vol" line 4 at SQL statement
 rollback;
 -- @description function_in_from_join_withfunc2_153.sql
@@ -3099,7 +3099,7 @@ begin;
 SELECT * FROM func1_mod_setint_vol(func2_sql_int_vol(5)), foo order by 1,2,3; 
 ERROR:  query plan with multiple segworker groups is not supported
 HINT:  likely caused by a function that reads or modifies data in a distributed table
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_vol" line 4 at SQL statement
 rollback;
 -- @description function_in_from_join_withfunc2_156.sql
@@ -3129,14 +3129,14 @@ rollback;
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_nosql_vol(5)), foo order by 1,2,3; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_join_withfunc2_163.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_sql_int_vol(5)), foo order by 1,2,3; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_join_withfunc2_166.sql
@@ -6360,7 +6360,7 @@ begin;
 SELECT * FROM foo, (SELECT * FROM func1_mod_setint_vol(func2_nosql_vol(5))) r order by 1,2,3; 
 ERROR:  query plan with multiple segworker groups is not supported
 HINT:  likely caused by a function that reads or modifies data in a distributed table
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_vol" line 4 at SQL statement
 rollback;
 -- @description function_in_from_subqry_withfunc2_153.sql
@@ -6368,7 +6368,7 @@ begin;
 SELECT * FROM foo, (SELECT * FROM func1_mod_setint_vol(func2_sql_int_vol(5))) r order by 1,2,3; 
 ERROR:  query plan with multiple segworker groups is not supported
 HINT:  likely caused by a function that reads or modifies data in a distributed table
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_vol" line 4 at SQL statement
 rollback;
 -- @description function_in_from_subqry_withfunc2_156.sql
@@ -6398,14 +6398,14 @@ rollback;
 begin;
 SELECT * FROM foo, (SELECT * FROM func1_mod_setint_stb(func2_nosql_vol(5))) r order by 1,2,3; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_subqry_withfunc2_163.sql
 begin;
 SELECT * FROM foo, (SELECT * FROM func1_mod_setint_stb(func2_sql_int_vol(5))) r order by 1,2,3; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_subqry_withfunc2_166.sql
@@ -7923,63 +7923,63 @@ rollback;
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_nosql_vol(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_161.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_nosql_stb(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_162.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_nosql_imm(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_163.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_sql_int_vol(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_164.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_sql_int_stb(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_165.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_sql_int_imm(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_166.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_read_int_vol(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_167.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_read_int_stb(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_168.sql
 begin;
 SELECT * FROM func1_mod_setint_stb(func2_mod_int_vol(5)) order by 1; 
 ERROR:  UPDATE is not allowed in a non-volatile function
-CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c >  $1 "
+CONTEXT:  SQL statement "UPDATE bar SET d = d+1 WHERE c > $1"
 PL/pgSQL function "func1_mod_setint_stb" line 4 at SQL statement
 rollback;
 -- @description function_in_from_withfunc2_169.sql

src/test/regress/expected/qp_targeted_dispatch.out

@@ -936,9 +936,9 @@ NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'ke
 HINT:  The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew.
 INFO:  Dispatch command to ALL contents
 INFO:  Dispatch command to ALL contents
-CONTEXT:  SQL statement "select sum(gp_statistics_estimate_reltuples_relpages_oid(c.oid))::float4[] from gp_dist_random('pg_class') c where c.oid=1237045"
+CONTEXT:  SQL statement "select pg_catalog.sum(pg_catalog.gp_statistics_estimate_reltuples_relpages_oid(c.oid))::pg_catalog.float4[] from pg_catalog.gp_dist_random('pg_catalog.pg_class') c where c.oid=1315184"
 INFO:  Dispatch command to ALL contents
-CONTEXT:  SQL statement "select Ta.key, Ta.value from public.zoompp7620 as Ta  limit 7500 "
+CONTEXT:  SQL statement "select Ta.key , (case when pg_column_size(Ta.value) > 1024 then NULL else Ta.value  end) as value, (case when Ta.value is NULL then false else true end) from public.zoompp7620 as Ta  limit 30000 "
 INFO:  Distributed transaction command 'Distributed Prepare' to ALL contents
 INFO:  Distributed transaction command 'Distributed Commit Prepared' to ALL contents
 insert into mpp7620 values (200, 200);

src/test/regress/expected/rangefuncs_cdb.out

@@ -170,7 +170,7 @@ $$  LANGUAGE plpgsql;
 --   Fails: plpgsql does not support SFRM_Materialize
 select foor(1);
 ERROR:  set-valued function called in context that cannot accept a set
-CONTEXT:  PL/pgSQL function "foor"
+CONTEXT:  PL/pgSQL function "foor" line 5 at RETURN NEXT
 -- expanding columns in the select list
 --    Fails: record type not registered
 select (foor(1)).*;