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

Fix read in order optimization of COLLATE is present #22379

Browse Source
This commit is contained in:
Alexey Milovidov 2021-04-20 21:20:45 +03:00
parent 632a5288fa
commit 9bc0706d2f
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1510,7 +1510,8 @@ ExpressionAnalysisResult::ExpressionAnalysisResult(
optimize_read_in_order =
settings.optimize_read_in_order
&& storage && query.orderBy()
&& storage
&& query.orderBy()
&& !query_analyzer.hasAggregation()
&& !query_analyzer.hasWindow()
&& !query.final()

9
src/Storages/ReadInOrderOptimizer.cpp
View File

@ -44,7 +44,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
int read_direction = required_sort_description.at(0).direction;
size_t prefix_size = std::min(required_sort_description.size(), sorting_key_columns.size());
auto aliase_columns = metadata_snapshot->getColumns().getAliases();
auto aliased_columns = metadata_snapshot->getColumns().getAliases();
for (size_t i = 0; i < prefix_size; ++i)
{
@ -55,6 +55,11 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
/// or in some simple cases when order key element is wrapped into monotonic function.
auto apply_order_judge = [&] (const ExpressionActions::Actions & actions, const String & sort_column)
{
/// If required order depend on collation, it cannot be matched with primary key order.
/// Because primary keys cannot have collations.
if (required_sort_description[i].collator)
return false;
int current_direction = required_sort_description[i].direction;
/// For the path: order by (sort_column, ...)
if (sort_column == sorting_key_columns[i] && current_direction == read_direction)
@ -125,7 +130,7 @@ InputOrderInfoPtr ReadInOrderOptimizer::getInputOrder(const StorageMetadataPtr &
/// currently we only support alias column without any function wrapper
/// ie: `order by aliased_column` can have this optimization, but `order by function(aliased_column)` can not.
/// This suits most cases.
if (context->getSettingsRef().optimize_respect_aliases && aliase_columns.contains(required_sort_description[i].column_name))
if (context->getSettingsRef().optimize_respect_aliases && aliased_columns.contains(required_sort_description[i].column_name))
{
auto column_expr = metadata_snapshot->getColumns().get(required_sort_description[i].column_name).default_desc.expression->clone();
replaceAliasColumnsInQuery(column_expr, metadata_snapshot->getColumns(), forbidden_columns, context);

6
tests/queries/0_stateless/01833_test_collation_alvarotuso.reference Normal file
View File

@ -0,0 +1,6 @@
a a
A A
b b
B B
c c
C C

21
tests/queries/0_stateless/01833_test_collation_alvarotuso.sql Normal file
View File

@ -0,0 +1,21 @@
DROP TABLE IF EXISTS test_collation;
CREATE TABLE test_collation
(
`v` String,
`v2` String
)
ENGINE = MergeTree
ORDER BY v
SETTINGS index_granularity = 8192;
insert into test_collation values ('A', 'A');
insert into test_collation values ('B', 'B');
insert into test_collation values ('C', 'C');
insert into test_collation values ('a', 'a');
insert into test_collation values ('b', 'b');
insert into test_collation values ('c', 'c');
SELECT * FROM test_collation ORDER BY v ASC COLLATE 'en';
DROP TABLE test_collation;