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

view: Keep v.u.generator shared pointer on view_builder::consumer

Browse Source 
This is another mutations consumer that pushes view updates forward and
thus also needs the view updates generator pointer. It gets one from the
view builder that already has the dependency on generator.

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>
This commit is contained in:
Pavel Emelyanov
2023-03-28 11:57:03 +03:00
parent 2652dffd89
commit ddc8c8b019
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
db/view/view.cc
View File

@@ -2269,6 +2269,7 @@ public:
private:
view_builder& _builder;
shared_ptr<view_update_generator> _gen;
build_step& _step;
built_views _built_views;
gc_clock::time_point _now;
@@ -2285,14 +2286,16 @@ private:
// beyond our limit on mutation size (by default 32 MB).
size_t _fragments_memory_usage = 0;
public:
consumer(view_builder& builder, build_step& step, gc_clock::time_point now)
consumer(view_builder& builder, shared_ptr<view_update_generator> gen, build_step& step, gc_clock::time_point now)
: _builder(builder)
, _gen(std::move(gen))
, _step(step)
, _built_views{step}
, _now(now) {
if (!step.current_key.key().is_empty(*_step.reader.schema())) {
load_views_to_build();
}
(void)_gen;
}
void load_views_to_build() {
@@ -2441,7 +2444,7 @@ void view_builder::execute(build_step& step, exponential_backoff_retry r) {
step.pslice,
batch_size,
query::max_partitions);
auto consumer = compact_for_query_v2<view_builder::consumer>(compaction_state, view_builder::consumer{*this, step, now});
auto consumer = compact_for_query_v2<view_builder::consumer>(compaction_state, view_builder::consumer{*this, _vug.shared_from_this(), step, now});
auto built = step.reader.consume_in_thread(std::move(consumer));
if (auto ds = std::move(*compaction_state).detach_state()) {
if (ds->current_tombstone) {