From f37e26c73dfd60c1ff94f020408b4da0871deb62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Botond=20D=C3=A9nes?= <bdenes@scylladb.com>
Date: Wed, 16 Jun 2021 10:57:24 +0300
Subject: [PATCH] querier: remove now unused cache_context

---
 querier.cc | 54 ------------------------------------------------------
 querier.hh | 25 -------------------------
 2 files changed, 79 deletions(-)

diff --git a/querier.cc b/querier.cc
index f862158e63..178bc19d9f 100644
--- a/querier.cc
+++ b/querier.cc
@@ -453,58 +453,4 @@ future<> querier_cache::stop() noexcept {
     }
 }
 
-querier_cache_context::querier_cache_context(querier_cache& cache, utils::UUID key, query::is_first_page is_first_page)
-    : _cache(&cache)
-    , _key(key)
-    , _is_first_page(is_first_page) {
-}
-
-void querier_cache_context::insert(data_querier&& q, tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{}) {
-        _cache->insert(_key, std::move(q), std::move(trace_state));
-    }
-}
-
-void querier_cache_context::insert(mutation_querier&& q, tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{}) {
-        _cache->insert(_key, std::move(q), std::move(trace_state));
-    }
-}
-
-void querier_cache_context::insert(shard_mutation_querier&& q, tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{}) {
-        _cache->insert(_key, std::move(q), std::move(trace_state));
-    }
-}
-
-std::optional<data_querier> querier_cache_context::lookup_data_querier(const schema& s,
-        const dht::partition_range& range,
-        const query::partition_slice& slice,
-        tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{} && !_is_first_page) {
-        return _cache->lookup_data_querier(_key, s, range, slice, std::move(trace_state));
-    }
-    return std::nullopt;
-}
-
-std::optional<mutation_querier> querier_cache_context::lookup_mutation_querier(const schema& s,
-        const dht::partition_range& range,
-        const query::partition_slice& slice,
-        tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{} && !_is_first_page) {
-        return _cache->lookup_mutation_querier(_key, s, range, slice, std::move(trace_state));
-    }
-    return std::nullopt;
-}
-
-std::optional<shard_mutation_querier> querier_cache_context::lookup_shard_mutation_querier(const schema& s,
-        const dht::partition_range_vector& ranges,
-        const query::partition_slice& slice,
-        tracing::trace_state_ptr trace_state) {
-    if (_cache && _key != utils::UUID{} && !_is_first_page) {
-        return _cache->lookup_shard_mutation_querier(_key, s, ranges, slice, std::move(trace_state));
-    }
-    return std::nullopt;
-}
-
 } // namespace query
diff --git a/querier.hh b/querier.hh
index f274d707b5..586a6f01de 100644
--- a/querier.hh
+++ b/querier.hh
@@ -470,29 +470,4 @@ public:
     }
 };
 
-class querier_cache_context {
-    querier_cache* _cache{};
-    utils::UUID _key;
-    query::is_first_page _is_first_page;
-
-public:
-    querier_cache_context() = default;
-    querier_cache_context(querier_cache& cache, utils::UUID key, query::is_first_page is_first_page);
-    void insert(data_querier&& q, tracing::trace_state_ptr trace_state);
-    void insert(mutation_querier&& q, tracing::trace_state_ptr trace_state);
-    void insert(shard_mutation_querier&& q, tracing::trace_state_ptr trace_state);
-    std::optional<data_querier> lookup_data_querier(const schema& s,
-            const dht::partition_range& range,
-            const query::partition_slice& slice,
-            tracing::trace_state_ptr trace_state);
-    std::optional<mutation_querier> lookup_mutation_querier(const schema& s,
-            const dht::partition_range& range,
-            const query::partition_slice& slice,
-            tracing::trace_state_ptr trace_state);
-    std::optional<shard_mutation_querier> lookup_shard_mutation_querier(const schema& s,
-            const dht::partition_range_vector& ranges,
-            const query::partition_slice& slice,
-            tracing::trace_state_ptr trace_state);
-};
-
 } // namespace query