From 87ac2e9ab056b5d97ac8ad558df9e78be3d423fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Tue, 1 Mar 2022 13:13:42 +0200
Subject: [PATCH] tree: migrate to the v2 consumer APIs

---
 db/view/view.cc       | 6 +++---
 mutation_partition.cc | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/view/view.cc b/db/view/view.cc
index d5b74d03d6..adf02864c9 100644
--- a/db/view/view.cc
+++ b/db/view/view.cc
@@ -363,7 +363,7 @@ public:
     void consume(tombstone t) { _builder.consume(t); }
     stop_iteration consume(static_row&& sr, tombstone t, bool is_alive) { return _builder.consume(std::move(sr), t, is_alive); }
     stop_iteration consume(clustering_row&& cr, row_tombstone t, bool is_alive) { return _builder.consume(std::move(cr), t, is_alive); }
-    stop_iteration consume(range_tombstone&& rt) { return _builder.consume(std::move(rt)); }
+    stop_iteration consume(range_tombstone_change&& rtc) { return _builder.consume(std::move(rtc)); }
     stop_iteration consume_end_of_partition()  { return _builder.consume_end_of_partition(); }
     result_type consume_end_of_stream() {
         _builder.consume_end_of_stream();
@@ -1949,7 +1949,7 @@ public:
         return stop_iteration::no;
     }
 
-    stop_iteration consume(range_tombstone&&) {
+    stop_iteration consume(range_tombstone_change&&) {
         inject_failure("view_builder_consume_range_tombstone");
         return stop_iteration::no;
     }
@@ -2007,7 +2007,7 @@ public:
 // Called in the context of a seastar::thread.
 void view_builder::execute(build_step& step, exponential_backoff_retry r) {
     gc_clock::time_point now = gc_clock::now();
-    auto consumer = compact_for_query<emit_only_live_rows::yes, view_builder::consumer>(
+    auto consumer = compact_for_query_v2<emit_only_live_rows::yes, view_builder::consumer>(
             *step.reader.schema(),
             now,
             step.pslice,
diff --git a/mutation_partition.cc b/mutation_partition.cc
index 9b999e1217..3668134447 100644
--- a/mutation_partition.cc
+++ b/mutation_partition.cc
@@ -2072,7 +2072,7 @@ to_data_query_result(const reconcilable_result& r, schema_ptr s, const query::pa
         query::result_options opts) {
     // This result was already built with a limit, don't apply another one.
     query::result::builder builder(slice, opts, query::result_memory_accounter{ query::result_memory_limiter::unlimited_result_size });
-    auto consumer = compact_for_query<emit_only_live_rows::yes, query_result_builder>(*s, gc_clock::time_point::min(), slice, max_rows,
+    auto consumer = compact_for_query_v2<emit_only_live_rows::yes, query_result_builder>(*s, gc_clock::time_point::min(), slice, max_rows,
             max_partitions, query_result_builder(*s, builder));
     const auto reverse = slice.options.contains(query::partition_slice::option::reversed) ? consume_in_reverse::legacy_half_reverse : consume_in_reverse::no;
 
@@ -2091,7 +2091,7 @@ to_data_query_result(const reconcilable_result& r, schema_ptr s, const query::pa
 query::result
 query_mutation(mutation&& m, const query::partition_slice& slice, uint64_t row_limit, gc_clock::time_point now, query::result_options opts) {
     query::result::builder builder(slice, opts, query::result_memory_accounter{ query::result_memory_limiter::unlimited_result_size });
-    auto consumer = compact_for_query<emit_only_live_rows::yes, query_result_builder>(*m.schema(), now, slice, row_limit,
+    auto consumer = compact_for_query_v2<emit_only_live_rows::yes, query_result_builder>(*m.schema(), now, slice, row_limit,
             query::max_partitions, query_result_builder(*m.schema(), builder));
     const auto reverse = slice.options.contains(query::partition_slice::option::reversed) ? consume_in_reverse::legacy_half_reverse : consume_in_reverse::no;
     std::move(m).consume(consumer, reverse);
@@ -2115,7 +2115,7 @@ public:
         _mutation->partition().insert_row(_schema, cr.key(), std::move(cr).as_deletable_row());
         return stop_iteration::no;
     }
-    stop_iteration consume(range_tombstone&& rt) {
+    stop_iteration consume(range_tombstone_change&& rtc) {
         return stop_iteration::no;
     }
     stop_iteration consume_end_of_partition() {
@@ -2314,7 +2314,7 @@ future<mutation_opt> counter_write_query(schema_ptr s, const mutation_source& so
     // do_with() doesn't support immovable objects
     auto r_a_r = std::make_unique<range_and_reader>(s, source, std::move(permit), dk, slice, std::move(trace_ptr));
     auto cwqrb = counter_write_query_result_builder(*s);
-    auto cfq = compact_for_query<emit_only_live_rows::yes, counter_write_query_result_builder>(
+    auto cfq = compact_for_query_v2<emit_only_live_rows::yes, counter_write_query_result_builder>(
             *s, gc_clock::now(), slice, query::max_rows, query::max_partitions, std::move(cwqrb));
     auto f = r_a_r->reader.consume(std::move(cfq));
     return f.finally([r_a_r = std::move(r_a_r)] {