From a930697cd7aa8866dad80d60c4b46da1b977162d Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Thu, 26 Dec 2019 21:51:54 +0300 Subject: [PATCH] TMP --- dbms/src/Interpreters/Context.cpp | 1 - dbms/src/Interpreters/Context.h | 3 -- dbms/src/Parsers/ASTAlterQuery.h | 1 - dbms/src/Parsers/ASTCreateQuery.h | 1 - dbms/src/Parsers/ExpressionElementParsers.cpp | 36 +------------------ dbms/src/Parsers/ExpressionElementParsers.h | 6 ---- dbms/src/Parsers/ParserCreateQuery.cpp | 1 - dbms/src/Storages/IStorage.cpp | 4 +-- dbms/src/Storages/IStorage.h | 2 +- dbms/src/Storages/Kafka/StorageKafka.cpp | 3 +- 10 files changed, 5 insertions(+), 53 deletions(-) diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp index 48c193a34e9..4ffc712f6f0 100644 --- a/dbms/src/Interpreters/Context.cpp +++ b/dbms/src/Interpreters/Context.cpp @@ -979,7 +979,6 @@ StoragePtr Context::getTableImpl(const StorageID & table_id, Exception * excepti return res; } - //FIXME what if table was moved to another database? db = resolveDatabase(table_id.database_name, current_database); checkDatabaseAccessRightsImpl(db); diff --git a/dbms/src/Interpreters/Context.h b/dbms/src/Interpreters/Context.h index 53d77adf94e..11af06f2b09 100644 --- a/dbms/src/Interpreters/Context.h +++ b/dbms/src/Interpreters/Context.h @@ -124,7 +124,6 @@ using IHostContextPtr = std::shared_ptr; * * Everything is encapsulated for all sorts of checks and locks. */ -///TODO remove syntax sugar and legacy methods from Context (e.g. getInputFormat(...) which just returns object from factory) class Context { private: @@ -249,8 +248,6 @@ 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/Parsers/ASTAlterQuery.h b/dbms/src/Parsers/ASTAlterQuery.h index 2262624a1a4..02e76d5555c 100644 --- a/dbms/src/Parsers/ASTAlterQuery.h +++ b/dbms/src/Parsers/ASTAlterQuery.h @@ -142,7 +142,6 @@ public: String with_name; /// REPLACE(ATTACH) PARTITION partition FROM db.table - //FIXME use StorageID String from_database; String from_table; /// To distinguish REPLACE and ATTACH PARTITION partition FROM db.table diff --git a/dbms/src/Parsers/ASTCreateQuery.h b/dbms/src/Parsers/ASTCreateQuery.h index 3beab213161..41847c28b1e 100644 --- a/dbms/src/Parsers/ASTCreateQuery.h +++ b/dbms/src/Parsers/ASTCreateQuery.h @@ -4,7 +4,6 @@ #include #include #include -#include namespace DB diff --git a/dbms/src/Parsers/ExpressionElementParsers.cpp b/dbms/src/Parsers/ExpressionElementParsers.cpp index 4ab56d3e83a..eb77d77a5c8 100644 --- a/dbms/src/Parsers/ExpressionElementParsers.cpp +++ b/dbms/src/Parsers/ExpressionElementParsers.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include "ASTColumnsMatcher.h" @@ -198,40 +198,6 @@ bool ParserCompoundIdentifier::parseImpl(Pos & pos, ASTPtr & node, Expected & ex } -bool parseStorageID(IParser::Pos & pos, StorageID & res, Expected & expected) -{ - ParserKeyword s_uuid("UUID"); - ParserIdentifier name_p; - ParserStringLiteral uuid_p; - ParserToken s_dot(TokenType::Dot); - - ASTPtr database; - ASTPtr table; - ASTPtr uuid; - - if (!name_p.parse(pos, table, expected)) - return false; - - if (s_dot.ignore(pos, expected)) - { - database = table; - if (!name_p.parse(pos, table, expected)) - return false; - } - - if (s_uuid.ignore(pos, expected)) - { - if (!uuid_p.parse(pos, uuid, expected)) - return false; - } - - tryGetIdentifierNameInto(database, res.database_name); - tryGetIdentifierNameInto(table, res.table_name); - res.uuid = uuid ? uuid->as()->value.get() : ""; - return true; -} - - bool ParserFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expected) { ParserIdentifier id_parser; diff --git a/dbms/src/Parsers/ExpressionElementParsers.h b/dbms/src/Parsers/ExpressionElementParsers.h index 9a1e090d8d6..fbcaeeb3d45 100644 --- a/dbms/src/Parsers/ExpressionElementParsers.h +++ b/dbms/src/Parsers/ExpressionElementParsers.h @@ -56,12 +56,6 @@ protected: bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected); }; -struct StorageID; -/// Table name, possibly with database name and UUID as string literal -/// [db_name.]table_name [UUID 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'] -//TODO replace with class -bool parseStorageID(IParser::Pos & pos, StorageID & res, Expected & expected); - /// Just * class ParserAsterisk : public IParserBase { diff --git a/dbms/src/Parsers/ParserCreateQuery.cpp b/dbms/src/Parsers/ParserCreateQuery.cpp index db2b42f5ea5..43e5d274994 100644 --- a/dbms/src/Parsers/ParserCreateQuery.cpp +++ b/dbms/src/Parsers/ParserCreateQuery.cpp @@ -13,7 +13,6 @@ #include #include #include -#include namespace DB diff --git a/dbms/src/Storages/IStorage.cpp b/dbms/src/Storages/IStorage.cpp index 1a1da6d6f4a..3faee4d841a 100644 --- a/dbms/src/Storages/IStorage.cpp +++ b/dbms/src/Storages/IStorage.cpp @@ -412,7 +412,7 @@ void IStorage::alter( SettingsChanges new_changes; params.applyForSettingsOnly(new_changes); IDatabase::ASTModifier settings_modifier = getSettingsModifier(new_changes); - context.getDatabase(table_id.database_name)->alterTable(context, table_id.table_name, getColumns(), getIndices(), getConstraints(), settings_modifier); //FIXME + context.getDatabase(table_id.database_name)->alterTable(context, table_id.table_name, getColumns(), getIndices(), getConstraints(), settings_modifier); } else { @@ -421,7 +421,7 @@ void IStorage::alter( auto new_indices = getIndices(); auto new_constraints = getConstraints(); params.applyForColumnsOnly(new_columns); - context.getDatabase(table_id.database_name)->alterTable(context, table_id.table_name, new_columns, new_indices, new_constraints, {}); //FIXME + context.getDatabase(table_id.database_name)->alterTable(context, table_id.table_name, new_columns, new_indices, new_constraints, {}); setColumns(std::move(new_columns)); } } diff --git a/dbms/src/Storages/IStorage.h b/dbms/src/Storages/IStorage.h index b77770d52c8..5fc164c77b2 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 only from DatabaseAtomic. + * Can be called directly 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 2a11e14a602..56cf62ce342 100644 --- a/dbms/src/Storages/Kafka/StorageKafka.cpp +++ b/dbms/src/Storages/Kafka/StorageKafka.cpp @@ -312,7 +312,7 @@ bool StorageKafka::checkDependencies(const StorageID & table_id) return false; // Check all its dependencies - if (!checkDependencies(StorageID(db_tab.database_name, db_tab.table_name))) + if (!checkDependencies(db_tab)) return false; } @@ -360,7 +360,6 @@ bool StorageKafka::streamToViews() // Create an INSERT query for streaming data auto insert = std::make_shared(); - //FIXME use uid if not empty insert->database = table_id.database_name; insert->table = table_id.table_name;