firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Frontported the forgotten part of the optimizer fix, thanks to Pavel Zotov

Browse Source
This commit is contained in:
Dmitry Yemanov 2020-07-20 20:20:41 +03:00
parent 6d848f4ab9
commit b089d4f87d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/Optimizer.cpp
View File

@ -864,9 +864,10 @@ void OptimizerRetrieval::analyzeNavigation(const InversionCandidateList& inversi
for (BoolExprNode* const* iter2 = otherCandidate->matches.begin();
iter2 != otherCandidate->matches.end(); ++iter2)
{
if (candidate->matches.exist(*iter2))
if (candidate->matches.exist(*iter2) &&
betterInversion(otherCandidate, candidate, true))
{
usableIndex = betterInversion(candidate, otherCandidate, true);
usableIndex = false;
break;
}
}
@ -963,8 +964,7 @@ bool OptimizerRetrieval::betterInversion(const InversionCandidate* inv1,
{
// For the same number of indexes compare number of matched segments.
// Note the inverted condition: the more matched segments the better.
compareSelectivity =
(inv2->matchedSegments - inv1->matchedSegments);
compareSelectivity = (inv2->matchedSegments - inv1->matchedSegments);
if (compareSelectivity == 0 && !ignoreUnmatched)
{