Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid index scan for lower/upper bounds containing NULL keys #8447

Merged
merged 1 commit into from
Feb 24, 2025
Merged

Avoid index scan for lower/upper bounds containing NULL keys #8447

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 20 additions & 8 deletions src/jrd/btr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1797,16 +1797,15 @@ bool BTR_make_bounds(thread_db* tdbb, const IndexRetrieval* retrieval,
(retrieval->irb_desc.idx_flags & idx_unique) ? INTL_KEY_UNIQUE :
INTL_KEY_SORT;

bool forceIncludeUpper = false, forceIncludeLower = false;

if (const auto count = retrieval->irb_upper_count)
{
const auto values = iterator ? iterator->getUpperValues() :
retrieval->irb_value + retrieval->irb_desc.idx_count;

bool forceInclude = false;
errorCode = BTR_make_key(tdbb, count, values, retrieval->irb_scale,
idx, upper, keyType, &forceInclude);
if (forceInclude)
forceInclFlag |= irb_force_upper;
idx, upper, keyType, &forceIncludeUpper);
}

if (errorCode == idx_e_ok)
Expand All @@ -1816,11 +1815,8 @@ bool BTR_make_bounds(thread_db* tdbb, const IndexRetrieval* retrieval,
const auto values = iterator ? iterator->getLowerValues() :
retrieval->irb_value;

bool forceInclude = false;
errorCode = BTR_make_key(tdbb, count, values, retrieval->irb_scale,
idx, lower, keyType, &forceInclude);
if (forceInclude)
forceInclFlag |= irb_force_lower;
idx, lower, keyType, &forceIncludeLower);
}
}

Expand All @@ -1830,6 +1826,22 @@ bool BTR_make_bounds(thread_db* tdbb, const IndexRetrieval* retrieval,
IndexErrorContext context(retrieval->irb_relation, &temp_idx);
context.raise(tdbb, errorCode);
}

// If retrieval is flagged to ignore NULLs and any segment of the key
// to be matched contains NULL, don't bother with a scan

if ((retrieval->irb_generic & irb_ignore_null_value_key) &&
((retrieval->irb_upper_count && upper->key_nulls) ||
(retrieval->irb_lower_count && lower->key_nulls)))
{
return false;
}

if (forceIncludeUpper)
forceInclFlag |= irb_force_upper;

if (forceIncludeLower)
forceInclFlag |= irb_force_lower;
}

return true;
Expand Down
Loading