mirror of
https://github.com/scylladb/scylladb.git
synced 2026-05-13 03:12:13 +00:00
"
This fixes an abort in an sstable reader when querying a partition with no
clustering ranges (happens on counter table mutation with no live rows) which
also doesn't have any static columns. In such case, the
sstable_mutation_reader will setup the data_consume_context such that it only
covers the static row of the partition, knowing that there is no need to read
any clustered rows. See partition.cc::advance_to_upper_bound(). Later when
the reader is done with the range for the static row, it will try to skip to
the first clustering range (missing in this case). If clustering_ranges_walker
tells us to skip to after_all_clustering_rows(), we will hit an assert inside
continuous_data_consumer::fast_forward_to() due to attempt to skip past the
original data file range. If clustering_ranges_walker returns
before_all_clustering_rows() instead, all is fine because we're still at the
same data file position.
Fixes #3304.
"
* 'tgrabiec/fix-counter-read-no-static-columns' of github.com:scylladb/seastar-dev:
tests: mutation_source_test: Test reads with no clustering ranges and no static columns
tests: simple_schema: Allow creating schema with no static column
clustering_ranges_walker: Stop after static row in case no clustering ranges
(cherry picked from commit 054854839a)
157 lines
5.3 KiB
C++
157 lines
5.3 KiB
C++
/*
|
|
* Copyright (C) 2017 ScyllaDB
|
|
*
|
|
* Modified by 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/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "make_random_string.hh"
|
|
#include "schema.hh"
|
|
#include "keys.hh"
|
|
#include "streamed_mutation.hh"
|
|
#include "mutation.hh"
|
|
#include "schema_builder.hh"
|
|
#include "streamed_mutation.hh"
|
|
|
|
// Helper for working with the following table:
|
|
//
|
|
// CREATE TABLE ks.cf (pk text, ck text, v text, s1 text static, PRIMARY KEY (pk, ck));
|
|
//
|
|
class simple_schema {
|
|
schema_ptr _s;
|
|
api::timestamp_type _timestamp = api::min_timestamp;
|
|
const column_definition& _v_def;
|
|
public:
|
|
api::timestamp_type new_timestamp() {
|
|
return _timestamp++;
|
|
}
|
|
tombstone new_tombstone() {
|
|
return {new_timestamp(), gc_clock::now()};
|
|
}
|
|
public:
|
|
using with_static = bool_class<class static_tag>;
|
|
simple_schema(with_static ws = with_static::yes)
|
|
: _s(schema_builder("ks", "cf")
|
|
.with_column("pk", utf8_type, column_kind::partition_key)
|
|
.with_column("ck", utf8_type, column_kind::clustering_key)
|
|
.with_column("s1", utf8_type, ws ? column_kind::static_column : column_kind::regular_column)
|
|
.with_column("v", utf8_type)
|
|
.build())
|
|
, _v_def(*_s->get_column_definition(to_bytes("v")))
|
|
{ }
|
|
|
|
clustering_key make_ckey(sstring ck) {
|
|
return clustering_key::from_single_value(*_s, data_value(ck).serialize());
|
|
}
|
|
|
|
query::clustering_range make_ckey_range(uint32_t start_inclusive, uint32_t end_inclusive) {
|
|
return query::clustering_range::make({make_ckey(start_inclusive)}, {make_ckey(end_inclusive)});
|
|
}
|
|
|
|
// Make a clustering_key which is n-th in some arbitrary sequence of keys
|
|
clustering_key make_ckey(uint32_t n) {
|
|
return make_ckey(sprint("ck%010d", n));
|
|
}
|
|
|
|
// Make a partition key which is n-th in some arbitrary sequence of keys.
|
|
// There is no particular order for the keys, they're not in ring order.
|
|
dht::decorated_key make_pkey(uint32_t n) {
|
|
return make_pkey(sprint("pk%010d", n));
|
|
}
|
|
|
|
dht::decorated_key make_pkey(sstring pk) {
|
|
auto key = partition_key::from_single_value(*_s, data_value(pk).serialize());
|
|
return dht::global_partitioner().decorate_key(*_s, key);
|
|
}
|
|
|
|
void add_row(mutation& m, const clustering_key& key, const sstring& v, api::timestamp_type t = api::missing_timestamp) {
|
|
if (t == api::missing_timestamp) {
|
|
t = new_timestamp();
|
|
}
|
|
m.set_clustered_cell(key, _v_def, atomic_cell::make_live(t, data_value(v).serialize()));
|
|
}
|
|
|
|
std::pair<sstring, api::timestamp_type> get_value(const clustering_row& row) {
|
|
auto cell = row.cells().find_cell(_v_def.id);
|
|
if (!cell) {
|
|
throw std::runtime_error("cell not found");
|
|
}
|
|
atomic_cell_view ac = cell->as_atomic_cell();
|
|
if (!ac.is_live()) {
|
|
throw std::runtime_error("cell is dead");
|
|
}
|
|
return std::make_pair(value_cast<sstring>(utf8_type->deserialize(ac.value())), ac.timestamp());
|
|
}
|
|
|
|
mutation_fragment make_row(const clustering_key& key, sstring v) {
|
|
auto row = clustering_row(key);
|
|
row.cells().apply(*_s->get_column_definition(to_bytes(sstring("v"))),
|
|
atomic_cell::make_live(new_timestamp(), data_value(v).serialize()));
|
|
return mutation_fragment(std::move(row));
|
|
}
|
|
|
|
void add_static_row(mutation& m, sstring s1) {
|
|
m.set_static_cell(to_bytes("s1"), data_value(s1), new_timestamp());
|
|
}
|
|
|
|
range_tombstone delete_range(mutation& m, const query::clustering_range& range) {
|
|
auto rt = make_range_tombstone(range);
|
|
m.partition().apply_delete(*_s, rt);
|
|
return rt;
|
|
}
|
|
|
|
range_tombstone make_range_tombstone(const query::clustering_range& range, tombstone t = {}) {
|
|
auto bv_range = bound_view::from_range(range);
|
|
if (!t) {
|
|
t = tombstone(new_timestamp(), gc_clock::now());
|
|
}
|
|
range_tombstone rt(bv_range.first, bv_range.second, t);
|
|
return rt;
|
|
}
|
|
|
|
mutation new_mutation(sstring pk) {
|
|
return mutation(make_pkey(pk), _s);
|
|
}
|
|
|
|
schema_ptr schema() {
|
|
return _s;
|
|
}
|
|
|
|
// Creates a sequence of keys in ring order
|
|
std::vector<dht::decorated_key> make_pkeys(int n) {
|
|
std::vector<dht::decorated_key> keys;
|
|
for (int i = 0; i < n; ++i) {
|
|
keys.push_back(make_pkey(i));
|
|
}
|
|
std::sort(keys.begin(), keys.end(), dht::decorated_key::less_comparator(_s));
|
|
return keys;
|
|
}
|
|
|
|
// Returns n clustering keys in their natural order
|
|
std::vector<clustering_key> make_ckeys(int n) {
|
|
std::vector<clustering_key> keys;
|
|
for (int i = 0; i < n; ++i) {
|
|
keys.push_back(make_ckey(i));
|
|
}
|
|
return keys;
|
|
}
|
|
};
|