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

Restore some old code, this should fix today's regressions

Browse Source
This commit is contained in:
Dmitry Yemanov 2022-10-20 19:48:47 +03:00
parent 34407151d0
commit 07fdf07828
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jrd/optimizer/Optimizer.h
View File

@ -617,7 +617,8 @@ public:
protected:
void analyzeNavigation(const InversionCandidateList& inversions);
bool betterInversion(const InversionCandidate* inv1, const InversionCandidate* inv2) const;
bool betterInversion(const InversionCandidate* inv1, const InversionCandidate* inv2,
bool ignoreUnmatched) const;
bool checkIndexCondition(index_desc& idx, MatchedBooleanList& matches) const;
bool checkIndexExpression(const index_desc* idx, ValueExprNode* node) const;
InversionNode* composeInversion(InversionNode* node1, InversionNode* node2,

11
src/jrd/optimizer/Retrieval.cpp
View File

@ -573,7 +573,7 @@ void Retrieval::analyzeNavigation(const InversionCandidateList& inversions)
for (const auto otherMatch : otherCandidate->matches)
{
if (candidate->matches.exist(otherMatch) &&
betterInversion(otherCandidate, candidate))
betterInversion(otherCandidate, candidate, true))
{
usableIndex = false;
break;
@ -604,7 +604,7 @@ void Retrieval::analyzeNavigation(const InversionCandidateList& inversions)
}
if (!bestCandidate ||
betterInversion(candidate, bestCandidate))
betterInversion(candidate, bestCandidate, false))
{
bestCandidate = candidate;
}
@ -621,7 +621,8 @@ void Retrieval::analyzeNavigation(const InversionCandidateList& inversions)
}
bool Retrieval::betterInversion(const InversionCandidate* inv1,
const InversionCandidate* inv2) const
const InversionCandidate* inv2,
bool ignoreUnmatched) const
{
// Return true if inversion1 is *better* than inversion2.
// It's mostly about the retrieval cost, but other aspects are also taken into account.
@ -679,7 +680,7 @@ bool Retrieval::betterInversion(const InversionCandidate* inv1,
// Note the inverted condition: the more matched segments the better.
diff = (inv2->matchedSegments - inv1->matchedSegments);
if (diff == 0)
if (diff == 0 && !ignoreUnmatched)
{
// For the same number of matched segments
// compare ones that aren't full matched
@ -1362,7 +1363,7 @@ InversionCandidate* Retrieval::makeInversion(InversionCandidateList& inversions)
break;
}
if (betterInversion(currentInv, bestCandidate))
if (betterInversion(currentInv, bestCandidate, false))
bestCandidate = currentInv;
}
}