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

db: view: pass base table to view_update_builder

Browse Source 
To be used by generate_update() for getting the
tombstone_gc_state via the table's compaction_manager.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2022-09-06 09:00:47 +03:00
parent 6a11c410fd
commit 71ede6124a
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
db/view/view.cc
View File

@@ -1278,6 +1278,7 @@ future<stop_iteration> view_update_builder::on_results() {
}
view_update_builder make_view_update_builder(
const replica::table& base_table,
const schema_ptr& base,
std::vector<view_and_base>&& views_to_update,
flat_mutation_reader_v2&& updates,
@@ -1291,7 +1292,7 @@ view_update_builder make_view_update_builder(
}
return view_updates(std::move(v));
}));
return view_update_builder(base, std::move(vs), std::move(updates), std::move(existings), now);
return view_update_builder(base_table, base, std::move(vs), std::move(updates), std::move(existings), now);
}
future<query::clustering_row_ranges> calculate_affected_clustering_ranges(const schema& base,

12
db/view/view.hh
View File

@@ -206,6 +206,10 @@ private:
};
class view_update_builder {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-private-field"
const replica::table& _base;
#pragma GCC diagnostic pop
schema_ptr _schema; // The base schema
std::vector<view_updates> _view_updates;
flat_mutation_reader_v2 _updates;
@@ -220,12 +224,13 @@ class view_update_builder {
partition_key _key = partition_key::make_empty();
public:
view_update_builder(schema_ptr s,
view_update_builder(const replica::table& base, schema_ptr s,
std::vector<view_updates>&& views_to_update,
flat_mutation_reader_v2&& updates,
flat_mutation_reader_v2_opt&& existings,
gc_clock::time_point now)
: _schema(std::move(s))
: _base(base)
, _schema(std::move(s))
, _view_updates(std::move(views_to_update))
, _updates(std::move(updates))
, _existings(std::move(existings))
@@ -249,7 +254,8 @@ private:
};
view_update_builder make_view_update_builder(
const schema_ptr& base,
const replica::table& base_table,
const schema_ptr& base_schema,
std::vector<view_and_base>&& views_to_update,
flat_mutation_reader_v2&& updates,
flat_mutation_reader_v2_opt&& existings,