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

do not allow merge from wide to compact parts

Browse Source
This commit is contained in:
Anton Popov 2020-12-23 03:11:32 +03:00
parent 410d0a51b5
commit 78c4b9f2bc
4 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,13 +79,16 @@ void FutureMergedMutatedPart::assign(MergeTreeData::DataPartsVector parts_)
size_t sum_rows = 0;
size_t sum_bytes_uncompressed = 0;
MergeTreeDataPartType future_part_type;
for (const auto & part : parts_)
{
sum_rows += part->rows_count;
sum_bytes_uncompressed += part->getTotalColumnsSize().data_uncompressed;
future_part_type = std::min(future_part_type, part->getType());
}
auto future_part_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
auto chosen_type = parts_.front()->storage.choosePartTypeOnDisk(sum_bytes_uncompressed, sum_rows);
future_part_type = std::min(future_part_type, chosen_type);
assign(std::move(parts_), future_part_type);
}

12
src/Storages/MergeTree/MergeTreeDataPartType.h
View File

@ -18,7 +18,7 @@ public:
/// Data of all columns is stored in one file. Marks are also stored in single file.
COMPACT,
/// Format with buffering data in RAM. Not implemented yet.
/// Format with buffering data in RAM.
IN_MEMORY,
UNKNOWN,
@ -37,6 +37,16 @@ public:
return !(*this == other);
}
bool operator<(const MergeTreeDataPartType & other) const
{
return value < other.value;
}
bool operator>(const MergeTreeDataPartType & other) const
{
return value > other.value;
}
void fromString(const String & str);
String toString() const;

9
tests/queries/0_stateless/01606_merge_from_wide_to_compact.reference Normal file
View File

@ -0,0 +1,9 @@
all_1_1_0 Wide
all_2_2_0 Wide
all_3_3_0 Wide
all_1_3_1 Wide
300000
all_1_3_1 Wide
all_4_4_0 Compact
all_1_4_2 Wide
400000

36
tests/queries/0_stateless/01606_merge_from_wide_to_compact.sql Normal file
View File

@ -0,0 +1,36 @@
DROP TABLE IF EXISTS wide_to_comp;
CREATE TABLE wide_to_comp (a Int, b Int, c Int)
ENGINE = MergeTree ORDER BY a
settings vertical_merge_algorithm_min_rows_to_activate = 1,
vertical_merge_algorithm_min_columns_to_activate = 1,
min_bytes_for_wide_part = 0;
SYSTEM STOP merges wide_to_comp;
INSERT INTO wide_to_comp SELECT number, number, number FROM numbers(100000);
INSERT INTO wide_to_comp SELECT number, number, number FROM numbers(100000);
INSERT INTO wide_to_comp SELECT number, number, number FROM numbers(100000);
SELECT name, part_type FROM system.parts WHERE table = 'wide_to_comp' AND database = currentDatabase() AND active ORDER BY name;
ALTER TABLE wide_to_comp MODIFY setting min_rows_for_wide_part = 10000000;
SYSTEM START merges wide_to_comp;
OPTIMIZE TABLE wide_to_comp FINAL;
SELECT name, part_type FROM system.parts WHERE table = 'wide_to_comp' AND database = currentDatabase() AND active ORDER BY name;
SELECT count() FROM wide_to_comp WHERE not ignore(*);
SYSTEM STOP merges wide_to_comp;
INSERT INTO wide_to_comp SELECT number, number, number FROM numbers(100000);
SELECT name, part_type FROM system.parts WHERE table = 'wide_to_comp' AND database = currentDatabase() AND active ORDER BY name;
ALTER TABLE wide_to_comp MODIFY setting min_rows_for_wide_part = 10000000;
SYSTEM START merges wide_to_comp;
OPTIMIZE TABLE wide_to_comp FINAL;
SELECT name, part_type FROM system.parts WHERE table = 'wide_to_comp' AND database = currentDatabase() AND active ORDER BY name;
SELECT count() FROM wide_to_comp WHERE not ignore(*);
DROP TABLE wide_to_comp;