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

Fix indices calculation during merge

Browse Source
This commit is contained in:
alesapin 2020-06-01 22:58:11 +03:00
parent ce6db6927b
commit ad6447398f
5 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Storages/IndicesDescription.cpp
View File

@ -108,4 +108,15 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
return result; return result;
} }
ExpressionActionsPtr IndicesDescription::getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const
{
ASTPtr combined_expr_list = std::make_shared<ASTExpressionList>();
for (const auto & index : *this)
for (const auto & index_expr : index.expression_list_ast->children)
combined_expr_list->children.push_back(index_expr->clone());
auto syntax_result = SyntaxAnalyzer(context).analyze(combined_expr_list, columns.getAllPhysical());
return ExpressionAnalyzer(combined_expr_list, syntax_result, context).getActions(false);
}
} }

3
src/Storages/IndicesDescription.h
View File

@ -59,6 +59,9 @@ struct IndicesDescription : public std::vector<IndexDescription>
String toString() const; String toString() const;
/// Parse description from string /// Parse description from string
static IndicesDescription parse(const String & str, const ColumnsDescription & columns, const Context & context); static IndicesDescription parse(const String & str, const ColumnsDescription & columns, const Context & context);
/// Return common expression for all stored indices
ExpressionActionsPtr getSingleExpressionForIndices(const ColumnsDescription & columns, const Context & context) const;
}; };
} }

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

@ -792,13 +792,15 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMergerMutator::mergePartsToTempor
if (need_remove_expired_values) if (need_remove_expired_values)
merged_stream = std::make_shared<TTLBlockInputStream>(merged_stream, data, new_data_part, time_of_merge, force_ttl); merged_stream = std::make_shared<TTLBlockInputStream>(merged_stream, data, new_data_part, time_of_merge, force_ttl);
const auto & index_factory = MergeTreeIndexFactory::instance();
if (data.hasSecondaryIndices()) if (data.hasSecondaryIndices())
{ {
merged_stream = std::make_shared<ExpressionBlockInputStream>(merged_stream, data.getPrimaryKeyAndSkipIndicesExpression()); const auto & indices = data.getSecondaryIndices();
merged_stream = std::make_shared<ExpressionBlockInputStream>(merged_stream, indices.getSingleExpressionForIndices(data.getColumns(), data.global_context));
merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream); merged_stream = std::make_shared<MaterializingBlockInputStream>(merged_stream);
} }
const auto & index_factory = MergeTreeIndexFactory::instance();
MergedBlockOutputStream to{ MergedBlockOutputStream to{
new_data_part, new_data_part,
merging_columns, merging_columns,

1
tests/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.reference Normal file
View File

@ -0,0 +1 @@
1

14
tests/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.sql Normal file
View File

@ -0,0 +1,14 @@
drop table if exists data_01292;
create table data_01292 (
key Int,
index key_idx (key) type minmax granularity 1
) Engine=MergeTree() ORDER BY (key+0);
insert into data_01292 values (1);
optimize table data_01292 final;
select * from data_01292 where key > 0;
drop table if exists data_01292;