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

Merge pull request #53489 from ClickHouse/fix-wrong-column-order-in-parallel-final

Browse Source 
Fix wrong columns order for queries with parallel FINAL.
This commit is contained in:
Nikolai Kochetov 2023-08-17 13:22:13 +02:00 committed by GitHub
commit 8dbe82c192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Processors/QueryPlan/PartsSplitter.cpp
View File

@ -254,6 +254,32 @@ namespace ErrorCodes
extern const int LOGICAL_ERROR;
}
static void reorderColumns(ActionsDAG & dag, const Block & header, const std::string & filter_column)
{
std::unordered_map<std::string_view, const ActionsDAG::Node *> inputs_map;
for (const auto * input : dag.getInputs())
inputs_map[input->result_name] = input;
for (const auto & col : header)
{
auto & input = inputs_map[col.name];
if (!input)
input = &dag.addInput(col);
}
ActionsDAG::NodeRawConstPtrs new_outputs;
new_outputs.reserve(header.columns() + 1);
new_outputs.push_back(&dag.findInOutputs(filter_column));
for (const auto & col : header)
{
auto & input = inputs_map[col.name];
new_outputs.push_back(input);
}
dag.getOutputs() = std::move(new_outputs);
}
Pipes buildPipesForReadingByPKRanges(
const KeyDescription & primary_key,
ExpressionActionsPtr sorting_expr,
@ -279,6 +305,7 @@ Pipes buildPipesForReadingByPKRanges(
continue;
auto syntax_result = TreeRewriter(context).analyze(filter_function, primary_key.expression->getRequiredColumnsWithTypes());
auto actions = ExpressionAnalyzer(filter_function, syntax_result, context).getActionsDAG(false);
reorderColumns(*actions, pipes[i].getHeader(), filter_function->getColumnName());
ExpressionActionsPtr expression_actions = std::make_shared<ExpressionActions>(std::move(actions));
auto description = fmt::format(
"filter values in [{}, {})", i ? ::toString(borders[i - 1]) : "-inf", i < borders.size() ? ::toString(borders[i]) : "+inf");

3
src/Processors/Transforms/FilterSortedStreamByRange.h
View File

@ -27,6 +27,9 @@ public:
true)
, filter_transform(header_, expression_, filter_column_name_, remove_filter_column_, on_totals_)
{
assertBlocksHaveEqualStructure(
header_, getOutputPort().getHeader(),
"Expression for FilterSortedStreamByRange should not change header");
}
String getName() const override { return "FilterSortedStreamByRange"; }

1
tests/queries/0_stateless/02841_parallel_final_wrong_columns_order.reference Normal file
View File

@ -0,0 +1 @@
1000000

9
tests/queries/0_stateless/02841_parallel_final_wrong_columns_order.sql Normal file
View File

@ -0,0 +1,9 @@
-- Tags: no-random-merge-tree-settings
-- Because we insert one million rows, it shouldn't choose too low index granularity.
drop table if exists tab2;
create table tab2 (id String, version Int64, l String, accountCode String, z Int32) engine = ReplacingMergeTree(z) PRIMARY KEY (accountCode, id) ORDER BY (accountCode, id, version, l);
insert into tab2 select toString(number), number, toString(number), toString(number), 0 from numbers(1e6);
set max_threads=2;
select count() from tab2 final;
DROP TABLE tab2;