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

Fixed CORE-1053

Browse Source
This commit is contained in:
alexpeshkoff 2006-12-14 16:20:35 +00:00
parent 20ae60d756
commit f86fef0c48
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/jrd/btr.cpp
View File

@ -487,6 +487,40 @@ DSC* BTR_eval_expression(thread_db* tdbb, index_desc* idx, Record* record, bool
} }
inline void checkForLowerKeySkip(
bool& skipLowerKey,
const bool partLower,
const IndexNode& node,
const temporary_key& lower,
const index_desc& idx,
const IndexRetrieval* retrieval)
{
if (skipLowerKey)
{
// are we skip all duplicates of lower key ?
if (node.prefix < lower.key_length) {
skipLowerKey = false;
}
else if ((node.prefix == lower.key_length) && node.length)
{
if (partLower)
{
const USHORT segnum =
idx.idx_count - (UCHAR)(idx.idx_flags & idx_descending ?
(*node.data) ^ -1 : *node.data);
if (segnum < retrieval->irb_lower_count) {
skipLowerKey = false;
}
}
else {
skipLowerKey = false;
}
}
}
}
void BTR_evaluate(thread_db* tdbb, IndexRetrieval* retrieval, RecordBitmap** bitmap) void BTR_evaluate(thread_db* tdbb, IndexRetrieval* retrieval, RecordBitmap** bitmap)
{ {
/************************************** /**************************************
@ -634,28 +668,8 @@ void BTR_evaluate(thread_db* tdbb, IndexRetrieval* retrieval, RecordBitmap** bit
BUGCHECK(204); // msg 204 index inconsistent BUGCHECK(204); // msg 204 index inconsistent
} }
if (skipLowerKey) checkForLowerKeySkip(skipLowerKey, partLower, node,
{ lower, idx, retrieval);
// are we skip all duplicates of lower key ?
if (node.prefix < lower.key_length) {
skipLowerKey = false;
}
else if ((node.prefix == lower.key_length) && node.length)
{
if (partLower)
{
const USHORT segnum = idx.idx_count -
(UCHAR)(descending ? (*node.data) ^ -1 : *node.data);
if (segnum < retrieval->irb_lower_count) {
skipLowerKey = false;
}
}
else {
skipLowerKey = false;
}
}
}
continue; continue;
} }
@ -668,6 +682,9 @@ void BTR_evaluate(thread_db* tdbb, IndexRetrieval* retrieval, RecordBitmap** bit
if (pointer > endPointer) { if (pointer > endPointer) {
BUGCHECK(204); // msg 204 index inconsistent BUGCHECK(204); // msg 204 index inconsistent
} }
checkForLowerKeySkip(skipLowerKey, partLower, node,
lower, idx, retrieval);
} }
} }