diff --git a/db/view/view.cc b/db/view/view.cc index dad585aac5..4be545214a 100644 --- a/db/view/view.cc +++ b/db/view/view.cc @@ -56,7 +56,7 @@ #include "utils/exponential_backoff_retry.hh" #include "utils/fb_utilities.hh" #include "query-result-writer.hh" -#include "readers/from_fragments.hh" +#include "readers/from_fragments_v2.hh" using namespace std::chrono_literals; @@ -1854,7 +1854,7 @@ private: built_views _built_views; gc_clock::time_point _now; std::vector _views_to_build; - std::deque _fragments; + std::deque _fragments; // The compact_for_query<> that feeds this consumer is already configured // to feed us up to view_builder::batchsize (128) rows and not an entire // partition. Still, if rows contain large blobs, saving 128 of them in diff --git a/replica/database.hh b/replica/database.hh index 7002269d47..9f79cc7b29 100644 --- a/replica/database.hh +++ b/replica/database.hh @@ -1027,7 +1027,7 @@ public: future<> populate_views( std::vector, dht::token base_token, - flat_mutation_reader&&, + flat_mutation_reader_v2&&, gc_clock::time_point); reader_concurrency_semaphore& streaming_read_concurrency_semaphore() { diff --git a/replica/table.cc b/replica/table.cc index 3d4bdbf6ae..ba2e593b9a 100644 --- a/replica/table.cc +++ b/replica/table.cc @@ -1810,13 +1810,13 @@ table::local_base_lock( future<> table::populate_views( std::vector views, dht::token base_token, - flat_mutation_reader&& reader, + flat_mutation_reader_v2&& reader, gc_clock::time_point now) { auto schema = reader.schema(); db::view::view_update_builder builder = co_await db::view::make_view_update_builder( schema, std::move(views), - upgrade_to_v2(std::move(reader)), + std::move(reader), { }, now);