diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-06-09 09:08:27 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-06-09 10:00:26 -0400 |
| commit | c9ce4a1c61ebf39c03885cc19fe7c32edc04a300 (patch) | |
| tree | 45fd8dd5e21154f735d29aa744b2cea5b6cda3eb /src/backend/optimizer/plan | |
| parent | 6581e930a8546a764e948ad429fc2e179fc38d09 (diff) | |
| download | postgresql-c9ce4a1c61ebf39c03885cc19fe7c32edc04a300.tar.gz postgresql-c9ce4a1c61ebf39c03885cc19fe7c32edc04a300.zip | |
Eliminate "parallel degree" terminology.
This terminology provoked widespread complaints. So, instead, rename
the GUC max_parallel_degree to max_parallel_workers_per_gather
(leaving room for a possible future GUC max_parallel_workers that acts
as a system-wide limit), and rename the parallel_degree reloption to
parallel_workers. Rename structure members to match.
These changes create a dump/restore hazard for users of PostgreSQL
9.6beta1 who have set the reloption (or applied the GUC using ALTER
USER or ALTER DATABASE).
Diffstat (limited to 'src/backend/optimizer/plan')
| -rw-r--r-- | src/backend/optimizer/plan/createplan.c | 2 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index bd19f43d586..52df17fe694 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -1394,7 +1394,7 @@ create_gather_plan(PlannerInfo *root, GatherPath *best_path) gather_plan = make_gather(tlist, NIL, - best_path->path.parallel_degree, + best_path->path.parallel_workers, best_path->single_copy, subplan); diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index b1554cb8390..ba0c0ecae9c 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -245,7 +245,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) glob->parallelModeOK = (cursorOptions & CURSOR_OPT_PARALLEL_OK) != 0 && IsUnderPostmaster && dynamic_shared_memory_type != DSM_IMPL_NONE && parse->commandType == CMD_SELECT && !parse->hasModifyingCTE && - parse->utilityStmt == NULL && max_parallel_degree > 0 && + parse->utilityStmt == NULL && max_parallel_workers_per_gather > 0 && !IsParallelWorker() && !IsolationIsSerializable() && !has_parallel_hazard((Node *) parse, true); @@ -3622,7 +3622,7 @@ create_grouping_paths(PlannerInfo *root, if (grouped_rel->partial_pathlist) { Path *path = (Path *) linitial(grouped_rel->partial_pathlist); - double total_groups = path->rows * path->parallel_degree; + double total_groups = path->rows * path->parallel_workers; path = (Path *) create_gather_path(root, grouped_rel, @@ -3717,7 +3717,7 @@ create_grouping_paths(PlannerInfo *root, if (hashaggtablesize < work_mem * 1024L) { - double total_groups = path->rows * path->parallel_degree; + double total_groups = path->rows * path->parallel_workers; path = (Path *) create_gather_path(root, grouped_rel, |