From 8633a0c0ccb4da187ba51ca2756f85dcce3b5bdb Mon Sep 17 00:00:00 2001 From: HappenLee Date: Wed, 28 Feb 2024 17:34:10 +0800 Subject: [PATCH] [Opt](exec) enable top opt in string type (#31489) enable top opt in string type --- be/src/runtime/runtime_predicate.cpp | 2 ++ .../doris/nereids/processor/post/TopNScanOpt.java | 3 +-- .../org/apache/doris/planner/OriginalPlanner.java | 3 +-- .../postprocess/TopNRuntimeFilterTest.java | 15 --------------- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/be/src/runtime/runtime_predicate.cpp b/be/src/runtime/runtime_predicate.cpp index 5141b65978..9e300dab4a 100644 --- a/be/src/runtime/runtime_predicate.cpp +++ b/be/src/runtime/runtime_predicate.cpp @@ -75,6 +75,8 @@ Status RuntimePredicate::init(const PrimitiveType type, const bool nulls_first) _get_value_fn = get_double_value; break; } + case PrimitiveType::TYPE_CHAR: + case PrimitiveType::TYPE_VARCHAR: case PrimitiveType::TYPE_STRING: { _get_value_fn = get_string_value; break; diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/TopNScanOpt.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/TopNScanOpt.java index 89d396611c..fab4e34a12 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/TopNScanOpt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/TopNScanOpt.java @@ -127,8 +127,7 @@ public class TopNScanOpt extends PlanPostProcessor { if (!firstKey.isColumnFromTable()) { return topN; } - if (firstKey.getDataType().isStringLikeType() - || firstKey.getDataType().isFloatType() + if (firstKey.getDataType().isFloatType() || firstKey.getDataType().isDoubleType()) { return topN; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/OriginalPlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/OriginalPlanner.java index 36087176f4..cf93be1611 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/OriginalPlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/OriginalPlanner.java @@ -543,8 +543,7 @@ public class OriginalPlanner extends Planner { && sortNode.getLimit() <= ConnectContext.get().getSessionVariable().topnOptLimitThreshold && sortNode.getSortInfo().getOrigOrderingExprs().size() > 0) { Expr firstSortExpr = sortNode.getSortInfo().getOrigOrderingExprs().get(0); - if (firstSortExpr instanceof SlotRef && !firstSortExpr.getType().isStringType() - && !firstSortExpr.getType().isFloatingPointType()) { + if (firstSortExpr instanceof SlotRef && !firstSortExpr.getType().isFloatingPointType()) { OlapScanNode scanNode = (OlapScanNode) child; if (scanNode.isDupKeysOrMergeOnWrite()) { sortNode.setUseTopnOpt(true); diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/TopNRuntimeFilterTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/TopNRuntimeFilterTest.java index 0ac233898a..95a407d134 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/TopNRuntimeFilterTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/TopNRuntimeFilterTest.java @@ -49,21 +49,6 @@ public class TopNRuntimeFilterTest extends SSBTestBase { Assertions.assertTrue(localTopN.getPhysicalTopN().isEnableRuntimeFilter()); } - // topn rf do not apply on string-like and float column - @Test - public void testNotUseTopNRf() { - String sql = "select * from customer order by c_name limit 5"; - PlanChecker checker = PlanChecker.from(connectContext).analyze(sql) - .rewrite() - .implement(); - PhysicalPlan plan = checker.getPhysicalPlan(); - plan = new PlanPostProcessors(checker.getCascadesContext()).process(plan); - Assertions.assertInstanceOf(PhysicalDeferMaterializeTopN.class, plan.children().get(0).child(0)); - PhysicalDeferMaterializeTopN localTopN - = (PhysicalDeferMaterializeTopN) plan.child(0).child(0); - Assertions.assertFalse(localTopN.getPhysicalTopN().isEnableRuntimeFilter()); - } - @Test public void testNotUseTopNRfForComplexCase() { String sql = "select * from (select 1) tl join (select * from customer order by c_custkey limit 5) tb";