bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

partition_snapshot_row_cursor.hh: switch from boost ranges to std ranges

Browse Source 
Converge on one range solution.
This commit is contained in:
Avi Kivity
2024-11-15 14:39:39 +02:00
parent 1c26c8deeb
commit 9720bb1e5f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
partition_snapshot_row_cursor.hh
View File

@@ -12,9 +12,8 @@
#include "row_cache.hh"
#include "utils/assert.hh"
#include "utils/small_vector.hh"
#include <boost/range/algorithm/find_if.hpp>
#include <boost/range/algorithm/heap_algorithm.hpp>
#include <fmt/core.h>
#include <ranges>
class partition_snapshot_row_cursor;
@@ -200,7 +199,7 @@ class partition_snapshot_row_cursor final {
version_heap_less_compare heap_less(*this);
position_in_partition::equal_compare eq(*_snp.schema());
do {
boost::range::pop_heap(_heap, heap_less);
std::ranges::pop_heap(_heap, heap_less);
memory::on_alloc_point();
position_in_version& v = _heap.back();
rows_entry& e = *v.it;
@@ -302,7 +301,7 @@ class partition_snapshot_row_cursor final {
++version_no;
first = false;
}
boost::range::make_heap(_heap, heap_less);
std::ranges::make_heap(_heap, heap_less);
_change_mark = _snp.get_change_mark();
}
@@ -358,7 +357,7 @@ class partition_snapshot_row_cursor final {
_latest_it = curr.it;
}
_heap.push_back(curr);
boost::range::push_heap(_heap, heap_less);
std::ranges::push_heap(_heap, heap_less);
}
}
return recreate_current_row();
@@ -435,7 +434,7 @@ public:
bool match;
auto it = rows.lower_bound(_position, match, cmp);
_latest_it = it;
auto heap_i = boost::find_if(_heap, [](auto&& v) { return v.version_no == 0; });
auto heap_i = std::ranges::find_if(_heap, [](auto&& v) { return v.version_no == 0; });
is_continuous cont;
tombstone rt;
@@ -468,25 +467,25 @@ public:
if (!it) {
if (heap_i != _heap.end()) {
_heap.erase(heap_i);
boost::range::make_heap(_heap, heap_less);
std::ranges::make_heap(_heap, heap_less);
}
} else if (match) {
_current_row.insert(_current_row.begin(), position_in_version{
it, std::move(rows), 0, _snp.version()->get_schema().get(), _unique_owner, cont, rt});
if (heap_i != _heap.end()) {
_heap.erase(heap_i);
boost::range::make_heap(_heap, heap_less);
std::ranges::make_heap(_heap, heap_less);
}
} else {
if (heap_i != _heap.end()) {
heap_i->it = it;
heap_i->continuous = cont;
heap_i->rt = rt;
boost::range::make_heap(_heap, heap_less);
std::ranges::make_heap(_heap, heap_less);
} else {
_heap.push_back(position_in_version{
it, std::move(rows), 0, _snp.version()->get_schema().get(), _unique_owner, cont, rt});
boost::range::push_heap(_heap, heap_less);
std::ranges::push_heap(_heap, heap_less);
}
}
}