wbtiger
/
ByConity
mirror of https://github.com/ByConity/ByConity
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix SummingMergeTree argument checking logic. 

This patch fixes the Nested Column Name checking logic, which allows nested
columns be explicitly specified in SummingMergeTree engine.
This commit is contained in:
Amos Bird 2017-10-11 15:26:25 +08:00 committed by alexey-milovidov
parent c05dfc201f
commit f30841d5ab
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -318,7 +318,7 @@ void MergeTreeData::MergingParams::check(const NamesAndTypesList & columns) cons
for (const auto & column_to_sum : columns_to_sum) for (const auto & column_to_sum : columns_to_sum)
if (columns.end() == std::find_if(columns.begin(), columns.end(), if (columns.end() == std::find_if(columns.begin(), columns.end(),
[&](const NameAndTypePair & name_and_type) { return column_to_sum == name_and_type.name; })) [&](const NameAndTypePair & name_and_type) { return column_to_sum == DataTypeNested::extractNestedTableName(name_and_type.name); }))
throw Exception("Column " + column_to_sum + " listed in columns to sum does not exist in table declaration."); throw Exception("Column " + column_to_sum + " listed in columns to sum does not exist in table declaration.");
} }

4
dbms/tests/queries/0_stateless/00146_summing_merge_tree_nested_map.reference
View File

@ -2,3 +2,7 @@
[1] [250] [1] [250]
[1,2] [250,150] [1,2] [250,150]
[2] [150] [2] [150]
20 [1,2] [100,150]
20 [1] [250]
20 [1,2] [250,150]
20 [2] [150]

11
dbms/tests/queries/0_stateless/00146_summing_merge_tree_nested_map.sql
View File

@ -8,3 +8,14 @@ optimize table test.nested_map;
select `SomeMap.ID`, `SomeMap.Num` from test.nested_map; select `SomeMap.ID`, `SomeMap.Num` from test.nested_map;
drop table test.nested_map; drop table test.nested_map;
drop table if exists test.nested_map_explicit;
create table test.nested_map_explicit (d default today(), k UInt64, SomeIntExcluded UInt32, SomeMap Nested(ID UInt32, Num Int64)) engine=SummingMergeTree(d, k, 8192, (SomeMap));
insert into test.nested_map_explicit (k, `SomeIntExcluded`, `SomeMap.ID`, `SomeMap.Num`) values (0, 20, [1],[100]),(1, 20, [1],[100]),(2, 20, [1],[100]),(3, 20, [1,2],[100,150]);
insert into test.nested_map_explicit (k, `SomeIntExcluded`, `SomeMap.ID`, `SomeMap.Num`) values (0, 20, [2],[150]),(1, 20, [1],[150]),(2, 20, [1,2],[150,150]),(3, 20, [1],[-100]);
optimize table test.nested_map_explicit;
select `SomeIntExcluded`, `SomeMap.ID`, `SomeMap.Num` from test.nested_map_explicit;
drop table test.nested_map_explicit;