From c7603215dd2ceccef5dd3cca4c72cf7ceba52d89 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Mon, 6 Feb 2017 11:03:06 +0100 Subject: [PATCH 1/4] Stop using a sequence to generate unique job IDs --- .../executor/multi_real_time_executor.c | 3 +- .../executor/multi_task_tracker_executor.c | 9 +-- .../planner/multi_physical_planner.c | 76 ++++++++++++------- src/backend/distributed/shared_library_init.c | 12 +++ .../distributed/multi_physical_planner.h | 3 +- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/src/backend/distributed/executor/multi_real_time_executor.c b/src/backend/distributed/executor/multi_real_time_executor.c index e6b1668c4..911408c96 100644 --- a/src/backend/distributed/executor/multi_real_time_executor.c +++ b/src/backend/distributed/executor/multi_real_time_executor.c @@ -225,8 +225,7 @@ MultiRealTimeExecute(Job *job) */ if (taskFailed) { - ereport(ERROR, (errmsg("failed to execute job " UINT64_FORMAT, job->jobId), - errdetail("Failure due to failed task %u", failedTaskId))); + ereport(ERROR, (errmsg("failed to execute task %u", failedTaskId))); } else if (QueryCancelPending) { diff --git a/src/backend/distributed/executor/multi_task_tracker_executor.c b/src/backend/distributed/executor/multi_task_tracker_executor.c index 44411ae16..307a82f1a 100644 --- a/src/backend/distributed/executor/multi_task_tracker_executor.c +++ b/src/backend/distributed/executor/multi_task_tracker_executor.c @@ -150,7 +150,6 @@ MultiTaskTrackerExecute(Job *job) ListCell *taskAndExecutionCell = NULL; uint32 taskTrackerCount = 0; uint32 topLevelTaskCount = 0; - uint64 failedJobId = 0; uint32 failedTaskId = 0; bool allTasksCompleted = false; bool taskFailed = false; @@ -279,7 +278,6 @@ MultiTaskTrackerExecute(Job *job) taskFailed = TaskExecutionFailed(taskExecution); if (taskFailed) { - failedJobId = taskExecution->jobId; failedTaskId = taskExecution->taskId; break; } @@ -336,7 +334,6 @@ MultiTaskTrackerExecute(Job *job) taskTransmitFailed = TaskExecutionFailed(taskExecution); if (taskTransmitFailed) { - failedJobId = taskExecution->jobId; failedTaskId = taskExecution->taskId; break; } @@ -415,13 +412,11 @@ MultiTaskTrackerExecute(Job *job) */ if (taskFailed) { - ereport(ERROR, (errmsg("failed to execute job " UINT64_FORMAT, failedJobId), - errdetail("Failure due to failed task %u", failedTaskId))); + ereport(ERROR, (errmsg("failed to execute task %u", failedTaskId))); } else if (clusterFailed) { - ereport(ERROR, (errmsg("failed to execute job " UINT64_FORMAT, job->jobId), - errdetail("Too many task tracker failures"))); + ereport(ERROR, (errmsg("failed to execute task %u", failedTaskId))); } else if (QueryCancelPending) { diff --git a/src/backend/distributed/planner/multi_physical_planner.c b/src/backend/distributed/planner/multi_physical_planner.c index 47aa1e375..b31d3f766 100644 --- a/src/backend/distributed/planner/multi_physical_planner.c +++ b/src/backend/distributed/planner/multi_physical_planner.c @@ -22,6 +22,7 @@ #include "access/heapam.h" #include "access/nbtree.h" #include "access/skey.h" +#include "access/xlog.h" #include "catalog/pg_am.h" #include "catalog/pg_operator.h" #include "catalog/pg_type.h" @@ -63,6 +64,7 @@ /* Policy to use when assigning tasks to worker nodes */ int TaskAssignmentPolicy = TASK_ASSIGNMENT_GREEDY; +bool EnableUniqueJobIds = true; /* @@ -1693,41 +1695,61 @@ ChildNodeList(MultiNode *multiNode) /* * UniqueJobId allocates and returns a unique jobId for the job to be executed. - * This allocation occurs both in shared memory and in write ahead logs; writing - * to logs avoids the risk of having jobId collisions. * - * Please note that the jobId sequence wraps around after 2^32 integers. This - * leaves the upper 32-bits to slave nodes and their jobs. + * The resulting job ID is built up as: + * <16-bit group ID><24-bit process ID><1-bit secondary flag><23-bit local counter> + * + * When citus.enable_unique_job_ids is off then only the local counter is + * included to get repeatable results. */ static uint64 UniqueJobId(void) { - text *sequenceName = cstring_to_text(JOBID_SEQUENCE_NAME); - Oid sequenceId = ResolveRelationId(sequenceName); - Datum sequenceIdDatum = ObjectIdGetDatum(sequenceId); - Datum jobIdDatum = 0; - int64 jobId = 0; - int64 localizedJobId = 0; - int64 localGroupId = GetLocalGroupId(); - Oid savedUserId = InvalidOid; - int savedSecurityContext = 0; + static uint32 jobIdCounter = 0; - GetUserIdAndSecContext(&savedUserId, &savedSecurityContext); - SetUserIdAndSecContext(CitusExtensionOwner(), SECURITY_LOCAL_USERID_CHANGE); + uint64 jobId = 0; + uint64 jobIdNumber = 0; + uint64 processId = 0; + uint64 localGroupId = 0; - /* generate new and unique jobId from sequence */ - jobIdDatum = DirectFunctionCall1(nextval_oid, sequenceIdDatum); - jobId = DatumGetInt64(jobIdDatum); + jobIdCounter++; + + if (EnableUniqueJobIds) + { + /* + * Add the local group id information to the jobId to + * prevent concurrent jobs on different groups to conflict. + */ + localGroupId = GetLocalGroupId() & 0xFF; + jobId = jobId | (localGroupId << 48); + + /* + * Add the current process ID to distinguish jobs by this + * backends from jobs started by other backends. Process + * IDs can have at most 24-bits on platforms supported by + * Citus. + */ + processId = MyProcPid & 0xFFFFFF; + jobId = jobId | (processId << 24); + + /* + * Add an extra bit for secondaries to distinguish their + * jobs from primaries. + */ + if (RecoveryInProgress()) + { + jobId = jobId | (1 << 23); + } + } /* - * Add the local group id information to the jobId to - * prevent concurrent jobs on different groups to conflict. + * Use the remaining 23 bits to distinguish jobs by the + * same backend. */ - localizedJobId = jobId | (localGroupId << 32); + jobIdNumber = jobIdCounter & 0x1FFFFFF; + jobId = jobId | jobIdNumber; - SetUserIdAndSecContext(savedUserId, savedSecurityContext); - - return localizedJobId; + return jobId; } @@ -2144,8 +2166,7 @@ SubquerySqlTaskList(Job *job) sqlTask->dependedTaskList = dataFetchTaskList; /* log the query string we generated */ - ereport(DEBUG4, (errmsg("generated sql query for job " UINT64_FORMAT - " and task %d", sqlTask->jobId, sqlTask->taskId), + ereport(DEBUG4, (errmsg("generated sql query for task %d", sqlTask->taskId), errdetail("query string: \"%s\"", sqlQueryString->data))); sqlTask->anchorShardId = AnchorShardId(fragmentCombination, anchorRangeTableId); @@ -2260,8 +2281,7 @@ SqlTaskList(Job *job) sqlTask->dependedTaskList = dataFetchTaskList; /* log the query string we generated */ - ereport(DEBUG4, (errmsg("generated sql query for job " UINT64_FORMAT - " and task %d", sqlTask->jobId, sqlTask->taskId), + ereport(DEBUG4, (errmsg("generated sql query for task %d", sqlTask->taskId), errdetail("query string: \"%s\"", sqlQueryString->data))); sqlTask->anchorShardId = INVALID_SHARD_ID; diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c index 115f39dcc..5a924bfe8 100644 --- a/src/backend/distributed/shared_library_init.c +++ b/src/backend/distributed/shared_library_init.c @@ -634,6 +634,18 @@ RegisterCitusConfigVariables(void) GUC_NO_SHOW_ALL, NULL, NULL, NULL); + DefineCustomBoolVariable( + "citus.enable_unique_job_ids", + gettext_noop("Enables unique job IDs by prepending the local process ID and " + "group ID. This should usually be enabled, but can be disabled " + "for repeatable output in regression tests."), + NULL, + &EnableUniqueJobIds, + true, + PGC_USERSET, + GUC_SUPERUSER_ONLY | GUC_NO_SHOW_ALL, + NULL, NULL, NULL); + /* warn about config items in the citus namespace that are not registered above */ EmitWarningsOnPlaceholders("citus"); } diff --git a/src/include/distributed/multi_physical_planner.h b/src/include/distributed/multi_physical_planner.h index 0cf340899..96d74561c 100644 --- a/src/include/distributed/multi_physical_planner.h +++ b/src/include/distributed/multi_physical_planner.h @@ -28,7 +28,6 @@ /* Definitions local to the physical planner */ -#define JOBID_SEQUENCE_NAME "pg_dist_jobid_seq" #define ARRAY_OUT_FUNC_ID 751 #define NON_PRUNABLE_JOIN -1 #define RESERVED_HASHED_COLUMN_ID MaxAttrNumber @@ -244,6 +243,8 @@ typedef struct OperatorCacheEntry /* Config variable managed via guc.c */ extern int TaskAssignmentPolicy; +extern bool EnableUniqueJobIds; + /* Function declarations for building physical plans and constructing queries */ extern MultiPlan * MultiPhysicalPlanCreate(MultiTreeRoot *multiTree); From d7a5f6997cd03070e1306b48f338d1742938e6eb Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Mon, 6 Feb 2017 11:10:41 +0100 Subject: [PATCH 2/4] Set citus.enable_unique_job_ids in tests with job ID in output --- src/test/regress/expected/multi_explain.out | 1 - .../multi_large_table_join_planning.out | 110 +++++++++--------- .../multi_large_table_task_assignment.out | 22 +--- .../regress/expected/multi_mx_explain.out | 3 - .../multi_mx_repartition_udt_prepare.out | 3 - .../multi_query_directory_cleanup.out | 77 ++++++------ .../expected/multi_repartition_udt.out | 1 - .../regress/expected/multi_router_planner.out | 7 +- .../expected/multi_task_assignment_policy.out | 43 +++---- src/test/regress/input/multi_subquery.source | 2 +- src/test/regress/output/multi_subquery.source | 1 - src/test/regress/sql/multi_explain.sql | 1 - .../sql/multi_large_table_join_planning.sql | 3 +- .../sql/multi_large_table_task_assignment.sql | 9 -- src/test/regress/sql/multi_mx_explain.sql | 6 +- .../sql/multi_mx_repartition_udt_prepare.sql | 3 - .../sql/multi_query_directory_cleanup.sql | 3 +- .../regress/sql/multi_repartition_udt.sql | 1 - src/test/regress/sql/multi_router_planner.sql | 1 - .../sql/multi_task_assignment_policy.sql | 10 -- 20 files changed, 117 insertions(+), 190 deletions(-) diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index b5871d084..5fa8ea4a3 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -2,7 +2,6 @@ -- MULTI_EXPLAIN -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 570000; -- print major version to make version-specific tests clear SELECT substring(version(), '\d+\.\d+') AS major_version; major_version 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 63c4a2cc0..2237b8014 100644 --- a/src/test/regress/expected/multi_large_table_join_planning.out +++ b/src/test/regress/expected/multi_large_table_join_planning.out @@ -6,7 +6,7 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 690000; +SET citus.enable_unique_job_ids TO off; BEGIN; SET client_min_messages TO DEBUG4; DEBUG: CommitTransactionCommand @@ -21,10 +21,6 @@ DEBUG: CommitTransactionCommand -- Debug4 log messages display jobIds within them. We explicitly set the jobId -- sequence here so that the regression output becomes independent of the number -- of jobs executed prior to running this test. -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250; -DEBUG: StartTransactionCommand -DEBUG: ProcessUtility -DEBUG: CommitTransactionCommand -- Multi-level repartition join to verify our projection columns are correctly -- referenced and propagated across multiple repartition jobs. The test also -- validates that only the minimal necessary projection columns are transferred @@ -53,21 +49,21 @@ DEBUG: join prunable for intervals [8997,10560] and [1,5986] DEBUG: join prunable for intervals [10560,12036] and [1,5986] DEBUG: join prunable for intervals [12036,13473] and [1,5986] DEBUG: join prunable for intervals [13473,14947] and [1,5986] -DEBUG: generated sql query for job 1250 and task 3 +DEBUG: generated sql query for task 3 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290000 lineitem JOIN orders_290008 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 6 +DEBUG: generated sql query for task 6 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290001 lineitem JOIN orders_290008 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 9 +DEBUG: generated sql query for task 9 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290002 lineitem JOIN orders_290008 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 12 +DEBUG: generated sql query for task 12 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290003 lineitem JOIN orders_290008 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 15 +DEBUG: generated sql query for task 15 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290004 lineitem JOIN orders_290009 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 18 +DEBUG: generated sql query for task 18 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290005 lineitem JOIN orders_290009 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 21 +DEBUG: generated sql query for task 21 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290006 lineitem JOIN orders_290009 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" -DEBUG: generated sql query for job 1250 and task 24 +DEBUG: generated sql query for task 24 DETAIL: query string: "SELECT lineitem.l_partkey, orders.o_orderkey, lineitem.l_quantity, lineitem.l_extendedprice, orders.o_custkey FROM (lineitem_290007 lineitem JOIN orders_290009 orders ON ((lineitem.l_orderkey = orders.o_orderkey))) WHERE ((lineitem.l_partkey < 1000) AND (orders.o_totalprice > 10.0))" DEBUG: assigned task 6 to node localhost:57637 DEBUG: assigned task 3 to node localhost:57638 @@ -79,10 +75,10 @@ DEBUG: assigned task 24 to node localhost:57637 DEBUG: assigned task 21 to node localhost:57638 DEBUG: join prunable for intervals [1,1000] and [6001,7000] DEBUG: join prunable for intervals [6001,7000] and [1,1000] -DEBUG: generated sql query for job 1251 and task 3 -DETAIL: query string: "SELECT "pg_merge_job_1250.task_000025".intermediate_column_1250_0, "pg_merge_job_1250.task_000025".intermediate_column_1250_1, "pg_merge_job_1250.task_000025".intermediate_column_1250_2, "pg_merge_job_1250.task_000025".intermediate_column_1250_3, "pg_merge_job_1250.task_000025".intermediate_column_1250_4 FROM (pg_merge_job_1250.task_000025 "pg_merge_job_1250.task_000025" JOIN part_290011 part ON (("pg_merge_job_1250.task_000025".intermediate_column_1250_0 = part.p_partkey))) WHERE (part.p_size > 8)" -DEBUG: generated sql query for job 1251 and task 6 -DETAIL: query string: "SELECT "pg_merge_job_1250.task_000034".intermediate_column_1250_0, "pg_merge_job_1250.task_000034".intermediate_column_1250_1, "pg_merge_job_1250.task_000034".intermediate_column_1250_2, "pg_merge_job_1250.task_000034".intermediate_column_1250_3, "pg_merge_job_1250.task_000034".intermediate_column_1250_4 FROM (pg_merge_job_1250.task_000034 "pg_merge_job_1250.task_000034" JOIN part_280002 part ON (("pg_merge_job_1250.task_000034".intermediate_column_1250_0 = part.p_partkey))) WHERE (part.p_size > 8)" +DEBUG: generated sql query for task 3 +DETAIL: query string: "SELECT "pg_merge_job_0001.task_000025".intermediate_column_1_0, "pg_merge_job_0001.task_000025".intermediate_column_1_1, "pg_merge_job_0001.task_000025".intermediate_column_1_2, "pg_merge_job_0001.task_000025".intermediate_column_1_3, "pg_merge_job_0001.task_000025".intermediate_column_1_4 FROM (pg_merge_job_0001.task_000025 "pg_merge_job_0001.task_000025" JOIN part_290011 part ON (("pg_merge_job_0001.task_000025".intermediate_column_1_0 = part.p_partkey))) WHERE (part.p_size > 8)" +DEBUG: generated sql query for task 6 +DETAIL: query string: "SELECT "pg_merge_job_0001.task_000034".intermediate_column_1_0, "pg_merge_job_0001.task_000034".intermediate_column_1_1, "pg_merge_job_0001.task_000034".intermediate_column_1_2, "pg_merge_job_0001.task_000034".intermediate_column_1_3, "pg_merge_job_0001.task_000034".intermediate_column_1_4 FROM (pg_merge_job_0001.task_000034 "pg_merge_job_0001.task_000034" JOIN part_280002 part ON (("pg_merge_job_0001.task_000034".intermediate_column_1_0 = part.p_partkey))) WHERE (part.p_size > 8)" DEBUG: pruning merge fetch taskId 1 DETAIL: Creating dependency on merge taskId 25 DEBUG: pruning merge fetch taskId 4 @@ -95,12 +91,12 @@ DEBUG: join prunable for intervals [1001,2000] and [1,1000] DEBUG: join prunable for intervals [1001,2000] and [6001,7000] DEBUG: join prunable for intervals [6001,7000] and [1,1000] DEBUG: join prunable for intervals [6001,7000] and [1001,2000] -DEBUG: generated sql query for job 1252 and task 3 -DETAIL: query string: "SELECT "pg_merge_job_1251.task_000007".intermediate_column_1251_0 AS l_partkey, "pg_merge_job_1251.task_000007".intermediate_column_1251_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1251.task_000007 "pg_merge_job_1251.task_000007" JOIN customer_290010 customer ON ((customer.c_custkey = "pg_merge_job_1251.task_000007".intermediate_column_1251_4))) WHERE ((("pg_merge_job_1251.task_000007".intermediate_column_1251_2 > 5.0) OR ("pg_merge_job_1251.task_000007".intermediate_column_1251_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_1251.task_000007".intermediate_column_1251_0, "pg_merge_job_1251.task_000007".intermediate_column_1251_1" -DEBUG: generated sql query for job 1252 and task 6 -DETAIL: query string: "SELECT "pg_merge_job_1251.task_000010".intermediate_column_1251_0 AS l_partkey, "pg_merge_job_1251.task_000010".intermediate_column_1251_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1251.task_000010 "pg_merge_job_1251.task_000010" JOIN customer_280001 customer ON ((customer.c_custkey = "pg_merge_job_1251.task_000010".intermediate_column_1251_4))) WHERE ((("pg_merge_job_1251.task_000010".intermediate_column_1251_2 > 5.0) OR ("pg_merge_job_1251.task_000010".intermediate_column_1251_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_1251.task_000010".intermediate_column_1251_0, "pg_merge_job_1251.task_000010".intermediate_column_1251_1" -DEBUG: generated sql query for job 1252 and task 9 -DETAIL: query string: "SELECT "pg_merge_job_1251.task_000013".intermediate_column_1251_0 AS l_partkey, "pg_merge_job_1251.task_000013".intermediate_column_1251_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1251.task_000013 "pg_merge_job_1251.task_000013" JOIN customer_280000 customer ON ((customer.c_custkey = "pg_merge_job_1251.task_000013".intermediate_column_1251_4))) WHERE ((("pg_merge_job_1251.task_000013".intermediate_column_1251_2 > 5.0) OR ("pg_merge_job_1251.task_000013".intermediate_column_1251_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_1251.task_000013".intermediate_column_1251_0, "pg_merge_job_1251.task_000013".intermediate_column_1251_1" +DEBUG: generated sql query for task 3 +DETAIL: query string: "SELECT "pg_merge_job_0002.task_000007".intermediate_column_2_0 AS l_partkey, "pg_merge_job_0002.task_000007".intermediate_column_2_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0002.task_000007 "pg_merge_job_0002.task_000007" JOIN customer_290010 customer ON ((customer.c_custkey = "pg_merge_job_0002.task_000007".intermediate_column_2_4))) WHERE ((("pg_merge_job_0002.task_000007".intermediate_column_2_2 > 5.0) OR ("pg_merge_job_0002.task_000007".intermediate_column_2_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_0002.task_000007".intermediate_column_2_0, "pg_merge_job_0002.task_000007".intermediate_column_2_1" +DEBUG: generated sql query for task 6 +DETAIL: query string: "SELECT "pg_merge_job_0002.task_000010".intermediate_column_2_0 AS l_partkey, "pg_merge_job_0002.task_000010".intermediate_column_2_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0002.task_000010 "pg_merge_job_0002.task_000010" JOIN customer_280001 customer ON ((customer.c_custkey = "pg_merge_job_0002.task_000010".intermediate_column_2_4))) WHERE ((("pg_merge_job_0002.task_000010".intermediate_column_2_2 > 5.0) OR ("pg_merge_job_0002.task_000010".intermediate_column_2_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_0002.task_000010".intermediate_column_2_0, "pg_merge_job_0002.task_000010".intermediate_column_2_1" +DEBUG: generated sql query for task 9 +DETAIL: query string: "SELECT "pg_merge_job_0002.task_000013".intermediate_column_2_0 AS l_partkey, "pg_merge_job_0002.task_000013".intermediate_column_2_1 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0002.task_000013 "pg_merge_job_0002.task_000013" JOIN customer_280000 customer ON ((customer.c_custkey = "pg_merge_job_0002.task_000013".intermediate_column_2_4))) WHERE ((("pg_merge_job_0002.task_000013".intermediate_column_2_2 > 5.0) OR ("pg_merge_job_0002.task_000013".intermediate_column_2_3 > 1200.0)) AND (customer.c_acctbal < 5000.0)) GROUP BY "pg_merge_job_0002.task_000013".intermediate_column_2_0, "pg_merge_job_0002.task_000013".intermediate_column_2_1" DEBUG: pruning merge fetch taskId 1 DETAIL: Creating dependency on merge taskId 7 DEBUG: pruning merge fetch taskId 4 @@ -110,12 +106,12 @@ DETAIL: Creating dependency on merge taskId 13 DEBUG: assigned task 6 to node localhost:57637 DEBUG: assigned task 9 to node localhost:57638 DEBUG: assigned task 3 to node localhost:57637 -DEBUG: completed cleanup query for job 1252 -DEBUG: completed cleanup query for job 1252 -DEBUG: completed cleanup query for job 1251 -DEBUG: completed cleanup query for job 1251 -DEBUG: completed cleanup query for job 1250 -DEBUG: completed cleanup query for job 1250 +DEBUG: completed cleanup query for job 3 +DEBUG: completed cleanup query for job 3 +DEBUG: completed cleanup query for job 2 +DEBUG: completed cleanup query for job 2 +DEBUG: completed cleanup query for job 1 +DEBUG: completed cleanup query for job 1 DEBUG: CommitTransactionCommand l_partkey | o_orderkey | count -----------+------------+------- @@ -162,21 +158,21 @@ GROUP BY ORDER BY l_partkey, o_orderkey; DEBUG: StartTransactionCommand -DEBUG: generated sql query for job 1253 and task 2 +DEBUG: generated sql query for task 2 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290000 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 4 +DEBUG: generated sql query for task 4 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290001 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 6 +DEBUG: generated sql query for task 6 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290002 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 8 +DEBUG: generated sql query for task 8 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290003 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 10 +DEBUG: generated sql query for task 10 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290004 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 12 +DEBUG: generated sql query for task 12 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290005 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 14 +DEBUG: generated sql query for task 14 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290006 lineitem WHERE (l_quantity < 5.0)" -DEBUG: generated sql query for job 1253 and task 16 +DEBUG: generated sql query for task 16 DETAIL: query string: "SELECT l_partkey, l_suppkey FROM lineitem_290007 lineitem WHERE (l_quantity < 5.0)" DEBUG: assigned task 4 to node localhost:57637 DEBUG: assigned task 2 to node localhost:57638 @@ -186,9 +182,9 @@ DEBUG: assigned task 12 to node localhost:57637 DEBUG: assigned task 10 to node localhost:57638 DEBUG: assigned task 16 to node localhost:57637 DEBUG: assigned task 14 to node localhost:57638 -DEBUG: generated sql query for job 1254 and task 2 +DEBUG: generated sql query for task 2 DETAIL: query string: "SELECT o_orderkey, o_shippriority FROM orders_290008 orders WHERE (o_totalprice <> 4.0)" -DEBUG: generated sql query for job 1254 and task 4 +DEBUG: generated sql query for task 4 DETAIL: query string: "SELECT o_orderkey, o_shippriority FROM orders_290009 orders WHERE (o_totalprice <> 4.0)" DEBUG: assigned task 4 to node localhost:57637 DEBUG: assigned task 2 to node localhost:57638 @@ -204,14 +200,14 @@ DEBUG: join prunable for task partitionId 2 and 3 DEBUG: join prunable for task partitionId 3 and 0 DEBUG: join prunable for task partitionId 3 and 1 DEBUG: join prunable for task partitionId 3 and 2 -DEBUG: generated sql query for job 1255 and task 3 -DETAIL: query string: "SELECT "pg_merge_job_1253.task_000017".intermediate_column_1253_0 AS l_partkey, "pg_merge_job_1254.task_000005".intermediate_column_1254_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1253.task_000017 "pg_merge_job_1253.task_000017" JOIN pg_merge_job_1254.task_000005 "pg_merge_job_1254.task_000005" ON (("pg_merge_job_1253.task_000017".intermediate_column_1253_1 = "pg_merge_job_1254.task_000005".intermediate_column_1254_1))) WHERE true GROUP BY "pg_merge_job_1253.task_000017".intermediate_column_1253_0, "pg_merge_job_1254.task_000005".intermediate_column_1254_0" -DEBUG: generated sql query for job 1255 and task 6 -DETAIL: query string: "SELECT "pg_merge_job_1253.task_000026".intermediate_column_1253_0 AS l_partkey, "pg_merge_job_1254.task_000008".intermediate_column_1254_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1253.task_000026 "pg_merge_job_1253.task_000026" JOIN pg_merge_job_1254.task_000008 "pg_merge_job_1254.task_000008" ON (("pg_merge_job_1253.task_000026".intermediate_column_1253_1 = "pg_merge_job_1254.task_000008".intermediate_column_1254_1))) WHERE true GROUP BY "pg_merge_job_1253.task_000026".intermediate_column_1253_0, "pg_merge_job_1254.task_000008".intermediate_column_1254_0" -DEBUG: generated sql query for job 1255 and task 9 -DETAIL: query string: "SELECT "pg_merge_job_1253.task_000035".intermediate_column_1253_0 AS l_partkey, "pg_merge_job_1254.task_000011".intermediate_column_1254_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1253.task_000035 "pg_merge_job_1253.task_000035" JOIN pg_merge_job_1254.task_000011 "pg_merge_job_1254.task_000011" ON (("pg_merge_job_1253.task_000035".intermediate_column_1253_1 = "pg_merge_job_1254.task_000011".intermediate_column_1254_1))) WHERE true GROUP BY "pg_merge_job_1253.task_000035".intermediate_column_1253_0, "pg_merge_job_1254.task_000011".intermediate_column_1254_0" -DEBUG: generated sql query for job 1255 and task 12 -DETAIL: query string: "SELECT "pg_merge_job_1253.task_000044".intermediate_column_1253_0 AS l_partkey, "pg_merge_job_1254.task_000014".intermediate_column_1254_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_1253.task_000044 "pg_merge_job_1253.task_000044" JOIN pg_merge_job_1254.task_000014 "pg_merge_job_1254.task_000014" ON (("pg_merge_job_1253.task_000044".intermediate_column_1253_1 = "pg_merge_job_1254.task_000014".intermediate_column_1254_1))) WHERE true GROUP BY "pg_merge_job_1253.task_000044".intermediate_column_1253_0, "pg_merge_job_1254.task_000014".intermediate_column_1254_0" +DEBUG: generated sql query for task 3 +DETAIL: query string: "SELECT "pg_merge_job_0004.task_000017".intermediate_column_4_0 AS l_partkey, "pg_merge_job_0005.task_000005".intermediate_column_5_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0004.task_000017 "pg_merge_job_0004.task_000017" JOIN pg_merge_job_0005.task_000005 "pg_merge_job_0005.task_000005" ON (("pg_merge_job_0004.task_000017".intermediate_column_4_1 = "pg_merge_job_0005.task_000005".intermediate_column_5_1))) WHERE true GROUP BY "pg_merge_job_0004.task_000017".intermediate_column_4_0, "pg_merge_job_0005.task_000005".intermediate_column_5_0" +DEBUG: generated sql query for task 6 +DETAIL: query string: "SELECT "pg_merge_job_0004.task_000026".intermediate_column_4_0 AS l_partkey, "pg_merge_job_0005.task_000008".intermediate_column_5_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0004.task_000026 "pg_merge_job_0004.task_000026" JOIN pg_merge_job_0005.task_000008 "pg_merge_job_0005.task_000008" ON (("pg_merge_job_0004.task_000026".intermediate_column_4_1 = "pg_merge_job_0005.task_000008".intermediate_column_5_1))) WHERE true GROUP BY "pg_merge_job_0004.task_000026".intermediate_column_4_0, "pg_merge_job_0005.task_000008".intermediate_column_5_0" +DEBUG: generated sql query for task 9 +DETAIL: query string: "SELECT "pg_merge_job_0004.task_000035".intermediate_column_4_0 AS l_partkey, "pg_merge_job_0005.task_000011".intermediate_column_5_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0004.task_000035 "pg_merge_job_0004.task_000035" JOIN pg_merge_job_0005.task_000011 "pg_merge_job_0005.task_000011" ON (("pg_merge_job_0004.task_000035".intermediate_column_4_1 = "pg_merge_job_0005.task_000011".intermediate_column_5_1))) WHERE true GROUP BY "pg_merge_job_0004.task_000035".intermediate_column_4_0, "pg_merge_job_0005.task_000011".intermediate_column_5_0" +DEBUG: generated sql query for task 12 +DETAIL: query string: "SELECT "pg_merge_job_0004.task_000044".intermediate_column_4_0 AS l_partkey, "pg_merge_job_0005.task_000014".intermediate_column_5_0 AS o_orderkey, count(*) AS count FROM (pg_merge_job_0004.task_000044 "pg_merge_job_0004.task_000044" JOIN pg_merge_job_0005.task_000014 "pg_merge_job_0005.task_000014" ON (("pg_merge_job_0004.task_000044".intermediate_column_4_1 = "pg_merge_job_0005.task_000014".intermediate_column_5_1))) WHERE true GROUP BY "pg_merge_job_0004.task_000044".intermediate_column_4_0, "pg_merge_job_0005.task_000014".intermediate_column_5_0" DEBUG: pruning merge fetch taskId 1 DETAIL: Creating dependency on merge taskId 17 DEBUG: pruning merge fetch taskId 2 @@ -228,16 +224,16 @@ DEBUG: pruning merge fetch taskId 10 DETAIL: Creating dependency on merge taskId 44 DEBUG: pruning merge fetch taskId 11 DETAIL: Creating dependency on merge taskId 14 -DEBUG: assigned task 3 to node localhost:57638 -DEBUG: assigned task 6 to node localhost:57637 -DEBUG: assigned task 9 to node localhost:57638 -DEBUG: assigned task 12 to node localhost:57637 -DEBUG: completed cleanup query for job 1255 -DEBUG: completed cleanup query for job 1255 -DEBUG: completed cleanup query for job 1253 -DEBUG: completed cleanup query for job 1253 -DEBUG: completed cleanup query for job 1254 -DEBUG: completed cleanup query for job 1254 +DEBUG: assigned task 3 to node localhost:57637 +DEBUG: assigned task 6 to node localhost:57638 +DEBUG: assigned task 9 to node localhost:57637 +DEBUG: assigned task 12 to node localhost:57638 +DEBUG: completed cleanup query for job 6 +DEBUG: completed cleanup query for job 6 +DEBUG: completed cleanup query for job 4 +DEBUG: completed cleanup query for job 4 +DEBUG: completed cleanup query for job 5 +DEBUG: completed cleanup query for job 5 DEBUG: CommitTransactionCommand l_partkey | o_orderkey | count -----------+------------+------- 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 bb7e3a1c5..49c75fb6f 100644 --- a/src/test/regress/expected/multi_large_table_task_assignment.out +++ b/src/test/regress/expected/multi_large_table_task_assignment.out @@ -6,7 +6,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 710000; BEGIN; SET client_min_messages TO DEBUG3; DEBUG: CommitTransactionCommand @@ -186,19 +185,6 @@ SET citus.large_table_shard_count TO 2; DEBUG: StartTransactionCommand DEBUG: ProcessUtility DEBUG: CommitTransactionCommand --- The next test, dual hash repartition join, uses the current jobId to assign --- tasks in a round-robin fashion. We therefore need to ensure that jobIds start --- with an odd number here to get consistent test output. -SELECT case when (currval('pg_dist_jobid_seq') % 2) = 0 - then nextval('pg_dist_jobid_seq') % 2 - else 1 end; -DEBUG: StartTransactionCommand -DEBUG: CommitTransactionCommand - case ------- - 1 -(1 row) - -- Dual hash repartition join which tests the separate hash repartition join -- task assignment algorithm. SELECT @@ -247,10 +233,10 @@ DEBUG: pruning merge fetch taskId 10 DETAIL: Creating dependency on merge taskId 44 DEBUG: pruning merge fetch taskId 11 DETAIL: Creating dependency on merge taskId 19 -DEBUG: assigned task 3 to node localhost:57637 -DEBUG: assigned task 6 to node localhost:57638 -DEBUG: assigned task 9 to node localhost:57637 -DEBUG: assigned task 12 to node localhost:57638 +DEBUG: assigned task 3 to node localhost:57638 +DEBUG: assigned task 6 to node localhost:57637 +DEBUG: assigned task 9 to node localhost:57638 +DEBUG: assigned task 12 to node localhost:57637 DEBUG: CommitTransactionCommand count ------- diff --git a/src/test/regress/expected/multi_mx_explain.out b/src/test/regress/expected/multi_mx_explain.out index 8faca4b77..16b93b645 100644 --- a/src/test/regress/expected/multi_mx_explain.out +++ b/src/test/regress/expected/multi_mx_explain.out @@ -2,11 +2,8 @@ -- MULTI_MX_EXPLAIN -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1320000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :master_port \a\t SET citus.task_executor_type TO 'real-time'; diff --git a/src/test/regress/expected/multi_mx_repartition_udt_prepare.out b/src/test/regress/expected/multi_mx_repartition_udt_prepare.out index 3ccf84eaf..fd985d68d 100644 --- a/src/test/regress/expected/multi_mx_repartition_udt_prepare.out +++ b/src/test/regress/expected/multi_mx_repartition_udt_prepare.out @@ -2,7 +2,6 @@ -- MULTI_MX_REPARTITION_UDT_PREPARE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; -- START type creation CREATE TYPE test_udt AS (i integer, i2 integer); -- ... as well as a function to use as its comparator... @@ -202,6 +201,4 @@ LOG: join order: [ "repartition_udt" ][ dual partition join "repartition_udt_ot \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; diff --git a/src/test/regress/expected/multi_query_directory_cleanup.out b/src/test/regress/expected/multi_query_directory_cleanup.out index e7de86b7c..2b20047f7 100644 --- a/src/test/regress/expected/multi_query_directory_cleanup.out +++ b/src/test/regress/expected/multi_query_directory_cleanup.out @@ -6,12 +6,11 @@ -- the resource owner should automatically clean up these intermediate query -- result files. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 810000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 810000; +SET citus.enable_unique_job_ids TO off; BEGIN; -- pg_ls_dir() displays jobids. We explicitly set the jobId sequence -- here so that the regression output becomes independent of the -- number of jobs executed prior to running this test. -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250; SELECT sum(l_extendedprice * l_discount) as revenue FROM lineitem; revenue --------------- @@ -218,26 +217,26 @@ FETCH 1 FROM c_19; SELECT * FROM pg_ls_dir('base/pgsql_job_cache') f ORDER BY f; f ----------------- - master_job_1256 - master_job_1257 - master_job_1258 - master_job_1259 - master_job_1260 - master_job_1261 - master_job_1262 - master_job_1263 - master_job_1264 - master_job_1265 - master_job_1266 - master_job_1267 - master_job_1268 - master_job_1269 - master_job_1270 - master_job_1271 - master_job_1272 - master_job_1273 - master_job_1274 - master_job_1275 + master_job_0007 + master_job_0008 + master_job_0009 + master_job_0010 + master_job_0011 + master_job_0012 + master_job_0013 + master_job_0014 + master_job_0015 + master_job_0016 + master_job_0017 + master_job_0018 + master_job_0019 + master_job_0020 + master_job_0021 + master_job_0022 + master_job_0023 + master_job_0024 + master_job_0025 + master_job_0026 (20 rows) -- close first, 17th (first after re-alloc) and last cursor. @@ -247,23 +246,23 @@ CLOSE c_19; SELECT * FROM pg_ls_dir('base/pgsql_job_cache') f ORDER BY f; f ----------------- - master_job_1257 - master_job_1258 - master_job_1259 - master_job_1260 - master_job_1261 - master_job_1262 - master_job_1263 - master_job_1264 - master_job_1265 - master_job_1266 - master_job_1267 - master_job_1268 - master_job_1269 - master_job_1270 - master_job_1271 - master_job_1273 - master_job_1274 + master_job_0008 + master_job_0009 + master_job_0010 + master_job_0011 + master_job_0012 + master_job_0013 + master_job_0014 + master_job_0015 + master_job_0016 + master_job_0017 + master_job_0018 + master_job_0019 + master_job_0020 + master_job_0021 + master_job_0022 + master_job_0024 + master_job_0025 (17 rows) ROLLBACK; diff --git a/src/test/regress/expected/multi_repartition_udt.out b/src/test/regress/expected/multi_repartition_udt.out index 6deeefddb..8ef1355cb 100644 --- a/src/test/regress/expected/multi_repartition_udt.out +++ b/src/test/regress/expected/multi_repartition_udt.out @@ -2,7 +2,6 @@ -- MULTI_REPARTITION_UDT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_router_planner.out b/src/test/regress/expected/multi_router_planner.out index 63fe2e7ba..af434a165 100644 --- a/src/test/regress/expected/multi_router_planner.out +++ b/src/test/regress/expected/multi_router_planner.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 840000; -- =================================================================== -- test router planner functionality for single shard select queries -- =================================================================== @@ -1873,8 +1872,7 @@ WARNING: relation "public.articles_append" does not exist CONTEXT: while executing command on localhost:57638 WARNING: relation "public.articles_append" does not exist CONTEXT: while executing command on localhost:57638 -ERROR: failed to execute job 840026 -DETAIL: Failure due to failed task 2 +ERROR: failed to execute task 2 -- same query with where false but evaluation left to worker SELECT author_id FROM articles_append WHERE @@ -1889,8 +1887,7 @@ WARNING: relation "public.articles_append" does not exist CONTEXT: while executing command on localhost:57638 WARNING: relation "public.articles_append" does not exist CONTEXT: while executing command on localhost:57638 -ERROR: failed to execute job 840027 -DETAIL: Failure due to failed task 2 +ERROR: failed to execute task 2 -- same query on router planner with where false but evaluation left to worker SELECT author_id FROM articles_single_shard_hash WHERE diff --git a/src/test/regress/expected/multi_task_assignment_policy.out b/src/test/regress/expected/multi_task_assignment_policy.out index d5f4fdc95..0468d42e2 100644 --- a/src/test/regress/expected/multi_task_assignment_policy.out +++ b/src/test/regress/expected/multi_task_assignment_policy.out @@ -2,7 +2,6 @@ -- MULTI_TASK_ASSIGNMENT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 880000; SET citus.explain_distributed_queries TO off; -- Check that our policies for assigning tasks to worker nodes run as expected. -- To test this, we first create a shell table, and then manually insert shard @@ -114,39 +113,11 @@ DEBUG: CommitTransactionCommand explain statements for distributed queries are not enabled (3 rows) --- Round-robin task assignment relies on the current jobId. We therefore need to --- ensure that jobIds start with an odd number here; this way, task assignment --- debug messages always produce the same output. Also, we make sure that the --- following case statement always prints out "1" as the query's result. -SELECT case when (currval('pg_dist_jobid_seq') % 2) = 0 - then nextval('pg_dist_jobid_seq') % 2 - else 1 end; -DEBUG: StartTransactionCommand -DEBUG: CommitTransactionCommand - case ------- - 1 -(1 row) - -- Finally test the round-robin task assignment policy SET citus.task_assignment_policy TO 'round-robin'; DEBUG: StartTransactionCommand DEBUG: ProcessUtility DEBUG: CommitTransactionCommand -EXPLAIN SELECT count(*) FROM task_assignment_test_table; -DEBUG: StartTransactionCommand -DEBUG: ProcessUtility -DEBUG: assigned task 6 to node localhost:57637 -DEBUG: assigned task 4 to node localhost:57637 -DEBUG: assigned task 2 to node localhost:57638 -DEBUG: CommitTransactionCommand - QUERY PLAN ------------------------------------------------------------------------ - Aggregate (cost=0.00..0.00 rows=0 width=0) - -> Custom Scan (Citus Real-Time) (cost=0.00..0.00 rows=0 width=0) - explain statements for distributed queries are not enabled -(3 rows) - EXPLAIN SELECT count(*) FROM task_assignment_test_table; DEBUG: StartTransactionCommand DEBUG: ProcessUtility @@ -175,6 +146,20 @@ DEBUG: CommitTransactionCommand explain statements for distributed queries are not enabled (3 rows) +EXPLAIN SELECT count(*) FROM task_assignment_test_table; +DEBUG: StartTransactionCommand +DEBUG: ProcessUtility +DEBUG: assigned task 6 to node localhost:57638 +DEBUG: assigned task 4 to node localhost:57638 +DEBUG: assigned task 2 to node localhost:57637 +DEBUG: CommitTransactionCommand + QUERY PLAN +----------------------------------------------------------------------- + Aggregate (cost=0.00..0.00 rows=0 width=0) + -> Custom Scan (Citus Real-Time) (cost=0.00..0.00 rows=0 width=0) + explain statements for distributed queries are not enabled +(3 rows) + RESET citus.task_assignment_policy; DEBUG: StartTransactionCommand DEBUG: ProcessUtility diff --git a/src/test/regress/input/multi_subquery.source b/src/test/regress/input/multi_subquery.source index 4d8b1b5fa..eeeae49a5 100644 --- a/src/test/regress/input/multi_subquery.source +++ b/src/test/regress/input/multi_subquery.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset @@ -702,6 +701,7 @@ LIMIT -- Same queries above with explain -- Simple join subquery pushdown + EXPLAIN SELECT avg(array_length(events, 1)) AS event_average FROM diff --git a/src/test/regress/output/multi_subquery.source b/src/test/regress/output/multi_subquery.source index 3f892b2fa..1e4c11981 100644 --- a/src/test/regress/output/multi_subquery.source +++ b/src/test/regress/output/multi_subquery.source @@ -2,7 +2,6 @@ -- MULTI_SUBQUERY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+\.\d+') AS major_version; diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index c7874a38a..068dc45db 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 570000; -- print major version to make version-specific tests clear SELECT substring(version(), '\d+\.\d+') AS major_version; 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 bc41d4427..3a10c5f76 100644 --- a/src/test/regress/sql/multi_large_table_join_planning.sql +++ b/src/test/regress/sql/multi_large_table_join_planning.sql @@ -8,7 +8,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 690000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 690000; +SET citus.enable_unique_job_ids TO off; BEGIN; @@ -20,7 +20,6 @@ SET citus.task_executor_type TO 'task-tracker'; -- sequence here so that the regression output becomes independent of the number -- of jobs executed prior to running this test. -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250; -- Multi-level repartition join to verify our projection columns are correctly -- referenced and propagated across multiple repartition jobs. The test also 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 bc4d0fbb7..bd4de27d7 100644 --- a/src/test/regress/sql/multi_large_table_task_assignment.sql +++ b/src/test/regress/sql/multi_large_table_task_assignment.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 710000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 710000; BEGIN; @@ -43,14 +42,6 @@ WHERE SET citus.large_table_shard_count TO 2; --- The next test, dual hash repartition join, uses the current jobId to assign --- tasks in a round-robin fashion. We therefore need to ensure that jobIds start --- with an odd number here to get consistent test output. - -SELECT case when (currval('pg_dist_jobid_seq') % 2) = 0 - then nextval('pg_dist_jobid_seq') % 2 - else 1 end; - -- Dual hash repartition join which tests the separate hash repartition join -- task assignment algorithm. diff --git a/src/test/regress/sql/multi_mx_explain.sql b/src/test/regress/sql/multi_mx_explain.sql index ea47a3285..408a0b7b4 100644 --- a/src/test/regress/sql/multi_mx_explain.sql +++ b/src/test/regress/sql/multi_mx_explain.sql @@ -3,11 +3,8 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1320000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :master_port \a\t @@ -65,6 +62,7 @@ BEGIN END; $BODY$ LANGUAGE plpgsql; + -- Test Text format EXPLAIN (COSTS FALSE, FORMAT TEXT) SELECT l_quantity, count(*) count_quantity FROM lineitem_mx @@ -81,6 +79,7 @@ SELECT true AS valid FROM explain_json($$ GROUP BY l_quantity ORDER BY count_quantity, l_quantity$$); \c - - - :worker_1_port + -- Test XML format EXPLAIN (COSTS FALSE, FORMAT XML) SELECT l_quantity, count(*) count_quantity FROM lineitem_mx @@ -102,6 +101,7 @@ EXPLAIN (COSTS FALSE, FORMAT TEXT) GROUP BY l_quantity ORDER BY count_quantity, l_quantity; \c - - - :worker_2_port + -- Test verbose EXPLAIN (COSTS FALSE, VERBOSE TRUE) SELECT sum(l_quantity) / avg(l_quantity) FROM lineitem_mx; diff --git a/src/test/regress/sql/multi_mx_repartition_udt_prepare.sql b/src/test/regress/sql/multi_mx_repartition_udt_prepare.sql index 1fc1c1496..db415ac7d 100644 --- a/src/test/regress/sql/multi_mx_repartition_udt_prepare.sql +++ b/src/test/regress/sql/multi_mx_repartition_udt_prepare.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; -- START type creation @@ -213,6 +212,4 @@ SELECT * FROM repartition_udt JOIN repartition_udt_other ORDER BY repartition_udt.pk; \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; diff --git a/src/test/regress/sql/multi_query_directory_cleanup.sql b/src/test/regress/sql/multi_query_directory_cleanup.sql index 035d30263..3c9a0f9f6 100644 --- a/src/test/regress/sql/multi_query_directory_cleanup.sql +++ b/src/test/regress/sql/multi_query_directory_cleanup.sql @@ -9,7 +9,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 810000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 810000; +SET citus.enable_unique_job_ids TO off; BEGIN; @@ -17,7 +17,6 @@ BEGIN; -- pg_ls_dir() displays jobids. We explicitly set the jobId sequence -- here so that the regression output becomes independent of the -- number of jobs executed prior to running this test. -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250; SELECT sum(l_extendedprice * l_discount) as revenue FROM lineitem; SELECT sum(l_extendedprice * l_discount) as revenue FROM lineitem; diff --git a/src/test/regress/sql/multi_repartition_udt.sql b/src/test/regress/sql/multi_repartition_udt.sql index d5f83b8e7..aa0032504 100644 --- a/src/test/regress/sql/multi_repartition_udt.sql +++ b/src/test/regress/sql/multi_repartition_udt.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 535000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 535000; -- START type creation diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql index 4d72d8e1f..4ad1f7798 100644 --- a/src/test/regress/sql/multi_router_planner.sql +++ b/src/test/regress/sql/multi_router_planner.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 840000; -- =================================================================== diff --git a/src/test/regress/sql/multi_task_assignment_policy.sql b/src/test/regress/sql/multi_task_assignment_policy.sql index 72dcdff11..28f8c57ed 100644 --- a/src/test/regress/sql/multi_task_assignment_policy.sql +++ b/src/test/regress/sql/multi_task_assignment_policy.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 880000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 880000; SET citus.explain_distributed_queries TO off; @@ -76,15 +75,6 @@ EXPLAIN SELECT count(*) FROM task_assignment_test_table; EXPLAIN SELECT count(*) FROM task_assignment_test_table; --- Round-robin task assignment relies on the current jobId. We therefore need to --- ensure that jobIds start with an odd number here; this way, task assignment --- debug messages always produce the same output. Also, we make sure that the --- following case statement always prints out "1" as the query's result. - -SELECT case when (currval('pg_dist_jobid_seq') % 2) = 0 - then nextval('pg_dist_jobid_seq') % 2 - else 1 end; - -- Finally test the round-robin task assignment policy SET citus.task_assignment_policy TO 'round-robin'; From 53899946e7bbef3213068754c431a0f690a37b19 Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Mon, 6 Feb 2017 11:11:54 +0100 Subject: [PATCH 3/4] Remove redundant pg_dist_jobid_seq restarts in tests --- src/test/regress/expected/multi_agg_approximate_distinct.out | 1 - src/test/regress/expected/multi_agg_approximate_distinct_0.out | 1 - src/test/regress/expected/multi_array_agg.out | 1 - src/test/regress/expected/multi_average_expression.out | 1 - src/test/regress/expected/multi_binary_master_copy_format.out | 1 - src/test/regress/expected/multi_citus_tools.out | 1 - src/test/regress/expected/multi_cluster_management.out | 1 - src/test/regress/expected/multi_colocation_utils.out | 1 - src/test/regress/expected/multi_complex_expressions.out | 1 - src/test/regress/expected/multi_count_type_conversion.out | 1 - src/test/regress/expected/multi_create_fdw.out | 1 - src/test/regress/expected/multi_create_insert_proxy.out | 1 - src/test/regress/expected/multi_create_shards.out | 1 - src/test/regress/expected/multi_create_table.out | 1 - src/test/regress/expected/multi_create_table_constraints.out | 1 - src/test/regress/expected/multi_data_types.out | 1 - src/test/regress/expected/multi_deparse_shard_query.out | 1 - src/test/regress/expected/multi_distribution_metadata.out | 1 - src/test/regress/expected/multi_drop_extension.out | 1 - src/test/regress/expected/multi_dropped_column_aliases.out | 1 - src/test/regress/expected/multi_expire_table_cache.out | 1 - src/test/regress/expected/multi_explain_0.out | 1 - src/test/regress/expected/multi_foreign_key.out | 1 - src/test/regress/expected/multi_function_evaluation.out | 1 - src/test/regress/expected/multi_generate_ddl_commands.out | 1 - src/test/regress/expected/multi_hash_pruning.out | 1 - src/test/regress/expected/multi_index_statements.out | 1 - src/test/regress/expected/multi_insert_select.out | 1 - src/test/regress/expected/multi_join_order_additional.out | 1 - src/test/regress/expected/multi_join_order_tpch_large.out | 1 - src/test/regress/expected/multi_join_pruning.out | 1 - src/test/regress/expected/multi_large_table_pruning.out | 1 - src/test/regress/expected/multi_limit_clause.out | 1 - src/test/regress/expected/multi_limit_clause_approximate.out | 1 - src/test/regress/expected/multi_master_protocol.out | 1 - src/test/regress/expected/multi_metadata_access.out | 1 - src/test/regress/expected/multi_metadata_sync.out | 1 - src/test/regress/expected/multi_modifications.out | 1 - src/test/regress/expected/multi_modifying_xacts.out | 1 - src/test/regress/expected/multi_mx_create_table.out | 1 - src/test/regress/expected/multi_mx_ddl.out | 1 - src/test/regress/expected/multi_mx_explain_0.out | 3 --- src/test/regress/expected/multi_mx_modifications.out | 1 - src/test/regress/expected/multi_mx_modifying_xacts.out | 1 - src/test/regress/expected/multi_mx_reference_table.out | 1 - src/test/regress/expected/multi_mx_router_planner.out | 1 - src/test/regress/expected/multi_mx_schema_support.out | 1 - src/test/regress/expected/multi_mx_tpch_query1.out | 3 --- src/test/regress/expected/multi_mx_tpch_query10.out | 3 --- src/test/regress/expected/multi_mx_tpch_query12.out | 3 --- src/test/regress/expected/multi_mx_tpch_query14.out | 3 --- src/test/regress/expected/multi_mx_tpch_query19.out | 3 --- src/test/regress/expected/multi_mx_tpch_query3.out | 3 --- src/test/regress/expected/multi_mx_tpch_query6.out | 3 --- src/test/regress/expected/multi_mx_tpch_query7.out | 3 --- src/test/regress/expected/multi_mx_tpch_query7_nested.out | 3 --- src/test/regress/expected/multi_name_lengths.out | 1 - src/test/regress/expected/multi_null_minmax_value_pruning.out | 1 - src/test/regress/expected/multi_partition_pruning.out | 1 - src/test/regress/expected/multi_prepare_plsql.out | 1 - src/test/regress/expected/multi_prepare_sql.out | 1 - src/test/regress/expected/multi_prune_shard_list.out | 1 - src/test/regress/expected/multi_reference_table.out | 1 - .../regress/expected/multi_remove_node_reference_table.out | 1 - src/test/regress/expected/multi_repair_shards.out | 1 - src/test/regress/expected/multi_repartitioned_subquery_udf.out | 1 - src/test/regress/expected/multi_replicate_reference_table.out | 1 - src/test/regress/expected/multi_schema_support.out | 1 - src/test/regress/expected/multi_shard_modify.out | 1 - src/test/regress/expected/multi_simple_queries.out | 1 - src/test/regress/expected/multi_single_relation_subquery.out | 1 - src/test/regress/expected/multi_sql_function.out | 1 - src/test/regress/expected/multi_table_ddl.out | 1 - src/test/regress/expected/multi_tpch_query1.out | 1 - src/test/regress/expected/multi_tpch_query10.out | 1 - src/test/regress/expected/multi_tpch_query12.out | 1 - src/test/regress/expected/multi_tpch_query14.out | 1 - src/test/regress/expected/multi_tpch_query19.out | 1 - src/test/regress/expected/multi_tpch_query3.out | 1 - src/test/regress/expected/multi_tpch_query6.out | 1 - src/test/regress/expected/multi_tpch_query7.out | 1 - src/test/regress/expected/multi_tpch_query7_nested.out | 1 - src/test/regress/expected/multi_transaction_recovery.out | 1 - src/test/regress/expected/multi_transactional_drop_shards.out | 1 - src/test/regress/expected/multi_truncate.out | 1 - .../regress/expected/multi_unsupported_worker_operations.out | 1 - src/test/regress/expected/multi_upgrade_reference_table.out | 1 - src/test/regress/expected/multi_upsert.out | 1 - src/test/regress/expected/multi_utilities.out | 1 - src/test/regress/expected/multi_utility_statements.out | 1 - src/test/regress/expected/multi_utility_warnings.out | 1 - src/test/regress/expected/multi_working_columns.out | 1 - src/test/regress/expected/task_tracker_assign_task.out | 1 - src/test/regress/expected/task_tracker_cleanup_job.out | 1 - src/test/regress/expected/task_tracker_create_table.out | 1 - src/test/regress/expected/task_tracker_partition_task.out | 1 - src/test/regress/expected/worker_binary_data_partition.out | 1 - src/test/regress/expected/worker_check_invalid_arguments.out | 1 - src/test/regress/expected/worker_create_table.out | 1 - src/test/regress/expected/worker_hash_partition.out | 1 - src/test/regress/expected/worker_hash_partition_complex.out | 1 - src/test/regress/expected/worker_merge_hash_files.out | 1 - src/test/regress/expected/worker_merge_range_files.out | 1 - src/test/regress/expected/worker_null_data_partition.out | 1 - src/test/regress/expected/worker_range_partition.out | 1 - src/test/regress/expected/worker_range_partition_complex.out | 1 - src/test/regress/input/multi_agg_distinct.source | 1 - src/test/regress/input/multi_agg_type_conversion.source | 1 - src/test/regress/input/multi_alter_table_statements.source | 1 - src/test/regress/input/multi_append_table_to_shard.source | 1 - src/test/regress/input/multi_complex_count_distinct.source | 1 - src/test/regress/input/multi_copy.source | 1 - src/test/regress/input/multi_create_schema.source | 1 - src/test/regress/input/multi_large_shardid.source | 1 - src/test/regress/input/multi_load_data.source | 1 - src/test/regress/input/multi_load_large_records.source | 1 - src/test/regress/input/multi_load_more_data.source | 1 - src/test/regress/input/multi_master_delete_protocol.source | 1 - src/test/regress/input/multi_mx_copy_data.source | 1 - src/test/regress/input/multi_outer_join.source | 1 - src/test/regress/input/multi_outer_join_reference.source | 1 - src/test/regress/input/worker_copy.source | 1 - src/test/regress/output/multi_agg_distinct.source | 1 - src/test/regress/output/multi_agg_type_conversion.source | 1 - src/test/regress/output/multi_alter_table_statements.source | 1 - src/test/regress/output/multi_append_table_to_shard.source | 1 - src/test/regress/output/multi_complex_count_distinct.source | 1 - src/test/regress/output/multi_copy.source | 1 - src/test/regress/output/multi_create_schema.source | 1 - src/test/regress/output/multi_large_shardid.source | 1 - src/test/regress/output/multi_load_data.source | 1 - src/test/regress/output/multi_load_large_records.source | 1 - src/test/regress/output/multi_load_more_data.source | 1 - src/test/regress/output/multi_master_delete_protocol.source | 1 - src/test/regress/output/multi_mx_copy_data.source | 1 - src/test/regress/output/multi_outer_join.source | 1 - src/test/regress/output/multi_outer_join_reference.source | 1 - src/test/regress/output/multi_subquery_0.source | 1 - src/test/regress/output/worker_copy.source | 1 - src/test/regress/sql/multi_agg_approximate_distinct.sql | 1 - src/test/regress/sql/multi_array_agg.sql | 1 - src/test/regress/sql/multi_average_expression.sql | 1 - src/test/regress/sql/multi_binary_master_copy_format.sql | 1 - src/test/regress/sql/multi_citus_tools.sql | 1 - src/test/regress/sql/multi_cluster_management.sql | 1 - src/test/regress/sql/multi_colocation_utils.sql | 1 - src/test/regress/sql/multi_complex_expressions.sql | 1 - src/test/regress/sql/multi_count_type_conversion.sql | 1 - src/test/regress/sql/multi_create_fdw.sql | 1 - src/test/regress/sql/multi_create_insert_proxy.sql | 1 - src/test/regress/sql/multi_create_shards.sql | 1 - src/test/regress/sql/multi_create_table.sql | 1 - src/test/regress/sql/multi_create_table_constraints.sql | 1 - src/test/regress/sql/multi_data_types.sql | 1 - src/test/regress/sql/multi_deparse_shard_query.sql | 1 - src/test/regress/sql/multi_distribution_metadata.sql | 1 - src/test/regress/sql/multi_drop_extension.sql | 1 - src/test/regress/sql/multi_dropped_column_aliases.sql | 1 - src/test/regress/sql/multi_expire_table_cache.sql | 1 - src/test/regress/sql/multi_foreign_key.sql | 1 - src/test/regress/sql/multi_function_evaluation.sql | 1 - src/test/regress/sql/multi_generate_ddl_commands.sql | 1 - src/test/regress/sql/multi_hash_pruning.sql | 1 - src/test/regress/sql/multi_index_statements.sql | 1 - src/test/regress/sql/multi_insert_select.sql | 1 - src/test/regress/sql/multi_join_order_additional.sql | 1 - src/test/regress/sql/multi_join_order_tpch_large.sql | 1 - src/test/regress/sql/multi_join_pruning.sql | 1 - src/test/regress/sql/multi_large_table_pruning.sql | 1 - src/test/regress/sql/multi_limit_clause.sql | 1 - src/test/regress/sql/multi_limit_clause_approximate.sql | 1 - src/test/regress/sql/multi_master_protocol.sql | 1 - src/test/regress/sql/multi_metadata_access.sql | 1 - src/test/regress/sql/multi_metadata_sync.sql | 1 - src/test/regress/sql/multi_modifications.sql | 1 - src/test/regress/sql/multi_modifying_xacts.sql | 1 - src/test/regress/sql/multi_mx_create_table.sql | 1 - src/test/regress/sql/multi_mx_ddl.sql | 1 - src/test/regress/sql/multi_mx_modifications.sql | 1 - src/test/regress/sql/multi_mx_modifying_xacts.sql | 1 - src/test/regress/sql/multi_mx_reference_table.sql | 1 - src/test/regress/sql/multi_mx_router_planner.sql | 1 - src/test/regress/sql/multi_mx_schema_support.sql | 1 - src/test/regress/sql/multi_mx_tpch_query1.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query10.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query12.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query14.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query19.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query3.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query6.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query7.sql | 3 --- src/test/regress/sql/multi_mx_tpch_query7_nested.sql | 3 --- src/test/regress/sql/multi_name_lengths.sql | 1 - src/test/regress/sql/multi_null_minmax_value_pruning.sql | 1 - src/test/regress/sql/multi_partition_pruning.sql | 1 - src/test/regress/sql/multi_prepare_plsql.sql | 1 - src/test/regress/sql/multi_prepare_sql.sql | 1 - src/test/regress/sql/multi_prune_shard_list.sql | 1 - src/test/regress/sql/multi_reference_table.sql | 1 - src/test/regress/sql/multi_remove_node_reference_table.sql | 1 - src/test/regress/sql/multi_repair_shards.sql | 1 - src/test/regress/sql/multi_repartitioned_subquery_udf.sql | 1 - src/test/regress/sql/multi_replicate_reference_table.sql | 1 - src/test/regress/sql/multi_schema_support.sql | 1 - src/test/regress/sql/multi_shard_modify.sql | 1 - src/test/regress/sql/multi_simple_queries.sql | 1 - src/test/regress/sql/multi_single_relation_subquery.sql | 1 - src/test/regress/sql/multi_sql_function.sql | 1 - src/test/regress/sql/multi_table_ddl.sql | 1 - src/test/regress/sql/multi_tpch_query1.sql | 1 - src/test/regress/sql/multi_tpch_query10.sql | 1 - src/test/regress/sql/multi_tpch_query12.sql | 1 - src/test/regress/sql/multi_tpch_query14.sql | 1 - src/test/regress/sql/multi_tpch_query19.sql | 1 - src/test/regress/sql/multi_tpch_query3.sql | 1 - src/test/regress/sql/multi_tpch_query6.sql | 1 - src/test/regress/sql/multi_tpch_query7.sql | 1 - src/test/regress/sql/multi_tpch_query7_nested.sql | 1 - src/test/regress/sql/multi_transaction_recovery.sql | 1 - src/test/regress/sql/multi_transactional_drop_shards.sql | 1 - src/test/regress/sql/multi_truncate.sql | 1 - src/test/regress/sql/multi_unsupported_worker_operations.sql | 1 - src/test/regress/sql/multi_upgrade_reference_table.sql | 1 - src/test/regress/sql/multi_upsert.sql | 1 - src/test/regress/sql/multi_utilities.sql | 1 - src/test/regress/sql/multi_utility_statements.sql | 1 - src/test/regress/sql/multi_utility_warnings.sql | 1 - src/test/regress/sql/multi_working_columns.sql | 1 - src/test/regress/sql/task_tracker_assign_task.sql | 1 - src/test/regress/sql/task_tracker_cleanup_job.sql | 1 - src/test/regress/sql/task_tracker_create_table.sql | 1 - src/test/regress/sql/task_tracker_partition_task.sql | 1 - src/test/regress/sql/worker_binary_data_partition.sql | 1 - src/test/regress/sql/worker_check_invalid_arguments.sql | 1 - src/test/regress/sql/worker_create_table.sql | 1 - src/test/regress/sql/worker_hash_partition.sql | 1 - src/test/regress/sql/worker_hash_partition_complex.sql | 1 - src/test/regress/sql/worker_merge_hash_files.sql | 1 - src/test/regress/sql/worker_merge_range_files.sql | 1 - src/test/regress/sql/worker_null_data_partition.sql | 1 - src/test/regress/sql/worker_range_partition.sql | 1 - src/test/regress/sql/worker_range_partition_complex.sql | 1 - 242 files changed, 280 deletions(-) diff --git a/src/test/regress/expected/multi_agg_approximate_distinct.out b/src/test/regress/expected/multi_agg_approximate_distinct.out index 7888aaa9c..63884df18 100644 --- a/src/test/regress/expected/multi_agg_approximate_distinct.out +++ b/src/test/regress/expected/multi_agg_approximate_distinct.out @@ -2,7 +2,6 @@ -- MULTI_AGG_APPROXIMATE_DISTINCT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 340000; -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN 'CREATE EXTENSION HLL' diff --git a/src/test/regress/expected/multi_agg_approximate_distinct_0.out b/src/test/regress/expected/multi_agg_approximate_distinct_0.out index 50cca6f91..1b552e248 100644 --- a/src/test/regress/expected/multi_agg_approximate_distinct_0.out +++ b/src/test/regress/expected/multi_agg_approximate_distinct_0.out @@ -2,7 +2,6 @@ -- MULTI_AGG_APPROXIMATE_DISTINCT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 340000; -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN 'CREATE EXTENSION HLL' diff --git a/src/test/regress/expected/multi_array_agg.out b/src/test/regress/expected/multi_array_agg.out index 7ce3556eb..61e4de31e 100644 --- a/src/test/regress/expected/multi_array_agg.out +++ b/src/test/regress/expected/multi_array_agg.out @@ -2,7 +2,6 @@ -- MULTI_ARRAY_AGG -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 520000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 520000; CREATE OR REPLACE FUNCTION array_sort (ANYARRAY) RETURNS ANYARRAY LANGUAGE SQL AS $$ diff --git a/src/test/regress/expected/multi_average_expression.out b/src/test/regress/expected/multi_average_expression.out index a0df52dfc..c0551ec50 100644 --- a/src/test/regress/expected/multi_average_expression.out +++ b/src/test/regress/expected/multi_average_expression.out @@ -5,7 +5,6 @@ -- expression, and can be anywhere in the projection order. This is in response -- to a bug we had due to the average expression introducing new columns. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 450000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 450000; SELECT sum(l_quantity) as sum_qty, sum(l_extendedprice) as sum_base_price, diff --git a/src/test/regress/expected/multi_binary_master_copy_format.out b/src/test/regress/expected/multi_binary_master_copy_format.out index 5e213e175..1711372f1 100644 --- a/src/test/regress/expected/multi_binary_master_copy_format.out +++ b/src/test/regress/expected/multi_binary_master_copy_format.out @@ -2,7 +2,6 @@ -- MULTI_BINARY_MASTER_COPY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 430000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_citus_tools.out b/src/test/regress/expected/multi_citus_tools.out index 6d89c6d51..a78634ed7 100644 --- a/src/test/regress/expected/multi_citus_tools.out +++ b/src/test/regress/expected/multi_citus_tools.out @@ -4,7 +4,6 @@ -- tests UDFs created for citus tools -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 d85f4890f..591471722 100644 --- a/src/test/regress/expected/multi_cluster_management.out +++ b/src/test/regress/expected/multi_cluster_management.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 048fa084d..6ae4378fd 100644 --- a/src/test/regress/expected/multi_colocation_utils.out +++ b/src/test/regress/expected/multi_colocation_utils.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; -- =================================================================== -- create test utility function -- =================================================================== diff --git a/src/test/regress/expected/multi_complex_expressions.out b/src/test/regress/expected/multi_complex_expressions.out index 28b1a5bb6..4dfb46a94 100644 --- a/src/test/regress/expected/multi_complex_expressions.out +++ b/src/test/regress/expected/multi_complex_expressions.out @@ -2,7 +2,6 @@ -- MULTI_COMPLEX_EXPRESSIONS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 420000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 420000; -- Check that we can correctly handle complex expressions and aggregates. SELECT sum(l_quantity) / avg(l_quantity) FROM lineitem; ?column? diff --git a/src/test/regress/expected/multi_count_type_conversion.out b/src/test/regress/expected/multi_count_type_conversion.out index ef5cefef6..204532b48 100644 --- a/src/test/regress/expected/multi_count_type_conversion.out +++ b/src/test/regress/expected/multi_count_type_conversion.out @@ -2,7 +2,6 @@ -- MULTI_COUNT_TYPE_CONVERSION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 400000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 400000; -- Verify that we can sort count(*) results correctly. We perform this check as -- our count() operations execute in two steps: worker nodes report their -- count() results, and the master node sums these counts up. During this sum(), diff --git a/src/test/regress/expected/multi_create_fdw.out b/src/test/regress/expected/multi_create_fdw.out index c19446ab3..c3b52e459 100644 --- a/src/test/regress/expected/multi_create_fdw.out +++ b/src/test/regress/expected/multi_create_fdw.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 390000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 cd4694b20..24e57002d 100644 --- a/src/test/regress/expected/multi_create_insert_proxy.out +++ b/src/test/regress/expected/multi_create_insert_proxy.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 380000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 deda65b43..88bc2dba5 100644 --- a/src/test/regress/expected/multi_create_shards.out +++ b/src/test/regress/expected/multi_create_shards.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 370000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 370000; -- =================================================================== -- create test functions and types needed for tests -- =================================================================== diff --git a/src/test/regress/expected/multi_create_table.out b/src/test/regress/expected/multi_create_table.out index 8529d01d4..0aeb0df99 100644 --- a/src/test/regress/expected/multi_create_table.out +++ b/src/test/regress/expected/multi_create_table.out @@ -2,7 +2,6 @@ -- MULTI_CREATE_TABLE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 360000; -- Create new table definitions for use in testing in distributed planning and -- execution functionality. Also create indexes to boost performance. CREATE TABLE lineitem ( diff --git a/src/test/regress/expected/multi_create_table_constraints.out b/src/test/regress/expected/multi_create_table_constraints.out index 19c9a4c67..b3b5cfbd3 100644 --- a/src/test/regress/expected/multi_create_table_constraints.out +++ b/src/test/regress/expected/multi_create_table_constraints.out @@ -2,7 +2,6 @@ -- MULTI_CREATE_TABLE_CONSTRAINTS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 365000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 2c3de9e53..76fd44367 100644 --- a/src/test/regress/expected/multi_data_types.out +++ b/src/test/regress/expected/multi_data_types.out @@ -3,7 +3,6 @@ -- create, distribute, INSERT, SELECT and UPDATE -- =================================================================== ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 530000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 051d2dbd0..4fe9f4a42 100644 --- a/src/test/regress/expected/multi_deparse_shard_query.out +++ b/src/test/regress/expected/multi_deparse_shard_query.out @@ -2,7 +2,6 @@ -- MULTI_DEPARSE_SHARD_QUERY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13100000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 13100000; CREATE FUNCTION deparse_shard_query_test(text) RETURNS VOID AS 'citus' diff --git a/src/test/regress/expected/multi_distribution_metadata.out b/src/test/regress/expected/multi_distribution_metadata.out index e4e329b40..610bac567 100644 --- a/src/test/regress/expected/multi_distribution_metadata.out +++ b/src/test/regress/expected/multi_distribution_metadata.out @@ -2,7 +2,6 @@ -- create test functions -- =================================================================== ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 540000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 540000; CREATE FUNCTION load_shard_id_array(regclass) RETURNS bigint[] AS 'citus' diff --git a/src/test/regress/expected/multi_drop_extension.out b/src/test/regress/expected/multi_drop_extension.out index d733afde5..462d35d64 100644 --- a/src/test/regress/expected/multi_drop_extension.out +++ b/src/test/regress/expected/multi_drop_extension.out @@ -3,7 +3,6 @@ -- -- Tests around dropping and recreating the extension ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 550000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 adec59995..163e3f26f 100644 --- a/src/test/regress/expected/multi_dropped_column_aliases.out +++ b/src/test/regress/expected/multi_dropped_column_aliases.out @@ -1,7 +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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 4de4475dc..0eeeab1fd 100644 --- a/src/test/regress/expected/multi_expire_table_cache.out +++ b/src/test/regress/expected/multi_expire_table_cache.out @@ -2,7 +2,6 @@ --- MULTI_EXPIRE_TABLE_CACHE --- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_0.out b/src/test/regress/expected/multi_explain_0.out index c7f97c695..69eb07d04 100644 --- a/src/test/regress/expected/multi_explain_0.out +++ b/src/test/regress/expected/multi_explain_0.out @@ -2,7 +2,6 @@ -- MULTI_EXPLAIN -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 570000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 570000; -- print major version to make version-specific tests clear SELECT substring(version(), '\d+\.\d+') AS major_version; major_version diff --git a/src/test/regress/expected/multi_foreign_key.out b/src/test/regress/expected/multi_foreign_key.out index 0ebbf6f6f..c05ce9f3d 100644 --- a/src/test/regress/expected/multi_foreign_key.out +++ b/src/test/regress/expected/multi_foreign_key.out @@ -2,7 +2,6 @@ -- MULTI_FOREIGN_KEY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1350000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 51d230a58..bc350fb13 100644 --- a/src/test/regress/expected/multi_function_evaluation.out +++ b/src/test/regress/expected/multi_function_evaluation.out @@ -2,7 +2,6 @@ -- MULTI_FUNCTION_EVALUATION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 6459e56ef..5b9a2c66c 100644 --- a/src/test/regress/expected/multi_generate_ddl_commands.out +++ b/src/test/regress/expected/multi_generate_ddl_commands.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 610000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 2e78bb379..0ece95f61 100644 --- a/src/test/regress/expected/multi_hash_pruning.out +++ b/src/test/regress/expected/multi_hash_pruning.out @@ -3,7 +3,6 @@ -- -- Tests for shard and join pruning logic on hash partitioned tables. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 630000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_index_statements.out b/src/test/regress/expected/multi_index_statements.out index b92999c8b..b29e8682c 100644 --- a/src/test/regress/expected/multi_index_statements.out +++ b/src/test/regress/expected/multi_index_statements.out @@ -4,7 +4,6 @@ -- Check that we can run CREATE INDEX and DROP INDEX statements on distributed -- tables. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 640000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 640000; -- -- CREATE TEST TABLES -- diff --git a/src/test/regress/expected/multi_insert_select.out b/src/test/regress/expected/multi_insert_select.out index 7507fc03b..6f6ab342b 100644 --- a/src/test/regress/expected/multi_insert_select.out +++ b/src/test/regress/expected/multi_insert_select.out @@ -2,7 +2,6 @@ -- MULTI_INSERT_SELECT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 13300000; -- create co-located tables SET citus.shard_count = 4; SET citus.shard_replication_factor = 2; diff --git a/src/test/regress/expected/multi_join_order_additional.out b/src/test/regress/expected/multi_join_order_additional.out index 1d96eb681..05971983c 100644 --- a/src/test/regress/expected/multi_join_order_additional.out +++ b/src/test/regress/expected/multi_join_order_additional.out @@ -2,7 +2,6 @@ -- MULTI_JOIN_ORDER_ADDITIONAL -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 650000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 8f4655b46..f27cb1492 100644 --- a/src/test/regress/expected/multi_join_order_tpch_large.out +++ b/src/test/regress/expected/multi_join_order_tpch_large.out @@ -2,7 +2,6 @@ -- MULTI_JOIN_ORDER_TPCH_LARGE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 660000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_join_pruning.out b/src/test/regress/expected/multi_join_pruning.out index e04799723..c26505b54 100644 --- a/src/test/regress/expected/multi_join_pruning.out +++ b/src/test/regress/expected/multi_join_pruning.out @@ -1,7 +1,6 @@ -- -- MULTI_JOIN_PRUNING -- -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 680000; -- Check that join-pruning works for joins between two large relations. For now -- we only check for join-pruning between locally partitioned relations. In the -- future we want to check for pruning between re-partitioned relations as well. diff --git a/src/test/regress/expected/multi_large_table_pruning.out b/src/test/regress/expected/multi_large_table_pruning.out index 63ba209d2..42bc58786 100644 --- a/src/test/regress/expected/multi_large_table_pruning.out +++ b/src/test/regress/expected/multi_large_table_pruning.out @@ -5,7 +5,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_limit_clause.out b/src/test/regress/expected/multi_limit_clause.out index 4ead2585f..793f928bc 100644 --- a/src/test/regress/expected/multi_limit_clause.out +++ b/src/test/regress/expected/multi_limit_clause.out @@ -2,7 +2,6 @@ -- MULTI_LIMIT_CLAUSE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 730000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 730000; -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; -- Check that we can correctly handle the Limit clause in distributed queries. diff --git a/src/test/regress/expected/multi_limit_clause_approximate.out b/src/test/regress/expected/multi_limit_clause_approximate.out index ef90d54ec..8700e63fb 100644 --- a/src/test/regress/expected/multi_limit_clause_approximate.out +++ b/src/test/regress/expected/multi_limit_clause_approximate.out @@ -2,7 +2,6 @@ -- MULTI_LIMIT_CLAUSE_APPROXIMATE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 720000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 720000; -- Display debug messages on limit clause push down. SET client_min_messages TO DEBUG1; -- We first look at results with limit optimization disabled. This first query diff --git a/src/test/regress/expected/multi_master_protocol.out b/src/test/regress/expected/multi_master_protocol.out index 4a164c49d..be55f3979 100644 --- a/src/test/regress/expected/multi_master_protocol.out +++ b/src/test/regress/expected/multi_master_protocol.out @@ -3,7 +3,6 @@ -- -- Tests that check the metadata returned by the master node. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 740000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 8e7b74904..432eefac9 100644 --- a/src/test/regress/expected/multi_metadata_access.out +++ b/src/test/regress/expected/multi_metadata_access.out @@ -2,7 +2,6 @@ -- MULTI_METADATA_ACCESS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_metadata_sync.out b/src/test/regress/expected/multi_metadata_sync.out index 924c2b9f4..72e463ccf 100644 --- a/src/test/regress/expected/multi_metadata_sync.out +++ b/src/test/regress/expected/multi_metadata_sync.out @@ -4,7 +4,6 @@ -- Tests for metadata snapshot functions, metadata syncing functions and propagation of -- metadata changes to MX tables. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; SELECT nextval('pg_catalog.pg_dist_shard_placement_placementid_seq') AS last_placement_id \gset ALTER SEQUENCE pg_catalog.pg_dist_shard_placement_placementid_seq RESTART 100000; diff --git a/src/test/regress/expected/multi_modifications.out b/src/test/regress/expected/multi_modifications.out index 58682830b..929e3e965 100644 --- a/src/test/regress/expected/multi_modifications.out +++ b/src/test/regress/expected/multi_modifications.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 750000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 750000; -- =================================================================== -- test end-to-end modification functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out index 9c2a1bcc5..191e8f948 100644 --- a/src/test/regress/expected/multi_modifying_xacts.out +++ b/src/test/regress/expected/multi_modifying_xacts.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1200000; -- =================================================================== -- test end-to-end modification functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_mx_create_table.out b/src/test/regress/expected/multi_mx_create_table.out index 5c17af922..3ea870ce3 100644 --- a/src/test/regress/expected/multi_mx_create_table.out +++ b/src/test/regress/expected/multi_mx_create_table.out @@ -2,7 +2,6 @@ -- MULTI_MX_CREATE_TABLE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1220000; SELECT start_metadata_sync_to_node('localhost', :worker_1_port); start_metadata_sync_to_node ----------------------------- diff --git a/src/test/regress/expected/multi_mx_ddl.out b/src/test/regress/expected/multi_mx_ddl.out index 7f87e5b57..e103c2183 100644 --- a/src/test/regress/expected/multi_mx_ddl.out +++ b/src/test/regress/expected/multi_mx_ddl.out @@ -1,6 +1,5 @@ -- Tests related to distributed DDL commands on mx cluster ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1600000; SELECT * FROM mx_ddl_table ORDER BY key; key | value -----+------- diff --git a/src/test/regress/expected/multi_mx_explain_0.out b/src/test/regress/expected/multi_mx_explain_0.out index 3c425c949..c580d3e34 100644 --- a/src/test/regress/expected/multi_mx_explain_0.out +++ b/src/test/regress/expected/multi_mx_explain_0.out @@ -2,11 +2,8 @@ -- MULTI_MX_EXPLAIN -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1320000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_1_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :worker_2_port -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1320000; \c - - - :master_port \a\t SET citus.task_executor_type TO 'real-time'; diff --git a/src/test/regress/expected/multi_mx_modifications.out b/src/test/regress/expected/multi_mx_modifications.out index e244c0578..89d4b9ec6 100644 --- a/src/test/regress/expected/multi_mx_modifications.out +++ b/src/test/regress/expected/multi_mx_modifications.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1330000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1330000; -- =================================================================== -- test end-to-end modification functionality for mx tables -- =================================================================== diff --git a/src/test/regress/expected/multi_mx_modifying_xacts.out b/src/test/regress/expected/multi_mx_modifying_xacts.out index afac72f54..92d29bf82 100644 --- a/src/test/regress/expected/multi_mx_modifying_xacts.out +++ b/src/test/regress/expected/multi_mx_modifying_xacts.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1340000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1340000; -- =================================================================== -- test end-to-end modification functionality for mx tables in transactions -- =================================================================== diff --git a/src/test/regress/expected/multi_mx_reference_table.out b/src/test/regress/expected/multi_mx_reference_table.out index 0aecc94f6..d49c0cb06 100644 --- a/src/test/regress/expected/multi_mx_reference_table.out +++ b/src/test/regress/expected/multi_mx_reference_table.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; \c - - - :master_port CREATE TABLE reference_table_test (value_1 int, value_2 float, value_3 text, value_4 timestamp); SELECT create_reference_table('reference_table_test'); diff --git a/src/test/regress/expected/multi_mx_router_planner.out b/src/test/regress/expected/multi_mx_router_planner.out index 9c6b09cf2..c6a4596c6 100644 --- a/src/test/regress/expected/multi_mx_router_planner.out +++ b/src/test/regress/expected/multi_mx_router_planner.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 840000; -- =================================================================== -- test router planner functionality for single shard select queries -- =================================================================== diff --git a/src/test/regress/expected/multi_mx_schema_support.out b/src/test/regress/expected/multi_mx_schema_support.out index 5035dc96f..74b577c97 100644 --- a/src/test/regress/expected/multi_mx_schema_support.out +++ b/src/test/regress/expected/multi_mx_schema_support.out @@ -2,7 +2,6 @@ -- MULTI_MX_SCHEMA_SUPPORT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1210000; -- connect to a worker node and run some queries \c - - - :worker_1_port -- test very basic queries diff --git a/src/test/regress/expected/multi_mx_tpch_query1.out b/src/test/regress/expected/multi_mx_tpch_query1.out index a0b0ac086..9c3a8092f 100644 --- a/src/test/regress/expected/multi_mx_tpch_query1.out +++ b/src/test/regress/expected/multi_mx_tpch_query1.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY1 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -40,7 +39,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark @@ -76,7 +74,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query10.out b/src/test/regress/expected/multi_mx_tpch_query10.out index 2a3bb08df..675902e8f 100644 --- a/src/test/regress/expected/multi_mx_tpch_query10.out +++ b/src/test/regress/expected/multi_mx_tpch_query10.out @@ -5,7 +5,6 @@ -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; -- connect to master \c - - - :master_port SELECT @@ -67,7 +66,6 @@ LIMIT 20; -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; SELECT c_custkey, c_name, @@ -127,7 +125,6 @@ LIMIT 20; -- connect to the other worker \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; SELECT c_custkey, c_name, diff --git a/src/test/regress/expected/multi_mx_tpch_query12.out b/src/test/regress/expected/multi_mx_tpch_query12.out index 959b03fe6..f4bce62ac 100644 --- a/src/test/regress/expected/multi_mx_tpch_query12.out +++ b/src/test/regress/expected/multi_mx_tpch_query12.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY12 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -45,7 +44,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark @@ -86,7 +84,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query14.out b/src/test/regress/expected/multi_mx_tpch_query14.out index 68b6b381c..418157a2b 100644 --- a/src/test/regress/expected/multi_mx_tpch_query14.out +++ b/src/test/regress/expected/multi_mx_tpch_query14.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY14 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -29,7 +28,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark @@ -54,7 +52,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query19.out b/src/test/regress/expected/multi_mx_tpch_query19.out index ae0b61d81..30e0b78d9 100644 --- a/src/test/regress/expected/multi_mx_tpch_query19.out +++ b/src/test/regress/expected/multi_mx_tpch_query19.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY19 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -46,7 +45,6 @@ WHERE -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified @@ -88,7 +86,6 @@ WHERE -- connect to the other node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified diff --git a/src/test/regress/expected/multi_mx_tpch_query3.out b/src/test/regress/expected/multi_mx_tpch_query3.out index 3e7c99bc2..2c714236d 100644 --- a/src/test/regress/expected/multi_mx_tpch_query3.out +++ b/src/test/regress/expected/multi_mx_tpch_query3.out @@ -5,7 +5,6 @@ -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; -- connect to the coordinator \c - - - :master_port SELECT @@ -53,7 +52,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, @@ -99,7 +97,6 @@ ORDER BY -- connect to the other node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/expected/multi_mx_tpch_query6.out b/src/test/regress/expected/multi_mx_tpch_query6.out index 7a1949d21..94fbcb004 100644 --- a/src/test/regress/expected/multi_mx_tpch_query6.out +++ b/src/test/regress/expected/multi_mx_tpch_query6.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY6 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem and orders tables as large @@ -25,7 +24,6 @@ WHERE -- connect to one of the worker nodes \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark @@ -46,7 +44,6 @@ WHERE -- connect to the other worker node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query7.out b/src/test/regress/expected/multi_mx_tpch_query7.out index 5b931980e..ad92569b5 100644 --- a/src/test/regress/expected/multi_mx_tpch_query7.out +++ b/src/test/regress/expected/multi_mx_tpch_query7.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY7 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem AND orders tables as large @@ -55,7 +54,6 @@ ORDER BY -- connect one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark @@ -106,7 +104,6 @@ ORDER BY -- connect to the other worker node \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_mx_tpch_query7_nested.out b/src/test/regress/expected/multi_mx_tpch_query7_nested.out index 16a9a1c6e..04e1dd7a2 100644 --- a/src/test/regress/expected/multi_mx_tpch_query7_nested.out +++ b/src/test/regress/expected/multi_mx_tpch_query7_nested.out @@ -2,7 +2,6 @@ -- MULTI_MX_TPCH_QUERY7_NESTED -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- connect to the coordinator \c - - - :master_port -- Change configuration to treat lineitem AND orders tables AS large @@ -64,7 +63,6 @@ ORDER BY -- connect to one of the workers \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects @@ -124,7 +122,6 @@ ORDER BY -- connect to the coordinator \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects diff --git a/src/test/regress/expected/multi_name_lengths.out b/src/test/regress/expected/multi_name_lengths.out index b4b9fec38..667e8ecce 100644 --- a/src/test/regress/expected/multi_name_lengths.out +++ b/src/test/regress/expected/multi_name_lengths.out @@ -2,7 +2,6 @@ -- MULTI_NAME_LENGTHS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 225000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 225000; SET citus.multi_shard_commit_protocol = '2pc'; -- Verify that a table name > 56 characters gets hashed properly. CREATE TABLE too_long_12345678901234567890123456789012345678901234567890 ( 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 0757254f7..db40bb99f 100644 --- a/src/test/regress/expected/multi_null_minmax_value_pruning.out +++ b/src/test/regress/expected/multi_null_minmax_value_pruning.out @@ -4,7 +4,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 760000; SET client_min_messages TO DEBUG2; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/expected/multi_partition_pruning.out b/src/test/regress/expected/multi_partition_pruning.out index 65034ae48..2fe161d8b 100644 --- a/src/test/regress/expected/multi_partition_pruning.out +++ b/src/test/regress/expected/multi_partition_pruning.out @@ -4,7 +4,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 770000; SET citus.explain_distributed_queries TO off; SET client_min_messages TO DEBUG2; -- Adding additional l_orderkey = 1 to make this query not router executable diff --git a/src/test/regress/expected/multi_prepare_plsql.out b/src/test/regress/expected/multi_prepare_plsql.out index 086f4aa59..8727fed5e 100644 --- a/src/test/regress/expected/multi_prepare_plsql.out +++ b/src/test/regress/expected/multi_prepare_plsql.out @@ -5,7 +5,6 @@ -- and converted into both plain SQL and PL/pgsql functions, which -- use prepared statements internally. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 780000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 780000; CREATE FUNCTION plpgsql_test_1() RETURNS TABLE(count bigint) AS $$ DECLARE BEGIN diff --git a/src/test/regress/expected/multi_prepare_sql.out b/src/test/regress/expected/multi_prepare_sql.out index f37c8564a..374223972 100644 --- a/src/test/regress/expected/multi_prepare_sql.out +++ b/src/test/regress/expected/multi_prepare_sql.out @@ -5,7 +5,6 @@ -- taken from other regression test files and converted into -- prepared statements. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 790000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 790000; PREPARE prepared_test_1 AS SELECT count(*) diff --git a/src/test/regress/expected/multi_prune_shard_list.out b/src/test/regress/expected/multi_prune_shard_list.out index a440478e5..07d293498 100644 --- a/src/test/regress/expected/multi_prune_shard_list.out +++ b/src/test/regress/expected/multi_prune_shard_list.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 800000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 800000; -- =================================================================== -- create test functions -- =================================================================== diff --git a/src/test/regress/expected/multi_reference_table.out b/src/test/regress/expected/multi_reference_table.out index 2e363623d..d90ef44c4 100644 --- a/src/test/regress/expected/multi_reference_table.out +++ b/src/test/regress/expected/multi_reference_table.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 127ae2492..477e6a880 100644 --- a/src/test/regress/expected/multi_remove_node_reference_table.out +++ b/src/test/regress/expected/multi_remove_node_reference_table.out @@ -3,7 +3,6 @@ -- -- Tests that check the metadata after master_remove_node. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1380000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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; diff --git a/src/test/regress/expected/multi_repair_shards.out b/src/test/regress/expected/multi_repair_shards.out index 41e92038a..40e04c9cf 100644 --- a/src/test/regress/expected/multi_repair_shards.out +++ b/src/test/regress/expected/multi_repair_shards.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 820000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 820000; -- =================================================================== -- test shard repair functionality -- =================================================================== diff --git a/src/test/regress/expected/multi_repartitioned_subquery_udf.out b/src/test/regress/expected/multi_repartitioned_subquery_udf.out index 39484ca4e..37f641223 100644 --- a/src/test/regress/expected/multi_repartitioned_subquery_udf.out +++ b/src/test/regress/expected/multi_repartitioned_subquery_udf.out @@ -2,7 +2,6 @@ -- MULTI_REPARTITIONED_SUBQUERY_UDF -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 830000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 1bf79a6f6..bffb670cd 100644 --- a/src/test/regress/expected/multi_replicate_reference_table.out +++ b/src/test/regress/expected/multi_replicate_reference_table.out @@ -3,7 +3,6 @@ -- -- Tests that check the metadata returned by the master node. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1370000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_schema_support.out b/src/test/regress/expected/multi_schema_support.out index 1cdc897ab..1208f8159 100644 --- a/src/test/regress/expected/multi_schema_support.out +++ b/src/test/regress/expected/multi_schema_support.out @@ -2,7 +2,6 @@ -- MULTI_SCHEMA_SUPPORT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1190000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1190000; -- create schema to test schema support CREATE SCHEMA test_schema_support; -- test master_append_table_to_shard with schema diff --git a/src/test/regress/expected/multi_shard_modify.out b/src/test/regress/expected/multi_shard_modify.out index c9b0f3cd2..bf09d36e6 100644 --- a/src/test/regress/expected/multi_shard_modify.out +++ b/src/test/regress/expected/multi_shard_modify.out @@ -2,7 +2,6 @@ -- MULTI_SHARD_MODIFY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 350000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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, diff --git a/src/test/regress/expected/multi_simple_queries.out b/src/test/regress/expected/multi_simple_queries.out index 0820a83bf..6728b3bb8 100644 --- a/src/test/regress/expected/multi_simple_queries.out +++ b/src/test/regress/expected/multi_simple_queries.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 850000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 8f570be25..890f9cb7f 100644 --- a/src/test/regress/expected/multi_single_relation_subquery.out +++ b/src/test/regress/expected/multi_single_relation_subquery.out @@ -3,7 +3,6 @@ -- -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 860000; SET citus.task_executor_type TO 'task-tracker'; select number_sum, diff --git a/src/test/regress/expected/multi_sql_function.out b/src/test/regress/expected/multi_sql_function.out index e8ceecf52..860fe9a75 100644 --- a/src/test/regress/expected/multi_sql_function.out +++ b/src/test/regress/expected/multi_sql_function.out @@ -2,7 +2,6 @@ -- MULTI_SQL_FUNCTION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; CREATE FUNCTION sql_test_no_1() RETURNS bigint AS ' SELECT count(*) diff --git a/src/test/regress/expected/multi_table_ddl.out b/src/test/regress/expected/multi_table_ddl.out index 4fc76fc9a..c881ab6ee 100644 --- a/src/test/regress/expected/multi_table_ddl.out +++ b/src/test/regress/expected/multi_table_ddl.out @@ -3,7 +3,6 @@ -- -- Tests around changing the schema and dropping of a distributed table ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 870000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_tpch_query1.out b/src/test/regress/expected/multi_tpch_query1.out index 6bc93dc4d..35a541c50 100644 --- a/src/test/regress/expected/multi_tpch_query1.out +++ b/src/test/regress/expected/multi_tpch_query1.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY1 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 890000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 890000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #1 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query10.out b/src/test/regress/expected/multi_tpch_query10.out index 2923dd432..5213bc5af 100644 --- a/src/test/regress/expected/multi_tpch_query10.out +++ b/src/test/regress/expected/multi_tpch_query10.out @@ -5,7 +5,6 @@ -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 900000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 900000; SELECT c_custkey, c_name, diff --git a/src/test/regress/expected/multi_tpch_query12.out b/src/test/regress/expected/multi_tpch_query12.out index ca9662c3e..a6270cfba 100644 --- a/src/test/regress/expected/multi_tpch_query12.out +++ b/src/test/regress/expected/multi_tpch_query12.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY12 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 910000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 910000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #12 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query14.out b/src/test/regress/expected/multi_tpch_query14.out index 9bf8a5a82..0ee550e84 100644 --- a/src/test/regress/expected/multi_tpch_query14.out +++ b/src/test/regress/expected/multi_tpch_query14.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY14 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 920000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 920000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #14 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query19.out b/src/test/regress/expected/multi_tpch_query19.out index e0f1f0d86..2deb3aca3 100644 --- a/src/test/regress/expected/multi_tpch_query19.out +++ b/src/test/regress/expected/multi_tpch_query19.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY19 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 930000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 930000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #19 from the TPC-H decision support benchmark. Note that we modified diff --git a/src/test/regress/expected/multi_tpch_query3.out b/src/test/regress/expected/multi_tpch_query3.out index 67797e2e1..853c4e493 100644 --- a/src/test/regress/expected/multi_tpch_query3.out +++ b/src/test/regress/expected/multi_tpch_query3.out @@ -5,7 +5,6 @@ -- we don't set citus.large_table_shard_count here, and instead use the default value -- coming from postgresql.conf or multi_task_tracker_executor.conf. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 940000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 940000; SELECT l_orderkey, sum(l_extendedprice * (1 - l_discount)) as revenue, diff --git a/src/test/regress/expected/multi_tpch_query6.out b/src/test/regress/expected/multi_tpch_query6.out index 3d29efa07..66398d859 100644 --- a/src/test/regress/expected/multi_tpch_query6.out +++ b/src/test/regress/expected/multi_tpch_query6.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY6 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 950000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 950000; -- Change configuration to treat lineitem and orders tables as large SET citus.large_table_shard_count TO 2; -- Query #6 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query7.out b/src/test/regress/expected/multi_tpch_query7.out index 69c8af9c4..d14202e92 100644 --- a/src/test/regress/expected/multi_tpch_query7.out +++ b/src/test/regress/expected/multi_tpch_query7.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY7 -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 970000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 970000; -- Change configuration to treat lineitem AND orders tables as large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H decision support benchmark diff --git a/src/test/regress/expected/multi_tpch_query7_nested.out b/src/test/regress/expected/multi_tpch_query7_nested.out index 1faa07b9c..ed2ff9529 100644 --- a/src/test/regress/expected/multi_tpch_query7_nested.out +++ b/src/test/regress/expected/multi_tpch_query7_nested.out @@ -2,7 +2,6 @@ -- MULTI_TPCH_QUERY7_NESTED -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 960000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 960000; -- Change configuration to treat lineitem AND orders tables AS large SET citus.large_table_shard_count TO 2; -- Query #7 from the TPC-H benchmark; modified to include sub-selects diff --git a/src/test/regress/expected/multi_transaction_recovery.out b/src/test/regress/expected/multi_transaction_recovery.out index 3ef82a7c0..a5ec64d3f 100644 --- a/src/test/regress/expected/multi_transaction_recovery.out +++ b/src/test/regress/expected/multi_transaction_recovery.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_transactional_drop_shards.out b/src/test/regress/expected/multi_transactional_drop_shards.out index 98987b13c..8ee38f2ca 100644 --- a/src/test/regress/expected/multi_transactional_drop_shards.out +++ b/src/test/regress/expected/multi_transactional_drop_shards.out @@ -3,7 +3,6 @@ -- -- Tests that check the metadata returned by the master node. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1410000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1410000; SET citus.shard_count TO 4; -- test DROP TABLE(ergo master_drop_all_shards) in transaction, then ROLLBACK CREATE TABLE transactional_drop_shards(column1 int); diff --git a/src/test/regress/expected/multi_truncate.out b/src/test/regress/expected/multi_truncate.out index bb7d14d0d..b65254d1a 100644 --- a/src/test/regress/expected/multi_truncate.out +++ b/src/test/regress/expected/multi_truncate.out @@ -2,7 +2,6 @@ -- MULTI_TRUNCATE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 09cefad64..024f08d3c 100644 --- a/src/test/regress/expected/multi_unsupported_worker_operations.out +++ b/src/test/regress/expected/multi_unsupported_worker_operations.out @@ -3,7 +3,6 @@ -- -- Tests for ensuring unsupported functions on workers error out. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_upgrade_reference_table.out b/src/test/regress/expected/multi_upgrade_reference_table.out index 3aaf0b276..80c2cde7a 100644 --- a/src/test/regress/expected/multi_upgrade_reference_table.out +++ b/src/test/regress/expected/multi_upgrade_reference_table.out @@ -4,7 +4,6 @@ -- Tests around upgrade_reference_table UDF -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1360000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1360000; -- test with not distributed table CREATE TABLE upgrade_reference_table_local(column1 int); diff --git a/src/test/regress/expected/multi_upsert.out b/src/test/regress/expected/multi_upsert.out index 8038b7087..089d9fe4c 100644 --- a/src/test/regress/expected/multi_upsert.out +++ b/src/test/regress/expected/multi_upsert.out @@ -1,6 +1,5 @@ -- this test file aims to test UPSERT feature on Citus ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 980000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 eda3b3a87..541a38701 100644 --- a/src/test/regress/expected/multi_utilities.out +++ b/src/test/regress/expected/multi_utilities.out @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 990000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 b7f4b3723..ae1d0a89b 100644 --- a/src/test/regress/expected/multi_utility_statements.out +++ b/src/test/regress/expected/multi_utility_statements.out @@ -5,7 +5,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 3ec7b5dbe..0791a12e0 100644 --- a/src/test/regress/expected/multi_utility_warnings.out +++ b/src/test/regress/expected/multi_utility_warnings.out @@ -4,7 +4,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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/multi_working_columns.out b/src/test/regress/expected/multi_working_columns.out index 13b5dadc1..f1d735b96 100644 --- a/src/test/regress/expected/multi_working_columns.out +++ b/src/test/regress/expected/multi_working_columns.out @@ -6,7 +6,6 @@ -- these columns are pulled to the master, and are correctly used in sorting and -- grouping. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1040000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1040000; SELECT l_quantity FROM lineitem ORDER BY l_shipdate, l_quantity LIMIT 20; l_quantity ------------ diff --git a/src/test/regress/expected/task_tracker_assign_task.out b/src/test/regress/expected/task_tracker_assign_task.out index ecbdfc461..f3f59b6e9 100644 --- a/src/test/regress/expected/task_tracker_assign_task.out +++ b/src/test/regress/expected/task_tracker_assign_task.out @@ -2,7 +2,6 @@ -- TASK_TRACKER_ASSIGN_TASK -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1050000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1050000; \set JobId 401010 \set SimpleTaskId 101101 \set RecoverableTaskId 801102 diff --git a/src/test/regress/expected/task_tracker_cleanup_job.out b/src/test/regress/expected/task_tracker_cleanup_job.out index efe40e58b..149f17422 100644 --- a/src/test/regress/expected/task_tracker_cleanup_job.out +++ b/src/test/regress/expected/task_tracker_cleanup_job.out @@ -2,7 +2,6 @@ -- TASK_TRACKER_CLEANUP_JOB -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1060000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 d5fd46d63..2d0a8e3f4 100644 --- a/src/test/regress/expected/task_tracker_create_table.out +++ b/src/test/regress/expected/task_tracker_create_table.out @@ -2,7 +2,6 @@ -- TASK_TRACKER_CREATE_TABLE -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1070000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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/task_tracker_partition_task.out b/src/test/regress/expected/task_tracker_partition_task.out index bd61ada0f..3a3b821b8 100644 --- a/src/test/regress/expected/task_tracker_partition_task.out +++ b/src/test/regress/expected/task_tracker_partition_task.out @@ -2,7 +2,6 @@ -- TASK_TRACKER_PARTITION_TASK -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1080000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1080000; \set JobId 401010 \set PartitionTaskId 801106 \set PartitionColumn l_orderkey diff --git a/src/test/regress/expected/worker_binary_data_partition.out b/src/test/regress/expected/worker_binary_data_partition.out index 77d20f5e1..1c8a1f9cd 100644 --- a/src/test/regress/expected/worker_binary_data_partition.out +++ b/src/test/regress/expected/worker_binary_data_partition.out @@ -2,7 +2,6 @@ -- WORKER_BINARY_DATA_PARTITION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1090000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1090000; \set JobId 201010 \set TaskId 101105 \set Partition_Column textcolumn diff --git a/src/test/regress/expected/worker_check_invalid_arguments.out b/src/test/regress/expected/worker_check_invalid_arguments.out index 8affeac11..f81f89dbe 100644 --- a/src/test/regress/expected/worker_check_invalid_arguments.out +++ b/src/test/regress/expected/worker_check_invalid_arguments.out @@ -2,7 +2,6 @@ -- WORKER_CHECK_INVALID_ARGUMENTS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1100000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 cc773b005..30a892250 100644 --- a/src/test/regress/expected/worker_create_table.out +++ b/src/test/regress/expected/worker_create_table.out @@ -5,7 +5,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1110000; CREATE TABLE lineitem ( l_orderkey bigint not null, l_partkey integer not null, diff --git a/src/test/regress/expected/worker_hash_partition.out b/src/test/regress/expected/worker_hash_partition.out index efeaf291e..afc7bba3c 100644 --- a/src/test/regress/expected/worker_hash_partition.out +++ b/src/test/regress/expected/worker_hash_partition.out @@ -2,7 +2,6 @@ -- WORKER_HASH_PARTITION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1130000; \set JobId 201010 \set TaskId 101103 \set Partition_Column l_orderkey diff --git a/src/test/regress/expected/worker_hash_partition_complex.out b/src/test/regress/expected/worker_hash_partition_complex.out index 29624a4c0..1b1727cf8 100644 --- a/src/test/regress/expected/worker_hash_partition_complex.out +++ b/src/test/regress/expected/worker_hash_partition_complex.out @@ -2,7 +2,6 @@ -- WORKER_HASH_PARTITION_COMPLEX -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1120000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1120000; \set JobId 201010 \set TaskId 101104 \set Partition_Column l_partkey diff --git a/src/test/regress/expected/worker_merge_hash_files.out b/src/test/regress/expected/worker_merge_hash_files.out index 671bbb5a5..82cb81cf1 100644 --- a/src/test/regress/expected/worker_merge_hash_files.out +++ b/src/test/regress/expected/worker_merge_hash_files.out @@ -2,7 +2,6 @@ -- WORKER_MERGE_HASH_FILES -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1140000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1140000; \set JobId 201010 \set TaskId 101103 \set Task_Table_Name public.task_101103 diff --git a/src/test/regress/expected/worker_merge_range_files.out b/src/test/regress/expected/worker_merge_range_files.out index 264312af7..80f7797cc 100644 --- a/src/test/regress/expected/worker_merge_range_files.out +++ b/src/test/regress/expected/worker_merge_range_files.out @@ -2,7 +2,6 @@ -- WORKER_MERGE_RANGE_FILES -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1150000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1150000; \set JobId 201010 \set TaskId 101101 \set Task_Table_Name public.task_101101 diff --git a/src/test/regress/expected/worker_null_data_partition.out b/src/test/regress/expected/worker_null_data_partition.out index 9180fb1ec..fc14e6d12 100644 --- a/src/test/regress/expected/worker_null_data_partition.out +++ b/src/test/regress/expected/worker_null_data_partition.out @@ -2,7 +2,6 @@ -- WORKER_NULL_DATA_PARTITION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1180000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1180000; \set JobId 201010 \set Range_TaskId 101106 \set Partition_Column s_nationkey diff --git a/src/test/regress/expected/worker_range_partition.out b/src/test/regress/expected/worker_range_partition.out index b9ffb7753..0590bdba7 100644 --- a/src/test/regress/expected/worker_range_partition.out +++ b/src/test/regress/expected/worker_range_partition.out @@ -2,7 +2,6 @@ -- WORKER_RANGE_PARTITION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1160000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1160000; \set JobId 201010 \set TaskId 101101 \set Partition_Column l_orderkey diff --git a/src/test/regress/expected/worker_range_partition_complex.out b/src/test/regress/expected/worker_range_partition_complex.out index fc68b2d32..15ac92db9 100644 --- a/src/test/regress/expected/worker_range_partition_complex.out +++ b/src/test/regress/expected/worker_range_partition_complex.out @@ -2,7 +2,6 @@ -- WORKER_RANGE_PARTITION_COMPLEX -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1170000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1170000; \set JobId 201010 \set TaskId 101102 \set Partition_Column l_partkey diff --git a/src/test/regress/input/multi_agg_distinct.source b/src/test/regress/input/multi_agg_distinct.source index a63ecbb05..6f601b9ca 100644 --- a/src/test/regress/input/multi_agg_distinct.source +++ b/src/test/regress/input/multi_agg_distinct.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 200000; -- Create a new range partitioned lineitem table and load data into it diff --git a/src/test/regress/input/multi_agg_type_conversion.source b/src/test/regress/input/multi_agg_type_conversion.source index 71bdc7e15..393245e25 100644 --- a/src/test/regress/input/multi_agg_type_conversion.source +++ b/src/test/regress/input/multi_agg_type_conversion.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 210000; -- Test aggregate type conversions using sums of integers and division operator diff --git a/src/test/regress/input/multi_alter_table_statements.source b/src/test/regress/input/multi_alter_table_statements.source index 931129866..7928d2077 100644 --- a/src/test/regress/input/multi_alter_table_statements.source +++ b/src/test/regress/input/multi_alter_table_statements.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 220000; -- Check that we can run ALTER TABLE statements on distributed tables. 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 95cd72deb..162a366c7 100644 --- a/src/test/regress/input/multi_append_table_to_shard.source +++ b/src/test/regress/input/multi_append_table_to_shard.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 230000; -- Initialize tables to join diff --git a/src/test/regress/input/multi_complex_count_distinct.source b/src/test/regress/input/multi_complex_count_distinct.source index 70b65e34b..ffd4438a1 100644 --- a/src/test/regress/input/multi_complex_count_distinct.source +++ b/src/test/regress/input/multi_complex_count_distinct.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 240000; CREATE TABLE lineitem_hash ( diff --git a/src/test/regress/input/multi_copy.source b/src/test/regress/input/multi_copy.source index 348d82b14..b7ae53195 100644 --- a/src/test/regress/input/multi_copy.source +++ b/src/test/regress/input/multi_copy.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 560000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 560000; -- Create a new hash-partitioned table into which to COPY diff --git a/src/test/regress/input/multi_create_schema.source b/src/test/regress/input/multi_create_schema.source index ece82d4bf..5e7ca2109 100644 --- a/src/test/regress/input/multi_create_schema.source +++ b/src/test/regress/input/multi_create_schema.source @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 250000; CREATE SCHEMA tpch diff --git a/src/test/regress/input/multi_large_shardid.source b/src/test/regress/input/multi_large_shardid.source index 2ce50e190..624a132b0 100644 --- a/src/test/regress/input/multi_large_shardid.source +++ b/src/test/regress/input/multi_large_shardid.source @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 100200300400500; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 9000000; -- Load additional data to start using large shard identifiers. diff --git a/src/test/regress/input/multi_load_data.source b/src/test/regress/input/multi_load_data.source index 6fd19d346..a48c51e36 100644 --- a/src/test/regress/input/multi_load_data.source +++ b/src/test/regress/input/multi_load_data.source @@ -7,7 +7,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 d94396ce8..a1376d2a0 100644 --- a/src/test/regress/input/multi_load_large_records.source +++ b/src/test/regress/input/multi_load_large_records.source @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 655201ac9..1b7f1f117 100644 --- a/src/test/regress/input/multi_load_more_data.source +++ b/src/test/regress/input/multi_load_more_data.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 a3cc63eb3..547530469 100644 --- a/src/test/regress/input/multi_master_delete_protocol.source +++ b/src/test/regress/input/multi_master_delete_protocol.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 320000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 320000; -- Create a new range partitioned customer_delete_protocol table and load data into it. diff --git a/src/test/regress/input/multi_mx_copy_data.source b/src/test/regress/input/multi_mx_copy_data.source index 5c801f8eb..a231d4ad8 100644 --- a/src/test/regress/input/multi_mx_copy_data.source +++ b/src/test/regress/input/multi_mx_copy_data.source @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 290000; \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; diff --git a/src/test/regress/input/multi_outer_join.source b/src/test/regress/input/multi_outer_join.source index 55d480812..63450b0c0 100644 --- a/src/test/regress/input/multi_outer_join.source +++ b/src/test/regress/input/multi_outer_join.source @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 be121413e..08261ee34 100644 --- a/src/test/regress/input/multi_outer_join_reference.source +++ b/src/test/regress/input/multi_outer_join_reference.source @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 65ca778db..2d259cad1 100644 --- a/src/test/regress/input/worker_copy.source +++ b/src/test/regress/input/worker_copy.source @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 260000; COPY lineitem FROM '@abs_srcdir@/data/lineitem.1.data' WITH DELIMITER '|'; diff --git a/src/test/regress/output/multi_agg_distinct.source b/src/test/regress/output/multi_agg_distinct.source index 41bc722ee..3f0ab6db6 100644 --- a/src/test/regress/output/multi_agg_distinct.source +++ b/src/test/regress/output/multi_agg_distinct.source @@ -2,7 +2,6 @@ -- MULTI_AGG_DISTINCT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 200000; -- Create a new range partitioned lineitem table and load data into it CREATE TABLE lineitem_range ( l_orderkey bigint not null, diff --git a/src/test/regress/output/multi_agg_type_conversion.source b/src/test/regress/output/multi_agg_type_conversion.source index 82a30be1a..599709891 100644 --- a/src/test/regress/output/multi_agg_type_conversion.source +++ b/src/test/regress/output/multi_agg_type_conversion.source @@ -2,7 +2,6 @@ -- MULTI_AGG_TYPE_CONVERSION -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 210000; -- Test aggregate type conversions using sums of integers and division operator SELECT sum(l_suppkey) FROM lineitem; sum diff --git a/src/test/regress/output/multi_alter_table_statements.source b/src/test/regress/output/multi_alter_table_statements.source index 2fdb0bb32..bd2080939 100644 --- a/src/test/regress/output/multi_alter_table_statements.source +++ b/src/test/regress/output/multi_alter_table_statements.source @@ -2,7 +2,6 @@ -- MULTI_ALTER_TABLE_STATEMENTS -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 220000; -- Check that we can run ALTER TABLE statements on distributed tables. -- We set the shardid sequence here so that the shardids in this test -- aren't affected by changes to the previous tests. 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 409c87f05..649a353be 100644 --- a/src/test/regress/output/multi_append_table_to_shard.source +++ b/src/test/regress/output/multi_append_table_to_shard.source @@ -2,7 +2,6 @@ -- MULTI_APPEND_TABLE_TO_SHARD -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 230000; -- Initialize tables to join CREATE TABLE multi_append_table_to_shard_right ( diff --git a/src/test/regress/output/multi_complex_count_distinct.source b/src/test/regress/output/multi_complex_count_distinct.source index d31db2928..707438761 100644 --- a/src/test/regress/output/multi_complex_count_distinct.source +++ b/src/test/regress/output/multi_complex_count_distinct.source @@ -2,7 +2,6 @@ -- COMPLEX_COUNT_DISTINCT -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 240000; CREATE TABLE lineitem_hash ( l_orderkey bigint not null, l_partkey integer not null, diff --git a/src/test/regress/output/multi_copy.source b/src/test/regress/output/multi_copy.source index f84f4a56d..3a68f0f21 100644 --- a/src/test/regress/output/multi_copy.source +++ b/src/test/regress/output/multi_copy.source @@ -2,7 +2,6 @@ -- MULTI_COPY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 560000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 560000; -- Create a new hash-partitioned table into which to COPY CREATE TABLE customer_copy_hash ( c_custkey integer, diff --git a/src/test/regress/output/multi_create_schema.source b/src/test/regress/output/multi_create_schema.source index 8826f431a..6999adb5a 100644 --- a/src/test/regress/output/multi_create_schema.source +++ b/src/test/regress/output/multi_create_schema.source @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 250000; CREATE SCHEMA tpch CREATE TABLE nation ( n_nationkey integer not null, diff --git a/src/test/regress/output/multi_large_shardid.source b/src/test/regress/output/multi_large_shardid.source index d223875b0..d9ca39128 100644 --- a/src/test/regress/output/multi_large_shardid.source +++ b/src/test/regress/output/multi_large_shardid.source @@ -5,7 +5,6 @@ -- differs from previous tests in that it modifies the *internal* shardId -- generator, forcing the distributed database to use 64-bit shard identifiers. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 100200300400500; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 9000000; -- Load additional data to start using large shard identifiers. \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/output/multi_load_data.source b/src/test/regress/output/multi_load_data.source index 3d694090a..a54306e69 100644 --- a/src/test/regress/output/multi_load_data.source +++ b/src/test/regress/output/multi_load_data.source @@ -6,7 +6,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 70a53cf26..9e6792c4c 100644 --- a/src/test/regress/output/multi_load_large_records.source +++ b/src/test/regress/output/multi_load_large_records.source @@ -5,7 +5,6 @@ -- 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; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 dec7d9c26..b41f68dc8 100644 --- a/src/test/regress/output/multi_load_more_data.source +++ b/src/test/regress/output/multi_load_more_data.source @@ -2,7 +2,6 @@ -- MULTI_STAGE_MORE_DATA -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 d46a6b429..05107af81 100644 --- a/src/test/regress/output/multi_master_delete_protocol.source +++ b/src/test/regress/output/multi_master_delete_protocol.source @@ -2,7 +2,6 @@ -- MULTI_MASTER_DELETE_PROTOCOL -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 320000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_mx_copy_data.source b/src/test/regress/output/multi_mx_copy_data.source index ca5c291dc..7883641fd 100644 --- a/src/test/regress/output/multi_mx_copy_data.source +++ b/src/test/regress/output/multi_mx_copy_data.source @@ -2,7 +2,6 @@ -- MULTI_MX_COPY_DATA -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 290000; \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; SET search_path TO citus_mx_test_schema; \COPY nation_hash FROM '@abs_srcdir@/data/nation.data' with delimiter '|'; diff --git a/src/test/regress/output/multi_outer_join.source b/src/test/regress/output/multi_outer_join.source index 0d9f12306..0f803dc6d 100644 --- a/src/test/regress/output/multi_outer_join.source +++ b/src/test/regress/output/multi_outer_join.source @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 2f9707b9b..ecaf1ae01 100644 --- a/src/test/regress/output/multi_outer_join_reference.source +++ b/src/test/regress/output/multi_outer_join_reference.source @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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/multi_subquery_0.source b/src/test/regress/output/multi_subquery_0.source index 5d5eb53e9..d759fc870 100644 --- a/src/test/regress/output/multi_subquery_0.source +++ b/src/test/regress/output/multi_subquery_0.source @@ -2,7 +2,6 @@ -- MULTI_SUBQUERY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 270000; -- print major version to make version-specific tests clear SHOW server_version \gset SELECT substring(:'server_version', '\d+\.\d+') AS major_version; diff --git a/src/test/regress/output/worker_copy.source b/src/test/regress/output/worker_copy.source index 31c3c19c4..9b8629c26 100644 --- a/src/test/regress/output/worker_copy.source +++ b/src/test/regress/output/worker_copy.source @@ -2,7 +2,6 @@ -- WORKER_COPY -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_agg_approximate_distinct.sql b/src/test/regress/sql/multi_agg_approximate_distinct.sql index e13784732..1dabe864c 100644 --- a/src/test/regress/sql/multi_agg_approximate_distinct.sql +++ b/src/test/regress/sql/multi_agg_approximate_distinct.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 340000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 340000; -- Create HLL extension if present, print false result otherwise SELECT CASE WHEN COUNT(*) > 0 THEN diff --git a/src/test/regress/sql/multi_array_agg.sql b/src/test/regress/sql/multi_array_agg.sql index 8688c2c2e..374dae407 100644 --- a/src/test/regress/sql/multi_array_agg.sql +++ b/src/test/regress/sql/multi_array_agg.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 520000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 520000; CREATE OR REPLACE FUNCTION array_sort (ANYARRAY) RETURNS ANYARRAY LANGUAGE SQL diff --git a/src/test/regress/sql/multi_average_expression.sql b/src/test/regress/sql/multi_average_expression.sql index 68d07625e..2f1774f43 100644 --- a/src/test/regress/sql/multi_average_expression.sql +++ b/src/test/regress/sql/multi_average_expression.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 450000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 450000; SELECT 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 94ca3ccfb..b24a57fe1 100644 --- a/src/test/regress/sql/multi_binary_master_copy_format.sql +++ b/src/test/regress/sql/multi_binary_master_copy_format.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 430000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 430000; -- Try binary master copy for different executors diff --git a/src/test/regress/sql/multi_citus_tools.sql b/src/test/regress/sql/multi_citus_tools.sql index 81032a994..fe56ee85c 100644 --- a/src/test/regress/sql/multi_citus_tools.sql +++ b/src/test/regress/sql/multi_citus_tools.sql @@ -5,7 +5,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 5430933ff..12e3d00ab 100644 --- a/src/test/regress/sql/multi_cluster_management.sql +++ b/src/test/regress/sql/multi_cluster_management.sql @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 91867b426..46af532c7 100644 --- a/src/test/regress/sql/multi_colocation_utils.sql +++ b/src/test/regress/sql/multi_colocation_utils.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; -- =================================================================== -- create test utility function diff --git a/src/test/regress/sql/multi_complex_expressions.sql b/src/test/regress/sql/multi_complex_expressions.sql index f0ce7c767..5e60b0edf 100644 --- a/src/test/regress/sql/multi_complex_expressions.sql +++ b/src/test/regress/sql/multi_complex_expressions.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 420000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 420000; -- Check that we can correctly handle complex expressions and aggregates. diff --git a/src/test/regress/sql/multi_count_type_conversion.sql b/src/test/regress/sql/multi_count_type_conversion.sql index ee45ff11d..b0059c299 100644 --- a/src/test/regress/sql/multi_count_type_conversion.sql +++ b/src/test/regress/sql/multi_count_type_conversion.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 400000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 400000; -- Verify that we can sort count(*) results correctly. We perform this check as diff --git a/src/test/regress/sql/multi_create_fdw.sql b/src/test/regress/sql/multi_create_fdw.sql index e8bd25386..9e8f892e2 100644 --- a/src/test/regress/sql/multi_create_fdw.sql +++ b/src/test/regress/sql/multi_create_fdw.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 390000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 390000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_insert_proxy.sql b/src/test/regress/sql/multi_create_insert_proxy.sql index ee8de14d8..8cf6c897c 100644 --- a/src/test/regress/sql/multi_create_insert_proxy.sql +++ b/src/test/regress/sql/multi_create_insert_proxy.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 380000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 380000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_shards.sql b/src/test/regress/sql/multi_create_shards.sql index b49f0c0f4..91fe6d33e 100644 --- a/src/test/regress/sql/multi_create_shards.sql +++ b/src/test/regress/sql/multi_create_shards.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 370000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 370000; -- =================================================================== diff --git a/src/test/regress/sql/multi_create_table.sql b/src/test/regress/sql/multi_create_table.sql index da20b263e..59172730b 100644 --- a/src/test/regress/sql/multi_create_table.sql +++ b/src/test/regress/sql/multi_create_table.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 360000; -- Create new table definitions for use in testing in distributed planning and -- execution functionality. Also create indexes to boost performance. diff --git a/src/test/regress/sql/multi_create_table_constraints.sql b/src/test/regress/sql/multi_create_table_constraints.sql index 8851b12a2..dde288bab 100644 --- a/src/test/regress/sql/multi_create_table_constraints.sql +++ b/src/test/regress/sql/multi_create_table_constraints.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 365000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 eaf4c41b4..315550474 100644 --- a/src/test/regress/sql/multi_data_types.sql +++ b/src/test/regress/sql/multi_data_types.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 530000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 e52242238..eccb493f8 100644 --- a/src/test/regress/sql/multi_deparse_shard_query.sql +++ b/src/test/regress/sql/multi_deparse_shard_query.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13100000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 13100000; CREATE FUNCTION deparse_shard_query_test(text) RETURNS VOID diff --git a/src/test/regress/sql/multi_distribution_metadata.sql b/src/test/regress/sql/multi_distribution_metadata.sql index 02c2be792..fbe8cf391 100644 --- a/src/test/regress/sql/multi_distribution_metadata.sql +++ b/src/test/regress/sql/multi_distribution_metadata.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 540000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 540000; CREATE FUNCTION load_shard_id_array(regclass) diff --git a/src/test/regress/sql/multi_drop_extension.sql b/src/test/regress/sql/multi_drop_extension.sql index 9a78ed609..9f334cc81 100644 --- a/src/test/regress/sql/multi_drop_extension.sql +++ b/src/test/regress/sql/multi_drop_extension.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 550000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 3c791ff28..a83b6e4f8 100644 --- a/src/test/regress/sql/multi_dropped_column_aliases.sql +++ b/src/test/regress/sql/multi_dropped_column_aliases.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 620000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 38d1ac07c..69903b65e 100644 --- a/src/test/regress/sql/multi_expire_table_cache.sql +++ b/src/test/regress/sql/multi_expire_table_cache.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1220000; -- create test table CREATE TABLE large_table(a int, b int); diff --git a/src/test/regress/sql/multi_foreign_key.sql b/src/test/regress/sql/multi_foreign_key.sql index 39ec6e72c..4d6511d0b 100644 --- a/src/test/regress/sql/multi_foreign_key.sql +++ b/src/test/regress/sql/multi_foreign_key.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1350000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 f31f973ef..18d389e15 100644 --- a/src/test/regress/sql/multi_function_evaluation.sql +++ b/src/test/regress/sql/multi_function_evaluation.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 3e7b644a3..15fe6353f 100644 --- a/src/test/regress/sql/multi_generate_ddl_commands.sql +++ b/src/test/regress/sql/multi_generate_ddl_commands.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 610000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 610000; -- =================================================================== diff --git a/src/test/regress/sql/multi_hash_pruning.sql b/src/test/regress/sql/multi_hash_pruning.sql index 7329fb10d..9ac77f710 100644 --- a/src/test/regress/sql/multi_hash_pruning.sql +++ b/src/test/regress/sql/multi_hash_pruning.sql @@ -6,7 +6,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 630000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_index_statements.sql b/src/test/regress/sql/multi_index_statements.sql index 784a7a988..557ec4043 100644 --- a/src/test/regress/sql/multi_index_statements.sql +++ b/src/test/regress/sql/multi_index_statements.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 640000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 640000; -- diff --git a/src/test/regress/sql/multi_insert_select.sql b/src/test/regress/sql/multi_insert_select.sql index f1f68c7fb..20d765ca1 100644 --- a/src/test/regress/sql/multi_insert_select.sql +++ b/src/test/regress/sql/multi_insert_select.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 13300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 13300000; -- create co-located tables SET citus.shard_count = 4; diff --git a/src/test/regress/sql/multi_join_order_additional.sql b/src/test/regress/sql/multi_join_order_additional.sql index 18d307017..42dc4b97a 100644 --- a/src/test/regress/sql/multi_join_order_additional.sql +++ b/src/test/regress/sql/multi_join_order_additional.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 650000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 20cf83dd0..6709a85ca 100644 --- a/src/test/regress/sql/multi_join_order_tpch_large.sql +++ b/src/test/regress/sql/multi_join_order_tpch_large.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 660000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 660000; -- Enable configuration to print table join order diff --git a/src/test/regress/sql/multi_join_pruning.sql b/src/test/regress/sql/multi_join_pruning.sql index 5d2edfbb8..99357aae8 100644 --- a/src/test/regress/sql/multi_join_pruning.sql +++ b/src/test/regress/sql/multi_join_pruning.sql @@ -3,7 +3,6 @@ -- -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 680000; -- Check that join-pruning works for joins between two large relations. For now diff --git a/src/test/regress/sql/multi_large_table_pruning.sql b/src/test/regress/sql/multi_large_table_pruning.sql index fd947f689..133cbc3b6 100644 --- a/src/test/regress/sql/multi_large_table_pruning.sql +++ b/src/test/regress/sql/multi_large_table_pruning.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 700000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 700000; SET citus.large_table_shard_count TO 2; diff --git a/src/test/regress/sql/multi_limit_clause.sql b/src/test/regress/sql/multi_limit_clause.sql index 7cf7a1578..bfe3ead77 100644 --- a/src/test/regress/sql/multi_limit_clause.sql +++ b/src/test/regress/sql/multi_limit_clause.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 730000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 730000; -- Display debug messages on limit clause push down. diff --git a/src/test/regress/sql/multi_limit_clause_approximate.sql b/src/test/regress/sql/multi_limit_clause_approximate.sql index 1e82a1c44..8d2cf19bb 100644 --- a/src/test/regress/sql/multi_limit_clause_approximate.sql +++ b/src/test/regress/sql/multi_limit_clause_approximate.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 720000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 720000; -- Display debug messages on limit clause push down. diff --git a/src/test/regress/sql/multi_master_protocol.sql b/src/test/regress/sql/multi_master_protocol.sql index 108453d89..a6eddfd22 100644 --- a/src/test/regress/sql/multi_master_protocol.sql +++ b/src/test/regress/sql/multi_master_protocol.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 740000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 eac112e38..e252eb7a3 100644 --- a/src/test/regress/sql/multi_metadata_access.sql +++ b/src/test/regress/sql/multi_metadata_access.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1360000; CREATE USER no_access; SET ROLE no_access; diff --git a/src/test/regress/sql/multi_metadata_sync.sql b/src/test/regress/sql/multi_metadata_sync.sql index adb6fa7fe..e19ce3cc4 100644 --- a/src/test/regress/sql/multi_metadata_sync.sql +++ b/src/test/regress/sql/multi_metadata_sync.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; SELECT nextval('pg_catalog.pg_dist_shard_placement_placementid_seq') AS last_placement_id \gset diff --git a/src/test/regress/sql/multi_modifications.sql b/src/test/regress/sql/multi_modifications.sql index e8e493038..43f2c6b7e 100644 --- a/src/test/regress/sql/multi_modifications.sql +++ b/src/test/regress/sql/multi_modifications.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 750000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 750000; -- =================================================================== diff --git a/src/test/regress/sql/multi_modifying_xacts.sql b/src/test/regress/sql/multi_modifying_xacts.sql index 037e78960..949f8949a 100644 --- a/src/test/regress/sql/multi_modifying_xacts.sql +++ b/src/test/regress/sql/multi_modifying_xacts.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1200000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1200000; -- =================================================================== diff --git a/src/test/regress/sql/multi_mx_create_table.sql b/src/test/regress/sql/multi_mx_create_table.sql index 989aaccd5..851fe9361 100644 --- a/src/test/regress/sql/multi_mx_create_table.sql +++ b/src/test/regress/sql/multi_mx_create_table.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1220000; SELECT start_metadata_sync_to_node('localhost', :worker_1_port); SELECT start_metadata_sync_to_node('localhost', :worker_2_port); diff --git a/src/test/regress/sql/multi_mx_ddl.sql b/src/test/regress/sql/multi_mx_ddl.sql index f0dd5cacf..9363b94d8 100644 --- a/src/test/regress/sql/multi_mx_ddl.sql +++ b/src/test/regress/sql/multi_mx_ddl.sql @@ -1,7 +1,6 @@ -- Tests related to distributed DDL commands on mx cluster ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1600000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1600000; SELECT * FROM mx_ddl_table ORDER BY key; diff --git a/src/test/regress/sql/multi_mx_modifications.sql b/src/test/regress/sql/multi_mx_modifications.sql index 373e7ce05..334d174cb 100644 --- a/src/test/regress/sql/multi_mx_modifications.sql +++ b/src/test/regress/sql/multi_mx_modifications.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1330000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1330000; -- =================================================================== diff --git a/src/test/regress/sql/multi_mx_modifying_xacts.sql b/src/test/regress/sql/multi_mx_modifying_xacts.sql index b7b482095..24f25876e 100644 --- a/src/test/regress/sql/multi_mx_modifying_xacts.sql +++ b/src/test/regress/sql/multi_mx_modifying_xacts.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1340000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1340000; -- =================================================================== diff --git a/src/test/regress/sql/multi_mx_reference_table.sql b/src/test/regress/sql/multi_mx_reference_table.sql index 31f89b60b..b612ea91e 100644 --- a/src/test/regress/sql/multi_mx_reference_table.sql +++ b/src/test/regress/sql/multi_mx_reference_table.sql @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; \c - - - :master_port 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_mx_router_planner.sql b/src/test/regress/sql/multi_mx_router_planner.sql index bdca55574..2d9d06969 100644 --- a/src/test/regress/sql/multi_mx_router_planner.sql +++ b/src/test/regress/sql/multi_mx_router_planner.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 840000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 840000; -- =================================================================== diff --git a/src/test/regress/sql/multi_mx_schema_support.sql b/src/test/regress/sql/multi_mx_schema_support.sql index b72a5ee04..b4cadeb80 100644 --- a/src/test/regress/sql/multi_mx_schema_support.sql +++ b/src/test/regress/sql/multi_mx_schema_support.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1210000; -- connect to a worker node and run some queries \c - - - :worker_1_port diff --git a/src/test/regress/sql/multi_mx_tpch_query1.sql b/src/test/regress/sql/multi_mx_tpch_query1.sql index 2b81d17fa..690059122 100644 --- a/src/test/regress/sql/multi_mx_tpch_query1.sql +++ b/src/test/regress/sql/multi_mx_tpch_query1.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- connect to the coordinator \c - - - :master_port @@ -41,7 +40,6 @@ ORDER BY \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large @@ -75,7 +73,6 @@ ORDER BY \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1310000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query10.sql b/src/test/regress/sql/multi_mx_tpch_query10.sql index 5af46c8a9..bbfe4e1cd 100644 --- a/src/test/regress/sql/multi_mx_tpch_query10.sql +++ b/src/test/regress/sql/multi_mx_tpch_query10.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; -- connect to master \c - - - :master_port @@ -51,7 +50,6 @@ LIMIT 20; \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; SELECT c_custkey, @@ -90,7 +88,6 @@ LIMIT 20; \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1300000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1300000; SELECT c_custkey, diff --git a/src/test/regress/sql/multi_mx_tpch_query12.sql b/src/test/regress/sql/multi_mx_tpch_query12.sql index 340c37530..a2c838158 100644 --- a/src/test/regress/sql/multi_mx_tpch_query12.sql +++ b/src/test/regress/sql/multi_mx_tpch_query12.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- connect to the coordinator \c - - - :master_port @@ -48,7 +47,6 @@ ORDER BY \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large @@ -89,7 +87,6 @@ ORDER BY \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1290000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1290000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query14.sql b/src/test/regress/sql/multi_mx_tpch_query14.sql index b4b6e5561..153add47a 100644 --- a/src/test/regress/sql/multi_mx_tpch_query14.sql +++ b/src/test/regress/sql/multi_mx_tpch_query14.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- connect to the coordinator \c - - - :master_port @@ -33,7 +32,6 @@ WHERE \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large @@ -59,7 +57,6 @@ WHERE \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1280000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1280000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query19.sql b/src/test/regress/sql/multi_mx_tpch_query19.sql index 7f2248406..aa14143df 100644 --- a/src/test/regress/sql/multi_mx_tpch_query19.sql +++ b/src/test/regress/sql/multi_mx_tpch_query19.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- connect to the coordinator \c - - - :master_port @@ -50,7 +49,6 @@ WHERE \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large @@ -93,7 +91,6 @@ WHERE \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1270000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query3.sql b/src/test/regress/sql/multi_mx_tpch_query3.sql index 403631c61..991edf1ce 100644 --- a/src/test/regress/sql/multi_mx_tpch_query3.sql +++ b/src/test/regress/sql/multi_mx_tpch_query3.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; -- connect to the coordinator \c - - - :master_port @@ -40,7 +39,6 @@ ORDER BY \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; SELECT l_orderkey, @@ -69,7 +67,6 @@ ORDER BY \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1260000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1260000; SELECT l_orderkey, diff --git a/src/test/regress/sql/multi_mx_tpch_query6.sql b/src/test/regress/sql/multi_mx_tpch_query6.sql index d6f8654b2..61e8cf0bf 100644 --- a/src/test/regress/sql/multi_mx_tpch_query6.sql +++ b/src/test/regress/sql/multi_mx_tpch_query6.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- connect to the coordinator \c - - - :master_port @@ -29,7 +28,6 @@ WHERE \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large @@ -51,7 +49,6 @@ WHERE \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1250000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query7.sql b/src/test/regress/sql/multi_mx_tpch_query7.sql index b23dec210..4f6b22d84 100644 --- a/src/test/regress/sql/multi_mx_tpch_query7.sql +++ b/src/test/regress/sql/multi_mx_tpch_query7.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- connect to the coordinator \c - - - :master_port @@ -59,7 +58,6 @@ ORDER BY \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large @@ -111,7 +109,6 @@ ORDER BY \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; -- Change configuration to treat lineitem AND orders tables as large diff --git a/src/test/regress/sql/multi_mx_tpch_query7_nested.sql b/src/test/regress/sql/multi_mx_tpch_query7_nested.sql index 889dfaacb..e71c5d345 100644 --- a/src/test/regress/sql/multi_mx_tpch_query7_nested.sql +++ b/src/test/regress/sql/multi_mx_tpch_query7_nested.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- connect to the coordinator \c - - - :master_port @@ -68,7 +67,6 @@ ORDER BY \c - - - :worker_1_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large @@ -129,7 +127,6 @@ ORDER BY \c - - - :worker_2_port ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1240000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1240000; -- Change configuration to treat lineitem AND orders tables AS large diff --git a/src/test/regress/sql/multi_name_lengths.sql b/src/test/regress/sql/multi_name_lengths.sql index 35ecd9506..5f992b0d7 100644 --- a/src/test/regress/sql/multi_name_lengths.sql +++ b/src/test/regress/sql/multi_name_lengths.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 225000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 225000; SET citus.multi_shard_commit_protocol = '2pc'; 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 db8ce464b..ceeaaec8d 100644 --- a/src/test/regress/sql/multi_null_minmax_value_pruning.sql +++ b/src/test/regress/sql/multi_null_minmax_value_pruning.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 760000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 760000; SET client_min_messages TO DEBUG2; diff --git a/src/test/regress/sql/multi_partition_pruning.sql b/src/test/regress/sql/multi_partition_pruning.sql index 18e58d5f5..fd2a4594a 100644 --- a/src/test/regress/sql/multi_partition_pruning.sql +++ b/src/test/regress/sql/multi_partition_pruning.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 770000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 770000; SET citus.explain_distributed_queries TO off; diff --git a/src/test/regress/sql/multi_prepare_plsql.sql b/src/test/regress/sql/multi_prepare_plsql.sql index 769bf2cdd..0b33aede0 100644 --- a/src/test/regress/sql/multi_prepare_plsql.sql +++ b/src/test/regress/sql/multi_prepare_plsql.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 780000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 780000; CREATE FUNCTION plpgsql_test_1() RETURNS TABLE(count bigint) AS $$ diff --git a/src/test/regress/sql/multi_prepare_sql.sql b/src/test/regress/sql/multi_prepare_sql.sql index 6284d1c94..734b2f904 100644 --- a/src/test/regress/sql/multi_prepare_sql.sql +++ b/src/test/regress/sql/multi_prepare_sql.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 790000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 790000; PREPARE prepared_test_1 AS diff --git a/src/test/regress/sql/multi_prune_shard_list.sql b/src/test/regress/sql/multi_prune_shard_list.sql index 62e0432c6..0e9b9f599 100644 --- a/src/test/regress/sql/multi_prune_shard_list.sql +++ b/src/test/regress/sql/multi_prune_shard_list.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 800000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 800000; -- =================================================================== diff --git a/src/test/regress/sql/multi_reference_table.sql b/src/test/regress/sql/multi_reference_table.sql index d2a4476b9..dd8e2d90f 100644 --- a/src/test/regress/sql/multi_reference_table.sql +++ b/src/test/regress/sql/multi_reference_table.sql @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1250000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 b1ae4e861..34bcaf7e5 100644 --- a/src/test/regress/sql/multi_remove_node_reference_table.sql +++ b/src/test/regress/sql/multi_remove_node_reference_table.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1380000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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; diff --git a/src/test/regress/sql/multi_repair_shards.sql b/src/test/regress/sql/multi_repair_shards.sql index 5ea38f126..9ddc8278a 100644 --- a/src/test/regress/sql/multi_repair_shards.sql +++ b/src/test/regress/sql/multi_repair_shards.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 820000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 820000; -- =================================================================== diff --git a/src/test/regress/sql/multi_repartitioned_subquery_udf.sql b/src/test/regress/sql/multi_repartitioned_subquery_udf.sql index 59d8ea030..f6b6cfc38 100644 --- a/src/test/regress/sql/multi_repartitioned_subquery_udf.sql +++ b/src/test/regress/sql/multi_repartitioned_subquery_udf.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 830000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 608299f4f..097b32262 100644 --- a/src/test/regress/sql/multi_replicate_reference_table.sql +++ b/src/test/regress/sql/multi_replicate_reference_table.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1370000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_schema_support.sql b/src/test/regress/sql/multi_schema_support.sql index 70feb03de..2215eead5 100644 --- a/src/test/regress/sql/multi_schema_support.sql +++ b/src/test/regress/sql/multi_schema_support.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1190000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1190000; -- create schema to test schema support CREATE SCHEMA test_schema_support; diff --git a/src/test/regress/sql/multi_shard_modify.sql b/src/test/regress/sql/multi_shard_modify.sql index 908bc9f46..fae2f0218 100644 --- a/src/test/regress/sql/multi_shard_modify.sql +++ b/src/test/regress/sql/multi_shard_modify.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 350000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 350000; -- Create a new hash partitioned multi_shard_modify_test table and load data into it. diff --git a/src/test/regress/sql/multi_simple_queries.sql b/src/test/regress/sql/multi_simple_queries.sql index faa70d7bc..5a1eb76ce 100644 --- a/src/test/regress/sql/multi_simple_queries.sql +++ b/src/test/regress/sql/multi_simple_queries.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 850000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 850000; -- =================================================================== diff --git a/src/test/regress/sql/multi_single_relation_subquery.sql b/src/test/regress/sql/multi_single_relation_subquery.sql index 42088eff7..956e2b65e 100644 --- a/src/test/regress/sql/multi_single_relation_subquery.sql +++ b/src/test/regress/sql/multi_single_relation_subquery.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 860000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 860000; SET citus.task_executor_type TO 'task-tracker'; diff --git a/src/test/regress/sql/multi_sql_function.sql b/src/test/regress/sql/multi_sql_function.sql index c6904a50a..22ba0a380 100644 --- a/src/test/regress/sql/multi_sql_function.sql +++ b/src/test/regress/sql/multi_sql_function.sql @@ -3,7 +3,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1230000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1230000; CREATE FUNCTION sql_test_no_1() RETURNS bigint AS ' diff --git a/src/test/regress/sql/multi_table_ddl.sql b/src/test/regress/sql/multi_table_ddl.sql index 4a3aa712f..44f48f72c 100644 --- a/src/test/regress/sql/multi_table_ddl.sql +++ b/src/test/regress/sql/multi_table_ddl.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 870000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 870000; CREATE TABLE testtableddl(somecol int, distributecol text NOT NULL); diff --git a/src/test/regress/sql/multi_tpch_query1.sql b/src/test/regress/sql/multi_tpch_query1.sql index 6a2f9f5e4..c8e408ffe 100644 --- a/src/test/regress/sql/multi_tpch_query1.sql +++ b/src/test/regress/sql/multi_tpch_query1.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 890000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 890000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query10.sql b/src/test/regress/sql/multi_tpch_query10.sql index 9f136f267..056497e6f 100644 --- a/src/test/regress/sql/multi_tpch_query10.sql +++ b/src/test/regress/sql/multi_tpch_query10.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 900000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 900000; SELECT diff --git a/src/test/regress/sql/multi_tpch_query12.sql b/src/test/regress/sql/multi_tpch_query12.sql index 170dbae7d..a00f5f896 100644 --- a/src/test/regress/sql/multi_tpch_query12.sql +++ b/src/test/regress/sql/multi_tpch_query12.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 910000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 910000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query14.sql b/src/test/regress/sql/multi_tpch_query14.sql index 5a730e95b..c15e063d6 100644 --- a/src/test/regress/sql/multi_tpch_query14.sql +++ b/src/test/regress/sql/multi_tpch_query14.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 920000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 920000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query19.sql b/src/test/regress/sql/multi_tpch_query19.sql index 52fc0e5b8..b048eeca4 100644 --- a/src/test/regress/sql/multi_tpch_query19.sql +++ b/src/test/regress/sql/multi_tpch_query19.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 930000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 930000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query3.sql b/src/test/regress/sql/multi_tpch_query3.sql index f96768b99..e315f8bef 100644 --- a/src/test/regress/sql/multi_tpch_query3.sql +++ b/src/test/regress/sql/multi_tpch_query3.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 940000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 940000; SELECT diff --git a/src/test/regress/sql/multi_tpch_query6.sql b/src/test/regress/sql/multi_tpch_query6.sql index af48ecb51..d84b31e1a 100644 --- a/src/test/regress/sql/multi_tpch_query6.sql +++ b/src/test/regress/sql/multi_tpch_query6.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 950000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 950000; -- Change configuration to treat lineitem and orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query7.sql b/src/test/regress/sql/multi_tpch_query7.sql index f0287200e..c42357db8 100644 --- a/src/test/regress/sql/multi_tpch_query7.sql +++ b/src/test/regress/sql/multi_tpch_query7.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 970000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 970000; -- Change configuration to treat lineitem AND orders tables as large diff --git a/src/test/regress/sql/multi_tpch_query7_nested.sql b/src/test/regress/sql/multi_tpch_query7_nested.sql index 7a80a93a2..82f95de32 100644 --- a/src/test/regress/sql/multi_tpch_query7_nested.sql +++ b/src/test/regress/sql/multi_tpch_query7_nested.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 960000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 960000; -- Change configuration to treat lineitem AND orders tables AS large diff --git a/src/test/regress/sql/multi_transaction_recovery.sql b/src/test/regress/sql/multi_transaction_recovery.sql index 5f8f6bb3c..b566080c9 100644 --- a/src/test/regress/sql/multi_transaction_recovery.sql +++ b/src/test/regress/sql/multi_transaction_recovery.sql @@ -1,5 +1,4 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1220000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1220000; -- Tests for prepared transaction recovery diff --git a/src/test/regress/sql/multi_transactional_drop_shards.sql b/src/test/regress/sql/multi_transactional_drop_shards.sql index cf259f4c3..193d46fad 100644 --- a/src/test/regress/sql/multi_transactional_drop_shards.sql +++ b/src/test/regress/sql/multi_transactional_drop_shards.sql @@ -5,7 +5,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1410000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1410000; SET citus.shard_count TO 4; diff --git a/src/test/regress/sql/multi_truncate.sql b/src/test/regress/sql/multi_truncate.sql index c17dfb609..0ff747c57 100644 --- a/src/test/regress/sql/multi_truncate.sql +++ b/src/test/regress/sql/multi_truncate.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1210000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 3860e80e0..89789de18 100644 --- a/src/test/regress/sql/multi_unsupported_worker_operations.sql +++ b/src/test/regress/sql/multi_unsupported_worker_operations.sql @@ -5,7 +5,6 @@ -- Tests for ensuring unsupported functions on workers error out. ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1270000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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_upgrade_reference_table.sql b/src/test/regress/sql/multi_upgrade_reference_table.sql index f4f25f084..d41b111b5 100644 --- a/src/test/regress/sql/multi_upgrade_reference_table.sql +++ b/src/test/regress/sql/multi_upgrade_reference_table.sql @@ -5,7 +5,6 @@ -- ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1360000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1360000; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1360000; -- test with not distributed table diff --git a/src/test/regress/sql/multi_upsert.sql b/src/test/regress/sql/multi_upsert.sql index 82eb68b12..72e0b9a92 100644 --- a/src/test/regress/sql/multi_upsert.sql +++ b/src/test/regress/sql/multi_upsert.sql @@ -2,7 +2,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 980000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 980000; CREATE TABLE upsert_test diff --git a/src/test/regress/sql/multi_utilities.sql b/src/test/regress/sql/multi_utilities.sql index e85d7ee85..5d1ac7bbf 100644 --- a/src/test/regress/sql/multi_utilities.sql +++ b/src/test/regress/sql/multi_utilities.sql @@ -1,6 +1,5 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 990000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 990000; -- =================================================================== diff --git a/src/test/regress/sql/multi_utility_statements.sql b/src/test/regress/sql/multi_utility_statements.sql index b1e8232c3..840914d20 100644 --- a/src/test/regress/sql/multi_utility_statements.sql +++ b/src/test/regress/sql/multi_utility_statements.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1000000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 fe47fc580..ad34134f9 100644 --- a/src/test/regress/sql/multi_utility_warnings.sql +++ b/src/test/regress/sql/multi_utility_warnings.sql @@ -7,7 +7,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1010000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1010000; CREATE DATABASE new_database; diff --git a/src/test/regress/sql/multi_working_columns.sql b/src/test/regress/sql/multi_working_columns.sql index aaee2dcb3..2da6600c7 100644 --- a/src/test/regress/sql/multi_working_columns.sql +++ b/src/test/regress/sql/multi_working_columns.sql @@ -9,7 +9,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1040000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1040000; SELECT l_quantity FROM lineitem ORDER BY l_shipdate, l_quantity LIMIT 20; diff --git a/src/test/regress/sql/task_tracker_assign_task.sql b/src/test/regress/sql/task_tracker_assign_task.sql index 34bfd56f7..aea391f04 100644 --- a/src/test/regress/sql/task_tracker_assign_task.sql +++ b/src/test/regress/sql/task_tracker_assign_task.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1050000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1050000; \set JobId 401010 diff --git a/src/test/regress/sql/task_tracker_cleanup_job.sql b/src/test/regress/sql/task_tracker_cleanup_job.sql index 2717f5ddf..beba0ab20 100644 --- a/src/test/regress/sql/task_tracker_cleanup_job.sql +++ b/src/test/regress/sql/task_tracker_cleanup_job.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1060000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 322d8fe23..78391fbf2 100644 --- a/src/test/regress/sql/task_tracker_create_table.sql +++ b/src/test/regress/sql/task_tracker_create_table.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1070000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1070000; -- New table definitions to test the task tracker process and protocol diff --git a/src/test/regress/sql/task_tracker_partition_task.sql b/src/test/regress/sql/task_tracker_partition_task.sql index 0f465f823..d0e90704c 100644 --- a/src/test/regress/sql/task_tracker_partition_task.sql +++ b/src/test/regress/sql/task_tracker_partition_task.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1080000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1080000; \set JobId 401010 diff --git a/src/test/regress/sql/worker_binary_data_partition.sql b/src/test/regress/sql/worker_binary_data_partition.sql index 1094dff89..b5eff2197 100644 --- a/src/test/regress/sql/worker_binary_data_partition.sql +++ b/src/test/regress/sql/worker_binary_data_partition.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1090000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1090000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_check_invalid_arguments.sql b/src/test/regress/sql/worker_check_invalid_arguments.sql index 6feb68ddc..420e02534 100644 --- a/src/test/regress/sql/worker_check_invalid_arguments.sql +++ b/src/test/regress/sql/worker_check_invalid_arguments.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1100000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 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 6ba2fe462..c65775104 100644 --- a/src/test/regress/sql/worker_create_table.sql +++ b/src/test/regress/sql/worker_create_table.sql @@ -8,7 +8,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1110000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1110000; CREATE TABLE lineitem ( diff --git a/src/test/regress/sql/worker_hash_partition.sql b/src/test/regress/sql/worker_hash_partition.sql index 50ae81d4c..90a1aaf54 100644 --- a/src/test/regress/sql/worker_hash_partition.sql +++ b/src/test/regress/sql/worker_hash_partition.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1130000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1130000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_hash_partition_complex.sql b/src/test/regress/sql/worker_hash_partition_complex.sql index 32d1810fa..39d1b98fc 100644 --- a/src/test/regress/sql/worker_hash_partition_complex.sql +++ b/src/test/regress/sql/worker_hash_partition_complex.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1120000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1120000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_merge_hash_files.sql b/src/test/regress/sql/worker_merge_hash_files.sql index bba66cf37..f2d09281c 100644 --- a/src/test/regress/sql/worker_merge_hash_files.sql +++ b/src/test/regress/sql/worker_merge_hash_files.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1140000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1140000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_merge_range_files.sql b/src/test/regress/sql/worker_merge_range_files.sql index cd7189258..069f4e360 100644 --- a/src/test/regress/sql/worker_merge_range_files.sql +++ b/src/test/regress/sql/worker_merge_range_files.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1150000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1150000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_null_data_partition.sql b/src/test/regress/sql/worker_null_data_partition.sql index ba9aa06ed..38c8d03c3 100644 --- a/src/test/regress/sql/worker_null_data_partition.sql +++ b/src/test/regress/sql/worker_null_data_partition.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1180000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1180000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_range_partition.sql b/src/test/regress/sql/worker_range_partition.sql index 6cee25568..cbf59f609 100644 --- a/src/test/regress/sql/worker_range_partition.sql +++ b/src/test/regress/sql/worker_range_partition.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1160000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1160000; \set JobId 201010 diff --git a/src/test/regress/sql/worker_range_partition_complex.sql b/src/test/regress/sql/worker_range_partition_complex.sql index 109cc95e1..9f10d10e4 100644 --- a/src/test/regress/sql/worker_range_partition_complex.sql +++ b/src/test/regress/sql/worker_range_partition_complex.sql @@ -4,7 +4,6 @@ ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1170000; -ALTER SEQUENCE pg_catalog.pg_dist_jobid_seq RESTART 1170000; \set JobId 201010 From 0f63edc5b4b7d0150d74aa2787a03fe3eae11c0f Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Fri, 7 Apr 2017 12:18:34 +0200 Subject: [PATCH 4/4] Add basic read-only transaction tests --- .../regress/expected/multi_basic_queries.out | 10 ++++++++++ .../regress/expected/multi_router_planner.out | 20 +++++++++++++++++++ src/test/regress/expected/multi_utilities.out | 6 ++++++ src/test/regress/sql/multi_basic_queries.sql | 6 ++++++ src/test/regress/sql/multi_router_planner.sql | 9 +++++++++ src/test/regress/sql/multi_utilities.sql | 6 ++++++ 6 files changed, 57 insertions(+) diff --git a/src/test/regress/expected/multi_basic_queries.out b/src/test/regress/expected/multi_basic_queries.out index c225ed6ef..33d2c5fe2 100644 --- a/src/test/regress/expected/multi_basic_queries.out +++ b/src/test/regress/expected/multi_basic_queries.out @@ -22,6 +22,16 @@ SELECT avg(l_extendedprice) FROM lineitem; 38141.835375000000 (1 row) +-- Verify that we can do queries in read-only mode +BEGIN; +SET TRANSACTION READ ONLY; +SELECT count(*) FROM lineitem; + count +------- + 12000 +(1 row) + +COMMIT; -- Verify temp tables which are used for final result aggregation don't persist. SELECT count(*) FROM pg_class WHERE relname LIKE 'pg_merge_job_%' AND relkind = 'r'; count diff --git a/src/test/regress/expected/multi_router_planner.out b/src/test/regress/expected/multi_router_planner.out index af434a165..a5ad42622 100644 --- a/src/test/regress/expected/multi_router_planner.out +++ b/src/test/regress/expected/multi_router_planner.out @@ -2023,6 +2023,26 @@ DEBUG: Plan is router executable 41 | 1 | aznavour | 11814 (5 rows) +END; +-- queries inside read-only transactions can be router plannable +BEGIN; +SET TRANSACTION READ ONLY; +SELECT * + FROM articles_hash + WHERE author_id = 1 + ORDER BY id; +DEBUG: predicate pruning for shardId 840001 +DEBUG: Creating router plan +DEBUG: Plan is router executable + id | author_id | title | word_count +----+-----------+--------------+------------ + 1 | 1 | arsenous | 9572 + 11 | 1 | alamo | 1347 + 21 | 1 | arcading | 5890 + 31 | 1 | athwartships | 7271 + 41 | 1 | aznavour | 11814 +(5 rows) + END; -- cursor queries are router plannable BEGIN; diff --git a/src/test/regress/expected/multi_utilities.out b/src/test/regress/expected/multi_utilities.out index 541a38701..b8497059b 100644 --- a/src/test/regress/expected/multi_utilities.out +++ b/src/test/regress/expected/multi_utilities.out @@ -19,6 +19,12 @@ SELECT master_create_worker_shards('sharded_table', 2, 1); COPY sharded_table TO STDOUT; COPY (SELECT COUNT(*) FROM sharded_table) TO STDOUT; 0 +BEGIN; +SET TRANSACTION READ ONLY; +COPY sharded_table TO STDOUT; +COPY (SELECT COUNT(*) FROM sharded_table) TO STDOUT; +0 +COMMIT; -- cursors may not involve distributed tables DECLARE all_sharded_rows CURSOR FOR SELECT * FROM sharded_table; ERROR: DECLARE CURSOR can only be used in transaction blocks diff --git a/src/test/regress/sql/multi_basic_queries.sql b/src/test/regress/sql/multi_basic_queries.sql index 27160ea01..583ec0bc3 100644 --- a/src/test/regress/sql/multi_basic_queries.sql +++ b/src/test/regress/sql/multi_basic_queries.sql @@ -15,5 +15,11 @@ SELECT sum(l_extendedprice) FROM lineitem; SELECT avg(l_extendedprice) FROM lineitem; +-- Verify that we can do queries in read-only mode +BEGIN; +SET TRANSACTION READ ONLY; +SELECT count(*) FROM lineitem; +COMMIT; + -- Verify temp tables which are used for final result aggregation don't persist. SELECT count(*) FROM pg_class WHERE relname LIKE 'pg_merge_job_%' AND relkind = 'r'; diff --git a/src/test/regress/sql/multi_router_planner.sql b/src/test/regress/sql/multi_router_planner.sql index 4ad1f7798..c94507b17 100644 --- a/src/test/regress/sql/multi_router_planner.sql +++ b/src/test/regress/sql/multi_router_planner.sql @@ -906,6 +906,15 @@ SELECT * ORDER BY id; END; +-- queries inside read-only transactions can be router plannable +BEGIN; +SET TRANSACTION READ ONLY; +SELECT * + FROM articles_hash + WHERE author_id = 1 + ORDER BY id; +END; + -- cursor queries are router plannable BEGIN; DECLARE test_cursor CURSOR FOR diff --git a/src/test/regress/sql/multi_utilities.sql b/src/test/regress/sql/multi_utilities.sql index 5d1ac7bbf..80bd795bd 100644 --- a/src/test/regress/sql/multi_utilities.sql +++ b/src/test/regress/sql/multi_utilities.sql @@ -14,6 +14,12 @@ SELECT master_create_worker_shards('sharded_table', 2, 1); COPY sharded_table TO STDOUT; COPY (SELECT COUNT(*) FROM sharded_table) TO STDOUT; +BEGIN; +SET TRANSACTION READ ONLY; +COPY sharded_table TO STDOUT; +COPY (SELECT COUNT(*) FROM sharded_table) TO STDOUT; +COMMIT; + -- cursors may not involve distributed tables DECLARE all_sharded_rows CURSOR FOR SELECT * FROM sharded_table;