From 7e5a0b6fd0fb4e075b495d82bf2d1e55af5cdfb7 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Fri, 21 May 2021 21:04:49 +0300
Subject: [PATCH] test: drop unused fields

Drop unused fields in various tests and test libraries.
---
 test/boost/logalloc_test.cc      |  2 --
 test/boost/querier_cache_test.cc |  1 -
 test/lib/cql_test_env.cc         | 10 ++--------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/test/boost/logalloc_test.cc b/test/boost/logalloc_test.cc
index bfd49320e5..64bfdc1fef 100644
--- a/test/boost/logalloc_test.cc
+++ b/test/boost/logalloc_test.cc
@@ -928,11 +928,9 @@ public:
 };
 
 class test_reclaimer: public region_group_reclaimer {
-    size_t _threshold;
     test_reclaimer *_result_accumulator;
     region_group _rg;
     std::vector<size_t> _reclaim_sizes;
-    bool _shutdown = false;
     shared_promise<> _unleash_reclaimer;
     seastar::gate _reclaimers_done;
     promise<> _unleashed;
diff --git a/test/boost/querier_cache_test.cc b/test/boost/querier_cache_test.cc
index 531c0b5ab2..7199db5b1b 100644
--- a/test/boost/querier_cache_test.cc
+++ b/test/boost/querier_cache_test.cc
@@ -75,7 +75,6 @@ public:
 
 private:
     // Expected value of the above counters, updated by this.
-    unsigned _expected_factory_invoked{};
     query::querier_cache::stats _expected_stats;
 
     simple_schema _s;
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index 136a6474e5..a75271ddcd 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -140,14 +140,12 @@ public:
     static constexpr std::string_view ks_name = "ks";
     static std::atomic<bool> active;
 private:
-    sharded<gms::feature_service>& _feature_service;
     sharded<database>& _db;
     sharded<cql3::query_processor>& _qp;
     sharded<auth::service>& _auth_service;
     sharded<db::view::view_builder>& _view_builder;
     sharded<db::view::view_update_generator>& _view_update_generator;
     sharded<service::migration_notifier>& _mnotifier;
-    sharded<cdc::generation_service>& _cdc_generation_service;
     sharded<qos::service_level_controller>& _sl_controller;
     sharded<service::migration_manager>& _mm;
 private:
@@ -174,7 +172,6 @@ private:
     }
 public:
     single_node_cql_env(
-            sharded<gms::feature_service>& feature_service,
             sharded<database>& db,
             sharded<cql3::query_processor>& qp,
             sharded<auth::service>& auth_service,
@@ -182,16 +179,13 @@ public:
             sharded<db::view::view_update_generator>& view_update_generator,
             sharded<service::migration_notifier>& mnotifier,
             sharded<service::migration_manager>& mm,
-            sharded<cdc::generation_service>& cdc_generation_service,
             sharded<qos::service_level_controller> &sl_controller)
-            : _feature_service(feature_service)
-            , _db(db)
+            : _db(db)
             , _qp(qp)
             , _auth_service(auth_service)
             , _view_builder(view_builder)
             , _view_update_generator(view_update_generator)
             , _mnotifier(mnotifier)
-            , _cdc_generation_service(cdc_generation_service)
             , _sl_controller(sl_controller)
             , _mm(mm)
     { }
@@ -708,7 +702,7 @@ public:
                 // The default user may already exist if this `cql_test_env` is starting with previously populated data.
             }
 
-            single_node_cql_env env(feature_service, db, qp, auth_service, view_builder, view_update_generator, mm_notif, mm, cdc_generation_service, std::ref(sl_controller));
+            single_node_cql_env env(db, qp, auth_service, view_builder, view_update_generator, mm_notif, mm, std::ref(sl_controller));
             env.start().get();
             auto stop_env = defer([&env] { env.stop().get(); });