thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-18 22:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "TMP"

Browse Source 
This reverts commit a930697cd7.
This commit is contained in:
Alexander Tokmakov 2020-01-15 16:17:52 +03:00
parent 8edd0e3b45
commit a108651d63
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/Context.h
View File

@ -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;

2
dbms/src/Storages/IStorage.h
View File

@ -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<std::mutex> * id_lock = nullptr);

2
dbms/src/Storages/Kafka/StorageKafka.cpp
View File

@ -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;
}