mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-12 19:02:12 +00:00
5f08831192
Right now reversed streamed mutation emits range tombstones after the mutation fragments affected by them. This breakes the queries. This patch reworks the way range tombstones are handled in reversed streams: - range tombstones are no longer flipped -- invariant that start bound is smaller than the end bound always holds - in reversed streams they are ordered by their end_position() Fixes #2982.
101 lines
3.4 KiB
C++
101 lines
3.4 KiB
C++
/*
|
|
* Copyright (C) 2016 ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "range_tombstone.hh"
|
|
#include "streamed_mutation.hh"
|
|
|
|
std::ostream& operator<<(std::ostream& out, const range_tombstone& rt) {
|
|
if (rt) {
|
|
return out << "{range_tombstone: start=" << rt.start_bound() << ", end=" << rt.end_bound() << ", " << rt.tomb << "}";
|
|
} else {
|
|
return out << "{range_tombstone: none}";
|
|
}
|
|
}
|
|
|
|
stdx::optional<range_tombstone> range_tombstone::apply(const schema& s, range_tombstone&& src)
|
|
{
|
|
bound_view::compare cmp(s);
|
|
if (tomb == src.tomb) {
|
|
if (cmp(end_bound(), src.end_bound())) {
|
|
end = std::move(src.end);
|
|
end_kind = src.end_kind;
|
|
}
|
|
return { };
|
|
}
|
|
if (tomb < src.tomb) {
|
|
std::swap(*this, src);
|
|
}
|
|
if (cmp(end_bound(), src.end_bound())) {
|
|
return range_tombstone(end, invert_kind(end_kind), std::move(src.end), src.end_kind, src.tomb);
|
|
}
|
|
return { };
|
|
}
|
|
|
|
position_in_partition_view range_tombstone::position() const {
|
|
return position_in_partition_view(position_in_partition_view::range_tombstone_tag_t(), start_bound());
|
|
}
|
|
|
|
position_in_partition_view range_tombstone::end_position() const {
|
|
return position_in_partition_view(position_in_partition_view::range_tombstone_tag_t(), end_bound());
|
|
}
|
|
|
|
void range_tombstone_accumulator::update_current_tombstone() {
|
|
_current_tombstone = boost::accumulate(_range_tombstones, _partition_tombstone, [] (tombstone t, const range_tombstone& rt) {
|
|
t.apply(rt.tomb);
|
|
return t;
|
|
});
|
|
}
|
|
|
|
void range_tombstone_accumulator::drop_unneeded_tombstones(const clustering_key_prefix& ck, int w) {
|
|
auto cmp = [&] (const range_tombstone& rt, const clustering_key_prefix& ck, int w) {
|
|
if (_reversed) {
|
|
auto bv = rt.start_bound();
|
|
return _cmp(ck, w, bv.prefix, weight(bv.kind));
|
|
}
|
|
auto bv = rt.end_bound();
|
|
return _cmp(bv.prefix, weight(bv.kind), ck, w);
|
|
};
|
|
while (!_range_tombstones.empty() && cmp(*_range_tombstones.begin(), ck, w)) {
|
|
_range_tombstones.pop_front();
|
|
}
|
|
update_current_tombstone();
|
|
}
|
|
|
|
void range_tombstone_accumulator::apply(range_tombstone rt) {
|
|
if (_reversed) {
|
|
drop_unneeded_tombstones(rt.end, weight(rt.end_kind));
|
|
} else {
|
|
drop_unneeded_tombstones(rt.start, weight(rt.start_kind));
|
|
}
|
|
_current_tombstone.apply(rt.tomb);
|
|
|
|
auto cmp = [&] (const range_tombstone& rt1, const range_tombstone& rt2) {
|
|
return _reversed ? _cmp(rt2.start_bound(), rt1.start_bound()) : _cmp(rt1.end_bound(), rt2.end_bound());
|
|
};
|
|
_range_tombstones.insert(boost::upper_bound(_range_tombstones, rt, cmp), std::move(rt));
|
|
}
|
|
|
|
void range_tombstone_accumulator::clear() {
|
|
_range_tombstones.clear();
|
|
_partition_tombstone = { };
|
|
_current_tombstone = { };
|
|
}
|