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

Merge pull request #37947 from kitaisreal/dictionaries-update-field-condition-fix

Browse Source 
Dictionaries custom query with update field fix
This commit is contained in:
Maksim Kita 2022-06-09 16:31:07 +02:00 committed by GitHub
commit aa5293da5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Dictionaries/ExternalQueryBuilder.cpp
View File

@ -84,6 +84,19 @@ std::string ExternalQueryBuilder::composeLoadAllQuery() const
}
else
{
/** In case UPDATE_FIELD is specified in {condition} for dictionary that must load all data.
* Replace {condition} with true_condition for initial dictionary load.
* For next dictionary loads {condition} will be updated with UPDATE_FIELD.
*/
static constexpr auto true_condition = "(1 = 1)";
auto condition_position = query.find(CONDITION_PLACEHOLDER_TO_REPLACE_VALUE);
if (condition_position != std::string::npos)
{
auto query_copy = query;
query_copy.replace(condition_position, CONDITION_PLACEHOLDER_TO_REPLACE_VALUE.size(), true_condition);
return query_copy;
}
return query;
}
}

84
tests/integration/test_dictionaries_update_field/test.py
View File

@ -33,32 +33,7 @@ def started_cluster():
cluster.shutdown()
@pytest.mark.parametrize(
"dictionary_name,dictionary_type",
[
("flat_update_field_dictionary", "FLAT"),
("simple_key_hashed_update_field_dictionary", "HASHED"),
("complex_key_hashed_update_field_dictionary", "COMPLEX_KEY_HASHED"),
],
)
def test_update_field(started_cluster, dictionary_name, dictionary_type):
create_dictionary_query = """
CREATE DICTIONARY {dictionary_name}
(
key UInt64,
value String,
last_insert_time DateTime
)
PRIMARY KEY key
SOURCE(CLICKHOUSE(table 'table_for_update_field_dictionary' update_field 'last_insert_time'))
LAYOUT({dictionary_type}())
LIFETIME(1);
""".format(
dictionary_name=dictionary_name, dictionary_type=dictionary_type
)
node.query(create_dictionary_query)
def dictionary_update_field_actions(dictionary_name):
node.query(
"INSERT INTO table_for_update_field_dictionary VALUES (1, 'First', now());"
)
@ -72,6 +47,7 @@ def test_update_field(started_cluster, dictionary_name, dictionary_type):
node.query(
"INSERT INTO table_for_update_field_dictionary VALUES (2, 'Second', now());"
)
time.sleep(10)
query_result = node.query(
@ -103,3 +79,59 @@ def test_update_field(started_cluster, dictionary_name, dictionary_type):
node.query(
"DROP DICTIONARY {dictionary_name}".format(dictionary_name=dictionary_name)
)
@pytest.mark.parametrize(
"dictionary_name,dictionary_type",
[
("flat_update_field_dictionary", "FLAT"),
("simple_key_hashed_update_field_dictionary", "HASHED"),
("complex_key_hashed_update_field_dictionary", "COMPLEX_KEY_HASHED"),
],
)
def test_update_field(started_cluster, dictionary_name, dictionary_type):
create_dictionary_query = """
CREATE DICTIONARY {dictionary_name}
(
key UInt64,
value String,
last_insert_time DateTime
)
PRIMARY KEY key
SOURCE(CLICKHOUSE(table 'table_for_update_field_dictionary' update_field 'last_insert_time'))
LAYOUT({dictionary_type}())
LIFETIME(1);
""".format(
dictionary_name=dictionary_name, dictionary_type=dictionary_type
)
node.query(create_dictionary_query)
dictionary_update_field_actions(dictionary_name)
@pytest.mark.parametrize(
"dictionary_name,dictionary_type",
[
("flat_update_field_dictionary", "FLAT"),
("simple_key_hashed_update_field_dictionary", "HASHED"),
("complex_key_hashed_update_field_dictionary", "COMPLEX_KEY_HASHED"),
],
)
def test_update_field_custom_query(started_cluster, dictionary_name, dictionary_type):
create_dictionary_query = """
CREATE DICTIONARY {dictionary_name}
(
key UInt64,
value String,
last_insert_time DateTime
)
PRIMARY KEY key
SOURCE(CLICKHOUSE(query $doc$SELECT key, value, last_insert_time FROM table_for_update_field_dictionary WHERE {{condition}};$doc$ update_field 'last_insert_time'))
LAYOUT({dictionary_type}())
LIFETIME(1);
""".format(
dictionary_name=dictionary_name, dictionary_type=dictionary_type
)
node.query(create_dictionary_query)
dictionary_update_field_actions(dictionary_name)