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

Avoid to remove sorting expression for now

Browse Source
This commit is contained in:
Igor Nikonov 2022-12-15 21:11:02 +00:00
parent 629f317d7d
commit ea0bd38ab1
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Processors/QueryPlan/Optimizations/removeRedundantOrderBy.cpp
View File

@ -171,8 +171,8 @@ private:
chassert(typeid_cast<ExpressionStep *>(sorting_node->children.front()->step.get())); chassert(typeid_cast<ExpressionStep *>(sorting_node->children.front()->step.get()));
chassert(!sorting_node->children.front()->children.empty()); chassert(!sorting_node->children.front()->children.empty());
/// need to remove sorting and its expression from plan /// need to remove sorting
parent_node->children.front() = sorting_node->children.front()->children.front(); parent_node->children.front() = sorting_node->children.front();
return true; return true;
} }

29
tests/queries/0_stateless/02496_remove_redundant_order_by.reference
View File

@ -22,7 +22,7 @@ Expression (Project names)
Header: number UInt64 Header: number UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_0 UInt64 Header: number_0 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))))
Header: number_0 UInt64 Header: number_0 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -40,7 +40,7 @@ Header: number UInt64
Header: number_1 UInt64 Header: number_1 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_1 UInt64 Header: number_1 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_1 UInt64 Header: number_1 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -57,7 +57,7 @@ Header: number UInt64
Header: number_1 UInt64 Header: number_1 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_1 UInt64 Header: number_1 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_1 UInt64 Header: number_1 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -72,7 +72,7 @@ Header: t1.number UInt64
Header: t1.number_0 UInt64 Header: t1.number_0 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_2 UInt64 Header: number_2 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_2 UInt64 Header: number_2 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -80,7 +80,7 @@ Header: t1.number UInt64
Header: t2.number_1 UInt64 Header: t2.number_1 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_4 UInt64 Header: number_4 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_4 UInt64 Header: number_4 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -97,11 +97,11 @@ Header: t1.number UInt64
Join (JOIN FillRightFirst) Join (JOIN FillRightFirst)
Header: t1.number_0 UInt64 Header: t1.number_0 UInt64
t2.number_1 UInt64 t2.number_1 UInt64
Expression ((Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))))) Expression ((Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))
Header: t1.number_0 UInt64 Header: t1.number_0 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
Expression ((Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))))) Expression ((Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))))
Header: t2.number_1 UInt64 Header: t2.number_1 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -111,7 +111,7 @@ Header: sum(number) UInt64
Aggregating Aggregating
Header: number_0 UInt64 Header: number_0 UInt64
sum(number_0) UInt64 sum(number_0) UInt64
Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))))) Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers))))))))))
Header: number_0 UInt64 Header: number_0 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -125,7 +125,7 @@ Header: any(number) UInt64
Header: number_0 UInt64 Header: number_0 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_1 UInt64 Header: number_1 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_1 UInt64 Header: number_1 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -140,7 +140,7 @@ Header: a UInt64
Aggregating Aggregating
Header: number_1 UInt64 Header: number_1 UInt64
sum(number_1) UInt64 sum(number_1) UInt64
Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers))))) Expression ((Before GROUP BY + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers))))))
Header: number_1 UInt64 Header: number_1 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -174,7 +174,7 @@ Header: a UInt64
Header: number_1 UInt64 Header: number_1 UInt64
Sorting (Sorting for ORDER BY) Sorting (Sorting for ORDER BY)
Header: number_2 UInt64 Header: number_2 UInt64
Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))) Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Project names + (Before ORDER BY + (Projection + Change column names to column identifiers)))))))
Header: number_2 UInt64 Header: number_2 UInt64
ReadFromStorage (SystemNumbers) ReadFromStorage (SystemNumbers)
Header: number UInt64 Header: number UInt64
@ -198,6 +198,7 @@ Expression (Project names)
Expression (Projection) Expression (Projection)
Expression (Change column names to column identifiers) Expression (Change column names to column identifiers)
Expression (Project names) Expression (Project names)
Expression (Projection) Expression (Before ORDER BY)
Expression (Change column names to column identifiers) Expression (Projection)
ReadFromStorage (SystemNumbers) Expression (Change column names to column identifiers)
ReadFromStorage (SystemNumbers)