mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sstables: Fix bug in read_range_rows()

Browse Source 
The method was using the same summary page for both min and max
tokens, whereas they can be different if they're distant enough from
each other.
This commit is contained in:
Tomasz Grabiec
2015-07-13 17:22:23 +02:00
parent 0a4651cd28
commit 2a491b2076
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sstables/partition.cc
View File

@@ -498,8 +498,8 @@ mutation_reader sstable::read_range_rows(schema_ptr schema,
min_idx = 0;
}
auto position = _summary.entries[min_idx].position;
auto ipos_fut = read_indexes(position).then([this, min_token] (auto index_list) {
auto min_position = _summary.entries[min_idx].position;
auto ipos_fut = read_indexes(min_position).then([this, min_token] (auto index_list) {
// Note that we have to adjust the binary search result here as
// well. We will never find the exact element, since we are not
// using real keys.
@@ -527,7 +527,8 @@ mutation_reader sstable::read_range_rows(schema_ptr schema,
return make_ready_future<uint64_t>(index_list[min_index_idx].position);
});
auto epos_fut = read_indexes(position).then([this, max_idx, max_token] (auto index_list) {
auto max_position = _summary.entries[max_idx].position;
auto epos_fut = read_indexes(max_position).then([this, max_idx, max_token] (auto index_list) {
auto m = adjust_binary_search_index(this->binary_search(index_list, maximum_key(), max_token));
auto max_index_idx = m >= 0 ? m : int(index_list.size());