From a65b063ab2d55945b2a0edeff1b49ca067747836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Thu, 22 Mar 2018 15:09:22 +0200
Subject: [PATCH] incremental_reader_selector: remote unused members
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since 3d725d6823 the incremental_reader_selector creates readers via
a factory function so these members, used previously for creating the
readers, are not needed anymore.

Signed-off-by: Botond Dénes <bdenes@scylladb.com>
Message-Id: <64b5cef93c1f9a2e544ccfd89e293627e99dd4cd.1521724155.git.bdenes@scylladb.com>
---
 database.cc | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/database.cc b/database.cc
index 489a73668e..d6d6a040cb 100644
--- a/database.cc
+++ b/database.cc
@@ -423,12 +423,7 @@ filter_sstable_for_reader(std::vector<sstables::shared_sstable>&& sstables, colu
 class incremental_reader_selector : public reader_selector {
     const dht::partition_range* _pr;
     lw_shared_ptr<sstables::sstable_set> _sstables;
-    const io_priority_class& _pc;
-    const query::partition_slice& _slice;
-    reader_resource_tracker _resource_tracker;
     tracing::trace_state_ptr _trace_state;
-    streamed_mutation::forwarding _fwd;
-    mutation_reader::forwarding _fwd_mr;
     sstables::sstable_set::incremental_selector _selector;
     std::unordered_set<sstables::shared_sstable> _read_sstables;
     sstable_reader_factory_type _fn;
@@ -442,22 +437,12 @@ public:
     explicit incremental_reader_selector(schema_ptr s,
             lw_shared_ptr<sstables::sstable_set> sstables,
             const dht::partition_range& pr,
-            const query::partition_slice& slice,
-            const io_priority_class& pc,
-            reader_resource_tracker resource_tracker,
             tracing::trace_state_ptr trace_state,
-            streamed_mutation::forwarding fwd,
-            mutation_reader::forwarding fwd_mr,
             sstable_reader_factory_type fn)
         : reader_selector(s, pr.start() ? pr.start()->value() : dht::ring_position::min())
         , _pr(&pr)
         , _sstables(std::move(sstables))
-        , _pc(pc)
-        , _slice(slice)
-        , _resource_tracker(std::move(resource_tracker))
         , _trace_state(std::move(trace_state))
-        , _fwd(fwd)
-        , _fwd_mr(fwd_mr)
         , _selector(_sstables->make_incremental_selector())
         , _fn(std::move(fn)) {
 
@@ -4534,12 +4519,7 @@ flat_mutation_reader make_local_shard_sstable_reader(schema_ptr s,
     return make_combined_reader(s, std::make_unique<incremental_reader_selector>(s,
                     std::move(sstables),
                     pr,
-                    slice,
-                    pc,
-                    std::move(resource_tracker),
                     std::move(trace_state),
-                    fwd,
-                    fwd_mr,
                     std::move(reader_factory_fn)),
             fwd,
             fwd_mr);
@@ -4562,12 +4542,7 @@ flat_mutation_reader make_range_sstable_reader(schema_ptr s,
     return make_combined_reader(s, std::make_unique<incremental_reader_selector>(s,
                     std::move(sstables),
                     pr,
-                    slice,
-                    pc,
-                    std::move(resource_tracker),
                     std::move(trace_state),
-                    fwd,
-                    fwd_mr,
                     std::move(reader_factory_fn)),
             fwd,
             fwd_mr);