From 73a3471fbdb73ee87006b7dc66b4c6abbd6f330c Mon Sep 17 00:00:00 2001
From: Gabriel <gabrielleebuaa@gmail.com>
Date: Thu, 25 Aug 2022 10:13:20 +0800
Subject: [PATCH] [minor](conjuncts) remove row-based conjuncts from vectorized
 engine (#12053)

---
 be/src/vec/exec/vaggregation_node.cpp   | 1 -
 be/src/vec/exec/volap_scanner.cpp       | 1 -
 be/src/vec/exec/volap_scanner.h         | 3 ---
 be/src/vec/exec/vset_operation_node.cpp | 1 -
 be/src/vec/exec/vunion_node.cpp         | 1 -
 5 files changed, 7 deletions(-)

diff --git a/be/src/vec/exec/vaggregation_node.cpp b/be/src/vec/exec/vaggregation_node.cpp
index e31f673643..a724c46afe 100644
--- a/be/src/vec/exec/vaggregation_node.cpp
+++ b/be/src/vec/exec/vaggregation_node.cpp
@@ -94,7 +94,6 @@ AggregationNode::AggregationNode(ObjectPool* pool, const TPlanNode& tnode,
     if (tnode.agg_node.__isset.use_streaming_preaggregation) {
         _is_streaming_preagg = tnode.agg_node.use_streaming_preaggregation;
         if (_is_streaming_preagg) {
-            DCHECK(_conjunct_ctxs.empty()) << "Preaggs have no conjuncts";
             DCHECK(!tnode.agg_node.grouping_exprs.empty()) << "Streaming preaggs do grouping";
             DCHECK(_limit == -1) << "Preaggs have no limits";
         }
diff --git a/be/src/vec/exec/volap_scanner.cpp b/be/src/vec/exec/volap_scanner.cpp
index 120f0af6d1..7a349ba26d 100644
--- a/be/src/vec/exec/volap_scanner.cpp
+++ b/be/src/vec/exec/volap_scanner.cpp
@@ -384,7 +384,6 @@ Status VOlapScanner::close(RuntimeState* state) {
     _tablet_reader_params.rs_readers.clear();
     update_counter();
     _tablet_reader.reset();
-    Expr::close(_conjunct_ctxs, state);
     _is_closed = true;
     return Status::OK();
 }
diff --git a/be/src/vec/exec/volap_scanner.h b/be/src/vec/exec/volap_scanner.h
index 427dc9fe54..2e21dc5777 100644
--- a/be/src/vec/exec/volap_scanner.h
+++ b/be/src/vec/exec/volap_scanner.h
@@ -57,8 +57,6 @@ public:
 
     RuntimeState* runtime_state() { return _runtime_state; }
 
-    std::vector<ExprContext*>* conjunct_ctxs() { return &_conjunct_ctxs; }
-
     VExprContext** vconjunct_ctx_ptr() { return &_vconjunct_ctx; }
 
     void discard_conjuncts() {
@@ -110,7 +108,6 @@ private:
     VOlapScanNode* _parent;
     const TupleDescriptor* _tuple_desc; /**< tuple descriptor */
 
-    std::vector<ExprContext*> _conjunct_ctxs;
     // to record which runtime filters have been used
     std::vector<bool> _runtime_filter_marks;
 
diff --git a/be/src/vec/exec/vset_operation_node.cpp b/be/src/vec/exec/vset_operation_node.cpp
index 88747512e8..b46d9988c5 100644
--- a/be/src/vec/exec/vset_operation_node.cpp
+++ b/be/src/vec/exec/vset_operation_node.cpp
@@ -90,7 +90,6 @@ Status VSetOperationNode::close(RuntimeState* state) {
 
 Status VSetOperationNode::init(const TPlanNode& tnode, RuntimeState* state) {
     RETURN_IF_ERROR(ExecNode::init(tnode, state));
-    DCHECK_EQ(_conjunct_ctxs.size(), 0);
     std::vector<std::vector<::doris::TExpr>> result_texpr_lists;
 
     // Create result_expr_ctx_lists_ from thrift exprs.
diff --git a/be/src/vec/exec/vunion_node.cpp b/be/src/vec/exec/vunion_node.cpp
index 940b5521ca..5ef738ba5b 100644
--- a/be/src/vec/exec/vunion_node.cpp
+++ b/be/src/vec/exec/vunion_node.cpp
@@ -42,7 +42,6 @@ VUnionNode::VUnionNode(ObjectPool* pool, const TPlanNode& tnode, const Descripto
 Status VUnionNode::init(const TPlanNode& tnode, RuntimeState* state) {
     RETURN_IF_ERROR(ExecNode::init(tnode, state));
     DCHECK(tnode.__isset.union_node);
-    DCHECK_EQ(_conjunct_ctxs.size(), 0);
     // Create const_expr_ctx_lists_ from thrift exprs.
     auto& const_texpr_lists = tnode.union_node.const_expr_lists;
     for (auto& texprs : const_texpr_lists) {