mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 08:40:50 +00:00
Follow up for #58554. Cleanup.
This commit is contained in:
parent
09d3b3c0d0
commit
fd2ee19f65
@ -1777,15 +1777,6 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
|
||||
|
||||
child = child_data.to_second;
|
||||
}
|
||||
|
||||
/// Input from second DAG should also be in the first.
|
||||
// if (copy.type == ActionType::INPUT)
|
||||
// {
|
||||
// auto & input_copy = first_nodes.emplace_back(*cur.node);
|
||||
// assert(cur_data.to_first == nullptr);
|
||||
// cur_data.to_first = &input_copy;
|
||||
// new_inputs.push_back(cur.node);
|
||||
// }
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1837,10 +1828,8 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
|
||||
for (const auto * input : new_inputs)
|
||||
{
|
||||
const auto & cur = data[input];
|
||||
if (cur.to_second)
|
||||
second_inputs.push_back(cur.to_second);
|
||||
if (cur.to_first)
|
||||
first_outputs.push_back(cur.to_first);
|
||||
second_inputs.push_back(cur.to_second);
|
||||
first_outputs.push_back(cur.to_first);
|
||||
}
|
||||
|
||||
for (const auto * input_node : inputs)
|
||||
|
@ -4,9 +4,8 @@
|
||||
#include <Processors/QueryPlan/ReadFromMergeTree.h>
|
||||
#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
|
||||
#include <Interpreters/ActionsDAG.h>
|
||||
#include <Planner/ActionsChain.h>
|
||||
#include "Functions/FunctionsLogical.h"
|
||||
#include "Functions/IFunctionAdaptors.h"
|
||||
#include <Functions/FunctionsLogical.h>
|
||||
#include <Functions/IFunctionAdaptors.h>
|
||||
|
||||
namespace DB
|
||||
{
|
||||
|
@ -132,9 +132,6 @@ MergeTreeWhereOptimizer::FilterActionsOptimizeResult MergeTreeWhereOptimizer::op
|
||||
if (!optimize_result)
|
||||
return {};
|
||||
|
||||
// if (optimize_result->where_conditions.empty())
|
||||
// return {.prewhere_nodes = {}, .fully_moved_to_prewhere = true};
|
||||
|
||||
std::unordered_set<const ActionsDAG::Node *> prewhere_conditions;
|
||||
for (const auto & condition : optimize_result->prewhere_conditions)
|
||||
prewhere_conditions.insert(condition.node.getDAGNode());
|
||||
|
Loading…
Reference in New Issue
Block a user