From 8f97af60d19a46b37fe998be38df4e6dd0760e45 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Wed, 20 Jun 2018 11:43:01 -0400 Subject: [PATCH] Consistently use the term 'partitioned rel' in partprune comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were using 'partition rel' in a few places, which is quite confusing. Author: Amit Langote Reviewed-by: David Rowley Reviewed-by: Michaël Paquier Discussion: https://postgr.es/m/fd256561-31a2-4b7e-cd84-d8241e7ebc3f@lab.ntt.co.jp --- src/backend/partitioning/partprune.c | 12 ++++++------ src/include/partitioning/partprune.h | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.c index 0a76b77d3e..cdc61a8997 100644 --- a/src/backend/partitioning/partprune.c +++ b/src/backend/partitioning/partprune.c @@ -176,7 +176,7 @@ static bool partkey_datum_from_expr(PartitionPruneContext *context, /* * make_partition_pruneinfo - * Build List of PartitionPruneInfos, one for each 'partitioned_rels'. + * Build List of PartitionPruneInfos, one for each partitioned rel. * These can be used in the executor to allow additional partition * pruning to take place. * @@ -190,7 +190,7 @@ static bool partkey_datum_from_expr(PartitionPruneContext *context, * pruning done during planning will have pruned everything that can be. */ List * -make_partition_pruneinfo(PlannerInfo *root, List *partition_rels, +make_partition_pruneinfo(PlannerInfo *root, List *partitioned_rels, List *subpaths, List *prunequal) { RelOptInfo *targetpart = NULL; @@ -229,11 +229,11 @@ make_partition_pruneinfo(PlannerInfo *root, List *partition_rels, /* * relid_subpart_map maps relid of a non-leaf partition to the index in - * 'partition_rels' of that rel (which will also be the index in the + * 'partitioned_rels' of that rel (which will also be the index in the * returned PartitionPruneInfo list of the info for that partition). */ i = 1; - foreach(lc, partition_rels) + foreach(lc, partitioned_rels) { Index rti = lfirst_int(lc); @@ -246,8 +246,8 @@ make_partition_pruneinfo(PlannerInfo *root, List *partition_rels, relid_subpart_map[rti] = i++; } - /* We now build a PartitionPruneInfo for each rel in partition_rels */ - foreach(lc, partition_rels) + /* We now build a PartitionPruneInfo for each partitioned rel */ + foreach(lc, partitioned_rels) { Index rti = lfirst_int(lc); RelOptInfo *subpart = find_base_rel(root, rti); diff --git a/src/include/partitioning/partprune.h b/src/include/partitioning/partprune.h index 09147b532c..9944d2832f 100644 --- a/src/include/partitioning/partprune.h +++ b/src/include/partitioning/partprune.h @@ -74,7 +74,8 @@ typedef struct PartitionPruneContext #define PruneCxtStateIdx(partnatts, step_id, keyno) \ ((partnatts) * (step_id) + (keyno)) -extern List *make_partition_pruneinfo(PlannerInfo *root, List *partition_rels, +extern List *make_partition_pruneinfo(PlannerInfo *root, + List *partitioned_rels, List *subpaths, List *prunequal); extern Relids prune_append_rel_partitions(RelOptInfo *rel); extern Bitmapset *get_matching_partitions(PartitionPruneContext *context,