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

Allow mutations to work with key constraints.

Browse Source
This commit is contained in:
Amos Bird 2020-09-18 23:50:28 +08:00
parent 76a3cc2dae
commit d842cb704f
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -1079,6 +1079,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mutatePartToTempor
auto context_for_reading = context;
context_for_reading.setSetting("max_streams_to_max_threads_ratio", 1);
context_for_reading.setSetting("max_threads", 1);
/// Allow mutations to work when force_index_by_date or force_primary_key is on.
context_for_reading.setSetting("force_index_by_date", 0);
context_for_reading.setSetting("force_primary_key", 0);
MutationCommands commands_for_part;
for (const auto & command : commands)

2
tests/integration/test_mutations_with_merge_tree/configs/users.xml
View File

@ -3,6 +3,8 @@
<profiles>
<default>
<max_expanded_ast_elements>500</max_expanded_ast_elements>
<force_index_by_date>1</force_index_by_date>
<force_primary_key>1</force_primary_key>
</default>
</profiles>
</yandex>

8
tests/integration/test_mutations_with_merge_tree/test.py
View File

@ -16,7 +16,7 @@ def started_cluster():
instance_test_mutations.query(
'''CREATE TABLE test_mutations_with_ast_elements(date Date, a UInt64, b String) ENGINE = MergeTree(date, (a, date), 8192)''')
instance_test_mutations.query(
'''INSERT INTO test_mutations_with_ast_elements SELECT '2019-07-29' AS date, 1, toString(number) FROM numbers(1)''')
'''INSERT INTO test_mutations_with_ast_elements SELECT '2019-07-29' AS date, 1, toString(number) FROM numbers(1) SETTINGS force_index_by_date = 0, force_primary_key = 0''')
yield cluster
finally:
cluster.shutdown()
@ -38,14 +38,14 @@ def test_mutations_with_merge_background_task(started_cluster):
instance_test_mutations.query('''DETACH TABLE test_mutations_with_ast_elements''')
instance_test_mutations.query('''ATTACH TABLE test_mutations_with_ast_elements''')
return int(instance.query(
"SELECT sum(is_done) FROM system.mutations WHERE table = 'test_mutations_with_ast_elements'").rstrip())
"SELECT sum(is_done) FROM system.mutations WHERE table = 'test_mutations_with_ast_elements' SETTINGS force_index_by_date = 0, force_primary_key = 0").rstrip())
if get_done_mutations(instance_test_mutations) == 100:
all_done = True
break
print instance_test_mutations.query(
"SELECT mutation_id, command, parts_to_do, is_done FROM system.mutations WHERE table = 'test_mutations_with_ast_elements' FORMAT TSVWithNames")
"SELECT mutation_id, command, parts_to_do, is_done FROM system.mutations WHERE table = 'test_mutations_with_ast_elements' SETTINGS force_index_by_date = 0, force_primary_key = 0 FORMAT TSVWithNames")
assert all_done
@ -59,4 +59,4 @@ def test_mutations_with_truncate_table(started_cluster):
instance_test_mutations.query("TRUNCATE TABLE test_mutations_with_ast_elements")
assert instance_test_mutations.query(
"SELECT COUNT() FROM system.mutations WHERE table = 'test_mutations_with_ast_elements'").rstrip() == '0'
"SELECT COUNT() FROM system.mutations WHERE table = 'test_mutations_with_ast_elements SETTINGS force_index_by_date = 0, force_primary_key = 0'").rstrip() == '0'