diff --git a/repair/row_level.cc b/repair/row_level.cc index c9f9deb8f5..62c92f85c7 100644 --- a/repair/row_level.cc +++ b/repair/row_level.cc @@ -516,7 +516,7 @@ void repair_writer_impl::create_writer(lw_shared_ptr w) { auto erm = t.get_effective_replication_map(); auto& sharder = erm->get_sharder(*(w->schema())); _writer_done = mutation_writer::distribute_reader_and_consume_on_shards(_schema, sharder, std::move(_queue_reader), - streaming::make_streaming_consumer(sstables::repair_origin, _db, _sys_dist_ks, _view_update_generator, _view_builder, w->get_estimated_partitions(), _reason, is_offstrategy_supported(_reason), topo_guard), + streaming::make_streaming_consumer(sstables::repair_origin, _db, _view_builder, w->get_estimated_partitions(), _reason, is_offstrategy_supported(_reason), topo_guard), t.stream_in_progress()).then([w, erm] (uint64_t partitions) { rlogger.debug("repair_writer: keyspace={}, table={}, managed to write partitions={} to sstable", w->schema()->ks_name(), w->schema()->cf_name(), partitions); diff --git a/streaming/consumer.cc b/streaming/consumer.cc index 01dbb1b509..53e8436093 100644 --- a/streaming/consumer.cc +++ b/streaming/consumer.cc @@ -20,8 +20,6 @@ namespace streaming { std::function (flat_mutation_reader_v2)> make_streaming_consumer(sstring origin, sharded& db, - sharded& sys_dist_ks, - sharded& vug, sharded& vb, uint64_t estimated_partitions, stream_reason reason, diff --git a/streaming/consumer.hh b/streaming/consumer.hh index bee80c34f7..8ac526cb3b 100644 --- a/streaming/consumer.hh +++ b/streaming/consumer.hh @@ -15,9 +15,7 @@ class database; } namespace db { -class system_distributed_keyspace; namespace view { -class view_update_generator; class view_builder; } } @@ -26,8 +24,6 @@ namespace streaming { std::function(flat_mutation_reader_v2)> make_streaming_consumer(sstring origin, sharded& db, - sharded& sys_dist_ks, - sharded& vug, sharded& vb, uint64_t estimated_partitions, stream_reason reason, diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc index f177ed72d4..9f846aab57 100644 --- a/streaming/stream_session.cc +++ b/streaming/stream_session.cc @@ -83,7 +83,7 @@ public: std::function(flat_mutation_reader_v2)> stream_manager::make_streaming_consumer(uint64_t estimated_partitions, stream_reason reason, service::frozen_topology_guard topo_guard) { - return streaming::make_streaming_consumer("streaming", _db, _sys_dist_ks, _view_update_generator, _view_builder, estimated_partitions, reason, is_offstrategy_supported(reason), topo_guard); + return streaming::make_streaming_consumer("streaming", _db, _view_builder, estimated_partitions, reason, is_offstrategy_supported(reason), topo_guard); } void stream_manager::init_messaging_service_handler(abort_source& as) {