diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/path/allpaths.c | 2 | ||||
| -rw-r--r-- | src/backend/optimizer/path/costsize.c | 2 | ||||
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 14 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 63761d55938..c4e1967f123 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -2915,7 +2915,7 @@ generate_useful_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_r * Consider incremental sort, but only when the subpath is already * partially sorted on a pathkey prefix. */ - if (enable_incrementalsort && presorted_keys > 0) + if (enable_incremental_sort && presorted_keys > 0) { Path *tmp; diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 4ff3c7a2fd3..87c9b49ce14 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -128,7 +128,7 @@ bool enable_indexonlyscan = true; bool enable_bitmapscan = true; bool enable_tidscan = true; bool enable_sort = true; -bool enable_incrementalsort = true; +bool enable_incremental_sort = true; bool enable_hashagg = true; bool hashagg_avoid_disk_plan = true; bool enable_nestloop = true; diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 4131019fc98..14f3fd44e36 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -5014,7 +5014,7 @@ create_ordered_paths(PlannerInfo *root, * presorted the path is. Additionally incremental sort may enable * a cheaper startup path to win out despite higher total cost. */ - if (!enable_incrementalsort) + if (!enable_incremental_sort) continue; /* Likewise, if the path can't be used for incremental sort. */ @@ -5095,7 +5095,7 @@ create_ordered_paths(PlannerInfo *root, * sort_pathkeys because then we can't possibly have a presorted * prefix of the list without having the list be fully sorted. */ - if (enable_incrementalsort && list_length(root->sort_pathkeys) > 1) + if (enable_incremental_sort && list_length(root->sort_pathkeys) > 1) { ListCell *lc; @@ -6572,7 +6572,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, * when the path is not already sorted and when incremental sort * is enabled. */ - if (is_sorted || !enable_incrementalsort) + if (is_sorted || !enable_incremental_sort) continue; /* Restore the input path (we might have added Sort on top). */ @@ -6699,7 +6699,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel, * when the path is not already sorted and when incremental * sort is enabled. */ - if (is_sorted || !enable_incrementalsort) + if (is_sorted || !enable_incremental_sort) continue; /* Restore the input path (we might have added Sort on top). */ @@ -7022,7 +7022,7 @@ create_partial_grouping_paths(PlannerInfo *root, * group_pathkeys because then we can't possibly have a presorted * prefix of the list without having the list be fully sorted. */ - if (enable_incrementalsort && list_length(root->group_pathkeys) > 1) + if (enable_incremental_sort && list_length(root->group_pathkeys) > 1) { foreach(lc, input_rel->pathlist) { @@ -7125,7 +7125,7 @@ create_partial_grouping_paths(PlannerInfo *root, * when the path is not already sorted and when incremental sort * is enabled. */ - if (is_sorted || !enable_incrementalsort) + if (is_sorted || !enable_incremental_sort) continue; /* Restore the input path (we might have added Sort on top). */ @@ -7304,7 +7304,7 @@ gather_grouping_paths(PlannerInfo *root, RelOptInfo *rel) * group_pathkeys because then we can't possibly have a presorted prefix * of the list without having the list be fully sorted. */ - if (!enable_incrementalsort || list_length(root->group_pathkeys) == 1) + if (!enable_incremental_sort || list_length(root->group_pathkeys) == 1) return; /* also consider incremental sort on partial paths, if enabled */ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index fe7e2f8b913..9f5e223920c 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -992,11 +992,11 @@ static struct config_bool ConfigureNamesBool[] = NULL, NULL, NULL }, { - {"enable_incrementalsort", PGC_USERSET, QUERY_TUNING_METHOD, + {"enable_incremental_sort", PGC_USERSET, QUERY_TUNING_METHOD, gettext_noop("Enables the planner's use of incremental sort steps."), NULL }, - &enable_incrementalsort, + &enable_incremental_sort, true, NULL, NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index ac02bd0c00a..bd4cb8144be 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -361,7 +361,7 @@ #enable_parallel_append = on #enable_seqscan = on #enable_sort = on -#enable_incrementalsort = on +#enable_incremental_sort = on #enable_tidscan = on #enable_partitionwise_join = off #enable_partitionwise_aggregate = off |