thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise

Browse Source
This commit is contained in:
Amos Bird 2022-01-29 20:55:52 +08:00
parent 2b3ce910c6
commit 04cff632db
No known key found for this signature in database
GPG Key ID: 80D430DCBECFEDB4
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Columns/IColumn.h
View File

@ -318,18 +318,15 @@ public:
virtual void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, EqualRanges & equal_ranges) const = 0; virtual void updatePermutation(bool reverse, size_t limit, int nan_direction_hint, Permutation & res, EqualRanges & equal_ranges) const = 0;
/** Equivalent to getPermutation and updatePermutation but collator is used to compare values. /** Equivalent to getPermutation and updatePermutation but collator is used to compare values.
* Overrides in String, LowCardinality(String), Nullable(String) and for Array and Tuple, containing them. * Supported for String, LowCardinality(String), Nullable(String) and for Array and Tuple, containing them.
*/ */
virtual void virtual void getPermutationWithCollation(const Collator &, bool, size_t, int, Permutation &) const
getPermutationWithCollation(const Collator &, bool reverse, size_t limit, int nan_direction_hint, Permutation & res) const
{ {
getPermutation(reverse, limit, nan_direction_hint, res); throw Exception("Collations could be specified only for String, LowCardinality(String), Nullable(String) or for Array or Tuple, containing them.", ErrorCodes::BAD_COLLATION);
} }
virtual void updatePermutationWithCollation(const Collator &, bool, size_t, int, Permutation &, EqualRanges&) const
virtual void updatePermutationWithCollation(
const Collator &, bool reverse, size_t limit, int nan_direction_hint, Permutation & res, EqualRanges & equal_ranges) const
{ {
updatePermutation(reverse, limit, nan_direction_hint, res, equal_ranges); throw Exception("Collations could be specified only for String, LowCardinality(String), Nullable(String) or for Array or Tuple, containing them.", ErrorCodes::BAD_COLLATION);
} }
/** Copies each element according offsets parameter. /** Copies each element according offsets parameter.

40
src/Interpreters/sortBlock.cpp
View File

@ -27,7 +27,7 @@ static bool isCollationRequired(const SortColumnDescription & description)
struct ColumnWithSortDescription struct ColumnWithSortDescription
{ {
const IColumn * column = nullptr; const IColumn * column = nullptr;
const SortColumnDescription * description = nullptr; SortColumnDescription description;
/// It means, that this column is ColumnConst /// It means, that this column is ColumnConst
bool column_const = false; bool column_const = false;
@ -35,14 +35,18 @@ struct ColumnWithSortDescription
using ColumnsWithSortDescriptions = std::vector<ColumnWithSortDescription>; using ColumnsWithSortDescriptions = std::vector<ColumnWithSortDescription>;
void flattenTupleColumnRecursively( void flattenTupleColumnRecursively(
ColumnsWithSortDescriptions & res, const ColumnTuple * tuple, const SortColumnDescription * description, bool is_constant) ColumnsWithSortDescriptions & res, const ColumnTuple * tuple, const SortColumnDescription & description, bool has_collation)
{ {
for (const auto & column : tuple->getColumns()) for (const auto & column : tuple->getColumns())
{ {
if (const auto * subtuple = typeid_cast<const ColumnTuple *>(column.get())) if (const auto * subtuple = typeid_cast<const ColumnTuple *>(column.get()))
flattenTupleColumnRecursively(res, subtuple, description, is_constant); flattenTupleColumnRecursively(res, subtuple, description, has_collation);
else else
res.emplace_back(ColumnWithSortDescription{column.get(), description, is_constant}); {
res.emplace_back(ColumnWithSortDescription{column.get(), description, isColumnConst(*column)});
if (has_collation && !res.back().column->isCollationSupported())
res.back().description.collator = nullptr;
}
} }
} }
@ -67,9 +71,9 @@ ColumnsWithSortDescriptions getColumnsWithSortDescription(const Block & block, c
ErrorCodes::BAD_COLLATION); ErrorCodes::BAD_COLLATION);
} }
if (const auto * tuple = typeid_cast<const ColumnTuple *>(column)) if (const auto * tuple = typeid_cast<const ColumnTuple *>(column))
flattenTupleColumnRecursively(res, tuple, &description[i], isColumnConst(*column)); flattenTupleColumnRecursively(res, tuple, description[i], isCollationRequired(description[i]));
else else
res.emplace_back(ColumnWithSortDescription{column, &description[i], isColumnConst(*column)}); res.emplace_back(ColumnWithSortDescription{column, description[i], isColumnConst(*column)});
} }
return res; return res;
} }
@ -88,7 +92,7 @@ struct PartialSortingLess
if (elem.column_const) if (elem.column_const)
res = 0; res = 0;
else else
res = elem.description->direction * elem.column->compareAt(a, b, *elem.column, elem.description->nulls_direction); res = elem.description.direction * elem.column->compareAt(a, b, *elem.column, elem.description.nulls_direction);
if (res < 0) if (res < 0)
return true; return true;
else if (res > 0) else if (res > 0)
@ -118,13 +122,13 @@ struct PartialSortingLessWithCollation
{ {
res = 0; res = 0;
} }
else if (isCollationRequired(*elem.description)) else if (isCollationRequired(elem.description))
{ {
res = elem.column->compareAtWithCollation(a, b, *elem.column, elem.description->nulls_direction, *elem.description->collator); res = elem.column->compareAtWithCollation(a, b, *elem.column, elem.description.nulls_direction, *elem.description.collator);
} }
else else
res = elem.column->compareAt(a, b, *elem.column, elem.description->nulls_direction); res = elem.column->compareAt(a, b, *elem.column, elem.description.nulls_direction);
res *= elem.description->direction; res *= elem.description.direction;
if (res < 0) if (res < 0)
return true; return true;
else if (res > 0) else if (res > 0)
@ -156,13 +160,13 @@ void sortBlock(Block & block, const SortDescription & description, UInt64 limit)
/// If only one column to sort by /// If only one column to sort by
if (columns_with_sort_desc.size() == 1) if (columns_with_sort_desc.size() == 1)
{ {
bool reverse = columns_with_sort_desc[0].description->direction == -1; bool reverse = columns_with_sort_desc[0].description.direction == -1;
const IColumn * column = columns_with_sort_desc[0].column; const IColumn * column = columns_with_sort_desc[0].column;
if (isCollationRequired(description[0])) if (isCollationRequired(description[0]))
column->getPermutationWithCollation(*description[0].collator, reverse, limit, description[0].nulls_direction, perm); column->getPermutationWithCollation(*description[0].collator, reverse, limit, description[0].nulls_direction, perm);
else else
{ {
int nan_direction_hint = columns_with_sort_desc[0].description->nulls_direction; int nan_direction_hint = columns_with_sort_desc[0].description.nulls_direction;
column->getPermutation(reverse, limit, nan_direction_hint, perm); column->getPermutation(reverse, limit, nan_direction_hint, perm);
} }
} }
@ -189,20 +193,20 @@ void sortBlock(Block & block, const SortDescription & description, UInt64 limit)
if (column.column_const) if (column.column_const)
continue; continue;
if (isCollationRequired(*column.description)) if (isCollationRequired(column.description))
{ {
column.column->updatePermutationWithCollation( column.column->updatePermutationWithCollation(
*column.description->collator, *column.description.collator,
column.description->direction < 0, column.description.direction < 0,
limit, limit,
column.description->nulls_direction, column.description.nulls_direction,
perm, perm,
ranges); ranges);
} }
else else
{ {
column.column->updatePermutation( column.column->updatePermutation(
column.description->direction < 0, limit, column.description->nulls_direction, perm, ranges); column.description.direction < 0, limit, column.description.nulls_direction, perm, ranges);
} }
} }
} }