From d328bb8c4953c8f7b0fac2cc1c4235a9e3ee261e Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Sat, 13 Nov 2021 14:34:22 +0800 Subject: [PATCH] Revert "Fix count decimal Literal BE core (#1249)" (#1253) This reverts commit 663e43759504784944da29b7582bdbd46adebd8b. --- .../analyzer/DecimalV3FunctionAnalyzer.java | 1 - .../starrocks/sql/plan/PlanFragmentTest.java | 25 ------------------- 2 files changed, 26 deletions(-) diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DecimalV3FunctionAnalyzer.java b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DecimalV3FunctionAnalyzer.java index ebce86fb0199b3..3c76783f39777c 100644 --- a/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DecimalV3FunctionAnalyzer.java +++ b/fe/fe-core/src/main/java/com/starrocks/sql/analyzer/DecimalV3FunctionAnalyzer.java @@ -31,7 +31,6 @@ public class DecimalV3FunctionAnalyzer { public static final Set DECIMAL_AGG_FUNCTION_WIDER_TYPE = new ImmutableSortedSet.Builder<>(String.CASE_INSENSITIVE_ORDER) - .add(FunctionSet.COUNT) .add("sum").add("sum_distinct").add("multi_distinct_sum").add("avg").add("variance") .add("variance_pop").add("var_pop").add("variance_samp").add("var_samp") .add("stddev").add("stddev_pop").add("stddev_samp").build(); diff --git a/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java b/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java index 3d7e6200fb3663..6915b74ced70dd 100644 --- a/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java +++ b/fe/fe-core/src/test/java/com/starrocks/sql/plan/PlanFragmentTest.java @@ -4548,29 +4548,4 @@ public void testCaseWhen() throws Exception { String plan = getFragmentPlan(sql); Assert.assertTrue(plan.contains("PREDICATES: if(1: v1 IS NOT NULL, NULL, NULL)")); } - - @Test - public void testCountDecimalV3Literal() throws Exception { - Config.enable_decimal_v3 = true; - String sql = "select count( - - cast(89 AS DECIMAL )) from t0"; - String plan = getFragmentPlan(sql); - Assert.assertTrue(plan.contains("output: count(89)")); - - sql = "select max( - - cast(89 AS DECIMAL )) from t0"; - plan = getFragmentPlan(sql); - Assert.assertTrue(plan.contains("output: max(89)")); - - sql = "select min( - - cast(89 AS DECIMAL )) from t0"; - plan = getFragmentPlan(sql); - Assert.assertTrue(plan.contains("output: min(89)")); - - sql = "select sum( - - cast(89 AS DECIMAL )) from t0"; - plan = getFragmentPlan(sql); - Assert.assertTrue(plan.contains("output: sum(89)")); - - sql = "select avg( - - cast(89 AS DECIMAL )) from t0"; - plan = getFragmentPlan(sql); - Assert.assertTrue(plan.contains("output: avg(89)")); - Config.enable_decimal_v3 = false; - } }