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

Fixing prewhere.

Browse Source
This commit is contained in:
Nikolai Kochetov 2024-09-18 16:51:18 +00:00
parent 79a62c99c5
commit de30ec1d1d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Planner/PlannerJoinTree.cpp
View File

@ -778,7 +778,18 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
auto & prewhere_info = table_expression_query_info.prewhere_info; auto & prewhere_info = table_expression_query_info.prewhere_info;
const auto & prewhere_actions = table_expression_data.getPrewhereFilterActions(); const auto & prewhere_actions = table_expression_data.getPrewhereFilterActions();
if (prewhere_actions) std::vector<std::pair<FilterDAGInfo, std::string>> where_filters;
if (prewhere_actions && select_query_options.build_logical_plan)
{
where_filters.emplace_back(
FilterDAGInfo{
prewhere_actions->clone(),
prewhere_actions->getOutputs().at(0)->result_name,
true},
"Prewhere");
}
else if (prewhere_actions)
{ {
prewhere_info = std::make_shared<PrewhereInfo>(); prewhere_info = std::make_shared<PrewhereInfo>();
prewhere_info->prewhere_actions = prewhere_actions->clone(); prewhere_info->prewhere_actions = prewhere_actions->clone();
@ -791,7 +802,6 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
const auto & columns_names = table_expression_data.getColumnNames(); const auto & columns_names = table_expression_data.getColumnNames();
std::vector<std::pair<FilterDAGInfo, std::string>> where_filters;
const auto add_filter = [&](FilterDAGInfo & filter_info, std::string description) const auto add_filter = [&](FilterDAGInfo & filter_info, std::string description)
{ {
bool is_final = table_expression_query_info.table_expression_modifiers bool is_final = table_expression_query_info.table_expression_modifiers