From d6cccee5bcfbc55555ad81a0f910319e62691e26 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Fri, 21 Apr 2017 15:18:39 -0600 Subject: [PATCH] Remove ALTER SEQUENCE from parallel groups Removing these has no side effect, and in the (current) PostgreSQL 10, an ERROR is printed during concurrent sequence modification. --- .../regress/expected/multi_agg_approximate_distinct.out | 1 - .../regress/expected/multi_agg_approximate_distinct_0.out | 1 - src/test/regress/expected/multi_average_expression.out | 1 - src/test/regress/expected/multi_basic_queries.out | 1 - src/test/regress/expected/multi_complex_expressions.out | 1 - src/test/regress/expected/multi_count_type_conversion.out | 1 - src/test/regress/expected/multi_limit_clause.out | 1 - .../regress/expected/multi_limit_clause_approximate.out | 1 - src/test/regress/expected/multi_mx_ddl.out | 1 - src/test/regress/expected/multi_mx_router_planner.out | 1 - src/test/regress/expected/multi_mx_schema_support.out | 1 - src/test/regress/expected/multi_mx_tpch_query1.out | 3 --- src/test/regress/expected/multi_mx_tpch_query10.out | 3 --- src/test/regress/expected/multi_mx_tpch_query12.out | 3 --- src/test/regress/expected/multi_mx_tpch_query14.out | 3 --- src/test/regress/expected/multi_mx_tpch_query19.out | 3 --- src/test/regress/expected/multi_mx_tpch_query3.out | 3 --- src/test/regress/expected/multi_mx_tpch_query6.out | 3 --- src/test/regress/expected/multi_mx_tpch_query7.out | 3 --- src/test/regress/expected/multi_mx_tpch_query7_nested.out | 3 --- src/test/regress/expected/multi_prepare_plsql.out | 1 - src/test/regress/expected/multi_prepare_sql.out | 1 - src/test/regress/expected/multi_tpch_query1.out | 1 - src/test/regress/expected/multi_tpch_query10.out | 1 - src/test/regress/expected/multi_tpch_query12.out | 1 - src/test/regress/expected/multi_tpch_query14.out | 1 - src/test/regress/expected/multi_tpch_query19.out | 1 - src/test/regress/expected/multi_tpch_query3.out | 1 - src/test/regress/expected/multi_tpch_query6.out | 1 - src/test/regress/expected/multi_tpch_query7.out | 1 - src/test/regress/expected/multi_tpch_query7_nested.out | 1 - src/test/regress/expected/multi_working_columns.out | 1 - src/test/regress/expected/task_tracker_assign_task.out | 1 - src/test/regress/expected/task_tracker_partition_task.out | 1 - src/test/regress/expected/worker_binary_data_partition.out | 1 - src/test/regress/expected/worker_hash_partition.out | 1 - src/test/regress/expected/worker_hash_partition_complex.out | 1 - src/test/regress/expected/worker_merge_hash_files.out | 1 - src/test/regress/expected/worker_merge_range_files.out | 1 - src/test/regress/expected/worker_null_data_partition.out | 1 - src/test/regress/expected/worker_range_partition.out | 1 - .../regress/expected/worker_range_partition_complex.out | 1 - src/test/regress/input/multi_agg_distinct.source | 3 --- src/test/regress/input/multi_agg_type_conversion.source | 3 --- src/test/regress/input/multi_mx_copy_data.source | 2 -- src/test/regress/output/multi_agg_distinct.source | 1 - src/test/regress/output/multi_agg_type_conversion.source | 1 - src/test/regress/output/multi_mx_copy_data.source | 1 - src/test/regress/sql/multi_agg_approximate_distinct.sql | 2 -- src/test/regress/sql/multi_average_expression.sql | 3 --- src/test/regress/sql/multi_basic_queries.sql | 5 +---- src/test/regress/sql/multi_complex_expressions.sql | 5 +---- src/test/regress/sql/multi_count_type_conversion.sql | 3 --- src/test/regress/sql/multi_limit_clause.sql | 3 --- src/test/regress/sql/multi_limit_clause_approximate.sql | 3 --- src/test/regress/sql/multi_mx_ddl.sql | 2 -- src/test/regress/sql/multi_mx_router_planner.sql | 2 -- src/test/regress/sql/multi_mx_schema_support.sql | 2 -- src/test/regress/sql/multi_mx_tpch_query1.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query10.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query12.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query14.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query19.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query3.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query6.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query7.sql | 6 ------ src/test/regress/sql/multi_mx_tpch_query7_nested.sql | 6 ------ src/test/regress/sql/multi_prepare_plsql.sql | 3 --- src/test/regress/sql/multi_prepare_sql.sql | 3 --- src/test/regress/sql/multi_tpch_query1.sql | 3 --- src/test/regress/sql/multi_tpch_query10.sql | 3 --- src/test/regress/sql/multi_tpch_query12.sql | 3 --- src/test/regress/sql/multi_tpch_query14.sql | 3 --- src/test/regress/sql/multi_tpch_query19.sql | 3 --- src/test/regress/sql/multi_tpch_query3.sql | 3 --- src/test/regress/sql/multi_tpch_query6.sql | 3 --- src/test/regress/sql/multi_tpch_query7.sql | 3 --- src/test/regress/sql/multi_tpch_query7_nested.sql | 3 --- src/test/regress/sql/multi_working_columns.sql | 3 --- src/test/regress/sql/task_tracker_assign_task.sql | 2 -- src/test/regress/sql/task_tracker_partition_task.sql | 2 -- src/test/regress/sql/worker_binary_data_partition.sql | 2 -- src/test/regress/sql/worker_hash_partition.sql | 2 -- src/test/regress/sql/worker_hash_partition_complex.sql | 2 -- src/test/regress/sql/worker_merge_hash_files.sql | 2 -- src/test/regress/sql/worker_merge_range_files.sql | 2 -- src/test/regress/sql/worker_null_data_partition.sql | 2 -- src/test/regress/sql/worker_range_partition.sql | 2 -- src/test/regress/sql/worker_range_partition_complex.sql | 2 -- 89 files changed, 2 insertions(+), 209 deletions(-) diff --git a/src/test/regress/expected/multi_agg_approximate_distinct.out b/src/test/regress/expected/multi_agg_approximate_distinct.out index 63884df18..5c426802e 100644 --- a/src/test/regress/expected/multi_agg_approximate_distinct.out +++ b/src/test/regress/expected/multi_agg_approximate_distinct.out @@ -1,7 +1,6 @@ -- -- MULTI_AGG_APPROXIMATE_DISTINCT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN 'CREATE EXTENSION HLL' diff --git a/src/test/regress/expected/multi_agg_approximate_distinct_0.out b/src/test/regress/expected/multi_agg_approximate_distinct_0.out index 1b552e248..da6ba329e 100644 --- a/src/test/regress/expected/multi_agg_approximate_distinct_0.out +++ b/src/test/regress/expected/multi_agg_approximate_distinct_0.out @@ -1,7 +1,6 @@ -- -- MULTI_AGG_APPROXIMATE_DISTINCT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN 'CREATE EXTENSION HLL' diff --git a/src/test/regress/expected/multi_average_expression.out b/src/test/regress/expected/multi_average_expression.out index c0551ec50..74511d553 100644 --- a/src/test/regress/expected/multi_average_expression.out +++ b/src/test/regress/expected/multi_average_expression.out @@ -4,7 +4,6 @@ -- This test checks that the group-by columns don't need to be above an average -- expression, and can be anywhere in the projection order. This is in response -- to a bug we had due to the average expression introducing new columns. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 450000; SELECT sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, diff --git a/src/test/regress/expected/multi_basic_queries.out b/src/test/regress/expected/multi_basic_queries.out index 33d2c5fe2..13393acff 100644 --- a/src/test/regress/expected/multi_basic_queries.out +++ b/src/test/regress/expected/multi_basic_queries.out @@ -1,7 +1,6 @@ -- -- MULTI_BASIC_QUERIES -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 440000; -- Execute simple sum, average, and count queries on data recently uploaded to -- our partitioned table. SELECT count(*) FROM lineitem; diff --git a/src/test/regress/expected/multi_complex_expressions.out b/src/test/regress/expected/multi_complex_expressions.out index 1c72e5afe..4cf5d18ba 100644 --- a/src/test/regress/expected/multi_complex_expressions.out +++ b/src/test/regress/expected/multi_complex_expressions.out @@ -1,7 +1,6 @@ -- -- MULTI_COMPLEX_EXPRESSIONS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 420000; -- Check that we can correctly handle complex expressions and aggregates. SELECT sum(l_quantity) / avg(l_quantity) FROM lineitem; ?column? diff --git a/src/test/regress/expected/multi_count_type_conversion.out b/src/test/regress/expected/multi_count_type_conversion.out index 204532b48..a258ebef2 100644 --- a/src/test/regress/expected/multi_count_type_conversion.out +++ b/src/test/regress/expected/multi_count_type_conversion.out @@ -1,7 +1,6 @@ -- -- MULTI_COUNT_TYPE_CONVERSION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 400000; -- Verify that we can sort count(*) results correctly. We perform this check as -- our count() operations execute in two steps: worker nodes report their -- count() results, and the master node sums these counts up. During this sum(), diff --git a/src/test/regress/expected/multi_limit_clause.out b/src/test/regress/expected/multi_limit_clause.out index 793f928bc..18e1adf20 100644 --- a/src/test/regress/expected/multi_limit_clause.out +++ b/src/test/regress/expected/multi_limit_clause.out @@ -1,7 +1,6 @@ -- -- MULTI_LIMIT_CLAUSE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 730000; -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; -- Check that we can correctly handle the Limit clause in distributed queries. diff --git a/src/test/regress/expected/multi_limit_clause_approximate.out b/src/test/regress/expected/multi_limit_clause_approximate.out index 8700e63fb..42e08877b 100644 --- a/src/test/regress/expected/multi_limit_clause_approximate.out +++ b/src/test/regress/expected/multi_limit_clause_approximate.out @@ -1,7 +1,6 @@ -- -- MULTI_LIMIT_CLAUSE_APPROXIMATE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 720000; -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; -- We first look at results with limit optimization disabled. This first query diff --git a/src/test/regress/expected/multi_mx_ddl.out b/src/test/regress/expected/multi_mx_ddl.out index e103c2183..a174d1a18 100644 --- a/src/test/regress/expected/multi_mx_ddl.out +++ b/src/test/regress/expected/multi_mx_ddl.out @@ -1,5 +1,4 @@ -- Tests related to distributed DDL commands on mx cluster -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; SELECT * FROM mx_ddl_table ORDER BY key; key | value -----+------- diff --git a/src/test/regress/expected/multi_mx_router_planner.out b/src/test/regress/expected/multi_mx_router_planner.out index bb03d3905..4bee82e09 100644 --- a/src/test/regress/expected/multi_mx_router_planner.out +++ b/src/test/regress/expected/multi_mx_router_planner.out @@ -1,4 +1,3 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; -- =================================================================== -- test router planner functionality for single shard select queries -- =================================================================== diff --git a/src/test/regress/expected/multi_mx_schema_support.out b/src/test/regress/expected/multi_mx_schema_support.out index 74b577c97..be9296ed5 100644 --- a/src/test/regress/expected/multi_mx_schema_support.out +++ b/src/test/regress/expected/multi_mx_schema_support.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_SCHEMA_SUPPORT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; -- connect to a worker node and run some queries \c - - - :worker_1_port -- test very basic queries diff --git a/src/test/regress/expected/multi_mx_tpch_query1.out b/src/test/regress/expected/multi_mx_tpch_query1.out index 9c3a8092f..8f4ea7750 100644 --- a/src/test/regress/expected/multi_mx_tpch_query1.out +++ b/src/test/regress/expected/multi_mx_tpch_query1.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY1 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -38,7 +37,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark @@ -73,7 +71,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query10.out b/src/test/regress/expected/multi_mx_tpch_query10.out index 675902e8f..bd172ea19 100644 --- a/src/test/regress/expected/multi_mx_tpch_query10.out +++ b/src/test/regress/expected/multi_mx_tpch_query10.out @@ -4,7 +4,6 @@ -- Query #10 from the TPC-H decision support benchmark. Unlike other TPC-H tests, -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -- connect to master \c - - - :master_port SELECT @@ -65,7 +64,6 @@ LIMIT 20; -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; SELECT c_custkey, c_name, @@ -124,7 +122,6 @@ LIMIT 20; -- connect to the other worker \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; SELECT c_custkey, c_name, diff --git a/src/test/regress/expected/multi_mx_tpch_query12.out b/src/test/regress/expected/multi_mx_tpch_query12.out index f4bce62ac..9c5cbe810 100644 --- a/src/test/regress/expected/multi_mx_tpch_query12.out +++ b/src/test/regress/expected/multi_mx_tpch_query12.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY12 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -43,7 +42,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark @@ -83,7 +81,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query14.out b/src/test/regress/expected/multi_mx_tpch_query14.out index 418157a2b..c63ed7b4a 100644 --- a/src/test/regress/expected/multi_mx_tpch_query14.out +++ b/src/test/regress/expected/multi_mx_tpch_query14.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY14 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -27,7 +26,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark @@ -51,7 +49,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query19.out b/src/test/regress/expected/multi_mx_tpch_query19.out index 30e0b78d9..654ae6d42 100644 --- a/src/test/regress/expected/multi_mx_tpch_query19.out +++ b/src/test/regress/expected/multi_mx_tpch_query19.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY19 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -44,7 +43,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified @@ -85,7 +83,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified diff --git a/src/test/regress/expected/multi_mx_tpch_query3.out b/src/test/regress/expected/multi_mx_tpch_query3.out index 2c714236d..00405aea3 100644 --- a/src/test/regress/expected/multi_mx_tpch_query3.out +++ b/src/test/regress/expected/multi_mx_tpch_query3.out @@ -4,7 +4,6 @@ -- Query #3 from the TPC-H decision support benchmark. Unlike other TPC-H tests, -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -- connect to the coordinator \c - - - :master_port SELECT @@ -51,7 +50,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, @@ -96,7 +94,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/expected/multi_mx_tpch_query6.out b/src/test/regress/expected/multi_mx_tpch_query6.out index 94fbcb004..4746a7b1b 100644 --- a/src/test/regress/expected/multi_mx_tpch_query6.out +++ b/src/test/regress/expected/multi_mx_tpch_query6.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY6 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -23,7 +22,6 @@ WHERE -- connect to one of the worker nodes \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark @@ -43,7 +41,6 @@ WHERE -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query7.out b/src/test/regress/expected/multi_mx_tpch_query7.out index ad92569b5..64c05a084 100644 --- a/src/test/regress/expected/multi_mx_tpch_query7.out +++ b/src/test/regress/expected/multi_mx_tpch_query7.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY7 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem AND orders tables as large @@ -53,7 +52,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark @@ -103,7 +101,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query7_nested.out b/src/test/regress/expected/multi_mx_tpch_query7_nested.out index 04e1dd7a2..3640ec043 100644 --- a/src/test/regress/expected/multi_mx_tpch_query7_nested.out +++ b/src/test/regress/expected/multi_mx_tpch_query7_nested.out @@ -1,7 +1,6 @@ -- -- MULTI_MX_TPCH_QUERY7_NESTED -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem AND orders tables AS large @@ -62,7 +61,6 @@ ORDER BY -- connect to one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects @@ -121,7 +119,6 @@ ORDER BY -- connect to the coordinator \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects diff --git a/src/test/regress/expected/multi_prepare_plsql.out b/src/test/regress/expected/multi_prepare_plsql.out index 9417f742b..424d522c3 100644 --- a/src/test/regress/expected/multi_prepare_plsql.out +++ b/src/test/regress/expected/multi_prepare_plsql.out @@ -4,7 +4,6 @@ -- Many of the queries are taken from other regression test files -- and converted into both plain SQL and PL/pgsql functions, which -- use prepared statements internally. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 780000; CREATE FUNCTION plpgsql_test_1() RETURNS TABLE(count bigint) AS $$ DECLARE BEGIN diff --git a/src/test/regress/expected/multi_prepare_sql.out b/src/test/regress/expected/multi_prepare_sql.out index 374223972..9083aca01 100644 --- a/src/test/regress/expected/multi_prepare_sql.out +++ b/src/test/regress/expected/multi_prepare_sql.out @@ -4,7 +4,6 @@ -- Tests covering PREPARE statements. Many of the queries are -- taken from other regression test files and converted into -- prepared statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 790000; PREPARE prepared_test_1 AS SELECT count(*) diff --git a/src/test/regress/expected/multi_tpch_query1.out b/src/test/regress/expected/multi_tpch_query1.out index 35a541c50..23a507e06 100644 --- a/src/test/regress/expected/multi_tpch_query1.out +++ b/src/test/regress/expected/multi_tpch_query1.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY1 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 890000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query10.out b/src/test/regress/expected/multi_tpch_query10.out index 5213bc5af..82eefa6df 100644 --- a/src/test/regress/expected/multi_tpch_query10.out +++ b/src/test/regress/expected/multi_tpch_query10.out @@ -4,7 +4,6 @@ -- Query #10 from the TPC-H decision support benchmark. Unlike other TPC-H tests, -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 900000; SELECT c_custkey, c_name, diff --git a/src/test/regress/expected/multi_tpch_query12.out b/src/test/regress/expected/multi_tpch_query12.out index a6270cfba..e54d3e0a4 100644 --- a/src/test/regress/expected/multi_tpch_query12.out +++ b/src/test/regress/expected/multi_tpch_query12.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY12 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 910000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query14.out b/src/test/regress/expected/multi_tpch_query14.out index 0ee550e84..2eded6dda 100644 --- a/src/test/regress/expected/multi_tpch_query14.out +++ b/src/test/regress/expected/multi_tpch_query14.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY14 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 920000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query19.out b/src/test/regress/expected/multi_tpch_query19.out index 2deb3aca3..d6ee657c1 100644 --- a/src/test/regress/expected/multi_tpch_query19.out +++ b/src/test/regress/expected/multi_tpch_query19.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY19 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 930000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified diff --git a/src/test/regress/expected/multi_tpch_query3.out b/src/test/regress/expected/multi_tpch_query3.out index 853c4e493..da87dc8f5 100644 --- a/src/test/regress/expected/multi_tpch_query3.out +++ b/src/test/regress/expected/multi_tpch_query3.out @@ -4,7 +4,6 @@ -- Query #3 from the TPC-H decision support benchmark. Unlike other TPC-H tests, -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 940000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/expected/multi_tpch_query6.out b/src/test/regress/expected/multi_tpch_query6.out index 66398d859..9badebd9e 100644 --- a/src/test/regress/expected/multi_tpch_query6.out +++ b/src/test/regress/expected/multi_tpch_query6.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY6 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 950000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query7.out b/src/test/regress/expected/multi_tpch_query7.out index d14202e92..55ab9ae63 100644 --- a/src/test/regress/expected/multi_tpch_query7.out +++ b/src/test/regress/expected/multi_tpch_query7.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY7 -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 970000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query7_nested.out b/src/test/regress/expected/multi_tpch_query7_nested.out index ed2ff9529..d6d6acf71 100644 --- a/src/test/regress/expected/multi_tpch_query7_nested.out +++ b/src/test/regress/expected/multi_tpch_query7_nested.out @@ -1,7 +1,6 @@ -- -- MULTI_TPCH_QUERY7_NESTED -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 960000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects diff --git a/src/test/regress/expected/multi_working_columns.out b/src/test/regress/expected/multi_working_columns.out index f1d735b96..38c05af49 100644 --- a/src/test/regress/expected/multi_working_columns.out +++ b/src/test/regress/expected/multi_working_columns.out @@ -5,7 +5,6 @@ -- projection order are called working (resjunk) columns. We check in here that -- these columns are pulled to the master, and are correctly used in sorting and -- grouping. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1040000; SELECT l_quantity FROM lineitem ORDER BY l_shipdate, l_quantity LIMIT 20; l_quantity ------------ diff --git a/src/test/regress/expected/task_tracker_assign_task.out b/src/test/regress/expected/task_tracker_assign_task.out index f3f59b6e9..d9dff929b 100644 --- a/src/test/regress/expected/task_tracker_assign_task.out +++ b/src/test/regress/expected/task_tracker_assign_task.out @@ -1,7 +1,6 @@ -- -- TASK_TRACKER_ASSIGN_TASK -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1050000; \set JobId 401010 \set SimpleTaskId 101101 \set RecoverableTaskId 801102 diff --git a/src/test/regress/expected/task_tracker_partition_task.out b/src/test/regress/expected/task_tracker_partition_task.out index 3a3b821b8..2d36f93b0 100644 --- a/src/test/regress/expected/task_tracker_partition_task.out +++ b/src/test/regress/expected/task_tracker_partition_task.out @@ -1,7 +1,6 @@ -- -- TASK_TRACKER_PARTITION_TASK -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1080000; \set JobId 401010 \set PartitionTaskId 801106 \set PartitionColumn l_orderkey diff --git a/src/test/regress/expected/worker_binary_data_partition.out b/src/test/regress/expected/worker_binary_data_partition.out index 1c8a1f9cd..afab11021 100644 --- a/src/test/regress/expected/worker_binary_data_partition.out +++ b/src/test/regress/expected/worker_binary_data_partition.out @@ -1,7 +1,6 @@ -- -- WORKER_BINARY_DATA_PARTITION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1090000; \set JobId 201010 \set TaskId 101105 \set Partition_Column textcolumn diff --git a/src/test/regress/expected/worker_hash_partition.out b/src/test/regress/expected/worker_hash_partition.out index afc7bba3c..61725f4f7 100644 --- a/src/test/regress/expected/worker_hash_partition.out +++ b/src/test/regress/expected/worker_hash_partition.out @@ -1,7 +1,6 @@ -- -- WORKER_HASH_PARTITION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; \set JobId 201010 \set TaskId 101103 \set Partition_Column l_orderkey diff --git a/src/test/regress/expected/worker_hash_partition_complex.out b/src/test/regress/expected/worker_hash_partition_complex.out index 1b1727cf8..2dfbe3702 100644 --- a/src/test/regress/expected/worker_hash_partition_complex.out +++ b/src/test/regress/expected/worker_hash_partition_complex.out @@ -1,7 +1,6 @@ -- -- WORKER_HASH_PARTITION_COMPLEX -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1120000; \set JobId 201010 \set TaskId 101104 \set Partition_Column l_partkey diff --git a/src/test/regress/expected/worker_merge_hash_files.out b/src/test/regress/expected/worker_merge_hash_files.out index 82cb81cf1..89246b89f 100644 --- a/src/test/regress/expected/worker_merge_hash_files.out +++ b/src/test/regress/expected/worker_merge_hash_files.out @@ -1,7 +1,6 @@ -- -- WORKER_MERGE_HASH_FILES -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1140000; \set JobId 201010 \set TaskId 101103 \set Task_Table_Name public.task_101103 diff --git a/src/test/regress/expected/worker_merge_range_files.out b/src/test/regress/expected/worker_merge_range_files.out index 80f7797cc..b39f52731 100644 --- a/src/test/regress/expected/worker_merge_range_files.out +++ b/src/test/regress/expected/worker_merge_range_files.out @@ -1,7 +1,6 @@ -- -- WORKER_MERGE_RANGE_FILES -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1150000; \set JobId 201010 \set TaskId 101101 \set Task_Table_Name public.task_101101 diff --git a/src/test/regress/expected/worker_null_data_partition.out b/src/test/regress/expected/worker_null_data_partition.out index fc14e6d12..11881fbc9 100644 --- a/src/test/regress/expected/worker_null_data_partition.out +++ b/src/test/regress/expected/worker_null_data_partition.out @@ -1,7 +1,6 @@ -- -- WORKER_NULL_DATA_PARTITION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1180000; \set JobId 201010 \set Range_TaskId 101106 \set Partition_Column s_nationkey diff --git a/src/test/regress/expected/worker_range_partition.out b/src/test/regress/expected/worker_range_partition.out index 0590bdba7..14e6203ed 100644 --- a/src/test/regress/expected/worker_range_partition.out +++ b/src/test/regress/expected/worker_range_partition.out @@ -1,7 +1,6 @@ -- -- WORKER_RANGE_PARTITION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1160000; \set JobId 201010 \set TaskId 101101 \set Partition_Column l_orderkey diff --git a/src/test/regress/expected/worker_range_partition_complex.out b/src/test/regress/expected/worker_range_partition_complex.out index 15ac92db9..57b2c7795 100644 --- a/src/test/regress/expected/worker_range_partition_complex.out +++ b/src/test/regress/expected/worker_range_partition_complex.out @@ -1,7 +1,6 @@ -- -- WORKER_RANGE_PARTITION_COMPLEX -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1170000; \set JobId 201010 \set TaskId 101102 \set Partition_Column l_partkey diff --git a/src/test/regress/input/multi_agg_distinct.source b/src/test/regress/input/multi_agg_distinct.source index 6f601b9ca..0c36c0284 100644 --- a/src/test/regress/input/multi_agg_distinct.source +++ b/src/test/regress/input/multi_agg_distinct.source @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 200000; - - -- Create a new range partitioned lineitem table and load data into it CREATE TABLE lineitem_range ( l_orderkey bigint not null, diff --git a/src/test/regress/input/multi_agg_type_conversion.source b/src/test/regress/input/multi_agg_type_conversion.source index 393245e25..80b08cb34 100644 --- a/src/test/regress/input/multi_agg_type_conversion.source +++ b/src/test/regress/input/multi_agg_type_conversion.source @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 210000; - - -- Test aggregate type conversions using sums of integers and division operator SELECT sum(l_suppkey) FROM lineitem; SELECT sum(l_suppkey) / 2 FROM lineitem; diff --git a/src/test/regress/input/multi_mx_copy_data.source b/src/test/regress/input/multi_mx_copy_data.source index a231d4ad8..525216771 100644 --- a/src/test/regress/input/multi_mx_copy_data.source +++ b/src/test/regress/input/multi_mx_copy_data.source @@ -2,8 +2,6 @@ -- MULTI_MX_COPY_DATA -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; - \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; SET search_path TO citus_mx_test_schema; diff --git a/src/test/regress/output/multi_agg_distinct.source b/src/test/regress/output/multi_agg_distinct.source index 3f0ab6db6..a62e4bd56 100644 --- a/src/test/regress/output/multi_agg_distinct.source +++ b/src/test/regress/output/multi_agg_distinct.source @@ -1,7 +1,6 @@ -- -- MULTI_AGG_DISTINCT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 200000; -- Create a new range partitioned lineitem table and load data into it CREATE TABLE lineitem_range ( l_orderkey bigint not null, diff --git a/src/test/regress/output/multi_agg_type_conversion.source b/src/test/regress/output/multi_agg_type_conversion.source index 599709891..1d8e1f64d 100644 --- a/src/test/regress/output/multi_agg_type_conversion.source +++ b/src/test/regress/output/multi_agg_type_conversion.source @@ -1,7 +1,6 @@ -- -- MULTI_AGG_TYPE_CONVERSION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 210000; -- Test aggregate type conversions using sums of integers and division operator SELECT sum(l_suppkey) FROM lineitem; sum diff --git a/src/test/regress/output/multi_mx_copy_data.source b/src/test/regress/output/multi_mx_copy_data.source index 7883641fd..06ba5790a 100644 --- a/src/test/regress/output/multi_mx_copy_data.source +++ b/src/test/regress/output/multi_mx_copy_data.source @@ -1,7 +1,6 @@ -- -- MULTI_MX_COPY_DATA -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; SET search_path TO citus_mx_test_schema; \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; diff --git a/src/test/regress/sql/multi_agg_approximate_distinct.sql b/src/test/regress/sql/multi_agg_approximate_distinct.sql index 1dabe864c..a6904baf0 100644 --- a/src/test/regress/sql/multi_agg_approximate_distinct.sql +++ b/src/test/regress/sql/multi_agg_approximate_distinct.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; - -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN 'CREATE EXTENSION HLL' diff --git a/src/test/regress/sql/multi_average_expression.sql b/src/test/regress/sql/multi_average_expression.sql index 2f1774f43..a8da49e7c 100644 --- a/src/test/regress/sql/multi_average_expression.sql +++ b/src/test/regress/sql/multi_average_expression.sql @@ -6,9 +6,6 @@ -- to a bug we had due to the average expression introducing new columns. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 450000; - - SELECT sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, diff --git a/src/test/regress/sql/multi_basic_queries.sql b/src/test/regress/sql/multi_basic_queries.sql index 583ec0bc3..881a7a18f 100644 --- a/src/test/regress/sql/multi_basic_queries.sql +++ b/src/test/regress/sql/multi_basic_queries.sql @@ -2,13 +2,10 @@ -- MULTI_BASIC_QUERIES -- - -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 440000; - - -- Execute simple sum, average, and count queries on data recently uploaded to -- our partitioned table. + SELECT count(*) FROM lineitem; SELECT sum(l_extendedprice) FROM lineitem; diff --git a/src/test/regress/sql/multi_complex_expressions.sql b/src/test/regress/sql/multi_complex_expressions.sql index 5ae818b27..45ebb7fd8 100644 --- a/src/test/regress/sql/multi_complex_expressions.sql +++ b/src/test/regress/sql/multi_complex_expressions.sql @@ -2,12 +2,9 @@ -- MULTI_COMPLEX_EXPRESSIONS -- - -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 420000; - - -- Check that we can correctly handle complex expressions and aggregates. + SELECT sum(l_quantity) / avg(l_quantity) FROM lineitem; SELECT sum(l_quantity) / (10 * avg(l_quantity)) FROM lineitem; diff --git a/src/test/regress/sql/multi_count_type_conversion.sql b/src/test/regress/sql/multi_count_type_conversion.sql index b0059c299..315f8ebb8 100644 --- a/src/test/regress/sql/multi_count_type_conversion.sql +++ b/src/test/regress/sql/multi_count_type_conversion.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 400000; - - -- Verify that we can sort count(*) results correctly. We perform this check as -- our count() operations execute in two steps: worker nodes report their -- count() results, and the master node sums these counts up. During this sum(), diff --git a/src/test/regress/sql/multi_limit_clause.sql b/src/test/regress/sql/multi_limit_clause.sql index bfe3ead77..6ddc9f770 100644 --- a/src/test/regress/sql/multi_limit_clause.sql +++ b/src/test/regress/sql/multi_limit_clause.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 730000; - - -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; diff --git a/src/test/regress/sql/multi_limit_clause_approximate.sql b/src/test/regress/sql/multi_limit_clause_approximate.sql index 8d2cf19bb..ab81768b4 100644 --- a/src/test/regress/sql/multi_limit_clause_approximate.sql +++ b/src/test/regress/sql/multi_limit_clause_approximate.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 720000; - - -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; diff --git a/src/test/regress/sql/multi_mx_ddl.sql b/src/test/regress/sql/multi_mx_ddl.sql index 9363b94d8..82c7d5543 100644 --- a/src/test/regress/sql/multi_mx_ddl.sql +++ b/src/test/regress/sql/multi_mx_ddl.sql @@ -1,7 +1,5 @@ -- Tests related to distributed DDL commands on mx cluster -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; - SELECT * FROM mx_ddl_table ORDER BY key; -- CREATE INDEX diff --git a/src/test/regress/sql/multi_mx_router_planner.sql b/src/test/regress/sql/multi_mx_router_planner.sql index efeafa7fb..9b76c7830 100644 --- a/src/test/regress/sql/multi_mx_router_planner.sql +++ b/src/test/regress/sql/multi_mx_router_planner.sql @@ -1,6 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; - -- =================================================================== -- test router planner functionality for single shard select queries diff --git a/src/test/regress/sql/multi_mx_schema_support.sql b/src/test/regress/sql/multi_mx_schema_support.sql index b4cadeb80..999b6d799 100644 --- a/src/test/regress/sql/multi_mx_schema_support.sql +++ b/src/test/regress/sql/multi_mx_schema_support.sql @@ -2,8 +2,6 @@ -- MULTI_MX_SCHEMA_SUPPORT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; - -- connect to a worker node and run some queries \c - - - :worker_1_port diff --git a/src/test/regress/sql/multi_mx_tpch_query1.sql b/src/test/regress/sql/multi_mx_tpch_query1.sql index 690059122..45a54ac40 100644 --- a/src/test/regress/sql/multi_mx_tpch_query1.sql +++ b/src/test/regress/sql/multi_mx_tpch_query1.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; - -- connect to the coordinator \c - - - :master_port @@ -39,8 +37,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; @@ -72,8 +68,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query10.sql b/src/test/regress/sql/multi_mx_tpch_query10.sql index bbfe4e1cd..bc26f8acf 100644 --- a/src/test/regress/sql/multi_mx_tpch_query10.sql +++ b/src/test/regress/sql/multi_mx_tpch_query10.sql @@ -7,8 +7,6 @@ -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; - -- connect to master \c - - - :master_port @@ -49,8 +47,6 @@ LIMIT 20; -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; - SELECT c_custkey, c_name, @@ -87,8 +83,6 @@ LIMIT 20; -- connect to the other worker \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; - SELECT c_custkey, c_name, diff --git a/src/test/regress/sql/multi_mx_tpch_query12.sql b/src/test/regress/sql/multi_mx_tpch_query12.sql index a2c838158..ef47d3040 100644 --- a/src/test/regress/sql/multi_mx_tpch_query12.sql +++ b/src/test/regress/sql/multi_mx_tpch_query12.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; - -- connect to the coordinator \c - - - :master_port @@ -46,8 +44,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; @@ -86,8 +82,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query14.sql b/src/test/regress/sql/multi_mx_tpch_query14.sql index 153add47a..22fa70273 100644 --- a/src/test/regress/sql/multi_mx_tpch_query14.sql +++ b/src/test/regress/sql/multi_mx_tpch_query14.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; - -- connect to the coordinator \c - - - :master_port @@ -31,8 +29,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; @@ -56,8 +52,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query19.sql b/src/test/regress/sql/multi_mx_tpch_query19.sql index aa14143df..a0b8c0f56 100644 --- a/src/test/regress/sql/multi_mx_tpch_query19.sql +++ b/src/test/regress/sql/multi_mx_tpch_query19.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; - -- connect to the coordinator \c - - - :master_port @@ -48,8 +46,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; @@ -90,8 +86,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query3.sql b/src/test/regress/sql/multi_mx_tpch_query3.sql index 991edf1ce..a9c27734f 100644 --- a/src/test/regress/sql/multi_mx_tpch_query3.sql +++ b/src/test/regress/sql/multi_mx_tpch_query3.sql @@ -7,8 +7,6 @@ -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; - -- connect to the coordinator \c - - - :master_port @@ -38,8 +36,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; - SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, @@ -66,8 +62,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; - SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/sql/multi_mx_tpch_query6.sql b/src/test/regress/sql/multi_mx_tpch_query6.sql index 61e8cf0bf..d28854c98 100644 --- a/src/test/regress/sql/multi_mx_tpch_query6.sql +++ b/src/test/regress/sql/multi_mx_tpch_query6.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; - -- connect to the coordinator \c - - - :master_port @@ -27,8 +25,6 @@ WHERE -- connect to one of the worker nodes \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; @@ -48,8 +44,6 @@ WHERE -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query7.sql b/src/test/regress/sql/multi_mx_tpch_query7.sql index 4f6b22d84..410213f26 100644 --- a/src/test/regress/sql/multi_mx_tpch_query7.sql +++ b/src/test/regress/sql/multi_mx_tpch_query7.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; - -- connect to the coordinator \c - - - :master_port @@ -57,8 +55,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; - -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; @@ -108,8 +104,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; - -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_mx_tpch_query7_nested.sql b/src/test/regress/sql/multi_mx_tpch_query7_nested.sql index e71c5d345..cfe36a25a 100644 --- a/src/test/regress/sql/multi_mx_tpch_query7_nested.sql +++ b/src/test/regress/sql/multi_mx_tpch_query7_nested.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; - -- connect to the coordinator \c - - - :master_port @@ -66,8 +64,6 @@ ORDER BY -- connect to one of the workers \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; - -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; @@ -126,8 +122,6 @@ ORDER BY -- connect to the coordinator \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; - -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_prepare_plsql.sql b/src/test/regress/sql/multi_prepare_plsql.sql index 59d278b3d..f4cd15489 100644 --- a/src/test/regress/sql/multi_prepare_plsql.sql +++ b/src/test/regress/sql/multi_prepare_plsql.sql @@ -7,9 +7,6 @@ -- use prepared statements internally. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 780000; - - CREATE FUNCTION plpgsql_test_1() RETURNS TABLE(count bigint) AS $$ DECLARE BEGIN diff --git a/src/test/regress/sql/multi_prepare_sql.sql b/src/test/regress/sql/multi_prepare_sql.sql index 734b2f904..a49f154b0 100644 --- a/src/test/regress/sql/multi_prepare_sql.sql +++ b/src/test/regress/sql/multi_prepare_sql.sql @@ -7,9 +7,6 @@ -- prepared statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 790000; - - PREPARE prepared_test_1 AS SELECT count(*) diff --git a/src/test/regress/sql/multi_tpch_query1.sql b/src/test/regress/sql/multi_tpch_query1.sql index c8e408ffe..382289313 100644 --- a/src/test/regress/sql/multi_tpch_query1.sql +++ b/src/test/regress/sql/multi_tpch_query1.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 890000; - - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query10.sql b/src/test/regress/sql/multi_tpch_query10.sql index 056497e6f..e3046ece8 100644 --- a/src/test/regress/sql/multi_tpch_query10.sql +++ b/src/test/regress/sql/multi_tpch_query10.sql @@ -7,9 +7,6 @@ -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 900000; - - SELECT c_custkey, c_name, diff --git a/src/test/regress/sql/multi_tpch_query12.sql b/src/test/regress/sql/multi_tpch_query12.sql index a00f5f896..746d422b2 100644 --- a/src/test/regress/sql/multi_tpch_query12.sql +++ b/src/test/regress/sql/multi_tpch_query12.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 910000; - - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query14.sql b/src/test/regress/sql/multi_tpch_query14.sql index c15e063d6..74f5b9954 100644 --- a/src/test/regress/sql/multi_tpch_query14.sql +++ b/src/test/regress/sql/multi_tpch_query14.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 920000; - - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query19.sql b/src/test/regress/sql/multi_tpch_query19.sql index b048eeca4..42a18e3bd 100644 --- a/src/test/regress/sql/multi_tpch_query19.sql +++ b/src/test/regress/sql/multi_tpch_query19.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 930000; - - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query3.sql b/src/test/regress/sql/multi_tpch_query3.sql index e315f8bef..1c5659ac5 100644 --- a/src/test/regress/sql/multi_tpch_query3.sql +++ b/src/test/regress/sql/multi_tpch_query3.sql @@ -7,9 +7,6 @@ -- coming from postgresql.conf or multi_task_tracker_executor.conf. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 940000; - - SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/sql/multi_tpch_query6.sql b/src/test/regress/sql/multi_tpch_query6.sql index d84b31e1a..e0d4d4fea 100644 --- a/src/test/regress/sql/multi_tpch_query6.sql +++ b/src/test/regress/sql/multi_tpch_query6.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 950000; - - -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query7.sql b/src/test/regress/sql/multi_tpch_query7.sql index c42357db8..eb8e208e1 100644 --- a/src/test/regress/sql/multi_tpch_query7.sql +++ b/src/test/regress/sql/multi_tpch_query7.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 970000; - - -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_tpch_query7_nested.sql b/src/test/regress/sql/multi_tpch_query7_nested.sql index 82f95de32..251ddd1e9 100644 --- a/src/test/regress/sql/multi_tpch_query7_nested.sql +++ b/src/test/regress/sql/multi_tpch_query7_nested.sql @@ -3,9 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 960000; - - -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_working_columns.sql b/src/test/regress/sql/multi_working_columns.sql index 2da6600c7..f7478ca87 100644 --- a/src/test/regress/sql/multi_working_columns.sql +++ b/src/test/regress/sql/multi_working_columns.sql @@ -8,9 +8,6 @@ -- grouping. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1040000; - - SELECT l_quantity FROM lineitem ORDER BY l_shipdate, l_quantity LIMIT 20; SELECT l_quantity, count(*) as count FROM lineitem diff --git a/src/test/regress/sql/task_tracker_assign_task.sql b/src/test/regress/sql/task_tracker_assign_task.sql index aea391f04..d19956773 100644 --- a/src/test/regress/sql/task_tracker_assign_task.sql +++ b/src/test/regress/sql/task_tracker_assign_task.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1050000; - \set JobId 401010 \set SimpleTaskId 101101 diff --git a/src/test/regress/sql/task_tracker_partition_task.sql b/src/test/regress/sql/task_tracker_partition_task.sql index d0e90704c..3d8f40117 100644 --- a/src/test/regress/sql/task_tracker_partition_task.sql +++ b/src/test/regress/sql/task_tracker_partition_task.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1080000; - \set JobId 401010 \set PartitionTaskId 801106 diff --git a/src/test/regress/sql/worker_binary_data_partition.sql b/src/test/regress/sql/worker_binary_data_partition.sql index b5eff2197..168302634 100644 --- a/src/test/regress/sql/worker_binary_data_partition.sql +++ b/src/test/regress/sql/worker_binary_data_partition.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1090000; - \set JobId 201010 \set TaskId 101105 diff --git a/src/test/regress/sql/worker_hash_partition.sql b/src/test/regress/sql/worker_hash_partition.sql index 90a1aaf54..024b46ed7 100644 --- a/src/test/regress/sql/worker_hash_partition.sql +++ b/src/test/regress/sql/worker_hash_partition.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; - \set JobId 201010 \set TaskId 101103 diff --git a/src/test/regress/sql/worker_hash_partition_complex.sql b/src/test/regress/sql/worker_hash_partition_complex.sql index 39d1b98fc..5b860ec71 100644 --- a/src/test/regress/sql/worker_hash_partition_complex.sql +++ b/src/test/regress/sql/worker_hash_partition_complex.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1120000; - \set JobId 201010 \set TaskId 101104 diff --git a/src/test/regress/sql/worker_merge_hash_files.sql b/src/test/regress/sql/worker_merge_hash_files.sql index f2d09281c..1336e05eb 100644 --- a/src/test/regress/sql/worker_merge_hash_files.sql +++ b/src/test/regress/sql/worker_merge_hash_files.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1140000; - \set JobId 201010 \set TaskId 101103 diff --git a/src/test/regress/sql/worker_merge_range_files.sql b/src/test/regress/sql/worker_merge_range_files.sql index 069f4e360..aacdc7d15 100644 --- a/src/test/regress/sql/worker_merge_range_files.sql +++ b/src/test/regress/sql/worker_merge_range_files.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1150000; - \set JobId 201010 \set TaskId 101101 diff --git a/src/test/regress/sql/worker_null_data_partition.sql b/src/test/regress/sql/worker_null_data_partition.sql index 38c8d03c3..557904187 100644 --- a/src/test/regress/sql/worker_null_data_partition.sql +++ b/src/test/regress/sql/worker_null_data_partition.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1180000; - \set JobId 201010 \set Range_TaskId 101106 diff --git a/src/test/regress/sql/worker_range_partition.sql b/src/test/regress/sql/worker_range_partition.sql index cbf59f609..32d55bbda 100644 --- a/src/test/regress/sql/worker_range_partition.sql +++ b/src/test/regress/sql/worker_range_partition.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1160000; - \set JobId 201010 \set TaskId 101101 diff --git a/src/test/regress/sql/worker_range_partition_complex.sql b/src/test/regress/sql/worker_range_partition_complex.sql index 9f10d10e4..a9ff2fccd 100644 --- a/src/test/regress/sql/worker_range_partition_complex.sql +++ b/src/test/regress/sql/worker_range_partition_complex.sql @@ -3,8 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1170000; - \set JobId 201010 \set TaskId 101102