Normalize tests: Line info varies between versions

src/test/regress/bin/normalize.sed

@@ -59,10 +59,10 @@ s/(job_[0-9]+\/task_[0-9]+\/p_[0-9]+\.)[0-9]+/\1xxxx/g
 
 # isolation_ref2ref_foreign_keys
 s/"(ref_table_[0-9]_|ref_table_[0-9]_value_fkey_)[0-9]+"/"\1xxxxxxx"/g
-#
+
-## Line info varies between versions
+# Line info varies between versions
-#/^LINE [0-9]+:.*$/d
+/^LINE [0-9]+:.*$/d
-#/^ *\^$/d
+/^ *\^$/d
 #
 ## Remove trailing whitespace
 #s/ *$//g

src/test/regress/expected/custom_aggregate_support.out

@@ -509,14 +509,10 @@ FROM popular_reviewer
 WHERE day >= '2018-05-24'::date AND day <= '2018-05-31'::date
 ORDER BY 2 DESC, 1;
 ERROR:  set-valued function called in context that cannot accept a set
-LINE 1: SELECT (topn(topn_union_agg(reviewers), 10)).*
-        ^
 SELECT (topn(topn_add_agg(user_id::text), 10)).*
 FROM customer_reviews
 ORDER BY 2 DESC, 1;
 ERROR:  set-valued function called in context that cannot accept a set
-LINE 1: SELECT (topn(topn_add_agg(user_id::text), 10)).*
-        ^
 -- The following is going to be supported after window function support
 SELECT day, (topn(agg, 10)).*
 FROM (

src/test/regress/expected/custom_aggregate_support_0.out

@@ -18,8 +18,6 @@ SET citus.shard_count TO 4;
 CREATE TABLE raw_table (day date, user_id int);
 CREATE TABLE daily_uniques(day date, unique_users hll);
 ERROR:  type "hll" does not exist
-LINE 1: CREATE TABLE daily_uniques(day date, unique_users hll);
-                                                          ^
 SELECT create_distributed_table('raw_table', 'user_id');
  create_distributed_table 
 ---------------------------------------------------------------------
@@ -28,8 +26,6 @@ SELECT create_distributed_table('raw_table', 'user_id');
 
 SELECT create_distributed_table('daily_uniques', 'day');
 ERROR:  relation "daily_uniques" does not exist
-LINE 1: SELECT create_distributed_table('daily_uniques', 'day');
-                                        ^
 INSERT INTO raw_table 
   SELECT day, user_id % 19 
   FROM generate_series('2018-05-24'::timestamp, '2018-06-24'::timestamp, '1 day'::interval) as f(day),
@@ -44,8 +40,6 @@ FROM (
   SELECT hll_add_agg(hll_hash_integer(user_id)) AS agg 
   FROM raw_table)a;
 ERROR:  function hll_hash_integer(integer) does not exist
-LINE 3:   SELECT hll_add_agg(hll_hash_integer(user_id)) AS agg 
-                             ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- Aggregate the data into daily_uniques
 INSERT INTO daily_uniques 
@@ -53,8 +47,6 @@ INSERT INTO daily_uniques
   FROM raw_table
   GROUP BY 1;
 ERROR:  relation "daily_uniques" does not exist
-LINE 1: INSERT INTO daily_uniques 
-                    ^
 -- Basic hll_cardinality check on aggregated data
 SELECT day, hll_cardinality(unique_users) 
 FROM daily_uniques 
@@ -62,36 +54,26 @@ WHERE day >= '2018-06-20' and day <= '2018-06-30'
 ORDER BY 2 DESC,1 
 LIMIT 10;
 ERROR:  relation "daily_uniques" does not exist
-LINE 2: FROM daily_uniques 
-             ^
 -- Union aggregated data for one week
 SELECT hll_cardinality(hll_union_agg(unique_users)) 
 FROM daily_uniques 
 WHERE day >= '2018-05-24'::date AND day <= '2018-05-31'::date;
 ERROR:  relation "daily_uniques" does not exist
-LINE 2: FROM daily_uniques 
-             ^
 SELECT EXTRACT(MONTH FROM day) AS month, hll_cardinality(hll_union_agg(unique_users))
 FROM daily_uniques
 WHERE day >= '2018-06-23' AND day <= '2018-07-01'
 GROUP BY 1 
 ORDER BY 1;
 ERROR:  relation "daily_uniques" does not exist
-LINE 2: FROM daily_uniques
-             ^
 -- These are going to be supported after window function support
 SELECT day, hll_cardinality(hll_union_agg(unique_users) OVER seven_days)
 FROM daily_uniques
 WINDOW seven_days AS (ORDER BY day ASC ROWS 6 PRECEDING);
 ERROR:  relation "daily_uniques" does not exist
-LINE 2: FROM daily_uniques
-             ^
 SELECT day, (hll_cardinality(hll_union_agg(unique_users) OVER two_days)) - hll_cardinality(unique_users) AS lost_uniques
 FROM daily_uniques
 WINDOW two_days AS (ORDER BY day ASC ROWS 1 PRECEDING);
 ERROR:  relation "daily_uniques" does not exist
-LINE 2: FROM daily_uniques
-             ^
 -- Test disabling hash_agg on coordinator query
 SET citus.explain_all_tasks to true;
 SET hll.force_groupagg to OFF;
@@ -102,8 +84,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 SET hll.force_groupagg to ON;
 EXPLAIN(COSTS OFF)
 SELECT
@@ -112,8 +92,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 -- Test disabling hash_agg with operator on coordinator query
 SET hll.force_groupagg to OFF;
 EXPLAIN(COSTS OFF)
@@ -123,8 +101,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 SET hll.force_groupagg to ON;
 EXPLAIN(COSTS OFF)
 SELECT
@@ -133,8 +109,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 -- Test disabling hash_agg with expression on coordinator query
 SET hll.force_groupagg to OFF;
 EXPLAIN(COSTS OFF)
@@ -144,8 +118,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 SET hll.force_groupagg to ON;
 EXPLAIN(COSTS OFF)
 SELECT
@@ -154,8 +126,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 -- Test disabling hash_agg with having
 SET hll.force_groupagg to OFF;
 EXPLAIN(COSTS OFF)
@@ -165,8 +135,6 @@ FROM
   daily_uniques
 GROUP BY(1);
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 SET hll.force_groupagg to ON;
 EXPLAIN(COSTS OFF)
 SELECT
@@ -176,8 +144,6 @@ FROM
 GROUP BY(1)
 HAVING hll_cardinality(hll_union_agg(unique_users)) > 1;
 ERROR:  relation "daily_uniques" does not exist
-LINE 5:   daily_uniques
-          ^
 DROP TABLE raw_table;
 DROP TABLE daily_uniques;
 ERROR:  table "daily_uniques" does not exist
@@ -225,8 +191,6 @@ FROM (
   )a
 ORDER BY 2 DESC, 1;
 ERROR:  function topn_add_agg(text) does not exist
-LINE 3:   SELECT topn_add_agg(user_id::text) AS agg 
-                 ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- Aggregate the data into popular_reviewer
 INSERT INTO popular_reviewer 
@@ -234,8 +198,6 @@ INSERT INTO popular_reviewer
   FROM customer_reviews
   GROUP BY 1;
 ERROR:  function topn_add_agg(text) does not exist
-LINE 2:   SELECT day, topn_add_agg(user_id::text)
-                      ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- Basic topn check on aggregated data
 SELECT day, (topn(reviewers, 10)).* 
@@ -244,8 +206,6 @@ WHERE day >= '2018-06-20' and day <= '2018-06-30'
 ORDER BY 3 DESC, 1, 2
 LIMIT 10;
 ERROR:  function topn(jsonb, integer) does not exist
-LINE 1: SELECT day, (topn(reviewers, 10)).* 
-                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- Union aggregated data for one week
 SELECT (topn(agg, 10)).* 
@@ -256,8 +216,6 @@ FROM (
 	)a
 ORDER BY 2 DESC, 1;
 ERROR:  function topn_union_agg(jsonb) does not exist
-LINE 3:  SELECT topn_union_agg(reviewers) AS agg
-                ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 SELECT month, (topn(agg, 5)).* 
 FROM (
@@ -269,8 +227,6 @@ FROM (
 	)a
 ORDER BY 1, 3 DESC, 2;
 ERROR:  function topn_union_agg(jsonb) does not exist
-LINE 3:  SELECT EXTRACT(MONTH FROM day) AS month, topn_union_agg(rev...
-                                                  ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- TODO the following queries will be supported after we fix #2265
 -- They work for PG9.6 but not for PG10
@@ -279,15 +235,11 @@ FROM popular_reviewer
 WHERE day >= '2018-05-24'::date AND day <= '2018-05-31'::date
 ORDER BY 2 DESC, 1;
 ERROR:  function topn_union_agg(jsonb) does not exist
-LINE 1: SELECT (topn(topn_union_agg(reviewers), 10)).* 
-                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 SELECT (topn(topn_add_agg(user_id::text), 10)).*
 FROM customer_reviews
 ORDER BY 2 DESC, 1;
 ERROR:  function topn_add_agg(text) does not exist
-LINE 1: SELECT (topn(topn_add_agg(user_id::text), 10)).*
-                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 -- The following is going to be supported after window function support
 SELECT day, (topn(agg, 10)).*
@@ -299,8 +251,6 @@ FROM (
 ORDER BY 3 DESC, 1, 2
 LIMIT 10;
 ERROR:  function topn_union_agg(jsonb) does not exist
-LINE 3:  SELECT day, topn_union_agg(reviewers) OVER seven_days AS ag...
-                     ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 SELECT day, (topn(topn_add_agg(user_id::text) OVER seven_days, 10)).*
 FROM customer_reviews
@@ -308,8 +258,6 @@ WINDOW seven_days AS (ORDER BY day ASC ROWS 6 PRECEDING)
 ORDER BY 3 DESC, 1, 2
 LIMIT 10;
 ERROR:  function topn_add_agg(text) does not exist
-LINE 1: SELECT day, (topn(topn_add_agg(user_id::text) OVER seven_day...
-                          ^
 HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
 DROP TABLE customer_reviews;
 DROP TABLE popular_reviewer;

src/test/regress/expected/distributed_functions.out

@@ -495,8 +495,6 @@ SELECT * FROM run_command_on_workers('SELECT function_tests2.sum2(id) FROM (sele
 -- postgres doesn't accept parameter names in the regprocedure input
 SELECT create_distributed_function('add_with_param_names(val1 int, int)', 'val1');
 ERROR:  syntax error at or near "int"
-LINE 1: SELECT create_distributed_function('add_with_param_names(val...
-                                           ^
 CONTEXT:  invalid type name "val1 int"
 -- invalid distribution_arg_name
 SELECT create_distributed_function('add_with_param_names(int, int)', distribution_arg_name:='test');

src/test/regress/expected/failure_vacuum_1.out

@@ -112,8 +112,6 @@ SELECT citus.mitmproxy('conn.onQuery(query="^VACUUM.*other").kill()');
 
 VACUUM vacuum_test, other_vacuum_test;
 ERROR:  syntax error at or near ","
-LINE 1: VACUUM vacuum_test, other_vacuum_test;
-                          ^
 SELECT citus.mitmproxy('conn.onQuery(query="^VACUUM.*other").cancel(' ||  pg_backend_pid() || ')');
  mitmproxy 
 ---------------------------------------------------------------------
@@ -122,8 +120,6 @@ SELECT citus.mitmproxy('conn.onQuery(query="^VACUUM.*other").cancel(' ||  pg_bac
 
 VACUUM vacuum_test, other_vacuum_test;
 ERROR:  syntax error at or near ","
-LINE 1: VACUUM vacuum_test, other_vacuum_test;
-                          ^
 -- ==== Clean up, we're done here ====
 SELECT citus.mitmproxy('conn.allow()');
  mitmproxy 

src/test/regress/expected/multi_create_shards.out

@@ -51,8 +51,6 @@ ERROR:  column "bad_column" of relation "table_to_distribute" does not exist
 -- use unrecognized partition type
 SELECT create_distributed_table('table_to_distribute', 'name', 'unrecognized');
 ERROR:  invalid input value for enum citus.distribution_type: "unrecognized"
-LINE 1: ..._distributed_table('table_to_distribute', 'name', 'unrecogni...
-                                                             ^
 -- use a partition column of a type lacking any default operator class
 SELECT create_distributed_table('table_to_distribute', 'json_data', 'hash');
 ERROR:  data type json has no default operator class for specified partition method

src/test/regress/expected/multi_metadata_sync.out

@@ -739,8 +739,6 @@ DROP INDEX mx_test_schema_2.mx_index_3;
 SELECT "Column", "Type", "Definition" FROM index_attrs WHERE
     relid = 'mx_test_schema_2.mx_index_3'::regclass;
 ERROR:  relation "mx_test_schema_2.mx_index_3" does not exist
-LINE 2:     relid = 'mx_test_schema_2.mx_index_3'::regclass;
-                    ^
 -- Check that ALTER TABLE statements are propagated
 \c - - - :master_port
 SET citus.multi_shard_commit_protocol TO '2pc';
@@ -1344,14 +1342,10 @@ DROP TABLE mx_ref;
 SELECT "Column", "Type", "Definition" FROM index_attrs WHERE
     relid = 'mx_ref_index'::regclass;
 ERROR:  relation "mx_ref_index" does not exist
-LINE 2:     relid = 'mx_ref_index'::regclass;
-                    ^
 \c - - - :worker_1_port
 SELECT "Column", "Type", "Definition" FROM index_attrs WHERE
     relid = 'mx_ref_index'::regclass;
 ERROR:  relation "mx_ref_index" does not exist
-LINE 2:     relid = 'mx_ref_index'::regclass;
-                    ^
 SELECT * FROM pg_dist_shard WHERE shardid=:ref_table_shardid;
  logicalrelid | shardid | shardstorage | shardminvalue | shardmaxvalue 
 ---------------------------------------------------------------------

src/test/regress/expected/multi_multiuser.out

@@ -408,8 +408,6 @@ $cmd$);
 SET ROLE usage_access;
 CREATE TABLE full_access_user_schema.t1 (id int);
 ERROR:  permission denied for schema full_access_user_schema
-LINE 1: CREATE TABLE full_access_user_schema.t1 (id int);
-                     ^
 RESET ROLE;
 -- now we create the table for the user
 CREATE TABLE full_access_user_schema.t1 (id int);

src/test/regress/expected/multi_router_planner.out

@@ -527,8 +527,6 @@ WITH new_article AS (
 )
 SELECT * FROM new_article;
 ERROR:  WITH clause containing a data-modifying statement must be at the top level
-LINE 2:     WITH nested_cte AS (
-                 ^
 -- Modifying statement in a CTE in subquery is also covered by PostgreSQL
 SELECT * FROM (
     WITH new_article AS (
@@ -537,8 +535,6 @@ SELECT * FROM (
     SELECT * FROM new_article
 ) AS subquery_cte;
 ERROR:  WITH clause containing a data-modifying statement must be at the top level
-LINE 2:     WITH new_article AS (
-                 ^
 -- grouping sets are supported on single shard
 SELECT
 	id, substring(title, 2, 1) AS subtitle, count(*)

src/test/regress/expected/multi_router_planner_fast_path.out

@@ -674,8 +674,6 @@ SELECT LEFT(title, 1) FROM articles_hash WHERE author_id = 1
 -- top-level union queries are supported through recursive planning
 SET client_min_messages to 'NOTICE';
 ERROR:  syntax error at or near "SET"
-LINE 3: SET client_min_messages to 'NOTICE';
-        ^
 -- unions in subqueries are not supported via fast-path planning
 SELECT * FROM (
 	(SELECT * FROM articles_hash WHERE author_id = 1)

src/test/regress/expected/multi_shard_update_delete.out

@@ -119,8 +119,6 @@ UPDATE users_test_table SET value_3 = 0;
 END;
 SELECT SUM(value_3) FROM users_copy_table;
 ERROR:  relation "users_copy_table" does not exist
-LINE 1: SELECT SUM(value_3) FROM users_copy_table;
-                                 ^
 -- Run multiple multi shard updates (with parallel executor)
 SET citus.multi_shard_modify_mode to 'parallel';
 UPDATE users_test_table SET value_3 = 5;

src/test/regress/expected/multi_utility_statements.out

@@ -207,8 +207,6 @@ COMMIT;
 SELECT customer_key, c_name, c_address 
        FROM customer_few ORDER BY customer_key LIMIT 5;
 ERROR:  relation "customer_few" does not exist
-LINE 2:        FROM customer_few ORDER BY customer_key LIMIT 5;
-                    ^
 -- Test DECLARE CURSOR .. WITH HOLD without parameters that calls ReScan on the top-level CustomScan
 CREATE TABLE cursor_me (x int, y int);
 SELECT create_distributed_table('cursor_me', 'x');

src/test/regress/expected/partitioned_intermediate_results.out

@@ -176,8 +176,6 @@ SELECT worker_partition_query_result('squares_range',
                                      '{20,40,60,100}'::text[],
                                      true);
 ERROR:  syntax error at or near "SELECxT"
-LINE 1: SELECT worker_partition_query_result('squares_range',
-        ^
 ROLLBACK TO SAVEPOINT s1;
 -- invalid result prefix
 SELECT worker_partition_query_result('squares_range/a/',

src/test/regress/expected/pg12.out

@@ -95,8 +95,6 @@ ERROR:  Citus does not support COPY FROM with WHERE
 invalid command \.
 select sum(id), sum(val) from cptest;
 ERROR:  syntax error at or near "1"
-LINE 1: 1,6
-        ^
 -- CTE materialized/not materialized
 CREATE TABLE single_hash_repartition_first (id int, sum int, avg float);
 CREATE TABLE single_hash_repartition_second (id int primary key, sum int, avg float);

src/test/regress/expected/replicate_reference_tables_to_coordinator.out

@@ -351,7 +351,5 @@ DROP SCHEMA replicate_ref_to_coordinator CASCADE;
 -- Make sure the shard was dropped
 SELECT 'numbers_8000001'::regclass::oid;
 ERROR:  relation "numbers_8000001" does not exist
-LINE 1: SELECT 'numbers_8000001'::regclass::oid;
-               ^
 SET search_path TO DEFAULT;
 RESET client_min_messages;

src/test/regress/expected/subqueries_not_supported.out

@@ -27,8 +27,6 @@ SELECT user_id FROM users_table WHERE user_id IN
 	 USING (user_id)
 	 );
 ERROR:  relation "events_table_local" does not exist
-LINE 5:    users_table_local JOIN (SELECT user_id FROM events_table_...
-                                                       ^
 SET client_min_messages TO DEBUG1;
 -- we don't support aggregate distinct if the group by is not on partition key, expect for count distinct
 -- thus baz and bar are recursively planned but not foo

src/test/regress/expected/with_basics.out

@@ -255,8 +255,6 @@ WITH top_ten(id, val1) AS (
 )
 SELECT * FROM top_ten ORDER BY user_id DESC;
 ERROR:  column "user_id" does not exist
-LINE 4: SELECT * FROM top_ten ORDER BY user_id DESC;
-                                       ^
 -- verify original name is used if alias is missing
 WITH top_ten(id) AS (
 	SELECT user_id, value_1 FROM users_table ORDER BY value_1 DESC, user_id DESC LIMIT 10

src/test/regress/expected/worker_check_invalid_arguments.out

@@ -30,8 +30,6 @@ SELECT worker_range_partition_table(:JobId, :TaskId, :Bad_Select_Query_Text,
        				    :Partition_Column_Name, :Partition_Column_Type,
 				    ARRAY['aaa', 'some']::_text);
 ERROR:  relation "bad_table_name" does not exist
-LINE 1: SELECT * FROM bad_table_name
-                      ^
 QUERY:  SELECT * FROM bad_table_name
 -- Check that we fail with bad partition column name
 SELECT worker_range_partition_table(:JobId, :TaskId, :Select_Query_Text,