database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

Fix bogus logic for combining range-partitioned columns during pruning.

Browse Source 
gen_prune_steps_from_opexps's notion of how to do this was overly
complicated and underly correct.

Per discussion of a report from Alan Jackson (though this fixes only one
aspect of that problem).  Back-patch to v11 where this code came in.

Amit Langote

Discussion: https://postgr.es/m/FAD28A83-AC73-489E-A058-2681FA31D648@tvsquared.com
This commit is contained in:
Tom Lane
2019-05-16 16:25:43 -04:00
parent 4b1fcb43d0
commit 3922f10646
3 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/backend/partitioning/partprune.c
View File

@ -1209,9 +1209,6 @@ gen_prune_steps_from_opexps(PartitionScheme part_scheme,
List *opsteps = NIL;
List *btree_clauses[BTMaxStrategyNumber + 1],
*hash_clauses[HTMaxStrategyNumber + 1];
bool need_next_less,
need_next_eq,
need_next_greater;
int i;
memset(btree_clauses, 0, sizeof(btree_clauses));
@ -1222,9 +1219,8 @@ gen_prune_steps_from_opexps(PartitionScheme part_scheme,
bool consider_next_key = true;
/*
* To be useful for pruning, we must have clauses for a prefix of
* partition keys in the case of range partitioning. So, ignore
* clauses for keys after this one.
* For range partitioning, if we have no clauses for the current key,
* we can't consider any later keys either, so we can stop here.
*/
if (part_scheme->strategy == PARTITION_STRATEGY_RANGE &&
clauselist == NIL)
@ -1239,7 +1235,6 @@ gen_prune_steps_from_opexps(PartitionScheme part_scheme,
clauselist == NIL && !bms_is_member(i, nullkeys))
return NULL;
need_next_eq = need_next_less = need_next_greater = true;
foreach(lc, clauselist)
{
PartClauseInfo *pc = (PartClauseInfo *) lfirst(lc);
@ -1261,7 +1256,6 @@ gen_prune_steps_from_opexps(PartitionScheme part_scheme,
case PARTITION_STRATEGY_RANGE:
{
PartClauseInfo *last = NULL;
bool inclusive = false;
/*
* Add this clause to the list of clauses to be used
@ -1279,35 +1273,13 @@ gen_prune_steps_from_opexps(PartitionScheme part_scheme,
lappend(btree_clauses[pc->op_strategy], pc);
/*
* We may not need the next clause if they're of
* certain strategy.
* We can't consider subsequent partition keys if the
* clause for the current key contains a non-inclusive
* operator.
*/
switch (pc->op_strategy)
{
case BTLessEqualStrategyNumber:
inclusive = true;
/* fall through */
case BTLessStrategyNumber:
if (!inclusive)
need_next_eq = need_next_less = false;
break;
case BTEqualStrategyNumber:
/* always accept clauses for the next key. */
break;
case BTGreaterEqualStrategyNumber:
inclusive = true;
/* fall through */
case BTGreaterStrategyNumber:
if (!inclusive)
need_next_eq = need_next_greater = false;
break;
}
/* We may want to change our mind. */
if (consider_next_key)
consider_next_key = (need_next_eq ||
need_next_less ||
need_next_greater);
if (pc->op_strategy == BTLessStrategyNumber ||
pc->op_strategy == BTGreaterStrategyNumber)
consider_next_key = false;
break;
}
@ -2847,7 +2819,7 @@ get_matching_range_bounds(PartitionPruneContext *context,
/*
* Look for the greatest bound that is < or <= lookup value and
* set minoff to its offset.
* set maxoff to its offset.
*/
off = partition_range_datum_bsearch(partsupfunc,
partcollation,