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

Revert "Better (methinks) inversion choice when the OR condition includes a node which is also matched directly"

Browse Source 
This reverts commit ebcd4dde64.
This commit is contained in:
Dmitry Yemanov 2025-01-09 14:59:05 +03:00
parent 29873bc712
commit 5167c588a4
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1496,35 +1496,19 @@ InversionCandidate* Retrieval::makeInversion(InversionCandidateList& inversions)
// Look if a match is already used by previous matches. // Look if a match is already used by previous matches.
bool anyMatchAlreadyUsed = false, matchUsedByNavigation = false; bool anyMatchAlreadyUsed = false, matchUsedByNavigation = false;
if (currentInv->boolean) for (const auto currentMatch : currentInv->matches)
{ {
if (matches.exist(currentInv->boolean)) if (matches.exist(currentMatch))
{ {
anyMatchAlreadyUsed = true; anyMatchAlreadyUsed = true;
if (navigationCandidate && if (navigationCandidate &&
navigationCandidate->matches.exist(currentInv->boolean)) navigationCandidate->matches.exist(currentMatch))
{ {
matchUsedByNavigation = true; matchUsedByNavigation = true;
} }
}
}
else
{
for (const auto currentMatch : currentInv->matches)
{
if (matches.exist(currentMatch))
{
anyMatchAlreadyUsed = true;
if (navigationCandidate && break;
navigationCandidate->matches.exist(currentMatch))
{
matchUsedByNavigation = true;
}
break;
}
} }
} }