kylin-3812 optimize the child CompareTupleFilter in a CompareTupleFilter

core-metadata/src/main/java/org/apache/kylin/metadata/expression/CaseTupleExpression.java

@@ -47,7 +47,8 @@ public CaseTupleExpression(List<Pair<TupleFilter, TupleExpression>> whenList, Tu
     protected boolean ifAbleToPushDown() {
         if (ifAbleToPushDown == null) {
             for (Pair<TupleFilter, TupleExpression> whenEntry : whenList) {
-                ifAbleToPushDown = whenEntry.getSecond().ifAbleToPushDown();
+                ifAbleToPushDown = TupleFilter.isEvaluableRecursively(whenEntry.getFirst())
+                        && whenEntry.getSecond().ifAbleToPushDown();
                 if (!ifAbleToPushDown) {
                     break;
                 }

core-metadata/src/main/java/org/apache/kylin/metadata/filter/CompareTupleFilter.java

@@ -38,6 +38,9 @@ public enum CompareResultType {
         AlwaysTrue, AlwaysFalse, Unknown
     }
 
+    // if the two children are both CompareTupleFilter, isNormal will be false
+    private boolean isNormal = true;
+
     // operand 1 is either a column or a function
     private TblColRef column;
     private FunctionTupleFilter function;
@@ -74,6 +77,9 @@ private CompareTupleFilter(CompareTupleFilter another) {
 
     @Override
     public void addChild(TupleFilter child) {
+        if (child instanceof CompareTupleFilter) {
+            child = optimizeChildCompareTupleFilter((CompareTupleFilter) child);
+        }
         super.addChild(child);
         if (child instanceof ColumnTupleFilter) {
             ColumnTupleFilter columnFilter = (ColumnTupleFilter) child;
@@ -234,7 +240,7 @@ private boolean isConstant(TupleFilter filter) {
 
     @Override
     public boolean isEvaluable() {
-        return (column != null || (function != null && function.isEvaluable())) //
+        return isNormal && (column != null || (function != null && function.isEvaluable())) //
                 && (!conditionValues.isEmpty() || operator == FilterOperatorEnum.ISNOTNULL || operator == FilterOperatorEnum.ISNULL) //
                 && secondColumn == null;
     }
@@ -283,6 +289,20 @@ public TupleFilter acceptOptimizeTransformer(FilterOptimizeTransformer transform
         return transformer.visit(this);
     }
 
+    private TupleFilter optimizeChildCompareTupleFilter(CompareTupleFilter child) {
+        FilterOptimizeTransformer transformer = new FilterOptimizeTransformer();
+        TupleFilter result = child.acceptOptimizeTransformer(transformer);
+        if (result == ConstantTupleFilter.TRUE) {
+            // use string instead of boolean since it's encoded as string
+            result = new ConstantTupleFilter("true");
+        } else if (result == ConstantTupleFilter.FALSE) {
+            result = new ConstantTupleFilter("false");
+        } else {
+            this.isNormal = false;
+        }
+        return result;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)

kylin-it/src/test/resources/query/sql_casewhen/query04.sql

@@ -0,0 +1,35 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+select "TEST_KYLIN_FACT"."ORDER_ID",
+       case
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='Auction') = (1 = 1) then 'B'
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='FP-GTC') = (1 = 1) then 'C'
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='ABIN') = (1 = 1) then 'D'
+           else 'N'
+       end as phase
+from TEST_KYLIN_FACT
+where "TEST_KYLIN_FACT"."CAL_DT" between '2013-01-01' and '2013-01-02'
+group by "TEST_KYLIN_FACT"."ORDER_ID",
+       case
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='Auction') = (1 = 1) then 'B'
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='FP-GTC') = (1 = 1) then 'C'
+           when ("TEST_KYLIN_FACT"."LSTG_FORMAT_NAME"='ABIN') = (1 = 1) then 'D'
+           else 'N'
+       end
+

query/src/main/java/org/apache/kylin/query/relnode/OLAPAggregateRel.java

@@ -278,7 +278,7 @@ void buildGroups() {
             TblColRef groupOutCol = inputColumnRowType.getColumnByIndex(i);
             if (tupleExpression instanceof ColumnTupleExpression) {
                 this.groups.add(((ColumnTupleExpression) tupleExpression).getColumn());
-            } else if (this.context.isDynamicColumnEnabled()) {
+            } else if (this.context.isDynamicColumnEnabled() && tupleExpression.ifForDynamicColumn()) {
                 Pair<Set<TblColRef>, Set<TblColRef>> cols = ExpressionColCollector.collectColumnsPair(tupleExpression);
 
                 // push down only available for the innermost aggregation