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

Fix #8214: Incorrect result of index list scan for a composite index, the second segment of which is a text field with COLLATE UNICODE_CI

Browse Source
This commit is contained in:
Dmitry Yemanov 2024-10-29 15:46:54 +03:00
parent bedf271e1f
commit 5ed57cb43b
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jrd/btr.cpp
View File

@ -766,7 +766,10 @@ void IndexScanListIterator::makeKeys(thread_db* tdbb, temporary_key* lower, temp
m_upperValues[m_segno] = *m_iterator;
const auto keyType =
(m_retrieval->irb_desc.idx_flags & idx_unique) ? INTL_KEY_UNIQUE : INTL_KEY_SORT;
(m_retrieval->irb_generic & irb_multi_starting) ? INTL_KEY_MULTI_STARTING :
(m_retrieval->irb_generic & irb_starting) ? INTL_KEY_PARTIAL :
(m_retrieval->irb_desc.idx_flags & idx_unique) ? INTL_KEY_UNIQUE :
INTL_KEY_SORT;
// Make the lower bound key

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

@ -877,10 +877,6 @@ void Retrieval::getInversionCandidates(InversionCandidateList& inversions,
// We can't use the next segments, and we'll need to use
// INTL_KEY_PARTIAL to construct the last segment's key.
scratch.usePartialKey = true;
// It's currently impossible to use a list scan with INTL_KEY_PARTIAL
if (scanType == segmentScanList)
scanType = segmentScanNone;
}
}
@ -931,16 +927,14 @@ void Retrieval::getInversionCandidates(InversionCandidateList& inversions,
// An equality scan for any unique index cannot retrieve more
// than one row. The same is true for an equivalence scan for
// any primary index.
const bool single_match =
// any primary index. A missing scan for any primary index is
// known to return no rows, but let's treat it the same way.
const bool uniqueMatch =
(scanType == segmentScanEqual && (idx->idx_flags & idx_unique)) ||
(scanType == segmentScanEquivalent && (idx->idx_flags & idx_primary));
(scanType == segmentScanEquivalent && (idx->idx_flags & idx_primary)) ||
(scanType == segmentScanMissing && (idx->idx_flags & idx_primary));
// dimitr: IS NULL scan against primary key is guaranteed
// to return zero rows. Do we need yet another
// special case here?
if (single_match && ((j + 1) == idx->idx_count))
if (uniqueMatch && ((j + 1) == idx->idx_count))
{
// We have found a full equal matching index and it's unique,
// so we can stop looking further, because this is the best