From a108651d631700584405f2da837c124a8a236be4 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Wed, 15 Jan 2020 16:17:52 +0300 Subject: [PATCH] Revert "TMP" This reverts commit a930697cd7aa8866dad80d60c4b46da1b977162d. --- dbms/src/Interpreters/Context.h | 2 ++ dbms/src/Storages/IStorage.h | 2 +- dbms/src/Storages/Kafka/StorageKafka.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dbms/src/Interpreters/Context.h b/dbms/src/Interpreters/Context.h index ae53572a9e5..cf94def0412 100644 --- a/dbms/src/Interpreters/Context.h +++ b/dbms/src/Interpreters/Context.h @@ -250,6 +250,8 @@ public: ClientInfo & getClientInfo() { return client_info; } const ClientInfo & getClientInfo() const { return client_info; } + void setQuota(const String & name, const String & quota_key, const String & user_name, const Poco::Net::IPAddress & address); + void addDependency(const StorageID & from, const StorageID & where); void removeDependency(const StorageID & from, const StorageID & where); Dependencies getDependencies(const StorageID & from) const; diff --git a/dbms/src/Storages/IStorage.h b/dbms/src/Storages/IStorage.h index 5fc164c77b2..b77770d52c8 100644 --- a/dbms/src/Storages/IStorage.h +++ b/dbms/src/Storages/IStorage.h @@ -315,7 +315,7 @@ public: /** * Just updates names of database and table without moving any data on disk - * Can be called directly only from DatabaseAtomic. + * Can be called only from DatabaseAtomic. */ virtual void renameInMemory(const String & new_database_name, const String & new_table_name, std::unique_lock * id_lock = nullptr); diff --git a/dbms/src/Storages/Kafka/StorageKafka.cpp b/dbms/src/Storages/Kafka/StorageKafka.cpp index 350370d8dcf..7f3de348aa3 100644 --- a/dbms/src/Storages/Kafka/StorageKafka.cpp +++ b/dbms/src/Storages/Kafka/StorageKafka.cpp @@ -313,7 +313,7 @@ bool StorageKafka::checkDependencies(const StorageID & table_id) return false; // Check all its dependencies - if (!checkDependencies(db_tab)) + if (!checkDependencies(StorageID(db_tab.database_name, db_tab.table_name))) return false; }