From 52058ea9742c7467e2b90fac86126e5cfbd3677b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Botond=20D=C3=A9nes?= Date: Thu, 30 Jun 2022 14:18:25 +0300 Subject: [PATCH] alternator: make is_alternator_keyspace() a standalone method --- alternator/executor.cc | 4 ++-- alternator/executor.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alternator/executor.cc b/alternator/executor.cc index 4365d81340..6b084d1b17 100644 --- a/alternator/executor.cc +++ b/alternator/executor.cc @@ -400,8 +400,8 @@ static rjson::value generate_arn_for_index(const schema& schema, std::string_vie schema.ks_name(), schema.cf_name(), index_name)); } -bool executor::is_alternator_keyspace(const sstring& ks_name) { - return ks_name.find(KEYSPACE_NAME_PREFIX) == 0; +bool is_alternator_keyspace(const sstring& ks_name) { + return ks_name.find(executor::KEYSPACE_NAME_PREFIX) == 0; } sstring executor::table_name(const schema& s) { diff --git a/alternator/executor.hh b/alternator/executor.hh index 7e9c89a9df..ca951de9a6 100644 --- a/alternator/executor.hh +++ b/alternator/executor.hh @@ -85,6 +85,7 @@ const std::map& get_tags_of_table(schema_ptr schema); std::optional find_tag(const schema& s, const sstring& tag); future<> update_tags(service::migration_manager& mm, schema_ptr schema, std::map&& tags_map); schema_ptr get_table(service::storage_proxy& proxy, const rjson::value& request); +bool is_alternator_keyspace(const sstring& ks_name); // An attribute_path_map object is used to hold data for various attributes // paths (parsed::path) in a hierarchy of attribute paths. Each attribute path @@ -212,7 +213,6 @@ public: private: friend class rmw_operation; - static bool is_alternator_keyspace(const sstring& ks_name); static void describe_key_schema(rjson::value& parent, const schema&, std::unordered_map * = nullptr); static void describe_key_schema(rjson::value& parent, const schema& schema, std::unordered_map&);