mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-03 21:47:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

sstables: respect range inclusiveness in key_reader

Browse Source 
When choosing a relevant range of buckets it wasn't taken into account
whether the range bounds are inclusive or not. That may have resulted in
more buckets being read than necessary which was a condition not
expected by the code responsible from looking for a relevant keys inside
the buckets.

Signed-off-by: Paweł Dziepak <pdziepak@scylladb.com>
This commit is contained in:
Paweł Dziepak
2015-12-18 15:19:32 +01:00
committed by Calle Wilund
parent d8e810686a
commit 2fd7caafa0
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sstables/partition.cc
View File

@@ -650,11 +650,19 @@ public:
: _s(s), _sst(std::move(sst)), _range(range)
{
auto& summary = _sst->_summary;
using summary_entries_type = std::decay_t<decltype(summary.entries)>;
_begin_bucket_id = 0;
if (range.start()) {
auto pos = std::lower_bound(summary.entries.begin(), summary.entries.end(),
range.start()->value(), index_comparator(*s));
summary_entries_type::iterator pos;
if (range.start()->is_inclusive()) {
pos = std::lower_bound(summary.entries.begin(), summary.entries.end(),
range.start()->value(), index_comparator(*s));
} else {
pos = std::upper_bound(summary.entries.begin(), summary.entries.end(),
range.start()->value(), index_comparator(*s));
}
_begin_bucket_id = std::distance(summary.entries.begin(), pos);
if (_begin_bucket_id) {
_begin_bucket_id--;
@@ -664,8 +672,14 @@ public:
_end_bucket_id = summary.header.size;
if (range.end()) {
auto pos = std::upper_bound(summary.entries.begin(), summary.entries.end(),
range.end()->value(), index_comparator(*s));
summary_entries_type::iterator pos;
if (range.end()->is_inclusive()) {
pos = std::upper_bound(summary.entries.begin(), summary.entries.end(),
range.end()->value(), index_comparator(*s));
} else {
pos = std::lower_bound(summary.entries.begin(), summary.entries.end(),
range.end()->value(), index_comparator(*s));
}
_end_bucket_id = std::distance(summary.entries.begin(), pos);
if (_end_bucket_id) {
_end_bucket_id--;