Resolve conflict

Signed-off-by: JaySon-Huang <tshent@qq.com>

Author: JaySon-Huang

dbms/src/Storages/DeltaMerge/Filter/PushDownExecutor.h

@@ -14,14 +14,12 @@
 
 #pragma once
 
-<<<<<<< HEAD
-=======
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include <Poco/JSON/Object.h>
 #pragma GCC diagnostic pop
+
 #include <Common/config.h> // For ENABLE_CLARA
->>>>>>> fc932c9f0d (Storages: Deprecated libclara for normal build (#10325))
 #include <Flash/Coprocessor/TiDBTableScan.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Storages/DeltaMerge/Filter/RSOperator.h>
@@ -51,20 +49,16 @@ class PushDownExecutor
         const ANNQueryInfoPtr & ann_query_info_,
 #if ENABLE_CLARA
         const FTSQueryInfoPtr & fts_query_info_,
-<<<<<<< HEAD
-        const ExpressionActionsPtr & beofre_where_,
-=======
 #endif
         const ExpressionActionsPtr & before_where_,
->>>>>>> fc932c9f0d (Storages: Deprecated libclara for normal build (#10325))
         const ExpressionActionsPtr & project_after_where_,
         const ColumnDefinesPtr & filter_columns_,
         const String filter_column_name_,
         const ExpressionActionsPtr & extra_cast_,
         const ColumnDefinesPtr & columns_after_cast_,
         const ColumnRangePtr & column_range_)
         : rs_operator(rs_operator_)
-        , before_where(beofre_where_)
+        , before_where(before_where_)
         , project_after_where(project_after_where_)
         , filter_column_name(std::move(filter_column_name_))
         , filter_columns(filter_columns_)
@@ -132,7 +126,7 @@ class PushDownExecutor
     const ExpressionActionsPtr before_where;
     // The projection after the filter, used to remove the tmp filter column
     // Used to construct the ExpressionBlockInputStream
-    // Note: ususally we will remove the tmp filter column in the LateMaterializationBlockInputStream, this only used for unexpected cases
+    // Note: usually we will remove the tmp filter column in the LateMaterializationBlockInputStream, this only used for unexpected cases
     const ExpressionActionsPtr project_after_where;
     const String filter_column_name;
     // The columns needed by the filter expression