From ac8dd527dcfd3028fb440d98ad5eebbb7eced5cc Mon Sep 17 00:00:00 2001
From: Antonio Andelic <antonio@clickhouse.com>
Date: Tue, 28 Mar 2023 07:47:37 +0000
Subject: [PATCH] Address PR comments

---
 src/Planner/Planner.cpp         | 5 -----
 src/Planner/PlannerJoinTree.cpp | 7 +++----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index e38f460e7c5..a8e0d80ce8c 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -38,7 +38,6 @@
 #include <Storages/IStorage.h>
 
 #include <Analyzer/Utils.h>
-#include <Analyzer/Passes/QueryAnalysisPass.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/SortNode.h>
@@ -70,10 +69,6 @@
 #include <Planner/CollectColumnIdentifiers.h>
 #include <Planner/PlannerQueryProcessingInfo.h>
 
-#include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
-
-#include <Storages/StorageDistributed.h>
-
 namespace DB
 {
 
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index 1741cca17c5..0479170eba1 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -1,7 +1,6 @@
 #include <Planner/PlannerJoinTree.h>
 
 #include <Common/scope_guard_safe.h>
-#include "Storages/SelectQueryInfo.h"
 
 #include <Columns/ColumnAggregateFunction.h>
 
@@ -439,8 +438,8 @@ FilterDAGInfo buildRowPolicyFilterIfNeeded(const StoragePtr & storage,
 }
 
 FilterDAGInfo buildCustomKeyFilterIfNeeded(const StoragePtr & storage,
-        SelectQueryInfo & table_expression_query_info,
-        PlannerContextPtr & planner_context)
+    SelectQueryInfo & table_expression_query_info,
+    PlannerContextPtr & planner_context)
 {
     const auto & query_context = planner_context->getQueryContext();
     const auto & settings = query_context->getSettingsRef();
@@ -688,7 +687,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     }
                     else
                     {
-                        if (auto * distributed = dynamic_cast<StorageDistributed *>(storage.get());
+                        if (auto * distributed = typeid_cast<StorageDistributed *>(storage.get());
                             distributed && canUseCustomKey(settings, *distributed->getCluster(), *query_context))
                         {
                             table_expression_query_info.use_custom_key = true;