From cb20fc2e4f87b023974390defcb2e8f992d68188 Mon Sep 17 00:00:00 2001
From: Piotr Sarna <sarna@scylladb.com>
Date: Thu, 14 Feb 2019 16:23:05 +0100
Subject: [PATCH] index: make non-pointer overload of is_index function

Previous interface enforced passing a shared pointer, which
might result in calling unneeded shared_from_this().
---
 index/secondary_index_manager.cc | 8 ++++++--
 index/secondary_index_manager.hh | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/index/secondary_index_manager.cc b/index/secondary_index_manager.cc
index 541c9270c5..037fbc7bcd 100644
--- a/index/secondary_index_manager.cc
+++ b/index/secondary_index_manager.cc
@@ -157,8 +157,12 @@ std::vector<index> secondary_index_manager::list_indexes() const {
 }
 
 bool secondary_index_manager::is_index(view_ptr view) const {
-    return boost::algorithm::any_of(_indices | boost::adaptors::map_values, [&view] (const index& i) {
-        return view->cf_name() == index_table_name(i.metadata().name());
+    return is_index(*view);
+}
+
+bool secondary_index_manager::is_index(const schema& s) const {
+    return boost::algorithm::any_of(_indices | boost::adaptors::map_values, [&s] (const index& i) {
+        return s.cf_name() == index_table_name(i.metadata().name());
     });
 }
 
diff --git a/index/secondary_index_manager.hh b/index/secondary_index_manager.hh
index 96c907a58e..f17cf05721 100644
--- a/index/secondary_index_manager.hh
+++ b/index/secondary_index_manager.hh
@@ -76,6 +76,7 @@ public:
     std::vector<index_metadata> get_dependent_indices(const column_definition& cdef) const;
     std::vector<index> list_indexes() const;
     bool is_index(view_ptr) const;
+    bool is_index(const schema& s) const;
 private:
     void add_index(const index_metadata& im);
 };