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

Merge pull request #53699 from ClickHouse/vdimir/filter_pushdown_const_bug

Browse Source
This commit is contained in:
vdimir 2023-08-28 11:45:05 +02:00 committed by GitHub
commit b92c436c29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Interpreters/ActionsDAG.cpp
View File

@ -2191,8 +2191,8 @@ ActionsDAGPtr ActionsDAG::cloneActionsForFilterPushDown(
/// Replace predicate result to constant 1.
Node node;
node.type = ActionType::COLUMN;
node.result_name = std::move(predicate->result_name);
node.result_type = std::move(predicate->result_type);
node.result_name = predicate->result_name;
node.result_type = predicate->result_type;
node.column = node.result_type->createColumnConst(0, 1);
if (predicate->type != ActionType::INPUT)

4
src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.cpp
View File

@ -201,5 +201,9 @@ void CreateSetAndFilterOnTheFlyStep::updateOutputStream()
output_stream = createOutputStream(input_streams.front(), input_streams.front().header, getDataStreamTraits());
}
bool CreateSetAndFilterOnTheFlyStep::isColumnPartOfSetKey(const String & column_name) const
{
return std::find(column_names.begin(), column_names.end(), column_name) != column_names.end();
}
}

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

@ -35,6 +35,8 @@ public:
SetWithStatePtr getSet() const { return own_set; }
bool isColumnPartOfSetKey(const String & column_name) const;
/// Set for another stream.
void setFiltering(SetWithStatePtr filtering_set_) { filtering_set = filtering_set_; }

11
src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
View File

@ -428,8 +428,15 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
return updated_steps;
}
if (auto updated_steps = simplePushDownOverStep<CreateSetAndFilterOnTheFlyStep>(parent_node, nodes, child))
return updated_steps;
if (const auto * join_filter_set_step = typeid_cast<CreateSetAndFilterOnTheFlyStep *>(child.get()))
{
const auto & filter_column_name = assert_cast<const FilterStep *>(parent_node->step.get())->getFilterColumnName();
bool can_remove_filter = !join_filter_set_step->isColumnPartOfSetKey(filter_column_name);
Names allowed_inputs = child->getOutputStream().header.getNames();
if (auto updated_steps = tryAddNewFilterStep(parent_node, nodes, allowed_inputs, can_remove_filter))
return updated_steps;
}
if (auto * union_step = typeid_cast<UnionStep *>(child.get()))
{

8
tests/queries/0_stateless/02861_filter_pushdown_const_bug.reference Normal file
View File

@ -0,0 +1,8 @@
1
1
1
1 1
1
1
1
1 1

18
tests/queries/0_stateless/02861_filter_pushdown_const_bug.sql Normal file
View File

@ -0,0 +1,18 @@
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (key UInt8) ENGINE = Memory;
INSERT INTO t1 VALUES (1),(2);
SET join_algorithm = 'full_sorting_merge';
SELECT key FROM ( SELECT key FROM t1 ) AS t1 JOIN ( SELECT key FROM t1 ) AS t2 ON t1.key = t2.key WHERE key;
SELECT key FROM ( SELECT 1 AS key ) AS t1 JOIN ( SELECT 1 AS key ) AS t2 ON t1.key = t2.key WHERE key;
SELECT * FROM ( SELECT 1 AS key GROUP BY NULL ) AS t1 INNER JOIN (SELECT 1 AS key) AS t2 ON t1.key = t2.key WHERE t1.key ORDER BY key;
SET max_rows_in_set_to_optimize_join = 0;
SELECT key FROM ( SELECT key FROM t1 ) AS t1 JOIN ( SELECT key FROM t1 ) AS t2 ON t1.key = t2.key WHERE key;
SELECT key FROM ( SELECT 1 AS key ) AS t1 JOIN ( SELECT 1 AS key ) AS t2 ON t1.key = t2.key WHERE key;
SELECT * FROM ( SELECT 1 AS key GROUP BY NULL ) AS t1 INNER JOIN (SELECT 1 AS key) AS t2 ON t1.key = t2.key WHERE t1.key ORDER BY key;
DROP TABLE IF EXISTS t1;