From fd2ee19f657276f47d280af83e2bfc95132fe919 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Mon, 12 Feb 2024 13:37:25 +0000
Subject: [PATCH] Follow up for #58554. Cleanup.

---
 src/Interpreters/ActionsDAG.cpp                   | 15 ++-------------
 .../QueryPlan/Optimizations/optimizePrewhere.cpp  |  5 ++---
 .../MergeTree/MergeTreeWhereOptimizer.cpp         |  3 ---
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 4fd7c6d9117..7240679abb7 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -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)
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
index ec07f028f20..49e1a49f131 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
@@ -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
 {
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index c52a2fee051..d9a89b9d4ef 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -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());