From 35bbd54946559ed81114cbdf13b9be59780840dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Wed, 16 Mar 2022 13:50:53 +0200
Subject: [PATCH] readers: merge generating.hh into generating_v2.hh

Both variants return a v2 reader and we are going to keep both for a
time to come.
---
 readers/generating.hh       | 25 -------------------------
 readers/generating_v2.hh    |  3 +++
 readers/mutation_readers.cc |  1 -
 streaming/stream_session.cc |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 readers/generating.hh

diff --git a/readers/generating.hh b/readers/generating.hh
deleted file mode 100644
index 1916471389..0000000000
--- a/readers/generating.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2022-present ScyllaDB
- */
-
-/*
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-#pragma once
-#include "schema_fwd.hh"
-#include <seastar/core/future.hh>
-#include <seastar/util/optimized_optional.hh>
-#include <functional>
-
-using namespace seastar;
-
-class flat_mutation_reader;
-class reader_permit;
-class mutation_fragment;
-
-using mutation_fragment_opt = optimized_optional<mutation_fragment>;
-
-flat_mutation_reader_v2
-make_generating_reader(schema_ptr s, reader_permit permit, std::function<future<mutation_fragment_opt> ()> get_next_fragment);
-
diff --git a/readers/generating_v2.hh b/readers/generating_v2.hh
index 53788ce1e9..b6dc95f2e3 100644
--- a/readers/generating_v2.hh
+++ b/readers/generating_v2.hh
@@ -19,3 +19,6 @@ class reader_permit;
 
 flat_mutation_reader_v2
 make_generating_reader(schema_ptr s, reader_permit permit, std::function<future<mutation_fragment_v2_opt> ()> get_next_fragment);
+
+flat_mutation_reader_v2
+make_generating_reader(schema_ptr s, reader_permit permit, std::function<future<mutation_fragment_opt> ()> get_next_fragment);
diff --git a/readers/mutation_readers.cc b/readers/mutation_readers.cc
index 4edeae31e0..ce6e22fabc 100644
--- a/readers/mutation_readers.cc
+++ b/readers/mutation_readers.cc
@@ -26,7 +26,6 @@
 #include "readers/from_fragments_v2.hh"
 #include "readers/from_mutations.hh"
 #include "readers/from_mutations_v2.hh"
-#include "readers/generating.hh"
 #include "readers/generating_v2.hh"
 #include "readers/multi_range.hh"
 #include "readers/nonforwardable.hh"
diff --git a/streaming/stream_session.cc b/streaming/stream_session.cc
index 966d595027..f8cfbad6f9 100644
--- a/streaming/stream_session.cc
+++ b/streaming/stream_session.cc
@@ -36,7 +36,7 @@
 #include "mutation_source_metadata.hh"
 #include "streaming/stream_mutation_fragments_cmd.hh"
 #include "consumer.hh"
-#include "readers/generating.hh"
+#include "readers/generating_v2.hh"
 
 namespace streaming {