thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 16:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25444 from kitaisreal/replace-dictionary

Browse Source 
Support REPLACE DICTIONARY, CREATE OR REPLACE DICTIONARY queries
This commit is contained in:
Maksim Kita 2021-06-26 16:19:58 +03:00 committed by GitHub
commit bf85b09a16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 197 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Interpreters/InterpreterCreateQuery.cpp
View File

@ -1101,6 +1101,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
[[maybe_unused]] bool done = doCreateTable(create, properties);
assert(done);
ast_drop->table = create.table;
ast_drop->is_dictionary = create.is_dictionary;
ast_drop->database = create.database;
ast_drop->kind = ASTDropQuery::Drop;
created = true;
@ -1113,14 +1114,18 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
ASTRenameQuery::Table{create.database, create.table},
ASTRenameQuery::Table{create.database, table_to_replace_name}
};
ast_rename->elements.push_back(std::move(elem));
ast_rename->exchange = true;
ast_rename->dictionary = create.is_dictionary;
InterpreterRenameQuery(ast_rename, getContext()).execute();
replaced = true;
InterpreterDropQuery(ast_drop, getContext()).execute();
create.table = table_to_replace_name;
return fillTableIfNeeded(create);
}
catch (...)

10
src/Parsers/ASTCreateQuery.cpp
View File

@ -305,8 +305,16 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
}
else
{
String action = "CREATE";
if (attach)
action = "ATTACH";
else if (replace_table && create_or_replace)
action = "CREATE OR REPLACE";
else if (replace_table)
action = "REPLACE";
/// Always DICTIONARY
settings.ostr << (settings.hilite ? hilite_keyword : "") << (attach ? "ATTACH " : "CREATE ") << "DICTIONARY "
settings.ostr << (settings.hilite ? hilite_keyword : "") << action << " DICTIONARY "
<< (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "")
<< (!database.empty() ? backQuoteIfNeed(database) + "." : "") << backQuoteIfNeed(table);
if (uuid != UUIDHelpers::Nil)

5
src/Parsers/ASTRenameQuery.h
View File

@ -75,12 +75,15 @@ protected:
}
settings.ostr << (settings.hilite ? hilite_keyword : "");
if (exchange)
if (exchange && dictionary)
settings.ostr << "EXCHANGE DICTIONARIES ";
else if (exchange)
settings.ostr << "EXCHANGE TABLES ";
else if (dictionary)
settings.ostr << "RENAME DICTIONARY ";
else
settings.ostr << "RENAME TABLE ";
settings.ostr << (settings.hilite ? hilite_none : "");
for (auto it = elements.cbegin(); it != elements.cend(); ++it)

20
src/Parsers/ParserCreateQuery.cpp
View File

@ -971,6 +971,8 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
{
ParserKeyword s_create("CREATE");
ParserKeyword s_attach("ATTACH");
ParserKeyword s_replace("REPLACE");
ParserKeyword s_or_replace("OR REPLACE");
ParserKeyword s_dictionary("DICTIONARY");
ParserKeyword s_if_not_exists("IF NOT EXISTS");
ParserKeyword s_on("ON");
@ -982,6 +984,8 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
ParserDictionary dictionary_p;
bool if_not_exists = false;
bool replace = false;
bool or_replace = false;
ASTPtr name;
ASTPtr attributes;
@ -989,13 +993,21 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
String cluster_str;
bool attach = false;
if (!s_create.ignore(pos, expected))
if (s_create.ignore(pos, expected))
{
if (s_attach.ignore(pos, expected))
if (s_or_replace.ignore(pos, expected))
{
replace = true;
or_replace = true;
}
}
else if (s_attach.ignore(pos, expected))
attach = true;
else if (s_replace.ignore(pos, expected))
replace = true;
else
return false;
}
if (!s_dictionary.ignore(pos, expected))
return false;
@ -1031,6 +1043,8 @@ bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, E
node = query;
query->is_dictionary = true;
query->attach = attach;
query->create_or_replace = or_replace;
query->replace_table = replace;
auto dict_id = name->as<ASTTableIdentifier>()->getTableId();
query->database = dict_id.database_name;

15
src/Storages/StorageDictionary.cpp
View File

@ -215,23 +215,26 @@ LoadablesConfigurationPtr StorageDictionary::getConfiguration() const
void StorageDictionary::renameInMemory(const StorageID & new_table_id)
{
auto old_table_id = getStorageID();
IStorage::renameInMemory(new_table_id);
if (configuration)
{
configuration->setString("dictionary.database", new_table_id.database_name);
configuration->setString("dictionary.name", new_table_id.table_name);
const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
external_dictionaries_loader.reloadConfig(getStorageID().getInternalDictionaryName());
auto result = external_dictionaries_loader.getLoadResult(getStorageID().getInternalDictionaryName());
if (!result.object)
return;
auto result = external_dictionaries_loader.getLoadResult(old_table_id.getInternalDictionaryName());
if (result.object)
{
const auto dictionary = std::static_pointer_cast<const IDictionary>(result.object);
dictionary->updateDictionaryName(new_table_id);
}
IStorage::renameInMemory(new_table_id);
external_dictionaries_loader.reloadConfig(old_table_id.getInternalDictionaryName());
dictionary_name = new_table_id.getFullNameNotQuoted();
}
}
void registerStorageDictionary(StorageFactory & factory)

4
src/Storages/StorageDictionary.h
View File

@ -45,7 +45,7 @@ public:
Poco::Timestamp getUpdateTime() const;
LoadablesConfigurationPtr getConfiguration() const;
const String & getDictionaryName() const { return dictionary_name; }
String getDictionaryName() const { return dictionary_name; }
/// Specifies where the table is located relative to the dictionary.
enum class Location
@ -66,7 +66,7 @@ public:
};
private:
const String dictionary_name;
String dictionary_name;
const Location location;
mutable std::mutex dictionary_config_mutex;

2
tests/queries/0_stateless/01913_replace_dictionary.reference Normal file
View File

@ -0,0 +1,2 @@
0 Value0
0 Value1

50
tests/queries/0_stateless/01913_replace_dictionary.sql Normal file
View File

@ -0,0 +1,50 @@
DROP DATABASE IF EXISTS 01913_db;
CREATE DATABASE 01913_db ENGINE=Atomic;
DROP TABLE IF EXISTS 01913_db.test_source_table_1;
CREATE TABLE 01913_db.test_source_table_1
(
id UInt64,
value String
) ENGINE=TinyLog;
INSERT INTO 01913_db.test_source_table_1 VALUES (0, 'Value0');
DROP DICTIONARY IF EXISTS 01913_db.test_dictionary;
CREATE DICTIONARY 01913_db.test_dictionary
(
id UInt64,
value String
)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(DB '01913_db' TABLE 'test_source_table_1'));
SELECT * FROM 01913_db.test_dictionary;
DROP TABLE IF EXISTS 01913_db.test_source_table_2;
CREATE TABLE 01913_db.test_source_table_2
(
id UInt64,
value_1 String
) ENGINE=TinyLog;
INSERT INTO 01913_db.test_source_table_2 VALUES (0, 'Value1');
REPLACE DICTIONARY 01913_db.test_dictionary
(
id UInt64,
value_1 String
)
PRIMARY KEY id
LAYOUT(HASHED())
SOURCE(CLICKHOUSE(DB '01913_db' TABLE 'test_source_table_2'))
LIFETIME(0);
SELECT * FROM 01913_db.test_dictionary;
DROP DICTIONARY 01913_db.test_dictionary;
DROP TABLE 01913_db.test_source_table_1;
DROP TABLE 01913_db.test_source_table_2;
DROP DATABASE 01913_db;

4
tests/queries/0_stateless/01914_exchange_dictionaries.reference Normal file
View File

@ -0,0 +1,4 @@
1 Table1
2 Table2
2 Table2
1 Table1

34
tests/queries/0_stateless/01914_exchange_dictionaries.sql Normal file
View File

@ -0,0 +1,34 @@
DROP TABLE IF EXISTS table_1;
CREATE TABLE table_1 (id UInt64, value String) ENGINE=TinyLog;
DROP TABLE IF EXISTS table_2;
CREATE TABLE table_2 (id UInt64, value String) ENGINE=TinyLog;
INSERT INTO table_1 VALUES (1, 'Table1');
INSERT INTO table_2 VALUES (2, 'Table2');
DROP DICTIONARY IF EXISTS dictionary_1;
CREATE DICTIONARY dictionary_1 (id UInt64, value String)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(TABLE 'table_1'));
DROP DICTIONARY IF EXISTS dictionary_2;
CREATE DICTIONARY dictionary_2 (id UInt64, value String)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(TABLE 'table_2'));
SELECT * FROM dictionary_1;
SELECT * FROM dictionary_2;
EXCHANGE DICTIONARIES dictionary_1 AND dictionary_2;
SELECT * FROM dictionary_1;
SELECT * FROM dictionary_2;
DROP DICTIONARY dictionary_1;
DROP DICTIONARY dictionary_2;
DROP TABLE table_1;
DROP TABLE table_2;

2
tests/queries/0_stateless/01915_create_or_replace_dictionary.reference Normal file
View File

@ -0,0 +1,2 @@
0 Value0
0 Value1

50
tests/queries/0_stateless/01915_create_or_replace_dictionary.sql Normal file
View File

@ -0,0 +1,50 @@
DROP DATABASE IF EXISTS 01915_db;
CREATE DATABASE 01915_db ENGINE=Atomic;
DROP TABLE IF EXISTS 01915_db.test_source_table_1;
CREATE TABLE 01915_db.test_source_table_1
(
id UInt64,
value String
) ENGINE=TinyLog;
INSERT INTO 01915_db.test_source_table_1 VALUES (0, 'Value0');
DROP DICTIONARY IF EXISTS 01915_db.test_dictionary;
CREATE OR REPLACE DICTIONARY 01915_db.test_dictionary
(
id UInt64,
value String
)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(DB '01915_db' TABLE 'test_source_table_1'));
SELECT * FROM 01915_db.test_dictionary;
DROP TABLE IF EXISTS 01915_db.test_source_table_2;
CREATE TABLE 01915_db.test_source_table_2
(
id UInt64,
value_1 String
) ENGINE=TinyLog;
INSERT INTO 01915_db.test_source_table_2 VALUES (0, 'Value1');
CREATE OR REPLACE DICTIONARY 01915_db.test_dictionary
(
id UInt64,
value_1 String
)
PRIMARY KEY id
LAYOUT(HASHED())
SOURCE(CLICKHOUSE(DB '01915_db' TABLE 'test_source_table_2'))
LIFETIME(0);
SELECT * FROM 01915_db.test_dictionary;
DROP DICTIONARY 01915_db.test_dictionary;
DROP TABLE 01915_db.test_source_table_1;
DROP TABLE 01915_db.test_source_table_2;
DROP DATABASE 01915_db;

5
tests/queries/skip_list.json
View File

@ -516,7 +516,10 @@
"01913_if_int_decimal",
"01913_join_push_down_bug",
"01921_with_fill_with_totals",
"01924_argmax_bitmap_state"
"01924_argmax_bitmap_state",
"01913_replace_dictionary",
"01914_exchange_dictionaries",
"01915_create_or_replace_dictionary"
],
"parallel":
[