From 83073f4e8bf014f5f1571546681509f67ec9cf39 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 11 Dec 2020 18:47:29 +0300 Subject: [PATCH] validation: Remove get_local_storage_proxy call It is used in validate_column_family. The last caller of it was removed by previous patch, so we may kill the helper itself Signed-off-by: Pavel Emelyanov --- validation.cc | 8 -------- validation.hh | 2 -- 2 files changed, 10 deletions(-) diff --git a/validation.cc b/validation.cc index f2dfefc002..7e5b544428 100644 --- a/validation.cc +++ b/validation.cc @@ -42,7 +42,6 @@ #include "validation.hh" #include "database.hh" #include "exceptions/exceptions.hh" -#include "service/storage_proxy.hh" namespace validation { @@ -96,13 +95,6 @@ validate_column_family(const database& db, const sstring& keyspace_name, const s } } -schema_ptr validate_column_family(const sstring& keyspace_name, - const sstring& cf_name) { - return validate_column_family( - service::get_local_storage_proxy().get_db().local(), - keyspace_name, cf_name); -} - void validate_keyspace(const database& db, const sstring& keyspace_name) { if (keyspace_name.empty()) { throw exceptions::invalid_request_exception("Keyspace not set"); diff --git a/validation.hh b/validation.hh index 11ce694acd..f2d141ca65 100644 --- a/validation.hh +++ b/validation.hh @@ -55,8 +55,6 @@ constexpr size_t max_key_size = std::numeric_limits::max(); std::optional is_cql_key_invalid(const schema& schema, partition_key_view key); void validate_cql_key(const schema& schema, partition_key_view key); schema_ptr validate_column_family(const database& db, const sstring& keyspace_name, const sstring& cf_name); -schema_ptr validate_column_family(const sstring& keyspace_name, const sstring& cf_name); - void validate_keyspace(const database& db, const sstring& keyspace_name); }