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

Fix: consider collation in column sort description comparison

Browse Source
This commit is contained in:
Igor Nikonov 2022-07-12 13:14:10 +00:00
parent ea5e7793b2
commit 2c8d9080bd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/SortDescription.h
View File

@ -8,6 +8,7 @@
#include <Core/SettingsEnums.h>
#include <Common/IntervalKind.h>
#include <DataTypes/IDataType.h>
#include <Columns/Collator.h>
class Collator;
@ -65,7 +66,8 @@ struct SortColumnDescription
bool operator == (const SortColumnDescription & other) const
{
return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction;
return column_name == other.column_name && direction == other.direction && nulls_direction == other.nulls_direction
&& (collator && other.collator && collator->getLocale() == other.collator->getLocale());
}
bool operator != (const SortColumnDescription & other) const

2
src/Processors/QueryPlan/SortingStep.h
View File

@ -69,7 +69,7 @@ private:
const SortDescription prefix_description;
const SortDescription result_description;
size_t max_block_size;
const size_t max_block_size;
UInt64 limit;
SizeLimits size_limits;