From 65ad96bc9ddfa33b6343002177ffa789a1b9aa51 Mon Sep 17 00:00:00 2001 From: Kang Date: Sun, 14 Jul 2024 10:48:57 +0800 Subject: [PATCH] [fix](index) rollback in compound opt (#37748) rollback opt in #34134 --- .../rowset/segment_v2/segment_iterator.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/be/src/olap/rowset/segment_v2/segment_iterator.cpp b/be/src/olap/rowset/segment_v2/segment_iterator.cpp index 34fbc865b3e701..919c66784638c8 100644 --- a/be/src/olap/rowset/segment_v2/segment_iterator.cpp +++ b/be/src/olap/rowset/segment_v2/segment_iterator.cpp @@ -731,16 +731,9 @@ Status SegmentIterator::_execute_predicates_except_leafnode_of_andnode( } else if (_is_literal_node(node_type)) { auto v_literal_expr = std::dynamic_pointer_cast(expr); _column_predicate_info->query_values.insert(v_literal_expr->value()); - } else if (node_type == TExprNodeType::BINARY_PRED || node_type == TExprNodeType::MATCH_PRED || - node_type == TExprNodeType::IN_PRED) { + } else if (node_type == TExprNodeType::BINARY_PRED || node_type == TExprNodeType::MATCH_PRED) { if (node_type == TExprNodeType::MATCH_PRED) { _column_predicate_info->query_op = "match"; - } else if (node_type == TExprNodeType::IN_PRED) { - if (expr->op() == TExprOpcode::type::FILTER_IN) { - _column_predicate_info->query_op = "in"; - } else { - _column_predicate_info->query_op = "not_in"; - } } else { _column_predicate_info->query_op = expr->fn().name.function_name; } @@ -864,10 +857,6 @@ Status SegmentIterator::_apply_index_except_leafnode_of_andnode() { pred_type == PredicateType::LT || pred_type == PredicateType::LE || pred_type == PredicateType::GT || pred_type == PredicateType::GE || pred_type == PredicateType::MATCH; - if (_opts.runtime_state->query_options().enable_inverted_index_compound_inlist) { - is_support |= (pred_type == PredicateType::IN_LIST || - pred_type == PredicateType::NOT_IN_LIST); - } if (!is_support) { _need_read_data_indices[column_id] = true; continue; @@ -2515,12 +2504,6 @@ void SegmentIterator::_calculate_pred_in_remaining_conjunct_root( } else { if (node_type == TExprNodeType::MATCH_PRED) { _column_predicate_info->query_op = "match"; - } else if (node_type == TExprNodeType::IN_PRED) { - if (expr->op() == TExprOpcode::type::FILTER_IN) { - _column_predicate_info->query_op = "in"; - } else { - _column_predicate_info->query_op = "not_in"; - } } else if (node_type != TExprNodeType::COMPOUND_PRED) { _column_predicate_info->query_op = expr->fn().name.function_name; }