Skip to content

Commit 2fb1aba

Browse files
peterepetere
committed
Rename enable_partition_wise_join to enable_partitionwise_join
Discussion: https://www.postgresql.org/message-id/flat/ad24e4f4-6481-066e-e3fb-6ef4a3121882%402ndquadrant.com
1 parent f8437c8 commit 2fb1aba

File tree

16 files changed

+88
-88
lines changed

16 files changed

+88
-88
lines changed

‎contrib/postgres_fdw/expected/postgres_fdw.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7682,9 +7682,9 @@ AND ftoptions @> array['fetch_size=60000'];
76827682

76837683
ROLLBACK;
76847684
-- ===================================================================
7685-
-- test partition-wise-joins
7685+
-- test partitionwise joins
76867686
-- ===================================================================
7687-
SET enable_partition_wise_join=on;
7687+
SET enable_partitionwise_join=on;
76887688
CREATE TABLE fprt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
76897689
CREATE TABLE fprt1_p1 (LIKE fprt1);
76907690
CREATE TABLE fprt1_p2 (LIKE fprt1);
@@ -7800,4 +7800,4 @@ SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t
78007800
400 | 400
78017801
(4 rows)
78027802

7803-
RESET enable_partition_wise_join;
7803+
RESET enable_partitionwise_join;

‎contrib/postgres_fdw/sql/postgres_fdw.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1863,9 +1863,9 @@ AND ftoptions @> array['fetch_size=60000'];
18631863
ROLLBACK;
18641864

18651865
-- ===================================================================
1866-
-- test partition-wise-joins
1866+
-- test partitionwise joins
18671867
-- ===================================================================
1868-
SET enable_partition_wise_join=on;
1868+
SET enable_partitionwise_join=on;
18691869

18701870
CREATE TABLE fprt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
18711871
CREATE TABLE fprt1_p1 (LIKE fprt1);
@@ -1913,4 +1913,4 @@ EXPLAIN (COSTS OFF)
19131913
SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
19141914
SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
19151915

1916-
RESET enable_partition_wise_join;
1916+
RESET enable_partitionwise_join;

‎doc/src/sgml/config.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3736,20 +3736,20 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
37363736
</listitem>
37373737
</varlistentry>
37383738

3739-
<varlistentry id="guc-enable-partition-wise-join" xreflabel="enable_partition_wise_join">
3740-
<term><varname>enable_partition_wise_join</varname> (<type>boolean</type>)
3739+
<varlistentry id="guc-enable-partitionwise-join" xreflabel="enable_partitionwise_join">
3740+
<term><varname>enable_partitionwise_join</varname> (<type>boolean</type>)
37413741
<indexterm>
3742-
<primary><varname>enable_partition_wise_join</varname> configuration parameter</primary>
3742+
<primary><varname>enable_partitionwise_join</varname> configuration parameter</primary>
37433743
</indexterm>
37443744
</term>
37453745
<listitem>
37463746
<para>
3747-
Enables or disables the query planner's use of partition-wise join,
3747+
Enables or disables the query planner's use of partitionwise join,
37483748
which allows a join between partitioned tables to be performed by
3749-
joining the matching partitions. Partition-wise join currently applies
3749+
joining the matching partitions. Partitionwise join currently applies
37503750
only when the join conditions include all the partition keys, which
37513751
must be of the same data type and have exactly matching sets of child
3752-
partitions. Because partition-wise join planning can use significantly
3752+
partitions. Because partitionwise join planning can use significantly
37533753
more CPU time and memory during planning, the default is
37543754
<literal>off</literal>.
37553755
</para>

‎src/backend/optimizer/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,8 +1076,8 @@ plan as possible. Expanding the range of cases in which more work can be
10761076
pushed below the Gather (and costing them accurately) is likely to keep us
10771077
busy for a long time to come.
10781078

1079-
Partition-wise joins
1080-
--------------------
1079+
Partitionwise joins
1080+
-------------------
10811081
A join between two similarly partitioned tables can be broken down into joins
10821082
between their matching partitions if there exists an equi-join condition
10831083
between the partition keys of the joining tables. The equi-join between
@@ -1089,7 +1089,7 @@ partitioned in the same way as the joining relations, thus allowing an N-way
10891089
join between similarly partitioned tables having equi-join condition between
10901090
their partition keys to be broken down into N-way joins between their matching
10911091
partitions. This technique of breaking down a join between partitioned tables
1092-
into joins between their partitions is called partition-wise join. We will use
1092+
into joins between their partitions is called partitionwise join. We will use
10931093
term "partitioned relation" for either a partitioned table or a join between
10941094
compatibly partitioned tables.
10951095

‎src/backend/optimizer/geqo/geqo_eval.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ merge_clump(PlannerInfo *root, List *clumps, Clump *new_clump, bool force)
264264
/* Keep searching if join order is not valid */
265265
if (joinrel)
266266
{
267-
/* Create paths for partition-wise joins. */
268-
generate_partition_wise_join_paths(root, joinrel);
267+
/* Create paths for partitionwise joins. */
268+
generate_partitionwise_join_paths(root, joinrel);
269269

270270
/* Create GatherPaths for any useful partial paths for rel */
271271
generate_gather_paths(root, joinrel);

‎src/backend/optimizer/path/allpaths.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
929929
/*
930930
* We need attr_needed data for building targetlist of a join
931931
* relation representing join between matching partitions for
932-
* partition-wise join. A given attribute of a child will be
932+
* partitionwise join. A given attribute of a child will be
933933
* needed in the same highest joinrel where the corresponding
934934
* attribute of parent is needed. Hence it suffices to use the
935935
* same Relids set for parent and child.
@@ -973,7 +973,7 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
973973
/*
974974
* Copy/Modify targetlist. Even if this child is deemed empty, we need
975975
* its targetlist in case it falls on nullable side in a child-join
976-
* because of partition-wise join.
976+
* because of partitionwise join.
977977
*
978978
* NB: the resulting childrel->reltarget->exprs may contain arbitrary
979979
* expressions, which otherwise would not occur in a rel's targetlist.
@@ -2636,7 +2636,7 @@ standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels)
26362636
join_search_one_level(root, lev);
26372637

26382638
/*
2639-
* Run generate_partition_wise_join_paths() and
2639+
* Run generate_partitionwise_join_paths() and
26402640
* generate_gather_paths() for each just-processed joinrel. We could
26412641
* not do this earlier because both regular and partial paths can get
26422642
* added to a particular joinrel at multiple times within
@@ -2649,8 +2649,8 @@ standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels)
26492649
{
26502650
rel = (RelOptInfo *) lfirst(lc);
26512651

2652-
/* Create paths for partition-wise joins. */
2653-
generate_partition_wise_join_paths(root, rel);
2652+
/* Create paths for partitionwise joins. */
2653+
generate_partitionwise_join_paths(root, rel);
26542654

26552655
/* Create GatherPaths for any useful partial paths for rel */
26562656
generate_gather_paths(root, rel);
@@ -3405,16 +3405,16 @@ compute_parallel_worker(RelOptInfo *rel, double heap_pages, double index_pages,
34053405
}
34063406

34073407
/*
3408-
* generate_partition_wise_join_paths
3409-
* Create paths representing partition-wise join for given partitioned
3408+
* generate_partitionwise_join_paths
3409+
* Create paths representing partitionwise join for given partitioned
34103410
* join relation.
34113411
*
34123412
* This must not be called until after we are done adding paths for all
34133413
* child-joins. Otherwise, add_path might delete a path to which some path
34143414
* generated here has a reference.
34153415
*/
34163416
void
3417-
generate_partition_wise_join_paths(PlannerInfo *root, RelOptInfo *rel)
3417+
generate_partitionwise_join_paths(PlannerInfo *root, RelOptInfo *rel)
34183418
{
34193419
List *live_children = NIL;
34203420
int cnt_parts;
@@ -3442,8 +3442,8 @@ generate_partition_wise_join_paths(PlannerInfo *root, RelOptInfo *rel)
34423442

34433443
Assert(child_rel != NULL);
34443444

3445-
/* Add partition-wise join paths for partitioned child-joins. */
3446-
generate_partition_wise_join_paths(root, child_rel);
3445+
/* Add partitionwise join paths for partitioned child-joins. */
3446+
generate_partitionwise_join_paths(root, child_rel);
34473447

34483448
/* Dummy children will not be scanned, so ignore those. */
34493449
if (IS_DUMMY_REL(child_rel))

‎src/backend/optimizer/path/costsize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ bool enable_material = true;
127127
bool enable_mergejoin = true;
128128
bool enable_hashjoin = true;
129129
bool enable_gathermerge = true;
130-
bool enable_partition_wise_join = false;
130+
bool enable_partitionwise_join = false;
131131
bool enable_parallel_append = true;
132132
bool enable_parallel_hash = true;
133133

‎src/backend/optimizer/path/joinrels.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static bool restriction_is_constant_false(List *restrictlist,
3939
static void populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1,
4040
RelOptInfo *rel2, RelOptInfo *joinrel,
4141
SpecialJoinInfo *sjinfo, List *restrictlist);
42-
static void try_partition_wise_join(PlannerInfo *root, RelOptInfo *rel1,
42+
static void try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1,
4343
RelOptInfo *rel2, RelOptInfo *joinrel,
4444
SpecialJoinInfo *parent_sjinfo,
4545
List *parent_restrictlist);
@@ -903,8 +903,8 @@ populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1,
903903
break;
904904
}
905905

906-
/* Apply partition-wise join technique, if possible. */
907-
try_partition_wise_join(root, rel1, rel2, joinrel, sjinfo, restrictlist);
906+
/* Apply partitionwise join technique, if possible. */
907+
try_partitionwise_join(root, rel1, rel2, joinrel, sjinfo, restrictlist);
908908
}
909909

910910

@@ -1286,25 +1286,25 @@ restriction_is_constant_false(List *restrictlist, bool only_pushed_down)
12861286
/*
12871287
* Assess whether join between given two partitioned relations can be broken
12881288
* down into joins between matching partitions; a technique called
1289-
* "partition-wise join"
1289+
* "partitionwise join"
12901290
*
1291-
* Partition-wise join is possible when a. Joining relations have same
1291+
* Partitionwise join is possible when a. Joining relations have same
12921292
* partitioning scheme b. There exists an equi-join between the partition keys
12931293
* of the two relations.
12941294
*
1295-
* Partition-wise join is planned as follows (details: optimizer/README.)
1295+
* Partitionwise join is planned as follows (details: optimizer/README.)
12961296
*
12971297
* 1. Create the RelOptInfos for joins between matching partitions i.e
12981298
* child-joins and add paths to them.
12991299
*
13001300
* 2. Construct Append or MergeAppend paths across the set of child joins.
1301-
* This second phase is implemented by generate_partition_wise_join_paths().
1301+
* This second phase is implemented by generate_partitionwise_join_paths().
13021302
*
13031303
* The RelOptInfo, SpecialJoinInfo and restrictlist for each child join are
13041304
* obtained by translating the respective parent join structures.
13051305
*/
13061306
static void
1307-
try_partition_wise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
1307+
try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
13081308
RelOptInfo *joinrel, SpecialJoinInfo *parent_sjinfo,
13091309
List *parent_restrictlist)
13101310
{
@@ -1334,7 +1334,7 @@ try_partition_wise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
13341334
joinrel->part_scheme == rel2->part_scheme);
13351335

13361336
/*
1337-
* Since we allow partition-wise join only when the partition bounds of
1337+
* Since we allow partitionwise join only when the partition bounds of
13381338
* the joining relations exactly match, the partition bounds of the join
13391339
* should match those of the joining relations.
13401340
*/
@@ -1478,7 +1478,7 @@ have_partkey_equi_join(RelOptInfo *rel1, RelOptInfo *rel2, JoinType jointype,
14781478

14791479
/*
14801480
* Only clauses referencing the partition keys are useful for
1481-
* partition-wise join.
1481+
* partitionwise join.
14821482
*/
14831483
ipk1 = match_expr_to_partition_keys(expr1, rel1, strict_op);
14841484
if (ipk1 < 0)
@@ -1489,13 +1489,13 @@ have_partkey_equi_join(RelOptInfo *rel1, RelOptInfo *rel2, JoinType jointype,
14891489

14901490
/*
14911491
* If the clause refers to keys at different ordinal positions, it can
1492-
* not be used for partition-wise join.
1492+
* not be used for partitionwise join.
14931493
*/
14941494
if (ipk1 != ipk2)
14951495
continue;
14961496

14971497
/*
1498-
* The clause allows partition-wise join if only it uses the same
1498+
* The clause allows partitionwise join if only it uses the same
14991499
* operator family as that specified by the partition key.
15001500
*/
15011501
if (rel1->part_scheme->strategy == PARTITION_STRATEGY_HASH)

‎src/backend/optimizer/util/relnode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,15 +1601,15 @@ build_joinrel_partition_info(RelOptInfo *joinrel, RelOptInfo *outer_rel,
16011601
int cnt;
16021602
PartitionScheme part_scheme;
16031603

1604-
/* Nothing to do if partition-wise join technique is disabled. */
1605-
if (!enable_partition_wise_join)
1604+
/* Nothing to do if partitionwise join technique is disabled. */
1605+
if (!enable_partitionwise_join)
16061606
{
16071607
Assert(!IS_PARTITIONED_REL(joinrel));
16081608
return;
16091609
}
16101610

16111611
/*
1612-
* We can only consider this join as an input to further partition-wise
1612+
* We can only consider this join as an input to further partitionwise
16131613
* joins if (a) the input relations are partitioned, (b) the partition
16141614
* schemes match, and (c) we can identify an equi-join between the
16151615
* partition keys. Note that if it were possible for

‎src/backend/utils/misc/guc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -914,11 +914,11 @@ static struct config_bool ConfigureNamesBool[] =
914914
NULL, NULL, NULL
915915
},
916916
{
917-
{"enable_partition_wise_join", PGC_USERSET, QUERY_TUNING_METHOD,
918-
gettext_noop("Enables partition-wise join."),
917+
{"enable_partitionwise_join", PGC_USERSET, QUERY_TUNING_METHOD,
918+
gettext_noop("Enables partitionwise join."),
919919
NULL
920920
},
921-
&enable_partition_wise_join,
921+
&enable_partitionwise_join,
922922
false,
923923
NULL, NULL, NULL
924924
},

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
#enable_seqscan = on
304304
#enable_sort = on
305305
#enable_tidscan = on
306-
#enable_partition_wise_join = off
306+
#enable_partitionwise_join = off
307307
#enable_parallel_hash = on
308308

309309
# - Planner Cost Constants -

‎src/include/optimizer/cost.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ extern PGDLLIMPORT bool enable_material;
6767
extern PGDLLIMPORT bool enable_mergejoin;
6868
extern PGDLLIMPORT bool enable_hashjoin;
6969
extern PGDLLIMPORT bool enable_gathermerge;
70-
extern PGDLLIMPORT bool enable_partition_wise_join;
70+
extern PGDLLIMPORT bool enable_partitionwise_join;
7171
extern PGDLLIMPORT bool enable_parallel_append;
7272
extern PGDLLIMPORT bool enable_parallel_hash;
7373
extern PGDLLIMPORT int constraint_exclusion;

‎src/include/optimizer/paths.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ extern int compute_parallel_worker(RelOptInfo *rel, double heap_pages,
5858
double index_pages, int max_workers);
5959
extern void create_partial_bitmap_paths(PlannerInfo *root, RelOptInfo *rel,
6060
Path *bitmapqual);
61-
extern void generate_partition_wise_join_paths(PlannerInfo *root,
61+
extern void generate_partitionwise_join_paths(PlannerInfo *root,
6262
RelOptInfo *rel);
6363

6464
#ifdef OPTIMIZER_DEBUG

0 commit comments

Comments
 (0)