From 89eb833375cce73f76b0a8711593ad2416a6c7ba Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Tue, 31 Oct 2017 18:00:50 +0100 Subject: [PATCH] Use citus.next_shard_id where practical in regression tests --- src/test/regress/expected/multi_703_upgrade.out | 2 +- src/test/regress/expected/multi_array_agg.out | 2 +- src/test/regress/expected/multi_binary_master_copy_format.out | 2 +- src/test/regress/expected/multi_cache_invalidation.out | 2 +- src/test/regress/expected/multi_citus_tools.out | 2 +- src/test/regress/expected/multi_cluster_management.out | 2 +- src/test/regress/expected/multi_colocation_utils.out | 3 ++- src/test/regress/expected/multi_create_fdw.out | 2 +- src/test/regress/expected/multi_create_insert_proxy.out | 2 +- src/test/regress/expected/multi_create_shards.out | 2 +- src/test/regress/expected/multi_create_table_constraints.out | 2 +- src/test/regress/expected/multi_data_types.out | 2 +- src/test/regress/expected/multi_deparse_shard_query.out | 2 +- src/test/regress/expected/multi_drop_extension.out | 2 +- src/test/regress/expected/multi_dropped_column_aliases.out | 2 +- src/test/regress/expected/multi_expire_table_cache.out | 2 +- src/test/regress/expected/multi_explain.out | 2 +- src/test/regress/expected/multi_explain_0.out | 2 +- src/test/regress/expected/multi_extension.out | 2 +- src/test/regress/expected/multi_foreign_key.out | 2 +- src/test/regress/expected/multi_function_evaluation.out | 2 +- src/test/regress/expected/multi_generate_ddl_commands.out | 2 +- src/test/regress/expected/multi_hash_pruning.out | 2 +- src/test/regress/expected/multi_having_pushdown.out | 2 +- src/test/regress/expected/multi_index_statements.out | 4 ++-- src/test/regress/expected/multi_insert_select.out | 2 +- src/test/regress/expected/multi_join_order_additional.out | 2 +- src/test/regress/expected/multi_join_order_tpch_large.out | 2 +- src/test/regress/expected/multi_large_table_join_planning.out | 2 +- .../regress/expected/multi_large_table_join_planning_0.out | 2 +- src/test/regress/expected/multi_large_table_pruning.out | 2 +- .../regress/expected/multi_large_table_task_assignment.out | 2 +- .../regress/expected/multi_large_table_task_assignment_0.out | 2 +- src/test/regress/expected/multi_master_protocol.out | 2 +- src/test/regress/expected/multi_metadata_access.out | 2 +- src/test/regress/expected/multi_modifications.out | 2 +- src/test/regress/expected/multi_multiuser.out | 2 +- src/test/regress/expected/multi_null_minmax_value_pruning.out | 2 +- .../regress/expected/multi_null_minmax_value_pruning_0.out | 2 +- src/test/regress/expected/multi_partition_pruning.out | 2 +- src/test/regress/expected/multi_partitioning.out | 2 +- src/test/regress/expected/multi_partitioning_0.out | 2 +- src/test/regress/expected/multi_prune_shard_list.out | 2 +- src/test/regress/expected/multi_query_directory_cleanup.out | 2 +- src/test/regress/expected/multi_read_from_secondaries.out | 2 +- src/test/regress/expected/multi_reference_table.out | 2 +- .../regress/expected/multi_remove_node_reference_table.out | 3 ++- src/test/regress/expected/multi_repair_shards.out | 2 +- src/test/regress/expected/multi_repartition_udt.out | 2 +- .../regress/expected/multi_repartitioned_subquery_udf.out | 2 +- src/test/regress/expected/multi_replicate_reference_table.out | 2 +- src/test/regress/expected/multi_router_planner.out | 2 +- src/test/regress/expected/multi_shard_modify.out | 4 ++-- src/test/regress/expected/multi_shard_update_delete.out | 2 +- src/test/regress/expected/multi_shard_update_delete_0.out | 2 +- src/test/regress/expected/multi_simple_queries.out | 2 +- src/test/regress/expected/multi_single_relation_subquery.out | 2 +- src/test/regress/expected/multi_size_queries.out | 2 +- src/test/regress/expected/multi_sql_function.out | 2 +- src/test/regress/expected/multi_subquery.out | 1 + src/test/regress/expected/multi_subquery_complex_queries.out | 2 +- .../expected/multi_subquery_complex_reference_clause.out | 2 +- src/test/regress/expected/multi_subquery_union.out | 2 +- src/test/regress/expected/multi_table_ddl.out | 2 +- src/test/regress/expected/multi_task_assignment_policy.out | 2 +- src/test/regress/expected/multi_task_assignment_policy_0.out | 2 +- src/test/regress/expected/multi_task_string_size.out | 2 +- src/test/regress/expected/multi_transaction_recovery.out | 2 +- src/test/regress/expected/multi_truncate.out | 2 +- .../regress/expected/multi_unsupported_worker_operations.out | 2 +- src/test/regress/expected/multi_upsert.out | 2 +- src/test/regress/expected/multi_utilities.out | 2 +- src/test/regress/expected/multi_utility_statements.out | 2 +- src/test/regress/expected/multi_utility_warnings.out | 2 +- src/test/regress/expected/task_tracker_cleanup_job.out | 2 +- src/test/regress/expected/task_tracker_create_table.out | 2 +- src/test/regress/expected/worker_check_invalid_arguments.out | 2 +- src/test/regress/expected/worker_create_table.out | 2 +- src/test/regress/input/multi_append_table_to_shard.source | 2 +- .../input/multi_behavioral_analytics_create_table.source | 2 +- src/test/regress/input/multi_complex_count_distinct.source | 2 +- src/test/regress/input/multi_create_schema.source | 2 +- src/test/regress/input/multi_load_data.source | 2 +- src/test/regress/input/multi_load_large_records.source | 2 +- src/test/regress/input/multi_load_more_data.source | 2 +- src/test/regress/input/multi_master_delete_protocol.source | 2 +- src/test/regress/input/multi_outer_join.source | 2 +- src/test/regress/input/multi_outer_join_reference.source | 2 +- src/test/regress/input/worker_copy.source | 2 +- src/test/regress/output/multi_append_table_to_shard.source | 2 +- .../output/multi_behavioral_analytics_create_table.source | 2 +- src/test/regress/output/multi_complex_count_distinct.source | 2 +- src/test/regress/output/multi_create_schema.source | 2 +- src/test/regress/output/multi_load_data.source | 2 +- src/test/regress/output/multi_load_large_records.source | 2 +- src/test/regress/output/multi_load_more_data.source | 2 +- src/test/regress/output/multi_master_delete_protocol.source | 2 +- src/test/regress/output/multi_outer_join.source | 2 +- src/test/regress/output/multi_outer_join_reference.source | 2 +- src/test/regress/output/worker_copy.source | 2 +- src/test/regress/sql/multi_703_upgrade.sql | 2 +- src/test/regress/sql/multi_array_agg.sql | 2 +- src/test/regress/sql/multi_binary_master_copy_format.sql | 2 +- src/test/regress/sql/multi_cache_invalidation.sql | 2 +- src/test/regress/sql/multi_citus_tools.sql | 2 +- src/test/regress/sql/multi_cluster_management.sql | 2 +- src/test/regress/sql/multi_colocation_utils.sql | 3 ++- src/test/regress/sql/multi_create_fdw.sql | 2 +- src/test/regress/sql/multi_create_insert_proxy.sql | 2 +- src/test/regress/sql/multi_create_shards.sql | 2 +- src/test/regress/sql/multi_create_table_constraints.sql | 2 +- src/test/regress/sql/multi_data_types.sql | 2 +- src/test/regress/sql/multi_deparse_shard_query.sql | 2 +- src/test/regress/sql/multi_drop_extension.sql | 2 +- src/test/regress/sql/multi_dropped_column_aliases.sql | 2 +- src/test/regress/sql/multi_expire_table_cache.sql | 2 +- src/test/regress/sql/multi_explain.sql | 2 +- src/test/regress/sql/multi_extension.sql | 2 +- src/test/regress/sql/multi_foreign_key.sql | 2 +- src/test/regress/sql/multi_function_evaluation.sql | 2 +- src/test/regress/sql/multi_generate_ddl_commands.sql | 2 +- src/test/regress/sql/multi_hash_pruning.sql | 2 +- src/test/regress/sql/multi_having_pushdown.sql | 2 +- src/test/regress/sql/multi_index_statements.sql | 4 ++-- src/test/regress/sql/multi_insert_select.sql | 2 +- src/test/regress/sql/multi_join_order_additional.sql | 2 +- src/test/regress/sql/multi_join_order_tpch_large.sql | 2 +- src/test/regress/sql/multi_large_table_join_planning.sql | 2 +- src/test/regress/sql/multi_large_table_pruning.sql | 2 +- src/test/regress/sql/multi_large_table_task_assignment.sql | 2 +- src/test/regress/sql/multi_master_protocol.sql | 2 +- src/test/regress/sql/multi_metadata_access.sql | 2 +- src/test/regress/sql/multi_modifications.sql | 2 +- src/test/regress/sql/multi_multiuser.sql | 2 +- src/test/regress/sql/multi_null_minmax_value_pruning.sql | 2 +- src/test/regress/sql/multi_partition_pruning.sql | 2 +- src/test/regress/sql/multi_partitioning.sql | 2 +- src/test/regress/sql/multi_prune_shard_list.sql | 2 +- src/test/regress/sql/multi_query_directory_cleanup.sql | 2 +- src/test/regress/sql/multi_read_from_secondaries.sql | 2 +- src/test/regress/sql/multi_reference_table.sql | 2 +- src/test/regress/sql/multi_remove_node_reference_table.sql | 4 +++- src/test/regress/sql/multi_repair_shards.sql | 2 +- src/test/regress/sql/multi_repartition_udt.sql | 2 +- src/test/regress/sql/multi_repartitioned_subquery_udf.sql | 2 +- src/test/regress/sql/multi_replicate_reference_table.sql | 2 +- src/test/regress/sql/multi_router_planner.sql | 2 +- src/test/regress/sql/multi_schema_support.sql | 2 +- src/test/regress/sql/multi_shard_modify.sql | 4 ++-- src/test/regress/sql/multi_shard_update_delete.sql | 2 +- src/test/regress/sql/multi_simple_queries.sql | 2 +- src/test/regress/sql/multi_single_relation_subquery.sql | 2 +- src/test/regress/sql/multi_size_queries.sql | 2 +- src/test/regress/sql/multi_sql_function.sql | 2 +- src/test/regress/sql/multi_subquery.sql | 1 + src/test/regress/sql/multi_subquery_complex_queries.sql | 2 +- .../regress/sql/multi_subquery_complex_reference_clause.sql | 2 +- src/test/regress/sql/multi_subquery_union.sql | 2 +- src/test/regress/sql/multi_table_ddl.sql | 2 +- src/test/regress/sql/multi_task_assignment_policy.sql | 2 +- src/test/regress/sql/multi_task_string_size.sql | 2 +- src/test/regress/sql/multi_transaction_recovery.sql | 2 +- src/test/regress/sql/multi_truncate.sql | 2 +- src/test/regress/sql/multi_unsupported_worker_operations.sql | 2 +- src/test/regress/sql/multi_upsert.sql | 2 +- src/test/regress/sql/multi_utilities.sql | 2 +- src/test/regress/sql/multi_utility_statements.sql | 2 +- src/test/regress/sql/multi_utility_warnings.sql | 2 +- src/test/regress/sql/task_tracker_cleanup_job.sql | 2 +- src/test/regress/sql/task_tracker_create_table.sql | 2 +- src/test/regress/sql/worker_check_invalid_arguments.sql | 2 +- src/test/regress/sql/worker_create_table.sql | 2 +- 172 files changed, 181 insertions(+), 174 deletions(-) diff --git a/src/test/regress/expected/multi_703_upgrade.out b/src/test/regress/expected/multi_703_upgrade.out index c9e6dbc7d..8c6204b72 100644 --- a/src/test/regress/expected/multi_703_upgrade.out +++ b/src/test/regress/expected/multi_703_upgrade.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 103000; +SET citus.next_shard_id TO 103000; -- tests that the upgrade from 7.0-2 to 7.0-3 properly migrates shard placements DROP EXTENSION citus; SET citus.enable_version_checks TO 'false'; diff --git a/src/test/regress/expected/multi_array_agg.out b/src/test/regress/expected/multi_array_agg.out index 61e4de31e..ad1e00aa2 100644 --- a/src/test/regress/expected/multi_array_agg.out +++ b/src/test/regress/expected/multi_array_agg.out @@ -1,7 +1,7 @@ -- -- MULTI_ARRAY_AGG -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 520000; +SET citus.next_shard_id TO 520000; CREATE OR REPLACE FUNCTION array_sort (ANYARRAY) RETURNS ANYARRAY LANGUAGE SQL AS $$ diff --git a/src/test/regress/expected/multi_binary_master_copy_format.out b/src/test/regress/expected/multi_binary_master_copy_format.out index 1711372f1..36643c014 100644 --- a/src/test/regress/expected/multi_binary_master_copy_format.out +++ b/src/test/regress/expected/multi_binary_master_copy_format.out @@ -1,7 +1,7 @@ -- -- MULTI_BINARY_MASTER_COPY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 430000; +SET citus.next_shard_id TO 430000; -- Try binary master copy for different executors SET citus.binary_master_copy_format TO 'on'; SET citus.task_executor_type TO 'task-tracker'; diff --git a/src/test/regress/expected/multi_cache_invalidation.out b/src/test/regress/expected/multi_cache_invalidation.out index e5bdd6698..dc475ee88 100644 --- a/src/test/regress/expected/multi_cache_invalidation.out +++ b/src/test/regress/expected/multi_cache_invalidation.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1601000; +SET citus.next_shard_id TO 1601000; CREATE TABLE tab9 (test_id integer NOT NULL, data int); CREATE TABLE tab10 (test_id integer NOT NULL, data int); SELECT master_create_distributed_table('tab9', 'test_id', 'hash'); diff --git a/src/test/regress/expected/multi_citus_tools.out b/src/test/regress/expected/multi_citus_tools.out index a78634ed7..aecc10b5a 100644 --- a/src/test/regress/expected/multi_citus_tools.out +++ b/src/test/regress/expected/multi_citus_tools.out @@ -3,7 +3,7 @@ -- -- tests UDFs created for citus tools -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; +SET citus.next_shard_id TO 1240000; -- test with invalid port, prevent OS dependent warning from being displayed SET client_min_messages to ERROR; -- PG 9.5 does not show context for plpgsql raise diff --git a/src/test/regress/expected/multi_cluster_management.out b/src/test/regress/expected/multi_cluster_management.out index b5b04c1d8..067a28517 100644 --- a/src/test/regress/expected/multi_cluster_management.out +++ b/src/test/regress/expected/multi_cluster_management.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- Tests functions related to cluster membership -- before starting the test, lets try to create reference table and see a -- meaningful error diff --git a/src/test/regress/expected/multi_colocation_utils.out b/src/test/regress/expected/multi_colocation_utils.out index a23b450fd..31650645f 100644 --- a/src/test/regress/expected/multi_colocation_utils.out +++ b/src/test/regress/expected/multi_colocation_utils.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; +SET citus.next_shard_id TO 1300000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 4; -- =================================================================== -- create test utility function @@ -631,6 +631,7 @@ SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='schema_colloca (1 row) \c - - - :master_port +SET citus.next_shard_id TO 1300068; CREATE TABLE table1_groupF ( id int ); SELECT create_reference_table('table1_groupF'); create_reference_table diff --git a/src/test/regress/expected/multi_create_fdw.out b/src/test/regress/expected/multi_create_fdw.out index c3b52e459..453dda1b9 100644 --- a/src/test/regress/expected/multi_create_fdw.out +++ b/src/test/regress/expected/multi_create_fdw.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 390000; +SET citus.next_shard_id TO 390000; -- =================================================================== -- get ready for the foreign data wrapper tests -- =================================================================== diff --git a/src/test/regress/expected/multi_create_insert_proxy.out b/src/test/regress/expected/multi_create_insert_proxy.out index 24e57002d..36cbf737c 100644 --- a/src/test/regress/expected/multi_create_insert_proxy.out +++ b/src/test/regress/expected/multi_create_insert_proxy.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 380000; +SET citus.next_shard_id TO 380000; -- =================================================================== -- test INSERT proxy creation functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_create_shards.out b/src/test/regress/expected/multi_create_shards.out index a3f221e70..377c784c9 100644 --- a/src/test/regress/expected/multi_create_shards.out +++ b/src/test/regress/expected/multi_create_shards.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 370000; +SET citus.next_shard_id TO 370000; -- =================================================================== -- create test functions and types needed for tests -- =================================================================== diff --git a/src/test/regress/expected/multi_create_table_constraints.out b/src/test/regress/expected/multi_create_table_constraints.out index 6781d26d6..9b3bab25d 100644 --- a/src/test/regress/expected/multi_create_table_constraints.out +++ b/src/test/regress/expected/multi_create_table_constraints.out @@ -1,7 +1,7 @@ -- -- MULTI_CREATE_TABLE_CONSTRAINTS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 365000; +SET citus.next_shard_id TO 365000; -- test that Citus forbids unique and EXCLUDE constraints on append-partitioned tables. CREATE TABLE uniq_cns_append_tables ( diff --git a/src/test/regress/expected/multi_data_types.out b/src/test/regress/expected/multi_data_types.out index 1cb4d1f9b..9e16d6e11 100644 --- a/src/test/regress/expected/multi_data_types.out +++ b/src/test/regress/expected/multi_data_types.out @@ -2,7 +2,7 @@ -- test composite type, varchar and enum types -- create, distribute, INSERT, SELECT and UPDATE -- =================================================================== -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 530000; +SET citus.next_shard_id TO 530000; -- create a custom type... CREATE TYPE test_composite_type AS ( i integer, diff --git a/src/test/regress/expected/multi_deparse_shard_query.out b/src/test/regress/expected/multi_deparse_shard_query.out index 4fe9f4a42..6551aa038 100644 --- a/src/test/regress/expected/multi_deparse_shard_query.out +++ b/src/test/regress/expected/multi_deparse_shard_query.out @@ -1,7 +1,7 @@ -- -- MULTI_DEPARSE_SHARD_QUERY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13100000; +SET citus.next_shard_id TO 13100000; CREATE FUNCTION deparse_shard_query_test(text) RETURNS VOID AS 'citus' diff --git a/src/test/regress/expected/multi_drop_extension.out b/src/test/regress/expected/multi_drop_extension.out index 0db559a5c..f44c8da14 100644 --- a/src/test/regress/expected/multi_drop_extension.out +++ b/src/test/regress/expected/multi_drop_extension.out @@ -2,7 +2,7 @@ -- MULTI_DROP_EXTENSION -- -- Tests around dropping and recreating the extension -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 550000; +SET citus.next_shard_id TO 550000; CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); SELECT master_create_distributed_table('testtableddl', 'distributecol', 'append'); master_create_distributed_table diff --git a/src/test/regress/expected/multi_dropped_column_aliases.out b/src/test/regress/expected/multi_dropped_column_aliases.out index 163e3f26f..1d9549bee 100644 --- a/src/test/regress/expected/multi_dropped_column_aliases.out +++ b/src/test/regress/expected/multi_dropped_column_aliases.out @@ -1,6 +1,6 @@ -- Tests that check that our query functionality behaves as expected when the -- table schema is modified via ALTER statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 620000; +SET citus.next_shard_id TO 620000; SELECT count(*) FROM customer; count ------- diff --git a/src/test/regress/expected/multi_expire_table_cache.out b/src/test/regress/expected/multi_expire_table_cache.out index 0eeeab1fd..fe7b4030d 100644 --- a/src/test/regress/expected/multi_expire_table_cache.out +++ b/src/test/regress/expected/multi_expire_table_cache.out @@ -1,7 +1,7 @@ --- --- MULTI_EXPIRE_TABLE_CACHE --- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- create test table CREATE TABLE large_table(a int, b int); SELECT master_create_distributed_table('large_table', 'a', 'hash'); diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index 1c332e84a..596f39f76 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -1,7 +1,7 @@ -- -- MULTI_EXPLAIN -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; +SET citus.next_shard_id TO 570000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_explain_0.out b/src/test/regress/expected/multi_explain_0.out index 4d856e33c..f2465a267 100644 --- a/src/test/regress/expected/multi_explain_0.out +++ b/src/test/regress/expected/multi_explain_0.out @@ -1,7 +1,7 @@ -- -- MULTI_EXPLAIN -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; +SET citus.next_shard_id TO 570000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index d4c27f8d5..b28077360 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -5,7 +5,7 @@ -- -- It'd be nice to script generation of this file, but alas, that's -- not done yet. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 580000; +SET citus.next_shard_id TO 580000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 580000; CREATE SCHEMA test; CREATE OR REPLACE FUNCTION test.maintenance_worker(p_dbname text DEFAULT current_database()) diff --git a/src/test/regress/expected/multi_foreign_key.out b/src/test/regress/expected/multi_foreign_key.out index a05c9519c..8ff59a47c 100644 --- a/src/test/regress/expected/multi_foreign_key.out +++ b/src/test/regress/expected/multi_foreign_key.out @@ -1,7 +1,7 @@ -- -- MULTI_FOREIGN_KEY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1350000; +SET citus.next_shard_id TO 1350000; -- set shard_count to 4 for faster tests, because we create/drop lots of shards in this test. SET citus.shard_count TO 4; -- create tables diff --git a/src/test/regress/expected/multi_function_evaluation.out b/src/test/regress/expected/multi_function_evaluation.out index 195e22804..d36a39d15 100644 --- a/src/test/regress/expected/multi_function_evaluation.out +++ b/src/test/regress/expected/multi_function_evaluation.out @@ -1,7 +1,7 @@ -- -- MULTI_FUNCTION_EVALUATION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; +SET citus.next_shard_id TO 1200000; -- nextval() works (no good way to test DEFAULT, or, by extension, SERIAL) CREATE TABLE example (key INT, value INT); SELECT master_create_distributed_table('example', 'key', 'hash'); diff --git a/src/test/regress/expected/multi_generate_ddl_commands.out b/src/test/regress/expected/multi_generate_ddl_commands.out index 829e8b8f7..82fe4934d 100644 --- a/src/test/regress/expected/multi_generate_ddl_commands.out +++ b/src/test/regress/expected/multi_generate_ddl_commands.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 610000; +SET citus.next_shard_id TO 610000; -- =================================================================== -- create test functions -- =================================================================== diff --git a/src/test/regress/expected/multi_hash_pruning.out b/src/test/regress/expected/multi_hash_pruning.out index 28eb3b1fa..dc836287b 100644 --- a/src/test/regress/expected/multi_hash_pruning.out +++ b/src/test/regress/expected/multi_hash_pruning.out @@ -2,7 +2,7 @@ -- MULTI_HASH_PRUNING -- -- Tests for shard and join pruning logic on hash partitioned tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 630000; +SET citus.next_shard_id TO 630000; -- Create a table partitioned on integer column and update partition type to -- hash. Then load data into this table and update shard min max values with -- hashed ones. Hash value of 1, 2, 3 and 4 are consecutively -1905060026, diff --git a/src/test/regress/expected/multi_having_pushdown.out b/src/test/regress/expected/multi_having_pushdown.out index 6ba07c4ad..911ebb389 100644 --- a/src/test/regress/expected/multi_having_pushdown.out +++ b/src/test/regress/expected/multi_having_pushdown.out @@ -1,7 +1,7 @@ -- -- MULTI_HAVING_PUSHDOWN -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 590000; +SET citus.next_shard_id TO 590000; CREATE TABLE lineitem_hash (LIKE lineitem); SELECT create_distributed_table('lineitem_hash', 'l_orderkey', 'hash'); create_distributed_table diff --git a/src/test/regress/expected/multi_index_statements.out b/src/test/regress/expected/multi_index_statements.out index 0adf8e33b..c856f756c 100644 --- a/src/test/regress/expected/multi_index_statements.out +++ b/src/test/regress/expected/multi_index_statements.out @@ -3,11 +3,11 @@ -- -- Check that we can run CREATE INDEX and DROP INDEX statements on distributed -- tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 640000; +SET citus.next_shard_id TO 640000; -- -- CREATE TEST TABLES -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 102080; +SET citus.next_shard_id TO 102080; CREATE TABLE index_test_range(a int, b int, c int); SELECT master_create_distributed_table('index_test_range', 'a', 'range'); master_create_distributed_table diff --git a/src/test/regress/expected/multi_insert_select.out b/src/test/regress/expected/multi_insert_select.out index 8749d135e..9df083005 100644 --- a/src/test/regress/expected/multi_insert_select.out +++ b/src/test/regress/expected/multi_insert_select.out @@ -1,7 +1,7 @@ -- -- MULTI_INSERT_SELECT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; +SET citus.next_shard_id TO 13300000; ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 13300000; -- create co-located tables SET citus.shard_count = 4; diff --git a/src/test/regress/expected/multi_join_order_additional.out b/src/test/regress/expected/multi_join_order_additional.out index 05971983c..6912c318b 100644 --- a/src/test/regress/expected/multi_join_order_additional.out +++ b/src/test/regress/expected/multi_join_order_additional.out @@ -1,7 +1,7 @@ -- -- MULTI_JOIN_ORDER_ADDITIONAL -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 650000; +SET citus.next_shard_id TO 650000; -- Set configuration to print table join order and pruned shards SET citus.explain_distributed_queries TO off; SET citus.log_multi_join_order TO TRUE; diff --git a/src/test/regress/expected/multi_join_order_tpch_large.out b/src/test/regress/expected/multi_join_order_tpch_large.out index f27cb1492..a7ab1acca 100644 --- a/src/test/regress/expected/multi_join_order_tpch_large.out +++ b/src/test/regress/expected/multi_join_order_tpch_large.out @@ -1,7 +1,7 @@ -- -- MULTI_JOIN_ORDER_TPCH_LARGE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 660000; +SET citus.next_shard_id TO 660000; -- Enable configuration to print table join order SET citus.explain_distributed_queries TO off; SET citus.log_multi_join_order TO TRUE; diff --git a/src/test/regress/expected/multi_large_table_join_planning.out b/src/test/regress/expected/multi_large_table_join_planning.out index 8bf29b367..922435f17 100644 --- a/src/test/regress/expected/multi_large_table_join_planning.out +++ b/src/test/regress/expected/multi_large_table_join_planning.out @@ -5,7 +5,7 @@ -- transaction block here so that we don't emit debug messages with changing -- transaction ids in them. Also, we set the executor type to task tracker -- executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000; +SET citus.next_shard_id TO 690000; SET citus.enable_unique_job_ids TO off; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/expected/multi_large_table_join_planning_0.out b/src/test/regress/expected/multi_large_table_join_planning_0.out index d07eaa9a9..5bae0e5cd 100644 --- a/src/test/regress/expected/multi_large_table_join_planning_0.out +++ b/src/test/regress/expected/multi_large_table_join_planning_0.out @@ -5,7 +5,7 @@ -- transaction block here so that we don't emit debug messages with changing -- transaction ids in them. Also, we set the executor type to task tracker -- executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000; +SET citus.next_shard_id TO 690000; SET citus.enable_unique_job_ids TO off; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/expected/multi_large_table_pruning.out b/src/test/regress/expected/multi_large_table_pruning.out index 6bd3149e4..c44cc6408 100644 --- a/src/test/regress/expected/multi_large_table_pruning.out +++ b/src/test/regress/expected/multi_large_table_pruning.out @@ -4,7 +4,7 @@ -- Tests covering partition and join-pruning for large table joins. Note that we -- set executor type to task tracker executor here, as we cannot run repartition -- jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 700000; +SET citus.next_shard_id TO 700000; SET citus.large_table_shard_count TO 2; SET client_min_messages TO DEBUG2; SET citus.task_executor_type TO 'task-tracker'; diff --git a/src/test/regress/expected/multi_large_table_task_assignment.out b/src/test/regress/expected/multi_large_table_task_assignment.out index 5405038e6..d310691e9 100644 --- a/src/test/regress/expected/multi_large_table_task_assignment.out +++ b/src/test/regress/expected/multi_large_table_task_assignment.out @@ -5,7 +5,7 @@ -- and dual hash repartition joins. The tests also cover task assignment propagation -- from a sql task to its depended tasks. Note that we set the executor type to task -- tracker executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000; +SET citus.next_shard_id TO 710000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_large_table_task_assignment_0.out b/src/test/regress/expected/multi_large_table_task_assignment_0.out index 590d879a2..d853bda7d 100644 --- a/src/test/regress/expected/multi_large_table_task_assignment_0.out +++ b/src/test/regress/expected/multi_large_table_task_assignment_0.out @@ -5,7 +5,7 @@ -- and dual hash repartition joins. The tests also cover task assignment propagation -- from a sql task to its depended tasks. Note that we set the executor type to task -- tracker executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000; +SET citus.next_shard_id TO 710000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_master_protocol.out b/src/test/regress/expected/multi_master_protocol.out index be55f3979..b06e15ab8 100644 --- a/src/test/regress/expected/multi_master_protocol.out +++ b/src/test/regress/expected/multi_master_protocol.out @@ -2,7 +2,7 @@ -- MULTI_MASTER_PROTOCOL -- -- Tests that check the metadata returned by the master node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 740000; +SET citus.next_shard_id TO 740000; SELECT part_storage_type, part_key, part_replica_count, part_max_size, part_placement_policy FROM master_get_table_metadata('lineitem'); part_storage_type | part_key | part_replica_count | part_max_size | part_placement_policy diff --git a/src/test/regress/expected/multi_metadata_access.out b/src/test/regress/expected/multi_metadata_access.out index 432eefac9..63ea37dd1 100644 --- a/src/test/regress/expected/multi_metadata_access.out +++ b/src/test/regress/expected/multi_metadata_access.out @@ -1,7 +1,7 @@ -- -- MULTI_METADATA_ACCESS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; +SET citus.next_shard_id TO 1360000; CREATE USER no_access; NOTICE: not propagating CREATE ROLE/USER commands to worker nodes HINT: Connect to worker nodes directly to manually create all necessary users and roles. diff --git a/src/test/regress/expected/multi_modifications.out b/src/test/regress/expected/multi_modifications.out index fb3b1e1b6..369323c5b 100644 --- a/src/test/regress/expected/multi_modifications.out +++ b/src/test/regress/expected/multi_modifications.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 750000; +SET citus.next_shard_id TO 750000; -- =================================================================== -- test end-to-end modification functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_multiuser.out b/src/test/regress/expected/multi_multiuser.out index a3d2e3383..120119162 100644 --- a/src/test/regress/expected/multi_multiuser.out +++ b/src/test/regress/expected/multi_multiuser.out @@ -3,7 +3,7 @@ -- -- Test user permissions. -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1420000; +SET citus.next_shard_id TO 1420000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1420000; SET citus.shard_replication_factor TO 1; SET citus.shard_count TO 2; diff --git a/src/test/regress/expected/multi_null_minmax_value_pruning.out b/src/test/regress/expected/multi_null_minmax_value_pruning.out index a0e435821..9498654c7 100644 --- a/src/test/regress/expected/multi_null_minmax_value_pruning.out +++ b/src/test/regress/expected/multi_null_minmax_value_pruning.out @@ -3,7 +3,7 @@ -- -- This test checks that we can handle null min/max values in shard statistics -- and that we don't partition or join prune shards that have null values. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000; +SET citus.next_shard_id TO 760000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_null_minmax_value_pruning_0.out b/src/test/regress/expected/multi_null_minmax_value_pruning_0.out index cebb9310e..5c349e0d2 100644 --- a/src/test/regress/expected/multi_null_minmax_value_pruning_0.out +++ b/src/test/regress/expected/multi_null_minmax_value_pruning_0.out @@ -3,7 +3,7 @@ -- -- This test checks that we can handle null min/max values in shard statistics -- and that we don't partition or join prune shards that have null values. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000; +SET citus.next_shard_id TO 760000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_partition_pruning.out b/src/test/regress/expected/multi_partition_pruning.out index 5f6c0471a..1d9d1d38b 100644 --- a/src/test/regress/expected/multi_partition_pruning.out +++ b/src/test/regress/expected/multi_partition_pruning.out @@ -3,7 +3,7 @@ -- -- Tests to verify that we correctly prune unreferenced shards. For this, we -- need to increase the logging verbosity of messages displayed on the client. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 770000; +SET citus.next_shard_id TO 770000; -- Adding additional l_orderkey = 1 to make this query not router executable SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030 or l_orderkey = 1; l_orderkey | l_linenumber | l_shipdate diff --git a/src/test/regress/expected/multi_partitioning.out b/src/test/regress/expected/multi_partitioning.out index ae6dc047b..1cc83a52e 100644 --- a/src/test/regress/expected/multi_partitioning.out +++ b/src/test/regress/expected/multi_partitioning.out @@ -1,7 +1,7 @@ -- -- Distributed Partitioned Table Tests -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1660000; +SET citus.next_shard_id TO 1660000; SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; -- diff --git a/src/test/regress/expected/multi_partitioning_0.out b/src/test/regress/expected/multi_partitioning_0.out index 2dfdb8e20..e9ff72780 100644 --- a/src/test/regress/expected/multi_partitioning_0.out +++ b/src/test/regress/expected/multi_partitioning_0.out @@ -1,7 +1,7 @@ -- -- Distributed Partitioned Table Tests -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1660000; +SET citus.next_shard_id TO 1660000; SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; -- diff --git a/src/test/regress/expected/multi_prune_shard_list.out b/src/test/regress/expected/multi_prune_shard_list.out index 4ddaaae9b..b9baaf36b 100644 --- a/src/test/regress/expected/multi_prune_shard_list.out +++ b/src/test/regress/expected/multi_prune_shard_list.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 800000; +SET citus.next_shard_id TO 800000; -- =================================================================== -- create test functions -- =================================================================== diff --git a/src/test/regress/expected/multi_query_directory_cleanup.out b/src/test/regress/expected/multi_query_directory_cleanup.out index 2b20047f7..8547afd99 100644 --- a/src/test/regress/expected/multi_query_directory_cleanup.out +++ b/src/test/regress/expected/multi_query_directory_cleanup.out @@ -5,7 +5,7 @@ -- on the master node for final processing. When the query completes or fails, -- the resource owner should automatically clean up these intermediate query -- result files. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 810000; +SET citus.next_shard_id TO 810000; SET citus.enable_unique_job_ids TO off; BEGIN; -- pg_ls_dir() displays jobids. We explicitly set the jobId sequence diff --git a/src/test/regress/expected/multi_read_from_secondaries.out b/src/test/regress/expected/multi_read_from_secondaries.out index 3a7c4aa2c..748f3566f 100644 --- a/src/test/regress/expected/multi_read_from_secondaries.out +++ b/src/test/regress/expected/multi_read_from_secondaries.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; +SET citus.next_shard_id TO 1600000; \c "dbname=regression options='-c\ citus.use_secondary_nodes=always'" CREATE TABLE dest_table (a int, b int); CREATE TABLE source_table (a int, b int); diff --git a/src/test/regress/expected/multi_reference_table.out b/src/test/regress/expected/multi_reference_table.out index 3d56b8582..0852425fa 100644 --- a/src/test/regress/expected/multi_reference_table.out +++ b/src/test/regress/expected/multi_reference_table.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; +SET citus.next_shard_id TO 1250000; CREATE TABLE reference_table_test (value_1 int, value_2 float, value_3 text, value_4 timestamp); -- insert some data, and make sure that cannot be create_distributed_table INSERT INTO reference_table_test VALUES (1, 1.0, '1', '2016-12-01'); diff --git a/src/test/regress/expected/multi_remove_node_reference_table.out b/src/test/regress/expected/multi_remove_node_reference_table.out index 485968b33..8e20113c0 100644 --- a/src/test/regress/expected/multi_remove_node_reference_table.out +++ b/src/test/regress/expected/multi_remove_node_reference_table.out @@ -2,7 +2,7 @@ -- MULTI_REMOVE_NODE_REFERENCE_TABLE -- -- Tests that check the metadata after master_remove_node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1380000; +SET citus.next_shard_id TO 1380000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1380000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1380000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1380000; @@ -711,6 +711,7 @@ WHERE \c - - - :master_port +SET citus.next_shard_id TO 1380001; -- verify table structure is changed SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.remove_node_reference_table'::regclass; Column | Type | Modifiers diff --git a/src/test/regress/expected/multi_repair_shards.out b/src/test/regress/expected/multi_repair_shards.out index b6787c9b8..39d7819b7 100644 --- a/src/test/regress/expected/multi_repair_shards.out +++ b/src/test/regress/expected/multi_repair_shards.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 820000; +SET citus.next_shard_id TO 820000; SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport=:worker_2_port \gset SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport=:worker_1_port \gset -- =================================================================== diff --git a/src/test/regress/expected/multi_repartition_udt.out b/src/test/regress/expected/multi_repartition_udt.out index 8ef1355cb..fb9fb50c8 100644 --- a/src/test/regress/expected/multi_repartition_udt.out +++ b/src/test/regress/expected/multi_repartition_udt.out @@ -1,7 +1,7 @@ -- -- MULTI_REPARTITION_UDT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; +SET citus.next_shard_id TO 535000; -- START type creation CREATE TYPE test_udt AS (i integer, i2 integer); -- ... as well as a function to use as its comparator... diff --git a/src/test/regress/expected/multi_repartitioned_subquery_udf.out b/src/test/regress/expected/multi_repartitioned_subquery_udf.out index 37f641223..a65177441 100644 --- a/src/test/regress/expected/multi_repartitioned_subquery_udf.out +++ b/src/test/regress/expected/multi_repartitioned_subquery_udf.out @@ -1,7 +1,7 @@ -- -- MULTI_REPARTITIONED_SUBQUERY_UDF -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 830000; +SET citus.next_shard_id TO 830000; -- Create UDF in master and workers \c - - - :master_port DROP FUNCTION IF EXISTS median(double precision[]); diff --git a/src/test/regress/expected/multi_replicate_reference_table.out b/src/test/regress/expected/multi_replicate_reference_table.out index f38bb46b7..3ffa01d9a 100644 --- a/src/test/regress/expected/multi_replicate_reference_table.out +++ b/src/test/regress/expected/multi_replicate_reference_table.out @@ -2,7 +2,7 @@ -- MULTI_REPLICATE_REFERENCE_TABLE -- -- Tests that check the metadata returned by the master node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1370000; +SET citus.next_shard_id TO 1370000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1370000; diff --git a/src/test/regress/expected/multi_router_planner.out b/src/test/regress/expected/multi_router_planner.out index 50f6a8da8..7f70ba895 100644 --- a/src/test/regress/expected/multi_router_planner.out +++ b/src/test/regress/expected/multi_router_planner.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; +SET citus.next_shard_id TO 840000; -- =================================================================== -- test router planner functionality for single shard select queries -- =================================================================== diff --git a/src/test/regress/expected/multi_shard_modify.out b/src/test/regress/expected/multi_shard_modify.out index 0f1b1cb11..78eb43666 100644 --- a/src/test/regress/expected/multi_shard_modify.out +++ b/src/test/regress/expected/multi_shard_modify.out @@ -1,7 +1,7 @@ -- -- MULTI_SHARD_MODIFY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 350000; +SET citus.next_shard_id TO 350000; -- Create a new hash partitioned multi_shard_modify_test table and load data into it. CREATE TABLE multi_shard_modify_test ( t_key integer not null, @@ -294,4 +294,4 @@ SELECT master_modify_multiple_shards('DELETE FROM multi_shard_modify_test WHERE 1 (1 row) -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 102046; +SET citus.next_shard_id TO 102046; diff --git a/src/test/regress/expected/multi_shard_update_delete.out b/src/test/regress/expected/multi_shard_update_delete.out index 962079e3e..3b29798a7 100644 --- a/src/test/regress/expected/multi_shard_update_delete.out +++ b/src/test/regress/expected/multi_shard_update_delete.out @@ -2,7 +2,7 @@ -- multi shard update delete -- this file is intended to test multi shard update/delete queries -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1440000; +SET citus.next_shard_id TO 1440000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1440000; SET citus.shard_replication_factor to 1; SET citus.multi_shard_modify_mode to 'parallel'; diff --git a/src/test/regress/expected/multi_shard_update_delete_0.out b/src/test/regress/expected/multi_shard_update_delete_0.out index 2c5c2a58d..676670812 100644 --- a/src/test/regress/expected/multi_shard_update_delete_0.out +++ b/src/test/regress/expected/multi_shard_update_delete_0.out @@ -2,7 +2,7 @@ -- multi shard update delete -- this file is intended to test multi shard update/delete queries -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1440000; +SET citus.next_shard_id TO 1440000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1440000; SET citus.shard_replication_factor to 1; SET citus.multi_shard_modify_mode to 'parallel'; diff --git a/src/test/regress/expected/multi_simple_queries.out b/src/test/regress/expected/multi_simple_queries.out index dd995c160..4a2c82bb9 100644 --- a/src/test/regress/expected/multi_simple_queries.out +++ b/src/test/regress/expected/multi_simple_queries.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 850000; +SET citus.next_shard_id TO 850000; -- =================================================================== -- test end-to-end query functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_single_relation_subquery.out b/src/test/regress/expected/multi_single_relation_subquery.out index 890f9cb7f..090d81ca7 100644 --- a/src/test/regress/expected/multi_single_relation_subquery.out +++ b/src/test/regress/expected/multi_single_relation_subquery.out @@ -2,7 +2,7 @@ -- MULTI_SINGLE_RELATION_SUBQUERY -- -- This test checks that we are able to run selected set of distributed SQL subqueries. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 860000; +SET citus.next_shard_id TO 860000; SET citus.task_executor_type TO 'task-tracker'; select number_sum, diff --git a/src/test/regress/expected/multi_size_queries.out b/src/test/regress/expected/multi_size_queries.out index eb2f8b080..8a4434eda 100644 --- a/src/test/regress/expected/multi_size_queries.out +++ b/src/test/regress/expected/multi_size_queries.out @@ -4,7 +4,7 @@ -- Test checks whether size of distributed tables can be obtained with citus_table_size. -- To find the relation size and total relation size citus_relation_size and -- citus_total_relation_size are also tested. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1390000; +SET citus.next_shard_id TO 1390000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1390000; -- Tests with invalid relation IDs SELECT citus_table_size(1); diff --git a/src/test/regress/expected/multi_sql_function.out b/src/test/regress/expected/multi_sql_function.out index 0c4458677..95709e8ef 100644 --- a/src/test/regress/expected/multi_sql_function.out +++ b/src/test/regress/expected/multi_sql_function.out @@ -1,7 +1,7 @@ -- -- MULTI_SQL_FUNCTION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; +SET citus.next_shard_id TO 1230000; CREATE FUNCTION sql_test_no_1() RETURNS bigint AS ' SELECT count(*) diff --git a/src/test/regress/expected/multi_subquery.out b/src/test/regress/expected/multi_subquery.out index 62b805f0e..01a87d0d8 100644 --- a/src/test/regress/expected/multi_subquery.out +++ b/src/test/regress/expected/multi_subquery.out @@ -2,6 +2,7 @@ -- MULTI_SUBQUERY -- -- no need to set shardid sequence given that we're not creating any shards +SET citus.next_shard_id TO 570032; SET citus.enable_router_execution TO FALSE; -- Check that we error out if shard min/max values are not exactly same. SELECT diff --git a/src/test/regress/expected/multi_subquery_complex_queries.out b/src/test/regress/expected/multi_subquery_complex_queries.out index d303bf671..6f11c2db1 100644 --- a/src/test/regress/expected/multi_subquery_complex_queries.out +++ b/src/test/regress/expected/multi_subquery_complex_queries.out @@ -4,7 +4,7 @@ -- the tables that are used depends to multi_insert_select_behavioral_analytics_create_table.sql -- -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.enable_router_execution TO FALSE; diff --git a/src/test/regress/expected/multi_subquery_complex_reference_clause.out b/src/test/regress/expected/multi_subquery_complex_reference_clause.out index 3ca038a5a..2a808d81e 100644 --- a/src/test/regress/expected/multi_subquery_complex_reference_clause.out +++ b/src/test/regress/expected/multi_subquery_complex_reference_clause.out @@ -4,7 +4,7 @@ -- the tables that are used depends to multi_insert_select_behavioral_analytics_create_table.sql -- -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.enable_router_execution TO FALSE; CREATE TABLE user_buy_test_table(user_id int, item_id int, buy_count int); diff --git a/src/test/regress/expected/multi_subquery_union.out b/src/test/regress/expected/multi_subquery_union.out index 3a5e00400..eddb00f1f 100644 --- a/src/test/regress/expected/multi_subquery_union.out +++ b/src/test/regress/expected/multi_subquery_union.out @@ -3,7 +3,7 @@ -- regression tests to cover more cases -- the tables that are used depends to multi_insert_select_behavioral_analytics_create_table.sql -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; SET citus.enable_router_execution TO false; -- a very simple union query SELECT user_id, counter diff --git a/src/test/regress/expected/multi_table_ddl.out b/src/test/regress/expected/multi_table_ddl.out index a2e4b0e85..87b3ce17f 100644 --- a/src/test/regress/expected/multi_table_ddl.out +++ b/src/test/regress/expected/multi_table_ddl.out @@ -2,7 +2,7 @@ -- MULTI_TABLE_DDL -- -- Tests around changing the schema and dropping of a distributed table -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 870000; +SET citus.next_shard_id TO 870000; CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); SELECT master_create_distributed_table('testtableddl', 'distributecol', 'append'); master_create_distributed_table diff --git a/src/test/regress/expected/multi_task_assignment_policy.out b/src/test/regress/expected/multi_task_assignment_policy.out index a8474de1d..a3daab850 100644 --- a/src/test/regress/expected/multi_task_assignment_policy.out +++ b/src/test/regress/expected/multi_task_assignment_policy.out @@ -1,7 +1,7 @@ -- -- MULTI_TASK_ASSIGNMENT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000; +SET citus.next_shard_id TO 880000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_task_assignment_policy_0.out b/src/test/regress/expected/multi_task_assignment_policy_0.out index f68678ddf..8741e0459 100644 --- a/src/test/regress/expected/multi_task_assignment_policy_0.out +++ b/src/test/regress/expected/multi_task_assignment_policy_0.out @@ -1,7 +1,7 @@ -- -- MULTI_TASK_ASSIGNMENT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000; +SET citus.next_shard_id TO 880000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+')::int > 9 AS version_above_nine; diff --git a/src/test/regress/expected/multi_task_string_size.out b/src/test/regress/expected/multi_task_string_size.out index ea190b685..57d527c07 100644 --- a/src/test/regress/expected/multi_task_string_size.out +++ b/src/test/regress/expected/multi_task_string_size.out @@ -1,7 +1,7 @@ -- -- MULTI_TASK_STRING_SIZE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1602000; +SET citus.next_shard_id TO 1602000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1602000; CREATE TABLE wide_table ( diff --git a/src/test/regress/expected/multi_transaction_recovery.out b/src/test/regress/expected/multi_transaction_recovery.out index 3a5f25aa0..3643ee8b3 100644 --- a/src/test/regress/expected/multi_transaction_recovery.out +++ b/src/test/regress/expected/multi_transaction_recovery.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- Tests for prepared transaction recovery -- Ensure pg_dist_transaction is empty for test SELECT recover_prepared_transactions(); diff --git a/src/test/regress/expected/multi_truncate.out b/src/test/regress/expected/multi_truncate.out index 86f08ff99..cb438c427 100644 --- a/src/test/regress/expected/multi_truncate.out +++ b/src/test/regress/expected/multi_truncate.out @@ -1,7 +1,7 @@ -- -- MULTI_TRUNCATE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; +SET citus.next_shard_id TO 1210000; -- -- truncate for append distribution -- expect all shards to be dropped diff --git a/src/test/regress/expected/multi_unsupported_worker_operations.out b/src/test/regress/expected/multi_unsupported_worker_operations.out index 6702b569b..c08a0f5e9 100644 --- a/src/test/regress/expected/multi_unsupported_worker_operations.out +++ b/src/test/regress/expected/multi_unsupported_worker_operations.out @@ -2,7 +2,7 @@ -- MULTI_UNSUPPORTED_WORKER_OPERATIONS -- -- Tests for ensuring unsupported functions on workers error out. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; +SET citus.next_shard_id TO 1270000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1370000; -- Set the colocation id to a safe value so that diff --git a/src/test/regress/expected/multi_upsert.out b/src/test/regress/expected/multi_upsert.out index 092401d25..218e02690 100644 --- a/src/test/regress/expected/multi_upsert.out +++ b/src/test/regress/expected/multi_upsert.out @@ -1,5 +1,5 @@ -- this test file aims to test UPSERT feature on Citus -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 980000; +SET citus.next_shard_id TO 980000; CREATE TABLE upsert_test ( part_key int UNIQUE, diff --git a/src/test/regress/expected/multi_utilities.out b/src/test/regress/expected/multi_utilities.out index 898c9b7f5..d0d0e63bf 100644 --- a/src/test/regress/expected/multi_utilities.out +++ b/src/test/regress/expected/multi_utilities.out @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 990000; +SET citus.next_shard_id TO 990000; -- =================================================================== -- test utility statement functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_utility_statements.out b/src/test/regress/expected/multi_utility_statements.out index ae1d0a89b..aa377b68d 100644 --- a/src/test/regress/expected/multi_utility_statements.out +++ b/src/test/regress/expected/multi_utility_statements.out @@ -4,7 +4,7 @@ -- Check that we can run utility statements with embedded SELECT statements on -- distributed tables. Currently we only support CREATE TABLE AS (SELECT..), -- DECLARE CURSOR, and COPY ... TO statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1000000; +SET citus.next_shard_id TO 1000000; CREATE TEMP TABLE lineitem_pricing_summary AS ( SELECT diff --git a/src/test/regress/expected/multi_utility_warnings.out b/src/test/regress/expected/multi_utility_warnings.out index 0791a12e0..94d54133c 100644 --- a/src/test/regress/expected/multi_utility_warnings.out +++ b/src/test/regress/expected/multi_utility_warnings.out @@ -3,7 +3,7 @@ -- -- Tests to check if we inform the user about potential caveats of creating new -- databases, schemas, and roles. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1010000; +SET citus.next_shard_id TO 1010000; CREATE DATABASE new_database; NOTICE: Citus partially supports CREATE DATABASE for distributed databases DETAIL: Citus does not propagate CREATE DATABASE command to workers diff --git a/src/test/regress/expected/task_tracker_cleanup_job.out b/src/test/regress/expected/task_tracker_cleanup_job.out index 149f17422..fd6a5d77e 100644 --- a/src/test/regress/expected/task_tracker_cleanup_job.out +++ b/src/test/regress/expected/task_tracker_cleanup_job.out @@ -1,7 +1,7 @@ -- -- TASK_TRACKER_CLEANUP_JOB -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1060000; +SET citus.next_shard_id TO 1060000; \set JobId 401010 \set CompletedTaskId 801107 \set RunningTaskId 801108 diff --git a/src/test/regress/expected/task_tracker_create_table.out b/src/test/regress/expected/task_tracker_create_table.out index 2d0a8e3f4..e34d79a98 100644 --- a/src/test/regress/expected/task_tracker_create_table.out +++ b/src/test/regress/expected/task_tracker_create_table.out @@ -1,7 +1,7 @@ -- -- TASK_TRACKER_CREATE_TABLE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1070000; +SET citus.next_shard_id TO 1070000; -- New table definitions to test the task tracker process and protocol CREATE TABLE lineitem_simple_task ( LIKE lineitem ); CREATE TABLE lineitem_compute_task ( LIKE lineitem ); diff --git a/src/test/regress/expected/worker_check_invalid_arguments.out b/src/test/regress/expected/worker_check_invalid_arguments.out index f81f89dbe..fbc91b468 100644 --- a/src/test/regress/expected/worker_check_invalid_arguments.out +++ b/src/test/regress/expected/worker_check_invalid_arguments.out @@ -1,7 +1,7 @@ -- -- WORKER_CHECK_INVALID_ARGUMENTS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1100000; +SET citus.next_shard_id TO 1100000; \set JobId 201010 \set TaskId 101108 \set Table_Name simple_binary_data_table diff --git a/src/test/regress/expected/worker_create_table.out b/src/test/regress/expected/worker_create_table.out index 30a892250..7364ce113 100644 --- a/src/test/regress/expected/worker_create_table.out +++ b/src/test/regress/expected/worker_create_table.out @@ -4,7 +4,7 @@ -- Create new table definitions for lineitem and supplier tables to test worker -- node execution logic. For now,the tests include range and hash partitioning -- of existing tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1110000; +SET citus.next_shard_id TO 1110000; CREATE TABLE lineitem ( l_orderkey bigint not null, l_partkey integer not null, diff --git a/src/test/regress/input/multi_append_table_to_shard.source b/src/test/regress/input/multi_append_table_to_shard.source index 162a366c7..213ef3c6b 100644 --- a/src/test/regress/input/multi_append_table_to_shard.source +++ b/src/test/regress/input/multi_append_table_to_shard.source @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 230000; +SET citus.next_shard_id TO 230000; -- Initialize tables to join diff --git a/src/test/regress/input/multi_behavioral_analytics_create_table.source b/src/test/regress/input/multi_behavioral_analytics_create_table.source index 838bfbf23..88a53758d 100644 --- a/src/test/regress/input/multi_behavioral_analytics_create_table.source +++ b/src/test/regress/input/multi_behavioral_analytics_create_table.source @@ -2,7 +2,7 @@ -- multi behavioral analytics -- this file is intended to create the table requires for the tests -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.shard_replication_factor = 1; SET citus.shard_count = 4; diff --git a/src/test/regress/input/multi_complex_count_distinct.source b/src/test/regress/input/multi_complex_count_distinct.source index 9d428f860..e98dc7191 100644 --- a/src/test/regress/input/multi_complex_count_distinct.source +++ b/src/test/regress/input/multi_complex_count_distinct.source @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 240000; +SET citus.next_shard_id TO 240000; CREATE TABLE lineitem_hash ( diff --git a/src/test/regress/input/multi_create_schema.source b/src/test/regress/input/multi_create_schema.source index 5e7ca2109..acb34edd4 100644 --- a/src/test/regress/input/multi_create_schema.source +++ b/src/test/regress/input/multi_create_schema.source @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 250000; +SET citus.next_shard_id TO 250000; CREATE SCHEMA tpch diff --git a/src/test/regress/input/multi_load_data.source b/src/test/regress/input/multi_load_data.source index a48c51e36..6a355b8be 100644 --- a/src/test/regress/input/multi_load_data.source +++ b/src/test/regress/input/multi_load_data.source @@ -6,7 +6,7 @@ -- citus.shard_max_size. These values are set in pg_regress_multi.pl. Shard placement -- policy is left to the default value (round-robin) to test the common install case. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; +SET citus.next_shard_id TO 290000; \copy lineitem FROM '@abs_srcdir@/data/lineitem.1.data' with delimiter '|' \copy lineitem FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|' diff --git a/src/test/regress/input/multi_load_large_records.source b/src/test/regress/input/multi_load_large_records.source index a1376d2a0..48351fc79 100644 --- a/src/test/regress/input/multi_load_large_records.source +++ b/src/test/regress/input/multi_load_large_records.source @@ -6,7 +6,7 @@ -- are creating shards of correct size even when records are large. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 300000; +SET citus.next_shard_id TO 300000; SET citus.shard_max_size TO "256kB"; diff --git a/src/test/regress/input/multi_load_more_data.source b/src/test/regress/input/multi_load_more_data.source index 065e2c800..7b2709090 100644 --- a/src/test/regress/input/multi_load_more_data.source +++ b/src/test/regress/input/multi_load_more_data.source @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; +SET citus.next_shard_id TO 280000; -- We load more data to customer and part tables to test distributed joins. The diff --git a/src/test/regress/input/multi_master_delete_protocol.source b/src/test/regress/input/multi_master_delete_protocol.source index ce5d8b0a1..352c6d4c0 100644 --- a/src/test/regress/input/multi_master_delete_protocol.source +++ b/src/test/regress/input/multi_master_delete_protocol.source @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 320000; +SET citus.next_shard_id TO 320000; -- Create a new range partitioned customer_delete_protocol table and load data into it. diff --git a/src/test/regress/input/multi_outer_join.source b/src/test/regress/input/multi_outer_join.source index 63450b0c0..d1776eb03 100644 --- a/src/test/regress/input/multi_outer_join.source +++ b/src/test/regress/input/multi_outer_join.source @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 310000; +SET citus.next_shard_id TO 310000; SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/input/multi_outer_join_reference.source b/src/test/regress/input/multi_outer_join_reference.source index 9a106eb61..ec09f311f 100644 --- a/src/test/regress/input/multi_outer_join_reference.source +++ b/src/test/regress/input/multi_outer_join_reference.source @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; +SET citus.next_shard_id TO 1260000; SET citus.log_multi_join_order to true; SET client_min_messages TO LOG; diff --git a/src/test/regress/input/worker_copy.source b/src/test/regress/input/worker_copy.source index 2d259cad1..f4626e64d 100644 --- a/src/test/regress/input/worker_copy.source +++ b/src/test/regress/input/worker_copy.source @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 260000; +SET citus.next_shard_id TO 260000; COPY lineitem FROM '@abs_srcdir@/data/lineitem.1.data' WITH DELIMITER '|'; diff --git a/src/test/regress/output/multi_append_table_to_shard.source b/src/test/regress/output/multi_append_table_to_shard.source index 649a353be..341f5fe0f 100644 --- a/src/test/regress/output/multi_append_table_to_shard.source +++ b/src/test/regress/output/multi_append_table_to_shard.source @@ -1,7 +1,7 @@ -- -- MULTI_APPEND_TABLE_TO_SHARD -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 230000; +SET citus.next_shard_id TO 230000; -- Initialize tables to join CREATE TABLE multi_append_table_to_shard_right ( diff --git a/src/test/regress/output/multi_behavioral_analytics_create_table.source b/src/test/regress/output/multi_behavioral_analytics_create_table.source index d0ad1547d..792d86eae 100644 --- a/src/test/regress/output/multi_behavioral_analytics_create_table.source +++ b/src/test/regress/output/multi_behavioral_analytics_create_table.source @@ -2,7 +2,7 @@ -- multi behavioral analytics -- this file is intended to create the table requires for the tests -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.shard_replication_factor = 1; SET citus.shard_count = 4; diff --git a/src/test/regress/output/multi_complex_count_distinct.source b/src/test/regress/output/multi_complex_count_distinct.source index b44fd35ae..b9925842b 100644 --- a/src/test/regress/output/multi_complex_count_distinct.source +++ b/src/test/regress/output/multi_complex_count_distinct.source @@ -1,7 +1,7 @@ -- -- COMPLEX_COUNT_DISTINCT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 240000; +SET citus.next_shard_id TO 240000; CREATE TABLE lineitem_hash ( l_orderkey bigint not null, l_partkey integer not null, diff --git a/src/test/regress/output/multi_create_schema.source b/src/test/regress/output/multi_create_schema.source index 6999adb5a..bd16cd559 100644 --- a/src/test/regress/output/multi_create_schema.source +++ b/src/test/regress/output/multi_create_schema.source @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 250000; +SET citus.next_shard_id TO 250000; CREATE SCHEMA tpch CREATE TABLE nation ( n_nationkey integer not null, diff --git a/src/test/regress/output/multi_load_data.source b/src/test/regress/output/multi_load_data.source index a54306e69..c5517a774 100644 --- a/src/test/regress/output/multi_load_data.source +++ b/src/test/regress/output/multi_load_data.source @@ -5,7 +5,7 @@ -- of shards uploaded depends on two config values: citus.shard_replication_factor and -- citus.shard_max_size. These values are set in pg_regress_multi.pl. Shard placement -- policy is left to the default value (round-robin) to test the common install case. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; +SET citus.next_shard_id TO 290000; \copy lineitem FROM '@abs_srcdir@/data/lineitem.1.data' with delimiter '|' \copy lineitem FROM '@abs_srcdir@/data/lineitem.2.data' with delimiter '|' \copy orders FROM '@abs_srcdir@/data/orders.1.data' with delimiter '|' diff --git a/src/test/regress/output/multi_load_large_records.source b/src/test/regress/output/multi_load_large_records.source index 9e6792c4c..fa43cfae4 100644 --- a/src/test/regress/output/multi_load_large_records.source +++ b/src/test/regress/output/multi_load_large_records.source @@ -4,7 +4,7 @@ -- Tests for loading data with large records (i.e. greater than the read buffer -- size, which is 32kB) in a distributed cluster. These tests make sure that we -- are creating shards of correct size even when records are large. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 300000; +SET citus.next_shard_id TO 300000; SET citus.shard_max_size TO "256kB"; CREATE TABLE large_records_table (data_id integer, data text); SELECT master_create_distributed_table('large_records_table', 'data_id', 'append'); diff --git a/src/test/regress/output/multi_load_more_data.source b/src/test/regress/output/multi_load_more_data.source index e73042f3e..4f8478592 100644 --- a/src/test/regress/output/multi_load_more_data.source +++ b/src/test/regress/output/multi_load_more_data.source @@ -1,7 +1,7 @@ -- -- MULTI_STAGE_MORE_DATA -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; +SET citus.next_shard_id TO 280000; -- We load more data to customer and part tables to test distributed joins. The -- loading causes the planner to consider customer and part tables as large, and -- evaluate plans where some of the underlying tables need to be repartitioned. diff --git a/src/test/regress/output/multi_master_delete_protocol.source b/src/test/regress/output/multi_master_delete_protocol.source index e2a324465..ab187306c 100644 --- a/src/test/regress/output/multi_master_delete_protocol.source +++ b/src/test/regress/output/multi_master_delete_protocol.source @@ -1,7 +1,7 @@ -- -- MULTI_MASTER_DELETE_PROTOCOL -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 320000; +SET citus.next_shard_id TO 320000; -- Create a new range partitioned customer_delete_protocol table and load data into it. CREATE TABLE customer_delete_protocol ( c_custkey integer not null, diff --git a/src/test/regress/output/multi_outer_join.source b/src/test/regress/output/multi_outer_join.source index 0f803dc6d..241f20a80 100644 --- a/src/test/regress/output/multi_outer_join.source +++ b/src/test/regress/output/multi_outer_join.source @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 310000; +SET citus.next_shard_id TO 310000; SET citus.large_table_shard_count TO 2; SET citus.log_multi_join_order to true; SET client_min_messages TO LOG; diff --git a/src/test/regress/output/multi_outer_join_reference.source b/src/test/regress/output/multi_outer_join_reference.source index a2b17a0fa..4ee3160f9 100644 --- a/src/test/regress/output/multi_outer_join_reference.source +++ b/src/test/regress/output/multi_outer_join_reference.source @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; +SET citus.next_shard_id TO 1260000; SET citus.log_multi_join_order to true; SET client_min_messages TO LOG; SET citus.shard_count TO 4; diff --git a/src/test/regress/output/worker_copy.source b/src/test/regress/output/worker_copy.source index 9b8629c26..becbc608e 100644 --- a/src/test/regress/output/worker_copy.source +++ b/src/test/regress/output/worker_copy.source @@ -1,7 +1,7 @@ -- -- WORKER_COPY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 260000; +SET citus.next_shard_id TO 260000; COPY lineitem FROM '@abs_srcdir@/data/lineitem.1.data' WITH DELIMITER '|'; COPY lineitem FROM '@abs_srcdir@/data/lineitem.2.data' WITH DELIMITER '|'; COPY supplier FROM '@abs_srcdir@/data/supplier.data' WITH DELIMITER '|'; diff --git a/src/test/regress/sql/multi_703_upgrade.sql b/src/test/regress/sql/multi_703_upgrade.sql index 573484344..aa6a4eec8 100644 --- a/src/test/regress/sql/multi_703_upgrade.sql +++ b/src/test/regress/sql/multi_703_upgrade.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 103000; +SET citus.next_shard_id TO 103000; -- tests that the upgrade from 7.0-2 to 7.0-3 properly migrates shard placements diff --git a/src/test/regress/sql/multi_array_agg.sql b/src/test/regress/sql/multi_array_agg.sql index 374dae407..220076480 100644 --- a/src/test/regress/sql/multi_array_agg.sql +++ b/src/test/regress/sql/multi_array_agg.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 520000; +SET citus.next_shard_id TO 520000; CREATE OR REPLACE FUNCTION array_sort (ANYARRAY) RETURNS ANYARRAY LANGUAGE SQL diff --git a/src/test/regress/sql/multi_binary_master_copy_format.sql b/src/test/regress/sql/multi_binary_master_copy_format.sql index b24a57fe1..639de0941 100644 --- a/src/test/regress/sql/multi_binary_master_copy_format.sql +++ b/src/test/regress/sql/multi_binary_master_copy_format.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 430000; +SET citus.next_shard_id TO 430000; -- Try binary master copy for different executors diff --git a/src/test/regress/sql/multi_cache_invalidation.sql b/src/test/regress/sql/multi_cache_invalidation.sql index 8594ad36d..83cd3e84a 100644 --- a/src/test/regress/sql/multi_cache_invalidation.sql +++ b/src/test/regress/sql/multi_cache_invalidation.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1601000; +SET citus.next_shard_id TO 1601000; CREATE TABLE tab9 (test_id integer NOT NULL, data int); CREATE TABLE tab10 (test_id integer NOT NULL, data int); SELECT master_create_distributed_table('tab9', 'test_id', 'hash'); diff --git a/src/test/regress/sql/multi_citus_tools.sql b/src/test/regress/sql/multi_citus_tools.sql index fe56ee85c..36f58b2a6 100644 --- a/src/test/regress/sql/multi_citus_tools.sql +++ b/src/test/regress/sql/multi_citus_tools.sql @@ -4,7 +4,7 @@ -- tests UDFs created for citus tools -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; +SET citus.next_shard_id TO 1240000; -- test with invalid port, prevent OS dependent warning from being displayed SET client_min_messages to ERROR; diff --git a/src/test/regress/sql/multi_cluster_management.sql b/src/test/regress/sql/multi_cluster_management.sql index 70844b99c..0d74fc615 100644 --- a/src/test/regress/sql/multi_cluster_management.sql +++ b/src/test/regress/sql/multi_cluster_management.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- Tests functions related to cluster membership diff --git a/src/test/regress/sql/multi_colocation_utils.sql b/src/test/regress/sql/multi_colocation_utils.sql index cf9ad6884..a5f704d88 100644 --- a/src/test/regress/sql/multi_colocation_utils.sql +++ b/src/test/regress/sql/multi_colocation_utils.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; +SET citus.next_shard_id TO 1300000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 4; -- =================================================================== @@ -292,6 +292,7 @@ SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.table3_ SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='schema_collocation.table4_groupE_1300052'::regclass; \c - - - :master_port +SET citus.next_shard_id TO 1300068; CREATE TABLE table1_groupF ( id int ); SELECT create_reference_table('table1_groupF'); diff --git a/src/test/regress/sql/multi_create_fdw.sql b/src/test/regress/sql/multi_create_fdw.sql index 9e8f892e2..3f83ae227 100644 --- a/src/test/regress/sql/multi_create_fdw.sql +++ b/src/test/regress/sql/multi_create_fdw.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 390000; +SET citus.next_shard_id TO 390000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_insert_proxy.sql b/src/test/regress/sql/multi_create_insert_proxy.sql index 8cf6c897c..122857c43 100644 --- a/src/test/regress/sql/multi_create_insert_proxy.sql +++ b/src/test/regress/sql/multi_create_insert_proxy.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 380000; +SET citus.next_shard_id TO 380000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_shards.sql b/src/test/regress/sql/multi_create_shards.sql index 91fe6d33e..4282ebf70 100644 --- a/src/test/regress/sql/multi_create_shards.sql +++ b/src/test/regress/sql/multi_create_shards.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 370000; +SET citus.next_shard_id TO 370000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_table_constraints.sql b/src/test/regress/sql/multi_create_table_constraints.sql index aafb644dc..cbb05fe63 100644 --- a/src/test/regress/sql/multi_create_table_constraints.sql +++ b/src/test/regress/sql/multi_create_table_constraints.sql @@ -2,7 +2,7 @@ -- MULTI_CREATE_TABLE_CONSTRAINTS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 365000; +SET citus.next_shard_id TO 365000; -- test that Citus forbids unique and EXCLUDE constraints on append-partitioned tables. diff --git a/src/test/regress/sql/multi_data_types.sql b/src/test/regress/sql/multi_data_types.sql index 3dd6eb0f7..512e02031 100644 --- a/src/test/regress/sql/multi_data_types.sql +++ b/src/test/regress/sql/multi_data_types.sql @@ -4,7 +4,7 @@ -- =================================================================== -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 530000; +SET citus.next_shard_id TO 530000; -- create a custom type... diff --git a/src/test/regress/sql/multi_deparse_shard_query.sql b/src/test/regress/sql/multi_deparse_shard_query.sql index eccb493f8..750343931 100644 --- a/src/test/regress/sql/multi_deparse_shard_query.sql +++ b/src/test/regress/sql/multi_deparse_shard_query.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13100000; +SET citus.next_shard_id TO 13100000; CREATE FUNCTION deparse_shard_query_test(text) RETURNS VOID diff --git a/src/test/regress/sql/multi_drop_extension.sql b/src/test/regress/sql/multi_drop_extension.sql index ae94eafed..dbe73acd8 100644 --- a/src/test/regress/sql/multi_drop_extension.sql +++ b/src/test/regress/sql/multi_drop_extension.sql @@ -4,7 +4,7 @@ -- Tests around dropping and recreating the extension -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 550000; +SET citus.next_shard_id TO 550000; CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); diff --git a/src/test/regress/sql/multi_dropped_column_aliases.sql b/src/test/regress/sql/multi_dropped_column_aliases.sql index a83b6e4f8..7e6729351 100644 --- a/src/test/regress/sql/multi_dropped_column_aliases.sql +++ b/src/test/regress/sql/multi_dropped_column_aliases.sql @@ -3,7 +3,7 @@ -- table schema is modified via ALTER statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 620000; +SET citus.next_shard_id TO 620000; SELECT count(*) FROM customer; diff --git a/src/test/regress/sql/multi_expire_table_cache.sql b/src/test/regress/sql/multi_expire_table_cache.sql index 69903b65e..2e7ac3c5d 100644 --- a/src/test/regress/sql/multi_expire_table_cache.sql +++ b/src/test/regress/sql/multi_expire_table_cache.sql @@ -3,7 +3,7 @@ --- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- create test table CREATE TABLE large_table(a int, b int); diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index 29cfd39df..50174ea11 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -2,7 +2,7 @@ -- MULTI_EXPLAIN -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; +SET citus.next_shard_id TO 570000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 31e8306ef..bef52eed2 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -7,7 +7,7 @@ -- not done yet. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 580000; +SET citus.next_shard_id TO 580000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 580000; CREATE SCHEMA test; diff --git a/src/test/regress/sql/multi_foreign_key.sql b/src/test/regress/sql/multi_foreign_key.sql index 4d6511d0b..130e41f41 100644 --- a/src/test/regress/sql/multi_foreign_key.sql +++ b/src/test/regress/sql/multi_foreign_key.sql @@ -2,7 +2,7 @@ -- MULTI_FOREIGN_KEY -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1350000; +SET citus.next_shard_id TO 1350000; -- set shard_count to 4 for faster tests, because we create/drop lots of shards in this test. SET citus.shard_count TO 4; diff --git a/src/test/regress/sql/multi_function_evaluation.sql b/src/test/regress/sql/multi_function_evaluation.sql index b61557f0b..4878e8add 100644 --- a/src/test/regress/sql/multi_function_evaluation.sql +++ b/src/test/regress/sql/multi_function_evaluation.sql @@ -2,7 +2,7 @@ -- MULTI_FUNCTION_EVALUATION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; +SET citus.next_shard_id TO 1200000; -- nextval() works (no good way to test DEFAULT, or, by extension, SERIAL) diff --git a/src/test/regress/sql/multi_generate_ddl_commands.sql b/src/test/regress/sql/multi_generate_ddl_commands.sql index 15fe6353f..b6ec78686 100644 --- a/src/test/regress/sql/multi_generate_ddl_commands.sql +++ b/src/test/regress/sql/multi_generate_ddl_commands.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 610000; +SET citus.next_shard_id TO 610000; -- =================================================================== diff --git a/src/test/regress/sql/multi_hash_pruning.sql b/src/test/regress/sql/multi_hash_pruning.sql index 5e95867d5..26928dbbd 100644 --- a/src/test/regress/sql/multi_hash_pruning.sql +++ b/src/test/regress/sql/multi_hash_pruning.sql @@ -5,7 +5,7 @@ -- Tests for shard and join pruning logic on hash partitioned tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 630000; +SET citus.next_shard_id TO 630000; -- Create a table partitioned on integer column and update partition type to -- hash. Then load data into this table and update shard min max values with diff --git a/src/test/regress/sql/multi_having_pushdown.sql b/src/test/regress/sql/multi_having_pushdown.sql index 99f3c2971..0abfcf1d8 100644 --- a/src/test/regress/sql/multi_having_pushdown.sql +++ b/src/test/regress/sql/multi_having_pushdown.sql @@ -2,7 +2,7 @@ -- MULTI_HAVING_PUSHDOWN -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 590000; +SET citus.next_shard_id TO 590000; CREATE TABLE lineitem_hash (LIKE lineitem); SELECT create_distributed_table('lineitem_hash', 'l_orderkey', 'hash'); diff --git a/src/test/regress/sql/multi_index_statements.sql b/src/test/regress/sql/multi_index_statements.sql index 65c6ecc7e..65e1e876c 100644 --- a/src/test/regress/sql/multi_index_statements.sql +++ b/src/test/regress/sql/multi_index_statements.sql @@ -6,14 +6,14 @@ -- tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 640000; +SET citus.next_shard_id TO 640000; -- -- CREATE TEST TABLES -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 102080; +SET citus.next_shard_id TO 102080; CREATE TABLE index_test_range(a int, b int, c int); SELECT master_create_distributed_table('index_test_range', 'a', 'range'); diff --git a/src/test/regress/sql/multi_insert_select.sql b/src/test/regress/sql/multi_insert_select.sql index 32444a280..f9d52d1d7 100644 --- a/src/test/regress/sql/multi_insert_select.sql +++ b/src/test/regress/sql/multi_insert_select.sql @@ -2,7 +2,7 @@ -- MULTI_INSERT_SELECT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; +SET citus.next_shard_id TO 13300000; ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART 13300000; -- create co-located tables diff --git a/src/test/regress/sql/multi_join_order_additional.sql b/src/test/regress/sql/multi_join_order_additional.sql index 5f4d85a04..45cac6d19 100644 --- a/src/test/regress/sql/multi_join_order_additional.sql +++ b/src/test/regress/sql/multi_join_order_additional.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 650000; +SET citus.next_shard_id TO 650000; -- Set configuration to print table join order and pruned shards diff --git a/src/test/regress/sql/multi_join_order_tpch_large.sql b/src/test/regress/sql/multi_join_order_tpch_large.sql index 6709a85ca..3bbcc3733 100644 --- a/src/test/regress/sql/multi_join_order_tpch_large.sql +++ b/src/test/regress/sql/multi_join_order_tpch_large.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 660000; +SET citus.next_shard_id TO 660000; -- Enable configuration to print table join order diff --git a/src/test/regress/sql/multi_large_table_join_planning.sql b/src/test/regress/sql/multi_large_table_join_planning.sql index 2532ad1fb..a54851f07 100644 --- a/src/test/regress/sql/multi_large_table_join_planning.sql +++ b/src/test/regress/sql/multi_large_table_join_planning.sql @@ -7,7 +7,7 @@ -- executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000; +SET citus.next_shard_id TO 690000; SET citus.enable_unique_job_ids TO off; -- print whether we're using version > 9 to make version-specific tests clear diff --git a/src/test/regress/sql/multi_large_table_pruning.sql b/src/test/regress/sql/multi_large_table_pruning.sql index 5e70ed3ab..c6a93a6fc 100644 --- a/src/test/regress/sql/multi_large_table_pruning.sql +++ b/src/test/regress/sql/multi_large_table_pruning.sql @@ -6,7 +6,7 @@ -- jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 700000; +SET citus.next_shard_id TO 700000; SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_large_table_task_assignment.sql b/src/test/regress/sql/multi_large_table_task_assignment.sql index 229a606ea..044941aae 100644 --- a/src/test/regress/sql/multi_large_table_task_assignment.sql +++ b/src/test/regress/sql/multi_large_table_task_assignment.sql @@ -7,7 +7,7 @@ -- tracker executor here, as we cannot run repartition jobs with real time executor. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000; +SET citus.next_shard_id TO 710000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/sql/multi_master_protocol.sql b/src/test/regress/sql/multi_master_protocol.sql index a6eddfd22..4a56722ee 100644 --- a/src/test/regress/sql/multi_master_protocol.sql +++ b/src/test/regress/sql/multi_master_protocol.sql @@ -4,7 +4,7 @@ -- Tests that check the metadata returned by the master node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 740000; +SET citus.next_shard_id TO 740000; SELECT part_storage_type, part_key, part_replica_count, part_max_size, diff --git a/src/test/regress/sql/multi_metadata_access.sql b/src/test/regress/sql/multi_metadata_access.sql index e252eb7a3..9b595979d 100644 --- a/src/test/regress/sql/multi_metadata_access.sql +++ b/src/test/regress/sql/multi_metadata_access.sql @@ -2,7 +2,7 @@ -- MULTI_METADATA_ACCESS -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; +SET citus.next_shard_id TO 1360000; CREATE USER no_access; SET ROLE no_access; diff --git a/src/test/regress/sql/multi_modifications.sql b/src/test/regress/sql/multi_modifications.sql index 512404809..ae9c2c6bb 100644 --- a/src/test/regress/sql/multi_modifications.sql +++ b/src/test/regress/sql/multi_modifications.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 750000; +SET citus.next_shard_id TO 750000; -- =================================================================== diff --git a/src/test/regress/sql/multi_multiuser.sql b/src/test/regress/sql/multi_multiuser.sql index cff3c7f59..4e928c3a3 100644 --- a/src/test/regress/sql/multi_multiuser.sql +++ b/src/test/regress/sql/multi_multiuser.sql @@ -4,7 +4,7 @@ -- Test user permissions. -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1420000; +SET citus.next_shard_id TO 1420000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1420000; SET citus.shard_replication_factor TO 1; diff --git a/src/test/regress/sql/multi_null_minmax_value_pruning.sql b/src/test/regress/sql/multi_null_minmax_value_pruning.sql index dee0a712d..43a820471 100644 --- a/src/test/regress/sql/multi_null_minmax_value_pruning.sql +++ b/src/test/regress/sql/multi_null_minmax_value_pruning.sql @@ -6,7 +6,7 @@ -- and that we don't partition or join prune shards that have null values. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000; +SET citus.next_shard_id TO 760000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/sql/multi_partition_pruning.sql b/src/test/regress/sql/multi_partition_pruning.sql index 1c4d0c78e..4a65cbbf8 100644 --- a/src/test/regress/sql/multi_partition_pruning.sql +++ b/src/test/regress/sql/multi_partition_pruning.sql @@ -6,7 +6,7 @@ -- need to increase the logging verbosity of messages displayed on the client. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 770000; +SET citus.next_shard_id TO 770000; -- Adding additional l_orderkey = 1 to make this query not router executable SELECT l_orderkey, l_linenumber, l_shipdate FROM lineitem WHERE l_orderkey = 9030 or l_orderkey = 1; diff --git a/src/test/regress/sql/multi_partitioning.sql b/src/test/regress/sql/multi_partitioning.sql index d0f9e9d81..d8351bc41 100644 --- a/src/test/regress/sql/multi_partitioning.sql +++ b/src/test/regress/sql/multi_partitioning.sql @@ -1,7 +1,7 @@ -- -- Distributed Partitioned Table Tests -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1660000; +SET citus.next_shard_id TO 1660000; SET citus.shard_count TO 4; SET citus.shard_replication_factor TO 1; diff --git a/src/test/regress/sql/multi_prune_shard_list.sql b/src/test/regress/sql/multi_prune_shard_list.sql index 4f42ee9f7..38f9ee1bd 100644 --- a/src/test/regress/sql/multi_prune_shard_list.sql +++ b/src/test/regress/sql/multi_prune_shard_list.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 800000; +SET citus.next_shard_id TO 800000; -- =================================================================== diff --git a/src/test/regress/sql/multi_query_directory_cleanup.sql b/src/test/regress/sql/multi_query_directory_cleanup.sql index 3c9a0f9f6..cde747bf8 100644 --- a/src/test/regress/sql/multi_query_directory_cleanup.sql +++ b/src/test/regress/sql/multi_query_directory_cleanup.sql @@ -8,7 +8,7 @@ -- result files. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 810000; +SET citus.next_shard_id TO 810000; SET citus.enable_unique_job_ids TO off; diff --git a/src/test/regress/sql/multi_read_from_secondaries.sql b/src/test/regress/sql/multi_read_from_secondaries.sql index 18c34496d..60593c723 100644 --- a/src/test/regress/sql/multi_read_from_secondaries.sql +++ b/src/test/regress/sql/multi_read_from_secondaries.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; +SET citus.next_shard_id TO 1600000; \c "dbname=regression options='-c\ citus.use_secondary_nodes=always'" diff --git a/src/test/regress/sql/multi_reference_table.sql b/src/test/regress/sql/multi_reference_table.sql index d254b352e..ede3a7956 100644 --- a/src/test/regress/sql/multi_reference_table.sql +++ b/src/test/regress/sql/multi_reference_table.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; +SET citus.next_shard_id TO 1250000; CREATE TABLE reference_table_test (value_1 int, value_2 float, value_3 text, value_4 timestamp); diff --git a/src/test/regress/sql/multi_remove_node_reference_table.sql b/src/test/regress/sql/multi_remove_node_reference_table.sql index a844121ec..a1dd84090 100644 --- a/src/test/regress/sql/multi_remove_node_reference_table.sql +++ b/src/test/regress/sql/multi_remove_node_reference_table.sql @@ -4,7 +4,7 @@ -- Tests that check the metadata after master_remove_node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1380000; +SET citus.next_shard_id TO 1380000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1380000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1380000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1380000; @@ -406,6 +406,8 @@ WHERE \c - - - :master_port +SET citus.next_shard_id TO 1380001; + -- verify table structure is changed SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.remove_node_reference_table'::regclass; diff --git a/src/test/regress/sql/multi_repair_shards.sql b/src/test/regress/sql/multi_repair_shards.sql index 858782312..7e0a37d06 100644 --- a/src/test/regress/sql/multi_repair_shards.sql +++ b/src/test/regress/sql/multi_repair_shards.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 820000; +SET citus.next_shard_id TO 820000; SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport=:worker_2_port \gset SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport=:worker_1_port \gset diff --git a/src/test/regress/sql/multi_repartition_udt.sql b/src/test/regress/sql/multi_repartition_udt.sql index aa0032504..359d63d01 100644 --- a/src/test/regress/sql/multi_repartition_udt.sql +++ b/src/test/regress/sql/multi_repartition_udt.sql @@ -2,7 +2,7 @@ -- MULTI_REPARTITION_UDT -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; +SET citus.next_shard_id TO 535000; -- START type creation diff --git a/src/test/regress/sql/multi_repartitioned_subquery_udf.sql b/src/test/regress/sql/multi_repartitioned_subquery_udf.sql index f6b6cfc38..518ef8228 100644 --- a/src/test/regress/sql/multi_repartitioned_subquery_udf.sql +++ b/src/test/regress/sql/multi_repartitioned_subquery_udf.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 830000; +SET citus.next_shard_id TO 830000; -- Create UDF in master and workers diff --git a/src/test/regress/sql/multi_replicate_reference_table.sql b/src/test/regress/sql/multi_replicate_reference_table.sql index 38becb491..ac78a199b 100644 --- a/src/test/regress/sql/multi_replicate_reference_table.sql +++ b/src/test/regress/sql/multi_replicate_reference_table.sql @@ -4,7 +4,7 @@ -- Tests that check the metadata returned by the master node. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1370000; +SET citus.next_shard_id TO 1370000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1370000; diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql index 97defa1e9..1bc6ec690 100644 --- a/src/test/regress/sql/multi_router_planner.sql +++ b/src/test/regress/sql/multi_router_planner.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; +SET citus.next_shard_id TO 840000; -- =================================================================== diff --git a/src/test/regress/sql/multi_schema_support.sql b/src/test/regress/sql/multi_schema_support.sql index 375384804..9f9b03e35 100644 --- a/src/test/regress/sql/multi_schema_support.sql +++ b/src/test/regress/sql/multi_schema_support.sql @@ -551,7 +551,6 @@ SELECT master_apply_delete_command('DELETE FROM nation_append') ; \c - - - :master_port - -- check joins of tables which are in schemas other than public -- we create new tables with replication factor of 1 -- so that we guarantee to have repartitions when necessary @@ -759,6 +758,7 @@ SELECT create_reference_table('schema_with_user.test_table'); \dn schema_with_user \c - - - :master_port + -- we do not use run_command_on_coordinator_and_workers here because when there is CASCADE, it causes deadlock DROP OWNED BY "test-user" CASCADE; SELECT run_command_on_workers('DROP OWNED BY "test-user" CASCADE'); diff --git a/src/test/regress/sql/multi_shard_modify.sql b/src/test/regress/sql/multi_shard_modify.sql index fae2f0218..ed9b1e208 100644 --- a/src/test/regress/sql/multi_shard_modify.sql +++ b/src/test/regress/sql/multi_shard_modify.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 350000; +SET citus.next_shard_id TO 350000; -- Create a new hash partitioned multi_shard_modify_test table and load data into it. @@ -162,4 +162,4 @@ SELECT master_modify_multiple_shards('UPDATE multi_shard_modify_test SET t_value -- commands with stable functions in their quals are allowed SELECT master_modify_multiple_shards('DELETE FROM multi_shard_modify_test WHERE t_key = temp_stable_func()'); -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 102046; +SET citus.next_shard_id TO 102046; diff --git a/src/test/regress/sql/multi_shard_update_delete.sql b/src/test/regress/sql/multi_shard_update_delete.sql index eb98dfd59..5f18a1c48 100644 --- a/src/test/regress/sql/multi_shard_update_delete.sql +++ b/src/test/regress/sql/multi_shard_update_delete.sql @@ -2,7 +2,7 @@ -- multi shard update delete -- this file is intended to test multi shard update/delete queries -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1440000; +SET citus.next_shard_id TO 1440000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1440000; SET citus.shard_replication_factor to 1; diff --git a/src/test/regress/sql/multi_simple_queries.sql b/src/test/regress/sql/multi_simple_queries.sql index eaaa915aa..5827331cb 100644 --- a/src/test/regress/sql/multi_simple_queries.sql +++ b/src/test/regress/sql/multi_simple_queries.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 850000; +SET citus.next_shard_id TO 850000; -- =================================================================== diff --git a/src/test/regress/sql/multi_single_relation_subquery.sql b/src/test/regress/sql/multi_single_relation_subquery.sql index 956e2b65e..3c034a7a8 100644 --- a/src/test/regress/sql/multi_single_relation_subquery.sql +++ b/src/test/regress/sql/multi_single_relation_subquery.sql @@ -4,7 +4,7 @@ -- This test checks that we are able to run selected set of distributed SQL subqueries. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 860000; +SET citus.next_shard_id TO 860000; SET citus.task_executor_type TO 'task-tracker'; diff --git a/src/test/regress/sql/multi_size_queries.sql b/src/test/regress/sql/multi_size_queries.sql index 27331361f..13af62007 100644 --- a/src/test/regress/sql/multi_size_queries.sql +++ b/src/test/regress/sql/multi_size_queries.sql @@ -5,7 +5,7 @@ -- To find the relation size and total relation size citus_relation_size and -- citus_total_relation_size are also tested. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1390000; +SET citus.next_shard_id TO 1390000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1390000; -- Tests with invalid relation IDs diff --git a/src/test/regress/sql/multi_sql_function.sql b/src/test/regress/sql/multi_sql_function.sql index b93313e08..e7ad60638 100644 --- a/src/test/regress/sql/multi_sql_function.sql +++ b/src/test/regress/sql/multi_sql_function.sql @@ -2,7 +2,7 @@ -- MULTI_SQL_FUNCTION -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; +SET citus.next_shard_id TO 1230000; CREATE FUNCTION sql_test_no_1() RETURNS bigint AS ' diff --git a/src/test/regress/sql/multi_subquery.sql b/src/test/regress/sql/multi_subquery.sql index 941ca9c0a..800e5389c 100644 --- a/src/test/regress/sql/multi_subquery.sql +++ b/src/test/regress/sql/multi_subquery.sql @@ -3,6 +3,7 @@ -- -- no need to set shardid sequence given that we're not creating any shards +SET citus.next_shard_id TO 570032; SET citus.enable_router_execution TO FALSE; -- Check that we error out if shard min/max values are not exactly same. diff --git a/src/test/regress/sql/multi_subquery_complex_queries.sql b/src/test/regress/sql/multi_subquery_complex_queries.sql index 787110511..1f22a1f4b 100644 --- a/src/test/regress/sql/multi_subquery_complex_queries.sql +++ b/src/test/regress/sql/multi_subquery_complex_queries.sql @@ -5,7 +5,7 @@ -- -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.enable_router_execution TO FALSE; diff --git a/src/test/regress/sql/multi_subquery_complex_reference_clause.sql b/src/test/regress/sql/multi_subquery_complex_reference_clause.sql index c76237c1d..183d8c0e0 100644 --- a/src/test/regress/sql/multi_subquery_complex_reference_clause.sql +++ b/src/test/regress/sql/multi_subquery_complex_reference_clause.sql @@ -5,7 +5,7 @@ -- -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1400000; SET citus.enable_router_execution TO FALSE; diff --git a/src/test/regress/sql/multi_subquery_union.sql b/src/test/regress/sql/multi_subquery_union.sql index f48d13603..874928760 100644 --- a/src/test/regress/sql/multi_subquery_union.sql +++ b/src/test/regress/sql/multi_subquery_union.sql @@ -4,7 +4,7 @@ -- the tables that are used depends to multi_insert_select_behavioral_analytics_create_table.sql -- We don't need shard id sequence here, so commented out to prevent conflicts with concurrent tests --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1400000; +-- SET citus.next_shard_id TO 1400000; SET citus.enable_router_execution TO false; -- a very simple union query diff --git a/src/test/regress/sql/multi_table_ddl.sql b/src/test/regress/sql/multi_table_ddl.sql index 11e36a08f..93d2064ac 100644 --- a/src/test/regress/sql/multi_table_ddl.sql +++ b/src/test/regress/sql/multi_table_ddl.sql @@ -4,7 +4,7 @@ -- Tests around changing the schema and dropping of a distributed table -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 870000; +SET citus.next_shard_id TO 870000; CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); diff --git a/src/test/regress/sql/multi_task_assignment_policy.sql b/src/test/regress/sql/multi_task_assignment_policy.sql index a6be1e91a..1df059539 100644 --- a/src/test/regress/sql/multi_task_assignment_policy.sql +++ b/src/test/regress/sql/multi_task_assignment_policy.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000; +SET citus.next_shard_id TO 880000; -- print whether we're using version > 9 to make version-specific tests clear SHOW server_version \gset diff --git a/src/test/regress/sql/multi_task_string_size.sql b/src/test/regress/sql/multi_task_string_size.sql index 9e858dcb6..c650902a0 100644 --- a/src/test/regress/sql/multi_task_string_size.sql +++ b/src/test/regress/sql/multi_task_string_size.sql @@ -1,7 +1,7 @@ -- -- MULTI_TASK_STRING_SIZE -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1602000; +SET citus.next_shard_id TO 1602000; ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1602000; CREATE TABLE wide_table diff --git a/src/test/regress/sql/multi_transaction_recovery.sql b/src/test/regress/sql/multi_transaction_recovery.sql index b8ec92363..02960fa96 100644 --- a/src/test/regress/sql/multi_transaction_recovery.sql +++ b/src/test/regress/sql/multi_transaction_recovery.sql @@ -1,4 +1,4 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; +SET citus.next_shard_id TO 1220000; -- Tests for prepared transaction recovery diff --git a/src/test/regress/sql/multi_truncate.sql b/src/test/regress/sql/multi_truncate.sql index 6fd7814de..b085823bf 100644 --- a/src/test/regress/sql/multi_truncate.sql +++ b/src/test/regress/sql/multi_truncate.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; +SET citus.next_shard_id TO 1210000; -- -- truncate for append distribution diff --git a/src/test/regress/sql/multi_unsupported_worker_operations.sql b/src/test/regress/sql/multi_unsupported_worker_operations.sql index cbfae7021..f647e4492 100644 --- a/src/test/regress/sql/multi_unsupported_worker_operations.sql +++ b/src/test/regress/sql/multi_unsupported_worker_operations.sql @@ -4,7 +4,7 @@ -- Tests for ensuring unsupported functions on workers error out. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; +SET citus.next_shard_id TO 1270000; ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1370000; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART 1370000; diff --git a/src/test/regress/sql/multi_upsert.sql b/src/test/regress/sql/multi_upsert.sql index 9795fc116..fd2c99274 100644 --- a/src/test/regress/sql/multi_upsert.sql +++ b/src/test/regress/sql/multi_upsert.sql @@ -1,7 +1,7 @@ -- this test file aims to test UPSERT feature on Citus -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 980000; +SET citus.next_shard_id TO 980000; CREATE TABLE upsert_test diff --git a/src/test/regress/sql/multi_utilities.sql b/src/test/regress/sql/multi_utilities.sql index dae0ca2f7..0e48f695b 100644 --- a/src/test/regress/sql/multi_utilities.sql +++ b/src/test/regress/sql/multi_utilities.sql @@ -1,5 +1,5 @@ -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 990000; +SET citus.next_shard_id TO 990000; -- =================================================================== diff --git a/src/test/regress/sql/multi_utility_statements.sql b/src/test/regress/sql/multi_utility_statements.sql index 840914d20..a0927a71e 100644 --- a/src/test/regress/sql/multi_utility_statements.sql +++ b/src/test/regress/sql/multi_utility_statements.sql @@ -7,7 +7,7 @@ -- DECLARE CURSOR, and COPY ... TO statements. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1000000; +SET citus.next_shard_id TO 1000000; CREATE TEMP TABLE lineitem_pricing_summary AS diff --git a/src/test/regress/sql/multi_utility_warnings.sql b/src/test/regress/sql/multi_utility_warnings.sql index ad34134f9..426c23474 100644 --- a/src/test/regress/sql/multi_utility_warnings.sql +++ b/src/test/regress/sql/multi_utility_warnings.sql @@ -6,7 +6,7 @@ -- databases, schemas, and roles. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1010000; +SET citus.next_shard_id TO 1010000; CREATE DATABASE new_database; diff --git a/src/test/regress/sql/task_tracker_cleanup_job.sql b/src/test/regress/sql/task_tracker_cleanup_job.sql index beba0ab20..153fa7078 100644 --- a/src/test/regress/sql/task_tracker_cleanup_job.sql +++ b/src/test/regress/sql/task_tracker_cleanup_job.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1060000; +SET citus.next_shard_id TO 1060000; \set JobId 401010 diff --git a/src/test/regress/sql/task_tracker_create_table.sql b/src/test/regress/sql/task_tracker_create_table.sql index 78391fbf2..c2e474bc9 100644 --- a/src/test/regress/sql/task_tracker_create_table.sql +++ b/src/test/regress/sql/task_tracker_create_table.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1070000; +SET citus.next_shard_id TO 1070000; -- New table definitions to test the task tracker process and protocol diff --git a/src/test/regress/sql/worker_check_invalid_arguments.sql b/src/test/regress/sql/worker_check_invalid_arguments.sql index 420e02534..abceee14c 100644 --- a/src/test/regress/sql/worker_check_invalid_arguments.sql +++ b/src/test/regress/sql/worker_check_invalid_arguments.sql @@ -3,7 +3,7 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1100000; +SET citus.next_shard_id TO 1100000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_create_table.sql b/src/test/regress/sql/worker_create_table.sql index c65775104..3814f037f 100644 --- a/src/test/regress/sql/worker_create_table.sql +++ b/src/test/regress/sql/worker_create_table.sql @@ -7,7 +7,7 @@ -- of existing tables. -ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1110000; +SET citus.next_shard_id TO 1110000; CREATE TABLE lineitem (