From 6f6e6762bab8b88b20cdfef3ddfd47e068d129fa Mon Sep 17 00:00:00 2001 From: Pavel Solodovnikov Date: Sat, 6 Jun 2020 14:51:49 +0300 Subject: [PATCH] cql: remove unused functions It seems that the following functions are never used, delete them: * `function::has_reference_to` * `functions::get_overload_count` * `to_identifiers` in column_identifier.hh * `single_column_relation::get_map_key` Tests: unit(dev, debug) Signed-off-by: Pavel Solodovnikov Message-Id: <20200606115149.1770453-1-pa.solodovnikov@scylladb.com> --- cql3/column_identifier.hh | 10 ---------- cql3/functions/abstract_function.hh | 4 ---- cql3/functions/as_json_function.hh | 4 ---- cql3/functions/function.hh | 1 - cql3/functions/functions.cc | 5 ----- cql3/functions/functions.hh | 1 - cql3/single_column_relation.hh | 4 ---- 7 files changed, 29 deletions(-) diff --git a/cql3/column_identifier.hh b/cql3/column_identifier.hh index e84598816b..b7f4d8fa54 100644 --- a/cql3/column_identifier.hh +++ b/cql3/column_identifier.hh @@ -139,16 +139,6 @@ static inline return def.column_specification->name; } -static inline -std::vector<::shared_ptr> to_identifiers(const std::vector& defs) { - std::vector<::shared_ptr> r; - r.reserve(defs.size()); - for (auto&& def : defs) { - r.push_back(to_identifier(*def)); - } - return r; -} - } namespace std { diff --git a/cql3/functions/abstract_function.hh b/cql3/functions/abstract_function.hh index c9b1770abb..4a25449b31 100644 --- a/cql3/functions/abstract_function.hh +++ b/cql3/functions/abstract_function.hh @@ -95,10 +95,6 @@ public: return _name.keyspace == ks_name && _name.name == function_name; } - virtual bool has_reference_to(function& f) const override { - return false; - } - virtual sstring column_name(const std::vector& column_names) const override { return format("{}({})", _name, join(", ", column_names)); } diff --git a/cql3/functions/as_json_function.hh b/cql3/functions/as_json_function.hh index 5ad99f2658..6ac4dd0754 100644 --- a/cql3/functions/as_json_function.hh +++ b/cql3/functions/as_json_function.hh @@ -144,10 +144,6 @@ public: return false; } - virtual bool has_reference_to(function& f) const override { - return false; - } - virtual sstring column_name(const std::vector& column_names) const override { return "[json]"; } diff --git a/cql3/functions/function.hh b/cql3/functions/function.hh index ad88dd8663..0299bd7933 100644 --- a/cql3/functions/function.hh +++ b/cql3/functions/function.hh @@ -82,7 +82,6 @@ public: virtual void print(std::ostream& os) const = 0; virtual bool uses_function(const sstring& ks_name, const sstring& function_name) const = 0; - virtual bool has_reference_to(function& f) const = 0; /** * Returns the name of the function to use within a ResultSet. diff --git a/cql3/functions/functions.cc b/cql3/functions/functions.cc index 3969d25465..5c177db2da 100644 --- a/cql3/functions/functions.cc +++ b/cql3/functions/functions.cc @@ -158,11 +158,6 @@ functions::make_arg_spec(const sstring& receiver_ks, const sstring& receiver_cf, fun.arg_types()[i]); } -int -functions::get_overload_count(const function_name& name) { - return _declared.count(name); -} - inline shared_ptr make_to_json_function(data_type t) { diff --git a/cql3/functions/functions.hh b/cql3/functions/functions.hh index 5b039a00d9..e9d99877ec 100644 --- a/cql3/functions/functions.hh +++ b/cql3/functions/functions.hh @@ -69,7 +69,6 @@ private: public: static lw_shared_ptr make_arg_spec(const sstring& receiver_ks, const sstring& receiver_cf, const function& fun, size_t i); - static int get_overload_count(const function_name& name); public: static shared_ptr get(database& db, const sstring& keyspace, diff --git a/cql3/single_column_relation.hh b/cql3/single_column_relation.hh index 4cae14c557..b0e56035e2 100644 --- a/cql3/single_column_relation.hh +++ b/cql3/single_column_relation.hh @@ -108,10 +108,6 @@ public: return _entity; } - ::shared_ptr get_map_key() { - return _map_key; - } - ::shared_ptr get_value() { return _value; }