thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 07:01:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storage Dictionary quoted names fix

Browse Source
This commit is contained in:
Maksim Kita 2021-07-20 11:35:10 +03:00
parent 4f1926550b
commit 9b53f4f2b3
4 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Interpreters/ExternalDictionariesLoader.cpp
View File

@ -81,8 +81,12 @@ DictionaryStructure ExternalDictionariesLoader::getDictionaryStructure(const std
std::string ExternalDictionariesLoader::resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const
{
bool has_dictionary = has(dictionary_name);
if (has_dictionary)
return dictionary_name;
std::string resolved_name = resolveDictionaryNameFromDatabaseCatalog(dictionary_name);
bool has_dictionary = has(resolved_name);
has_dictionary = has(resolved_name);
if (!has_dictionary)
{

3
src/Storages/StorageDictionary.cpp
View File

@ -167,7 +167,8 @@ Pipe StorageDictionary::read(
const size_t max_block_size,
const unsigned /*threads*/)
{
auto dictionary = getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, local_context);
auto registered_dictionary_name = location == Location::SameDatabaseAndNameAsDictionary ? getStorageID().getInternalDictionaryName() : dictionary_name;
auto dictionary = getContext()->getExternalDictionariesLoader().getDictionary(registered_dictionary_name, local_context);
auto stream = dictionary->getBlockInputStream(column_names, max_block_size);
/// TODO: update dictionary interface for processors.
return Pipe(std::make_shared<SourceFromInputStream>(stream));

2
tests/queries/0_stateless/01948_dictionary_quoted_database_name.reference Normal file
View File

@ -0,0 +1,2 @@
0 Value
0 Value

38
tests/queries/0_stateless/01948_dictionary_quoted_database_name.sql Normal file
View File

@ -0,0 +1,38 @@
DROP DATABASE IF EXISTS `01945.db`;
CREATE DATABASE `01945.db`;
CREATE TABLE `01945.db`.test_dictionary_values
(
id UInt64,
value String
) ENGINE=TinyLog;
INSERT INTO `01945.db`.test_dictionary_values VALUES (0, 'Value');
CREATE DICTIONARY `01945.db`.test_dictionary
(
id UInt64,
value String
)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(DB '01945.db' TABLE 'test_dictionary_values'));
SELECT * FROM `01945.db`.test_dictionary;
DROP DICTIONARY `01945.db`.test_dictionary;
CREATE DICTIONARY `01945.db`.`test_dictionary.test`
(
id UInt64,
value String
)
PRIMARY KEY id
LAYOUT(DIRECT())
SOURCE(CLICKHOUSE(DB '01945.db' TABLE 'test_dictionary_values'));
SELECT * FROM `01945.db`.`test_dictionary.test`;
DROP DICTIONARY `01945.db`.`test_dictionary.test`;
DROP TABLE `01945.db`.test_dictionary_values;
DROP DATABASE `01945.db`;