mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

readers: merge generating.hh into generating_v2.hh

Browse Source 
Both variants return a v2 reader and we are going to keep both for a
time to come.
This commit is contained in:
Botond Dénes
2022-03-16 13:50:53 +02:00
parent 7844ff9912
commit 35bbd54946
4 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
readers/generating.hh
View File

@@ -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);

3
readers/generating_v2.hh
View File

@@ -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);

1
readers/mutation_readers.cc
View File

@@ -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"

2
streaming/stream_session.cc
View File

@@ -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 {