diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2024-10-14 15:36:18 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2024-10-14 15:36:18 +0200 |
| commit | c594f1ad2ba7cbe66e8ae98da4ffed06491d1082 (patch) | |
| tree | 12d7f1656a8c301219a0ec36a88d483e2f2879ca /src/backend/executor/nodeMergejoin.c | |
| parent | 0d2aa4d4937bb0500823edfc7d620f4e5fa45b9c (diff) | |
| download | postgresql-c594f1ad2ba7cbe66e8ae98da4ffed06491d1082.tar.gz postgresql-c594f1ad2ba7cbe66e8ae98da4ffed06491d1082.zip | |
Track scan reversals in MergeJoin
The MergeJoin struct was tracking "mergeStrategies", which were an
array of btree strategy numbers, purely for the purpose of comparing
it later against btree strategies to determine if the scan direction
was forward or reverse. Change that. Instead, track
"mergeReversals", an array of bool, to indicate the same without an
unfortunate assumption that a strategy number refers specifically to a
btree strategy.
Author: Mark Dilger <mark.dilger@enterprisedb.com>
Discussion: https://www.postgresql.org/message-id/flat/E72EAA49-354D-4C2E-8EB9-255197F55330@enterprisedb.com
Diffstat (limited to 'src/backend/executor/nodeMergejoin.c')
| -rw-r--r-- | src/backend/executor/nodeMergejoin.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 29c54fcd753..b593905978b 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -175,7 +175,7 @@ static MergeJoinClause MJExamineQuals(List *mergeclauses, Oid *mergefamilies, Oid *mergecollations, - int *mergestrategies, + bool *mergereversals, bool *mergenullsfirst, PlanState *parent) { @@ -193,7 +193,7 @@ MJExamineQuals(List *mergeclauses, MergeJoinClause clause = &clauses[iClause]; Oid opfamily = mergefamilies[iClause]; Oid collation = mergecollations[iClause]; - StrategyNumber opstrategy = mergestrategies[iClause]; + bool reversed = mergereversals[iClause]; bool nulls_first = mergenullsfirst[iClause]; int op_strategy; Oid op_lefttype; @@ -212,12 +212,7 @@ MJExamineQuals(List *mergeclauses, /* Set up sort support data */ clause->ssup.ssup_cxt = CurrentMemoryContext; clause->ssup.ssup_collation = collation; - if (opstrategy == BTLessStrategyNumber) - clause->ssup.ssup_reverse = false; - else if (opstrategy == BTGreaterStrategyNumber) - clause->ssup.ssup_reverse = true; - else /* planner screwed up */ - elog(ERROR, "unsupported mergejoin strategy %d", opstrategy); + clause->ssup.ssup_reverse = reversed; clause->ssup.ssup_nulls_first = nulls_first; /* Extract the operator's declared left/right datatypes */ @@ -1608,7 +1603,7 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags) mergestate->mj_Clauses = MJExamineQuals(node->mergeclauses, node->mergeFamilies, node->mergeCollations, - node->mergeStrategies, + node->mergeReversals, node->mergeNullsFirst, (PlanState *) mergestate); |