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

sstable_set: move select_sstable_runs() into partitioned_sstable_set

Browse Source 
after compound set is introduced, select_sstable_runs() will no longer
work because the sstable runs live in sstable_set, but they should
actually live in the sstable_set being written to.

Given that runs is a concept that belongs only to strategies which
use partitioned_sstable_set, let's move the implementation of
select_sstable_runs() to it.

Signed-off-by: Raphael S. Carvalho <raphaelsc@scylladb.com>
Message-Id: <20210312042255.111060-2-raphaelsc@scylladb.com>
This commit is contained in:
Raphael S. Carvalho
2021-03-12 01:22:41 -03:00
committed by Pekka Enberg
parent 11308c05f4
commit 02b2df1ea9
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sstables/sstable_set.cc
View File

@@ -70,8 +70,7 @@ sstable_set::sstable_set(std::unique_ptr<sstable_set_impl> impl, schema_ptr s)
sstable_set::sstable_set(const sstable_set& x)
: _impl(x._impl->clone())
, _schema(x._schema)
, _all_runs(x._all_runs) {
, _schema(x._schema) {
}
sstable_set::sstable_set(sstable_set&&) noexcept = default;
@@ -95,6 +94,11 @@ sstable_set::select(const dht::partition_range& range) const {
std::vector<sstable_run>
sstable_set::select_sstable_runs(const std::vector<shared_sstable>& sstables) const {
return _impl->select_sstable_runs(sstables);
}
std::vector<sstable_run>
partitioned_sstable_set::select_sstable_runs(const std::vector<shared_sstable>& sstables) const {
auto run_ids = boost::copy_range<std::unordered_set<utils::UUID>>(sstables | boost::adaptors::transformed(std::mem_fn(&sstable::run_identifier)));
return boost::copy_range<std::vector<sstable_run>>(run_ids | boost::adaptors::transformed([this] (utils::UUID run_id) {
return _all_runs.at(run_id);
@@ -113,18 +117,11 @@ void sstable_set::for_each_sstable(std::function<void(const shared_sstable&)> fu
void
sstable_set::insert(shared_sstable sst) {
_impl->insert(sst);
try {
_all_runs[sst->run_identifier()].insert(sst);
} catch (...) {
_impl->erase(sst);
throw;
}
}
void
sstable_set::erase(shared_sstable sst) {
_impl->erase(sst);
_all_runs[sst->run_identifier()].erase(sst);
}
sstable_set::~sstable_set() = default;
@@ -261,11 +258,16 @@ void partitioned_sstable_set::for_each_sstable(std::function<void(const shared_s
void partitioned_sstable_set::insert(shared_sstable sst) {
_all->insert(sst);
try {
if (store_as_unleveled(sst)) {
_unleveled_sstables.push_back(std::move(sst));
} else {
_leveled_sstables_change_cnt++;
_leveled_sstables.add({make_interval(*sst), value_set({sst})});
_all_runs[sst->run_identifier()].insert(sst);
try {
if (store_as_unleveled(sst)) {
_unleveled_sstables.push_back(sst);
} else {
_leveled_sstables_change_cnt++;
_leveled_sstables.add({make_interval(*sst), value_set({sst})});
}
} catch (...) {
_all_runs[sst->run_identifier()].erase(sst);
}
} catch (...) {
_all->erase(sst);
@@ -273,6 +275,7 @@ void partitioned_sstable_set::insert(shared_sstable sst) {
}
void partitioned_sstable_set::erase(shared_sstable sst) {
_all_runs[sst->run_identifier()].erase(sst);
_all->erase(sst);
if (store_as_unleveled(sst)) {
_unleveled_sstables.erase(std::remove(_unleveled_sstables.begin(), _unleveled_sstables.end(), sst), _unleveled_sstables.end());
@@ -683,6 +686,11 @@ filter_sstable_for_reader_by_ck(std::vector<shared_sstable>&& sstables, column_f
return sstables;
}
std::vector<sstable_run>
sstable_set_impl::select_sstable_runs(const std::vector<shared_sstable>& sstables) const {
throw_with_backtrace<std::bad_function_call>();
}
flat_mutation_reader
sstable_set_impl::create_single_key_sstable_reader(
column_family* cf,

1
sstables/sstable_set.hh
View File

@@ -52,7 +52,6 @@ public:
class sstable_set : public enable_lw_shared_from_this<sstable_set> {
std::unique_ptr<sstable_set_impl> _impl;
schema_ptr _schema;
std::unordered_map<utils::UUID, sstable_run> _all_runs;
public:
~sstable_set();
sstable_set(std::unique_ptr<sstable_set_impl> impl, schema_ptr s);

3
sstables/sstable_set_impl.hh
View File

@@ -39,6 +39,7 @@ public:
virtual ~sstable_set_impl() {}
virtual std::unique_ptr<sstable_set_impl> clone() const = 0;
virtual std::vector<shared_sstable> select(const dht::partition_range& range) const = 0;
virtual std::vector<sstable_run> select_sstable_runs(const std::vector<shared_sstable>& sstables) const;
virtual lw_shared_ptr<sstable_list> all() const = 0;
virtual void for_each_sstable(std::function<void(const shared_sstable&)> func) const = 0;
virtual void insert(shared_sstable sst) = 0;
@@ -70,6 +71,7 @@ private:
std::vector<shared_sstable> _unleveled_sstables;
interval_map_type _leveled_sstables;
lw_shared_ptr<sstable_list> _all;
std::unordered_map<utils::UUID, sstable_run> _all_runs;
// Change counter on interval map for leveled sstables which is used by
// incremental selector to determine whether or not to invalidate iterators.
uint64_t _leveled_sstables_change_cnt = 0;
@@ -91,6 +93,7 @@ public:
virtual std::unique_ptr<sstable_set_impl> clone() const override;
virtual std::vector<shared_sstable> select(const dht::partition_range& range) const override;
virtual std::vector<sstable_run> select_sstable_runs(const std::vector<shared_sstable>& sstables) const override;
virtual lw_shared_ptr<sstable_list> all() const override;
virtual void for_each_sstable(std::function<void(const shared_sstable&)> func) const override;
virtual void insert(shared_sstable sst) override;