From 5e6893075d35bb52cdae31fc147f7d0098d01088 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 16 May 2024 12:09:24 +0300 Subject: [PATCH] repair: Keep view_builder& on repair_writer_impl Preparation patch, next patches will make use of this new member Signed-off-by: Pavel Emelyanov --- repair/row_level.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/repair/row_level.cc b/repair/row_level.cc index f22f5451a5..70a4e4b3e8 100644 --- a/repair/row_level.cc +++ b/repair/row_level.cc @@ -419,6 +419,7 @@ class repair_writer_impl : public repair_writer::impl { sharded& _db; sharded& _sys_dist_ks; sharded& _view_update_generator; + sharded& _view_builder; streaming::stream_reason _reason; flat_mutation_reader_v2 _queue_reader; public: @@ -428,6 +429,7 @@ public: sharded& db, sharded& sys_dist_ks, sharded& view_update_generator, + sharded& view_builder, streaming::stream_reason reason, mutation_fragment_queue queue, flat_mutation_reader_v2 queue_reader) @@ -437,6 +439,7 @@ public: , _db(db) , _sys_dist_ks(sys_dist_ks) , _view_update_generator(view_update_generator) + , _view_builder(view_builder) , _reason(reason) , _queue_reader(std::move(queue_reader)) {} @@ -531,10 +534,11 @@ lw_shared_ptr make_repair_writer( streaming::stream_reason reason, sharded& db, sharded& sys_dist_ks, - sharded& view_update_generator) { + sharded& view_update_generator, + sharded& view_builder) { auto [queue_reader, queue_handle] = make_queue_reader_v2(schema, permit); auto queue = make_mutation_fragment_queue(schema, permit, std::move(queue_handle)); - auto i = std::make_unique(schema, permit, db, sys_dist_ks, view_update_generator, reason, std::move(queue), std::move(queue_reader)); + auto i = std::make_unique(schema, permit, db, sys_dist_ks, view_update_generator, view_builder, reason, std::move(queue), std::move(queue_reader)); return make_lw_shared(schema, permit, std::move(i)); } @@ -863,7 +867,7 @@ public: , _remote_sharder(make_remote_sharder()) , _same_sharding_config(is_same_sharding_config(cf)) , _nr_peer_nodes(nr_peer_nodes) - , _repair_writer(make_repair_writer(_schema, _permit, _reason, _db, rs.get_sys_dist_ks(), rs.get_view_update_generator())) + , _repair_writer(make_repair_writer(_schema, _permit, _reason, _db, rs.get_sys_dist_ks(), rs.get_view_update_generator(), rs.get_view_builder())) , _sink_source_for_get_full_row_hashes(_repair_meta_id, _nr_peer_nodes, [&rs] (uint32_t repair_meta_id, std::optional dst_cpu_id_opt, netw::messaging_service::msg_addr addr) { auto dst_cpu_id = dst_cpu_id_opt.value_or(repair_unspecified_shard);