From 2a3bd2babe47d553b46a70d22b794a92d9d00140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Chojnowski?= <michal.chojnowski@scylladb.com>
Date: Fri, 4 Jun 2021 15:27:36 +0200
Subject: [PATCH] locator: token_metadata: remove the `include_min` parameter
 from `ring_range()`

`include_min` is always set to the default value. Remove it.
---
 locator/token_metadata.cc | 24 ++++++++++--------------
 locator/token_metadata.hh |  4 ++--
 service/storage_proxy.cc  |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/locator/token_metadata.cc b/locator/token_metadata.cc
index eed5dc7f91..a9e395db2c 100644
--- a/locator/token_metadata.cc
+++ b/locator/token_metadata.cc
@@ -125,10 +125,10 @@ public:
      *
      * @return The requested range (see the description above)
      */
-    boost::iterator_range<tokens_iterator> ring_range(const token& start, bool include_min = false) const;
+    boost::iterator_range<tokens_iterator> ring_range(const token& start) const;
 
     boost::iterator_range<tokens_iterator> ring_range(
-        const std::optional<dht::partition_range::bound>& start, bool include_min = false) const;
+        const std::optional<dht::partition_range::bound>& start) const;
 
     topology& get_topology() {
         return _topology;
@@ -962,8 +962,8 @@ token_metadata_impl::tokens_end() const {
 
 inline
 boost::iterator_range<token_metadata_impl::tokens_iterator>
-token_metadata_impl::ring_range(const token& start, bool include_min) const {
-    auto begin = tokens_iterator(start, this, include_min);
+token_metadata_impl::ring_range(const token& start) const {
+    auto begin = tokens_iterator(start, this);
     auto end = tokens_end();
     return boost::make_iterator_range(begin, end);
 }
@@ -1318,11 +1318,8 @@ void token_metadata_impl::add_bootstrap_token(token t, inet_address endpoint) {
 }
 
 boost::iterator_range<token_metadata_impl::tokens_iterator>
-token_metadata_impl::ring_range(
-    const std::optional<dht::partition_range::bound>& start,
-    bool include_min) const
-{
-    auto r = ring_range(start ? start->value().token() : dht::minimum_token(), include_min);
+token_metadata_impl::ring_range(const std::optional<dht::partition_range::bound>& start) const {
+    auto r = ring_range(start ? start->value().token() : dht::minimum_token());
 
     if (!r.empty()) {
         // We should skip the first token if it's excluded by the range.
@@ -1854,17 +1851,16 @@ token_metadata::tokens_end() const {
 }
 
 boost::iterator_range<token_metadata::tokens_iterator>
-token_metadata::ring_range(const token& start, bool include_min) const {
-    auto impl_range = _impl->ring_range(start, include_min);
+token_metadata::ring_range(const token& start) const {
+    auto impl_range = _impl->ring_range(start);
     return boost::make_iterator_range(
             tokens_iterator(std::move(impl_range.begin())),
             tokens_iterator(std::move(impl_range.end())));
 }
 
 boost::iterator_range<token_metadata::tokens_iterator>
-token_metadata::ring_range(
-        const std::optional<dht::partition_range::bound>& start, bool include_min) const {
-    auto impl_range = _impl->ring_range(start, include_min);
+token_metadata::ring_range(const std::optional<dht::partition_range::bound>& start) const {
+    auto impl_range = _impl->ring_range(start);
     return boost::make_iterator_range(
             tokens_iterator(std::move(impl_range.begin())),
             tokens_iterator(std::move(impl_range.end())));
diff --git a/locator/token_metadata.hh b/locator/token_metadata.hh
index a7a092b4c6..b9c77f2ce1 100644
--- a/locator/token_metadata.hh
+++ b/locator/token_metadata.hh
@@ -203,9 +203,9 @@ public:
      *
      * @return The requested range (see the description above)
      */
-    boost::iterator_range<tokens_iterator> ring_range(const token& start, bool include_min = false) const;
+    boost::iterator_range<tokens_iterator> ring_range(const token& start) const;
     boost::iterator_range<tokens_iterator> ring_range(
-        const std::optional<dht::partition_range::bound>& start, bool include_min = false) const;
+        const std::optional<dht::partition_range::bound>& start) const;
 
     topology& get_topology();
     const topology& get_topology() const;
diff --git a/service/storage_proxy.cc b/service/storage_proxy.cc
index 6b1b409166..c890ada9f2 100644
--- a/service/storage_proxy.cc
+++ b/service/storage_proxy.cc
@@ -4681,7 +4681,7 @@ void query_ranges_to_vnodes_generator::process_one_range(size_t n, dht::partitio
     }
 
     // divide the queryRange into pieces delimited by the ring
-    auto ring_iter = _tmptr->ring_range(cr.start(), false);
+    auto ring_iter = _tmptr->ring_range(cr.start());
     for (const dht::token& upper_bound_token : ring_iter) {
         /*
          * remainder can be a range/bounds of token _or_ keys and we want to split it with a token: