You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2024/07/15 08:30:38 UTC

(kylin) 12/30: KYLIN-5861 Change package of query optimization rules

This is an automated email from the ASF dual-hosted git repository.

liyang pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit aedb70fbed7a81a120929af5cdff766ed526cec5
Author: Pengfei Zhan <de...@gmail.com>
AuthorDate: Thu Oct 26 20:36:44 2023 +0800

    KYLIN-5861 Change package of query optimization rules
---
 .../org/apache/kylin/common/KylinConfigBase.java   |  11 +-
 .../kylin/metadata/datatype/BooleanSerializer.java |   2 +-
 .../query/engine/CountDistinctExprPlannerTest.java |  25 ++--
 .../engine/EnhancedAggPushDownPlannerTest.java     |  22 ++-
 .../query/engine/SumCastDoublePlannerTest.java     |   4 +-
 .../kylin/query/engine/SumExprPlannerTest.java     |  75 +++++------
 ...hdownRuleTest.java => AggPushDownRuleTest.java} |  56 ++++----
 .../kylin/query/rules/CalciteRuleTestBase.java     |  18 +--
 .../kylin/query/rules/FilterSimplifyRuleTest.java  |   9 +-
 .../query/rules/ScalarSubqueryJoinRuleTest.java    |  16 +--
 .../query/engine/CountDistinctExprPlannerTest.xml  |  34 ++---
 .../apache/kylin/query/engine/SqlToRelNodeTest.xml |   4 +-
 .../kylin/query/engine/SumExprPlannerTest.xml      |   8 +-
 ...ushdownRuleTest.xml => AggPushDownRuleTest.xml} | 110 +++++++--------
 .../apache/kylin/query/relnode/ContextUtil.java    |  30 ++---
 .../kylin/query/relnode/OlapAggregateRel.java      |   8 +-
 .../apache/kylin/query/relnode/OlapFilterRel.java  |  15 ++-
 .../apache/kylin/query/relnode/OlapJoinRel.java    |   7 +-
 .../apache/kylin/query/relnode/OlapLimitRel.java   |   2 +-
 .../apache/kylin/query/relnode/OlapMinusRel.java   |   8 ++
 .../kylin/query/relnode/OlapNonEquiJoinRel.java    |   7 +-
 .../apache/kylin/query/relnode/OlapProjectRel.java |  15 ++-
 .../org/apache/kylin/query/relnode/OlapRel.java    |   2 +
 .../apache/kylin/query/relnode/OlapSortRel.java    |   8 +-
 .../apache/kylin/query/relnode/OlapTableScan.java  |   2 +-
 .../query/relnode/OlapToEnumerableConverter.java   |   4 +-
 .../apache/kylin/query/relnode/OlapUnionRel.java   |   2 +-
 .../apache/kylin/query/relnode/OlapValuesRel.java  |   2 +-
 .../apache/kylin/query/relnode/OlapWindowRel.java  |   2 +-
 .../util/{KapRelUtil.java => OlapRelUtil.java}     |   6 +-
 .../kylin/query/util/RelAggPushDownUtil.java       |  18 +--
 .../optrule/KapOLAPToEnumerableConverterRule.java  |  44 ------
 .../kyligence/kap/query/optrule/KapUnionRule.java  |  48 -------
 .../kap/query/optrule/OLAPAggregateRule.java       |  71 ----------
 .../kap/query/optrule/OLAPFilterRule.java          |  52 --------
 .../kyligence/kap/query/optrule/OLAPJoinRule.java  |  80 -----------
 .../kyligence/kap/query/optrule/OLAPLimitRule.java |  58 --------
 .../kap/query/optrule/OLAPProjectRule.java         |  60 ---------
 .../kyligence/kap/query/optrule/OLAPSortRule.java  |  52 --------
 .../kap/query/optrule/OLAPWindowRule.java          |  47 -------
 .../apache/kylin/query/engine/PlannerFactory.java  |  86 ++++++------
 .../org/apache/kylin/query/engine/QueryExec.java   |   3 +
 .../apache/kylin/query/engine/QueryOptimizer.java  |   5 +-
 .../optrule/AbstractAggCaseWhenFunctionRule.java   |   2 +-
 .../query/optrule/AggregateMultipleExpandRule.java |   2 +-
 .../query/optrule/AggregateProjectReduceRule.java  |   2 +-
 .../query/optrule/CorrReduceFunctionRule.java      |   2 +-
 .../optrule/CountDistinctCaseWhenFunctionRule.java |  17 +--
 .../query/optrule/ExtensionOlapJoinRule.java       |   2 +-
 .../optrule/FilterJoinConditionMergeRule.java      |   2 +-
 .../kylin}/query/optrule/FilterSimplifyRule.java   |   2 +-
 .../kylin}/query/optrule/JoinFilterRule.java       |   2 +-
 .../query/optrule/OlapAggFilterTransposeRule.java} |  16 +--
 .../query/optrule/OlapAggJoinTransposeRule.java}   |  15 ++-
 .../query/optrule/OlapAggProjectMergeRule.java}    |  20 +--
 .../optrule/OlapAggProjectTransposeRule.java}      |  20 +--
 .../kylin/query/optrule/OlapAggSumCastRule.java}   |  42 ++----
 .../optrule/OlapAggregateReduceFunctionsRule.java} |   8 +-
 .../kylin/query/optrule/OlapAggregateRule.java}    |  14 +-
 .../query/optrule/OlapCountDistinctJoinRule.java}  |  18 +--
 .../optrule/OlapEquivJoinConditionFixRule.java}    |  10 +-
 .../kylin/query/optrule/OlapFilterJoinRule.java}   |  31 +++--
 .../kylin/query/optrule/OlapFilterRule.java}       |  12 +-
 .../optrule/OlapJoinProjectTransposeRule.java}     |   6 +-
 .../apache/kylin/query/optrule/OlapJoinRule.java}  |  18 +--
 .../apache/kylin/query/optrule/OlapLimitRule.java} |  12 +-
 .../apache/kylin/query/optrule/OlapMinusRule.java} |  12 +-
 .../kylin/query/optrule/OlapModelViewRule.java}    |  12 +-
 .../optrule/OlapProjectJoinTransposeRule.java}     |  12 +-
 .../kylin/query/optrule/OlapProjectMergeRule.java} |  20 +--
 .../kylin/query/optrule/OlapProjectRule.java}      |  17 +--
 .../apache/kylin/query/optrule/OlapRuleUtils.java} |   8 +-
 .../apache/kylin/query/optrule/OlapSortRule.java}  |  12 +-
 .../query/optrule/OlapSumCastTransposeRule.java}   |  15 ++-
 .../query/optrule/OlapSumTransCastToThenRule.java} |  51 +++----
 .../optrule/OlapToEnumerableConverterRule.java}    |  12 +-
 .../apache/kylin/query/optrule/OlapUnionRule.java} |  12 +-
 .../kylin/query/optrule/OlapValuesRule.java}       |  10 +-
 .../kylin/query/optrule/OlapWindowRule.java}       |  12 +-
 .../query/optrule/RightJoinToLeftJoinRule.java     |   2 +-
 .../query/optrule/ScalarSubqueryJoinRule.java      |   2 +-
 .../kylin}/query/optrule/SumBasicOperatorRule.java |  26 +---
 .../query/optrule/SumCaseWhenFunctionRule.java     |  36 +++--
 .../query/optrule/SumConstantConvertRule.java      |  17 +--
 .../java/org/apache/kylin/query/util/HepUtils.java | 148 +++++++++++----------
 .../apache/kylin/query/util/KapRelUtilTest.java    |  81 -----------
 .../apache/kylin/query/util/OlapRelUtilTest.java   |  81 +++++++++++
 .../apache/kylin/query/runtime/plan/JoinPlan.scala |   4 +-
 .../kylin/query/runtime/plan/ResultPlan.scala      |   2 +-
 89 files changed, 718 insertions(+), 1299 deletions(-)

diff --git a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index a7acba56bc..e7fc037491 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -1887,7 +1887,7 @@ public abstract class KylinConfigBase implements Serializable {
     public List<String> getCalciteAddRule() {
         String rules = getOptional("kylin.query.calcite.add-rule");
         if (StringUtils.isEmpty(rules)) {
-            return Lists.newArrayList("io.kyligence.kap.query.optrule.ExtensionOlapJoinRule#INSTANCE");
+            return Lists.newArrayList("org.apache.kylin.query.optrule.ExtensionOlapJoinRule#INSTANCE");
         }
         return Lists.newArrayList(rules.split(","));
     }
@@ -1899,7 +1899,7 @@ public abstract class KylinConfigBase implements Serializable {
     public List<String> getCalciteRemoveRule() {
         String rules = getOptional("kylin.query.calcite.remove-rule");
         if (StringUtils.isEmpty(rules)) {
-            return Lists.newArrayList("io.kyligence.kap.query.optrule.OLAPJoinRule#INSTANCE");
+            return Lists.newArrayList();
         }
         return Lists.newArrayList(rules.split(","));
     }
@@ -2864,6 +2864,7 @@ public abstract class KylinConfigBase implements Serializable {
     public boolean isFlatTableRedistributionEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.engine.redistribution-flattable-enabled", FALSE));
     }
+
     public boolean isPersistFlatViewEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.engine.persist-flatview", FALSE));
     }
@@ -2871,6 +2872,7 @@ public abstract class KylinConfigBase implements Serializable {
     public boolean isPersistFlatUseSnapshotEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.engine.persist-flat-use-snapshot-enabled", TRUE));
     }
+
     public boolean isBuildExcludedTableEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.engine.build-excluded-table", FALSE));
     }
@@ -2955,8 +2957,8 @@ public abstract class KylinConfigBase implements Serializable {
         File libArm64 = new File(kylinHome + "/lib/" + ASYNC_PROFILER_LIB_LINUX_ARM64);
         File libX64Musl = new File(kylinHome + "/lib/" + ASYNC_PROFILER_LIB_LINUX_MUSL_X64);
         File libArm64Musl = new File(kylinHome + "/lib/" + ASYNC_PROFILER_LIB_LINUX_MUSL_ARM64);
-        return libX64.getCanonicalPath() + "," + libArm64.getCanonicalPath()
-                + "," + libX64Musl.getCanonicalPath() + "," + libArm64Musl.getCanonicalPath();
+        return libX64.getCanonicalPath() + "," + libArm64.getCanonicalPath() + "," + libX64Musl.getCanonicalPath() + ","
+                + libArm64Musl.getCanonicalPath();
     }
 
     private String getLogPropertyFile(String filename) {
@@ -4151,6 +4153,7 @@ public abstract class KylinConfigBase implements Serializable {
     public boolean isJobTmpDirALLPermissionEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.engine.job-tmp-dir-all-permission-enabled", FALSE));
     }
+
     public boolean isProjectMergeWithBloatEnabled() {
         return Boolean.parseBoolean(getOptional("kylin.query.project-merge-with-bloat-enabled", "true"));
     }
diff --git a/src/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java b/src/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
index c2ee1742d4..a19a7f9085 100644
--- a/src/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
+++ b/src/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java
@@ -61,4 +61,4 @@ public class BooleanSerializer extends DataTypeSerializer<Long> {
         return str == null ? 0L
                 : (long) BooleanUtils.toInteger(ArrayUtils.contains(TRUE_VALUE_SET, str.toLowerCase(Locale.ROOT)));
     }
-}
\ No newline at end of file
+}
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.java
index c4e192c2e1..c9b5a14f1f 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.java
@@ -19,9 +19,9 @@
 package org.apache.kylin.query.engine;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.test.DiffRepository;
@@ -58,23 +58,15 @@ public class CountDistinctExprPlannerTest extends CalciteRuleTestBase {
         return diff;
     }
 
-    protected void checkSQL(String project, String sql, String prefix, StringOutput StrOut,
-            Collection<RelOptRule>... ruleSets) {
-        Collection<RelOptRule> rules = new HashSet<>();
-        for (Collection<RelOptRule> ruleSet : ruleSets) {
-            rules.addAll(ruleSet);
-        }
-        super.checkSQLPostOptimize(project, sql, prefix, StrOut, rules);
-    }
-
     @Test
     @Ignore("For development")
     public void dumpPlans() throws IOException {
         List<Pair<String, String>> queries = readALLSQLs(KylinConfig.getInstanceFromEnv(), defaultProject,
                 "query/sql_count_distinct_expr");
         CalciteRuleTestBase.StringOutput output = new CalciteRuleTestBase.StringOutput(false);
-        queries.forEach(e -> checkSQL(defaultProject, e.getSecond(), e.getFirst(), output, HepUtils.SumExprRules,
-                HepUtils.CountDistinctExprRules));
+        List<RelOptRule> rules = Stream.concat(HepUtils.SumExprRules.stream(), HepUtils.CountDistinctExprRules.stream())
+                .collect(Collectors.toList());
+        queries.forEach(e -> checkSQLPostOptimize(defaultProject, e.getSecond(), e.getFirst(), output, rules));
         output.dump(log);
     }
 
@@ -82,12 +74,13 @@ public class CountDistinctExprPlannerTest extends CalciteRuleTestBase {
     public void testAllCases() throws IOException {
         List<Pair<String, String>> queries = readALLSQLs(KylinConfig.getInstanceFromEnv(), defaultProject,
                 "query/sql_count_distinct_expr");
-        queries.forEach(e -> checkSQL(defaultProject, e.getSecond(), e.getFirst(), null, HepUtils.SumExprRules,
-                HepUtils.CountDistinctExprRules));
+        List<RelOptRule> rules = Stream.concat(HepUtils.SumExprRules.stream(), HepUtils.CountDistinctExprRules.stream())
+                .collect(Collectors.toList());
+        queries.forEach(e -> checkSQLPostOptimize(defaultProject, e.getSecond(), e.getFirst(), null, rules));
     }
 
     @Test
-    public void testSimpleCountDistinctExpr() throws IOException {
+    public void testSimpleCountDistinctExpr() {
         String SQL = "SELECT COUNT(DISTINCT CASE WHEN LSTG_FORMAT_NAME='FP-NON GTC' THEN PRICE ELSE null END) "
                 + "FROM TEST_KYLIN_FACT";
         checkSQLPostOptimize(defaultProject, SQL, null, null, HepUtils.CountDistinctExprRules);
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.java
index cd17343544..7a8ecbcd56 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/EnhancedAggPushDownPlannerTest.java
@@ -18,20 +18,24 @@
 
 package org.apache.kylin.query.engine;
 
+import static org.hamcrest.CoreMatchers.notNullValue;
+
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.apache.calcite.plan.RelOptRule;
+import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.test.DiffRepository;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.QueryContext;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.query.rules.CalciteRuleTestBase;
 import org.apache.kylin.query.util.HepUtils;
+import org.apache.kylin.query.util.RelAggPushDownUtil;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -61,13 +65,19 @@ public class EnhancedAggPushDownPlannerTest extends CalciteRuleTestBase {
         return diff;
     }
 
-    protected void checkSQL(String project, String sql, String prefix, StringOutput StrOut,
-            Collection<RelOptRule>... ruleSets) {
-        Collection<RelOptRule> rules = new HashSet<>();
+    protected void checkSQL(String sql, String prefix, Collection<RelOptRule>... ruleSets) {
+        // should be LinkedHashSet, otherwise the result is unstable
+        Collection<RelOptRule> rules = new LinkedHashSet<>();
         for (Collection<RelOptRule> ruleSet : ruleSets) {
             rules.addAll(ruleSet);
         }
-        super.checkSQLAfterRule(project, sql, prefix, StrOut, rules);
+        RelNode relBefore = toCalcitePlan(defaultProject, sql, KylinConfig.getInstanceFromEnv());
+        Assert.assertThat(relBefore, notNullValue());
+        RelAggPushDownUtil.clearUnmatchedJoinDigest();
+        RelAggPushDownUtil.collectAllJoinRel(relBefore);
+        RelNode relAfter = HepUtils.runRuleCollection(relBefore, rules, false);
+        Assert.assertThat(relAfter, notNullValue());
+        checkDiff(relBefore, relAfter, prefix);
     }
 
     @Test
@@ -79,7 +89,7 @@ public class EnhancedAggPushDownPlannerTest extends CalciteRuleTestBase {
         postOptRules.addAll(HepUtils.SumExprRules);
         postOptRules.addAll(HepUtils.CountDistinctExprRules);
         postOptRules.addAll(HepUtils.AggPushDownRules);
-        queries.forEach(e -> checkSQL(defaultProject, e.getSecond(), e.getFirst(), null, postOptRules));
+        queries.forEach(e -> checkSQL(e.getSecond(), e.getFirst(), postOptRules));
     }
 
 }
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumCastDoublePlannerTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumCastDoublePlannerTest.java
index b61613f236..51e04e06d3 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumCastDoublePlannerTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumCastDoublePlannerTest.java
@@ -20,7 +20,7 @@ package org.apache.kylin.query.engine;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.apache.calcite.plan.RelOptRule;
@@ -59,7 +59,7 @@ public class SumCastDoublePlannerTest extends CalciteRuleTestBase {
 
     protected void checkSQL(String project, String sql, String prefix, StringOutput StrOut,
             Collection<RelOptRule>... ruleSets) {
-        Collection<RelOptRule> rules = new HashSet<>();
+        Collection<RelOptRule> rules = new LinkedHashSet<>();
         for (Collection<RelOptRule> ruleSet : ruleSets) {
             rules.addAll(ruleSet);
         }
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumExprPlannerTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumExprPlannerTest.java
index b6255dae88..fb73616ba3 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumExprPlannerTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/engine/SumExprPlannerTest.java
@@ -25,6 +25,19 @@ import org.apache.calcite.test.DiffRepository;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.guava30.shaded.common.collect.ImmutableList;
+import org.apache.kylin.query.optrule.OlapAggFilterTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggJoinTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectMergeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggregateRule;
+import org.apache.kylin.query.optrule.OlapCountDistinctJoinRule;
+import org.apache.kylin.query.optrule.OlapJoinRule;
+import org.apache.kylin.query.optrule.OlapProjectRule;
+import org.apache.kylin.query.optrule.OlapSumCastTransposeRule;
+import org.apache.kylin.query.optrule.OlapSumTransCastToThenRule;
+import org.apache.kylin.query.optrule.SumBasicOperatorRule;
+import org.apache.kylin.query.optrule.SumCaseWhenFunctionRule;
+import org.apache.kylin.query.optrule.SumConstantConvertRule;
 import org.apache.kylin.query.rules.CalciteRuleTestBase;
 import org.apache.kylin.query.util.HepUtils;
 import org.junit.After;
@@ -33,19 +46,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import io.kyligence.kap.query.optrule.KapAggFilterTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggJoinTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectMergeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggregateRule;
-import io.kyligence.kap.query.optrule.KapCountDistinctJoinRule;
-import io.kyligence.kap.query.optrule.KapJoinRule;
-import io.kyligence.kap.query.optrule.KapProjectRule;
-import io.kyligence.kap.query.optrule.KapSumCastTransposeRule;
-import io.kyligence.kap.query.optrule.KapSumTransCastToThenRule;
-import io.kyligence.kap.query.optrule.SumBasicOperatorRule;
-import io.kyligence.kap.query.optrule.SumCaseWhenFunctionRule;
-import io.kyligence.kap.query.optrule.SumConstantConvertRule;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -55,8 +55,6 @@ public class SumExprPlannerTest extends CalciteRuleTestBase {
     static final DiffRepository diff = DiffRepository.lookup(SumExprPlannerTest.class);
 
     private void openSumCaseWhen() {
-        // we must make sure kap.query.enable-convert-sum-expression is TRUE to
-        // avoid adding SumConstantConvertRule in PlannerFactory
         overwriteSystemProp("kylin.query.convert-sum-expression-enabled", "true");
     }
 
@@ -189,13 +187,12 @@ public class SumExprPlannerTest extends CalciteRuleTestBase {
                 + "     (SELECT LSTG_FORMAT_NAME, ORDER_ID, SUM (\"PRICE\") AS \"X_measure__0\"\n"
                 + "      FROM TEST_KYLIN_FACT  GROUP  BY LSTG_FORMAT_NAME, ORDER_ID) \"t0\" ON \"自定义 SQL 查询\".\"ORDER_ID\" = \"t0\".\"ORDER_ID\"\n"
                 + "GROUP  BY \"自定义 SQL 查询\".\"CAL_DT\"\n";
-        super.checkSQLPostOptimize(defaultProject, SQL, null, null,
-                ImmutableList.of(KapAggProjectMergeRule.AGG_PROJECT_JOIN,
-                        KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN,
-                        KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN, KapAggProjectTransposeRule.AGG_PROJECT_JOIN,
-                        KapAggFilterTransposeRule.AGG_FILTER_JOIN, KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
-                        KapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG, KapAggregateRule.INSTANCE,
-                        KapJoinRule.INSTANCE, KapProjectRule.INSTANCE));
+        super.checkSQLPostOptimize(defaultProject, SQL, null, null, ImmutableList.of(
+                OlapAggProjectMergeRule.AGG_PROJECT_JOIN, OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN,
+                OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN, OlapAggProjectTransposeRule.AGG_PROJECT_JOIN,
+                OlapAggFilterTransposeRule.AGG_FILTER_JOIN, OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
+                OlapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG, OlapAggregateRule.INSTANCE,
+                OlapJoinRule.INSTANCE, OlapProjectRule.INSTANCE));
     }
 
     @Test
@@ -221,15 +218,14 @@ public class SumExprPlannerTest extends CalciteRuleTestBase {
                 + " MAX(\"LINEORDER\".\"LO_ORDERDATE\") AS \"X_measure__0\"\n" + " FROM\n"
                 + " \"SSB\".\"LINEORDER\" \"LINEORDER\"\n" + " GROUP BY\n" + " 1.1000000000000001\n" + " ) \"t0\"\n"
                 + "GROUP BY\n" + " 1.1000000000000001\n" + "LIMIT 500";
-        super.checkSQLPostOptimize(defaultProject, SQL, null, null,
-                ImmutableList.of(SumCaseWhenFunctionRule.INSTANCE, SumBasicOperatorRule.INSTANCE,
-                        SumConstantConvertRule.INSTANCE, KapSumTransCastToThenRule.INSTANCE,
-                        KapSumCastTransposeRule.INSTANCE, KapProjectRule.INSTANCE, KapAggregateRule.INSTANCE,
-                        KapJoinRule.EQUAL_NULL_SAFE_INSTANT, KapAggProjectMergeRule.AGG_PROJECT_JOIN,
-                        KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN,
-                        KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN, KapAggProjectTransposeRule.AGG_PROJECT_JOIN,
-                        KapAggFilterTransposeRule.AGG_FILTER_JOIN, KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
-                        KapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG));
+        super.checkSQLPostOptimize(defaultProject, SQL, null, null, ImmutableList.of(SumCaseWhenFunctionRule.INSTANCE,
+                SumBasicOperatorRule.INSTANCE, SumConstantConvertRule.INSTANCE, OlapSumTransCastToThenRule.INSTANCE,
+                OlapSumCastTransposeRule.INSTANCE, OlapProjectRule.INSTANCE, OlapAggregateRule.INSTANCE,
+                OlapJoinRule.EQUAL_NULL_SAFE_INSTANT, OlapAggProjectMergeRule.AGG_PROJECT_JOIN,
+                OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN, OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN,
+                OlapAggProjectTransposeRule.AGG_PROJECT_JOIN, OlapAggFilterTransposeRule.AGG_FILTER_JOIN,
+                OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
+                OlapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG));
     }
 
     @Test
@@ -244,14 +240,13 @@ public class SumExprPlannerTest extends CalciteRuleTestBase {
                 + " MAX(\"LINEORDER\".\"LO_ORDERDATE\") AS \"X_measure__0\"\n" + " FROM\n"
                 + " \"SSB\".\"LINEORDER\" \"LINEORDER\"\n" + " GROUP BY\n" + " 1.1000000000000001\n" + " ) \"t0\"\n"
                 + "where \"LINEORDER\".\"LO_QUANTITY\" > 1 \n" + "GROUP BY\n" + " 1.1000000000000001\n" + "LIMIT 500";
-        super.checkSQLPostOptimize(defaultProject, SQL, null, null,
-                ImmutableList.of(SumCaseWhenFunctionRule.INSTANCE, SumBasicOperatorRule.INSTANCE,
-                        SumConstantConvertRule.INSTANCE, KapSumTransCastToThenRule.INSTANCE,
-                        KapSumCastTransposeRule.INSTANCE, KapProjectRule.INSTANCE, KapAggregateRule.INSTANCE,
-                        KapJoinRule.EQUAL_NULL_SAFE_INSTANT, KapAggProjectMergeRule.AGG_PROJECT_JOIN,
-                        KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN,
-                        KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN, KapAggProjectTransposeRule.AGG_PROJECT_JOIN,
-                        KapAggFilterTransposeRule.AGG_FILTER_JOIN, KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
-                        KapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG));
+        super.checkSQLPostOptimize(defaultProject, SQL, null, null, ImmutableList.of(SumCaseWhenFunctionRule.INSTANCE,
+                SumBasicOperatorRule.INSTANCE, SumConstantConvertRule.INSTANCE, OlapSumTransCastToThenRule.INSTANCE,
+                OlapSumCastTransposeRule.INSTANCE, OlapProjectRule.INSTANCE, OlapAggregateRule.INSTANCE,
+                OlapJoinRule.EQUAL_NULL_SAFE_INSTANT, OlapAggProjectMergeRule.AGG_PROJECT_JOIN,
+                OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN, OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN,
+                OlapAggProjectTransposeRule.AGG_PROJECT_JOIN, OlapAggFilterTransposeRule.AGG_FILTER_JOIN,
+                OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
+                OlapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG));
     }
 }
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushdownRuleTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushDownRuleTest.java
similarity index 74%
rename from src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushdownRuleTest.java
rename to src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushDownRuleTest.java
index eec9bb41bf..dcd6221889 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushdownRuleTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/AggPushDownRuleTest.java
@@ -28,22 +28,20 @@ import org.apache.calcite.test.DiffRepository;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.guava30.shaded.common.collect.Lists;
+import org.apache.kylin.query.optrule.OlapAggFilterTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggJoinTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectMergeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggregateRule;
+import org.apache.kylin.query.optrule.OlapFilterRule;
+import org.apache.kylin.query.optrule.OlapJoinRule;
+import org.apache.kylin.query.optrule.OlapProjectRule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import io.kyligence.kap.query.optrule.KapAggFilterTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggJoinTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectMergeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggregateRule;
-import io.kyligence.kap.query.optrule.KapFilterRule;
-import io.kyligence.kap.query.optrule.KapJoinRule;
-import io.kyligence.kap.query.optrule.KapProjectRule;
+public class AggPushDownRuleTest extends CalciteRuleTestBase {
 
-public class AggPushdownRuleTest extends CalciteRuleTestBase {
-
-    private final DiffRepository diff = DiffRepository.lookup(AggPushdownRuleTest.class);
     private final String project = "subquery";
     private final List<RelOptRule> rulesDefault = Lists.newArrayList();
 
@@ -51,10 +49,10 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
     public void setUp() {
         overwriteSystemProp("calcite.keep-in-clause", "false");
         createTestMetadata("src/test/resources/ut_meta/agg_push_down");
-        rulesDefault.add(KapFilterRule.INSTANCE);
-        rulesDefault.add(KapProjectRule.INSTANCE);
-        rulesDefault.add(KapAggregateRule.INSTANCE);
-        rulesDefault.add(KapJoinRule.INSTANCE);
+        rulesDefault.add(OlapFilterRule.INSTANCE);
+        rulesDefault.add(OlapProjectRule.INSTANCE);
+        rulesDefault.add(OlapAggregateRule.INSTANCE);
+        rulesDefault.add(OlapJoinRule.INSTANCE);
     }
 
     @After
@@ -64,7 +62,7 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
 
     @Override
     protected DiffRepository getDiffRepo() {
-        return diff;
+        return DiffRepository.lookup(this.getClass());
     }
 
     @Test
@@ -73,12 +71,12 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
         KylinConfig config = KylinConfig.getInstanceFromEnv();
         List<Pair<String, String>> queries = readALLSQLs(config, project, "query/sql_select_subquery");
         List<RelOptRule> rulesToAdd = Lists.newArrayList();
-        rulesToAdd.add(KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
-        rulesToAdd.add(KapAggProjectMergeRule.AGG_PROJECT_JOIN);
-        rulesToAdd.add(KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN);
-        rulesToAdd.add(KapAggProjectTransposeRule.AGG_PROJECT_JOIN);
-        rulesToAdd.add(KapAggFilterTransposeRule.AGG_FILTER_JOIN);
-        rulesToAdd.add(KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG);
+        rulesToAdd.add(OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
+        rulesToAdd.add(OlapAggProjectMergeRule.AGG_PROJECT_JOIN);
+        rulesToAdd.add(OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN);
+        rulesToAdd.add(OlapAggProjectTransposeRule.AGG_PROJECT_JOIN);
+        rulesToAdd.add(OlapAggFilterTransposeRule.AGG_FILTER_JOIN);
+        rulesToAdd.add(OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG);
         for (Pair<String, String> pair : queries) {
             RelNode relBefore = toCalcitePlan(project, pair.getSecond(), config);
             RelNode relAfter = toCalcitePlan(project, pair.getSecond(), config, null, rulesToAdd);
@@ -93,7 +91,7 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
         Pair<String, String> query = readOneSQL(config, project, "query/sql_select_subquery", "query05.sql");
 
         List<RelOptRule> rules = Lists.newArrayList(rulesDefault);
-        rules.add(KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
+        rules.add(OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
 
         RelRoot relRoot = sqlToRelRoot(project, query.getSecond(), config);
         RelNode relBefore = optimizeSQL(relRoot, rulesDefault);
@@ -108,7 +106,7 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
         Pair<String, String> query = readOneSQL(config, project, "query/sql_select_subquery", "query01.sql");
 
         List<RelOptRule> rules = Lists.newArrayList(rulesDefault);
-        rules.add(KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN);
+        rules.add(OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN);
 
         RelRoot relRoot = sqlToRelRoot(project, query.getSecond(), config);
         RelNode relBefore = optimizeSQL(relRoot, rulesDefault);
@@ -123,10 +121,10 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
         Pair<String, String> query = readOneSQL(config, project, "query/sql_select_subquery", "query05.sql");
 
         List<RelOptRule> rulesBefore = Lists.newArrayList(rulesDefault);
-        rulesBefore.add(KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
+        rulesBefore.add(OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
 
         List<RelOptRule> rules = Lists.newArrayList(rulesBefore);
-        rules.add(KapAggFilterTransposeRule.AGG_FILTER_JOIN);
+        rules.add(OlapAggFilterTransposeRule.AGG_FILTER_JOIN);
 
         RelRoot relRoot = sqlToRelRoot(project, query.getSecond(), config);
         RelNode relBefore = optimizeSQL(relRoot, rulesBefore);
@@ -141,11 +139,11 @@ public class AggPushdownRuleTest extends CalciteRuleTestBase {
         Pair<String, String> query = readOneSQL(config, project, "query/sql_select_subquery", "query05.sql");
 
         List<RelOptRule> rulesBefore = Lists.newArrayList(rulesDefault);
-        rulesBefore.add(KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
-        rulesBefore.add(KapAggFilterTransposeRule.AGG_FILTER_JOIN);
+        rulesBefore.add(OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN);
+        rulesBefore.add(OlapAggFilterTransposeRule.AGG_FILTER_JOIN);
 
         List<RelOptRule> rules = Lists.newArrayList(rulesBefore);
-        rules.add(KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG);
+        rules.add(OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG);
 
         RelRoot relRoot = sqlToRelRoot(project, query.getSecond(), config);
         RelNode relBefore = optimizeSQL(relRoot, rulesBefore);
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/CalciteRuleTestBase.java b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/CalciteRuleTestBase.java
index f152f903b4..0803fd2cbd 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/CalciteRuleTestBase.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/CalciteRuleTestBase.java
@@ -48,7 +48,6 @@ import org.apache.kylin.query.engine.QueryOptimizer;
 import org.apache.kylin.query.util.HepUtils;
 import org.apache.kylin.query.util.QueryParams;
 import org.apache.kylin.query.util.QueryUtil;
-import org.apache.kylin.query.util.RelAggPushDownUtil;
 import org.apache.kylin.util.ExecAndComp;
 import org.junit.Assert;
 import org.slf4j.Logger;
@@ -127,7 +126,7 @@ public class CalciteRuleTestBase extends NLocalFileMetadataTestCase {
         }).collect(Collectors.toList());
     }
 
-    void checkDiff(RelNode relBefore, RelNode relAfter, String prefix) {
+    protected void checkDiff(RelNode relBefore, RelNode relAfter, String prefix) {
         String before = Strings.isNullOrEmpty(prefix) ? "planBefore" : prefix + ".planBefore";
         String beforeExpected = "${" + before + "}";
         final String planBefore = NL + RelOptUtil.toString(relBefore);
@@ -146,21 +145,6 @@ public class CalciteRuleTestBase extends NLocalFileMetadataTestCase {
         checkDiff(relBefore, relAfter, prefix);
     }
 
-    protected void checkSQLAfterRule(String project, String sql, String prefix, StringOutput StrOut,
-            Collection<RelOptRule> rules) {
-        RelNode relBefore = toCalcitePlan(project, sql, KylinConfig.getInstanceFromEnv());
-        Assert.assertThat(relBefore, notNullValue());
-        RelAggPushDownUtil.clearUnmatchedJoinDigest();
-        RelAggPushDownUtil.collectAllJoinRel(relBefore);
-        RelNode relAfter = HepUtils.runRuleCollection(relBefore, rules, false);
-        Assert.assertThat(relAfter, notNullValue());
-        if (StrOut != null) {
-            StrOut.output(relBefore, relAfter, prefix);
-        } else {
-            checkDiff(relBefore, relAfter, prefix);
-        }
-    }
-
     protected void checkSQLPostOptimize(String project, String sql, String prefix, StringOutput StrOut,
             Collection<RelOptRule> rules) {
         RelNode relBefore = toCalcitePlan(project, sql, KylinConfig.getInstanceFromEnv());
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/FilterSimplifyRuleTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/FilterSimplifyRuleTest.java
index bec709b609..000d6ef677 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/FilterSimplifyRuleTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/FilterSimplifyRuleTest.java
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.kylin.query.rules;
 
 import java.io.IOException;
@@ -27,19 +26,17 @@ import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.test.DiffRepository;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
+import org.apache.kylin.query.optrule.FilterJoinConditionMergeRule;
+import org.apache.kylin.query.optrule.FilterSimplifyRule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import io.kyligence.kap.query.optrule.FilterJoinConditionMergeRule;
-import io.kyligence.kap.query.optrule.FilterSimplifyRule;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class FilterSimplifyRuleTest extends CalciteRuleTestBase {
     static final String defaultProject = "default";
-    private final DiffRepository diff = DiffRepository.lookup(FilterSimplifyRuleTest.class);
-
 
     @Before
     public void setup() {
@@ -53,7 +50,7 @@ public class FilterSimplifyRuleTest extends CalciteRuleTestBase {
 
     @Override
     protected DiffRepository getDiffRepo() {
-        return diff;
+        return DiffRepository.lookup(FilterSimplifyRuleTest.class);
     }
 
     @Test
diff --git a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/ScalarSubqueryJoinRuleTest.java b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/ScalarSubqueryJoinRuleTest.java
index 0c8c75ac89..e8e733a61b 100644
--- a/src/kylin-it/src/test/java/org/apache/kylin/query/rules/ScalarSubqueryJoinRuleTest.java
+++ b/src/kylin-it/src/test/java/org/apache/kylin/query/rules/ScalarSubqueryJoinRuleTest.java
@@ -28,16 +28,16 @@ import org.apache.calcite.test.DiffRepository;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.util.Pair;
 import org.apache.kylin.guava30.shaded.common.collect.ImmutableList;
+import org.apache.kylin.query.optrule.AggregateProjectReduceRule;
+import org.apache.kylin.query.optrule.OlapAggregateRule;
+import org.apache.kylin.query.optrule.OlapJoinRule;
+import org.apache.kylin.query.optrule.OlapProjectRule;
+import org.apache.kylin.query.optrule.ScalarSubqueryJoinRule;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import io.kyligence.kap.query.optrule.AggregateProjectReduceRule;
-import io.kyligence.kap.query.optrule.KapAggregateRule;
-import io.kyligence.kap.query.optrule.KapJoinRule;
-import io.kyligence.kap.query.optrule.KapProjectRule;
-import io.kyligence.kap.query.optrule.ScalarSubqueryJoinRule;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -97,9 +97,9 @@ public class ScalarSubqueryJoinRuleTest extends CalciteRuleTestBase {
 
     private List<RelOptRule> getTransformRules() {
         return ImmutableList.of(// basic rules
-                KapAggregateRule.INSTANCE, //
-                KapProjectRule.INSTANCE, //
-                KapJoinRule.INSTANCE, //
+                OlapAggregateRule.INSTANCE, //
+                OlapProjectRule.INSTANCE, //
+                OlapJoinRule.INSTANCE, //
                 // relative rules
                 ProjectMergeRule.INSTANCE, //
                 AggregateProjectMergeRule.INSTANCE, //
diff --git a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.xml b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.xml
index 66a73c369f..96db7edf05 100644
--- a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.xml
+++ b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/CountDistinctExprPlannerTest.xml
@@ -193,26 +193,26 @@ OlapToEnumerableConverter
             <![CDATA[
 OlapToEnumerableConverter
   OlapProjectRel(EXPR$0=[$1], CAL_DT=[$0], EXPR$2=[$2], EXPR$3=[$3], ctx=[])
-    OlapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[BITMAP_COUNT($2)], AGG$2=[SUM($3)], ctx=[])
-      OlapProjectRel(CAL_DT=[$0], EXPR$0=[$2], $f2=[CASE(>($1, 2012-12-01), $4, null)], EXPR$3=[$3], ctx=[])
-        OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], AGG$0=[$5], AGG$1=[$6], COUNT_DISTINCT_CASE$0$0=[$2], ctx=[])
-          OlapJoinRel(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner], ctx=[])
-            OlapAggregateRel(group-set=[[0, 2]], groups=[null], COUNT_DISTINCT_CASE$0$0=[BITMAP_UUID($3)], ctx=[])
-              OlapProjectRel(CAL_DT=[$2], $f1=[CAST(0):DECIMAL(19, 4)], CAL_DT0=[$2], TEST_COUNT_DISTINCT_BITMAP=[$10], $f4=[0], $f5=[CAST(0):DECIMAL(29, 4)], ctx=[])
+    OlapProjectRel(CAL_DT=[$0], AGG$0=[$3], EXPR$2=[$1], AGG$1=[$4], ctx=[])
+      OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
+        OlapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[BITMAP_COUNT($1)], ctx=[])
+          OlapProjectRel(CAL_DT=[$0], $f1=[CASE(>($1, 2012-12-01), $2, null)], ctx=[])
+            OlapAggregateRel(group-set=[[0, 1]], groups=[null], COUNT_DISTINCT_CASE$0$0=[BITMAP_UUID($2)], ctx=[])
+              OlapProjectRel(CAL_DT=[$2], CAL_DT0=[$2], TEST_COUNT_DISTINCT_BITMAP=[$10], $f3=[0], ctx=[])
                 OlapJoinRel(condition=[=($1, $39)], joinType=[left], ctx=[])
                   OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
                   OlapTableScan(table=[[DEFAULT, TEST_ORDER]], ctx=[], fields=[[0, 1, 2, 3, 4]])
-            OlapAggregateRel(group-set=[[0, 1]], groups=[null], AGG$0=[SUM($2)], AGG$1=[SUM($3)], ctx=[])
-              OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], $f2=[CASE(=($2, 2012-10-30), $4, null)], EXPR$3=[$3], ctx=[])
-                OlapAggregateRel(group-set=[[0, 1, 2]], groups=[null], TOP_AGG$0=[SUM($3)], TOP_AGG$1=[SUM($4)], TOP_AGG$2=[SUM($5)], ctx=[])
-                  OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], CAL_DT01=[$2], EXPR$3=[$3], SUM_CASE$0$0=[$4], $f5=[*(0, $5)], ctx=[])
-                    OlapAggregateRel(group-set=[[0, 1, 2]], groups=[null], AGG$0=[SUM($3)], AGG$1=[SUM($4)], AGG$2=[SUM($5)], ctx=[])
-                      OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], CAL_DT01=[$2], $f3=[*($3, 9)], SUM_CASE$0$0=[$4], SUM_CONST$2=[$5], ctx=[])
-                        OlapAggregateRel(group-set=[[0, 1, 2]], groups=[null], SUM_OP$0=[SUM($3)], SUM_CASE$0$0=[SUM($4)], SUM_CONST$2=[COUNT()], ctx=[])
-                          OlapProjectRel(CAL_DT=[$2], CAL_DT0=[$2], CAL_DT01=[$2], PRICE=[$8], PRICE0=[$8], ctx=[])
-                            OlapJoinRel(condition=[=($1, $39)], joinType=[left], ctx=[])
-                              OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
-                              OlapTableScan(table=[[DEFAULT, TEST_ORDER]], ctx=[], fields=[[0, 1, 2, 3, 4]])
+        OlapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[SUM($2)], ctx=[])
+          OlapProjectRel(CAL_DT=[$0], $f1=[CASE(=($1, 2012-10-30), $3, null)], EXPR$3=[$2], ctx=[])
+            OlapAggregateRel(group-set=[[0, 1]], groups=[null], AGG$0=[SUM($2)], AGG$1=[SUM($3)], AGG$2=[SUM($4)], ctx=[])
+              OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], $f2=[*($2, 9)], SUM_CASE$0$0=[$3], SUM_CASE$0$1=[$4], ctx=[])
+                OlapAggregateRel(group-set=[[0, 1]], groups=[null], TOP_AGG$0=[SUM($2)], TOP_AGG$1=[SUM($3)], TOP_AGG$2=[SUM($4)], ctx=[])
+                  OlapProjectRel(CAL_DT=[$0], CAL_DT0=[$1], SUM_OP$0=[$2], SUM_CASE$0$0=[$3], $f4=[*(0, $4)], ctx=[])
+                    OlapAggregateRel(group-set=[[0, 1]], groups=[null], SUM_OP$0=[SUM($2)], SUM_CASE$0$0=[SUM($3)], SUM_CONST$2=[COUNT()], ctx=[])
+                      OlapProjectRel(CAL_DT=[$2], CAL_DT0=[$2], PRICE=[$8], PRICE0=[$8], ctx=[])
+                        OlapJoinRel(condition=[=($1, $39)], joinType=[left], ctx=[])
+                          OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
+                          OlapTableScan(table=[[DEFAULT, TEST_ORDER]], ctx=[], fields=[[0, 1, 2, 3, 4]])
 ]]>
         </Resource>
         <Resource name="query07.planBefore">
diff --git a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SqlToRelNodeTest.xml b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SqlToRelNodeTest.xml
index ac1d4b20dd..79f81da219 100644
--- a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SqlToRelNodeTest.xml
+++ b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SqlToRelNodeTest.xml
@@ -167,8 +167,8 @@ OlapToEnumerableConverter
         <Resource name="bloat_merge_sql.bloat_enabled_bloat_5">
             <![CDATA[
 OlapToEnumerableConverter
-  OlapProjectRel(EXPR$0=[+(+($0, $0), +($0, $0))], ctx=[])
-    OlapProjectRel(V=[CASE(>($0, 60), 1, 0)], ctx=[])
+  OlapProjectRel(EXPR$0=[+($0, $0)], ctx=[])
+    OlapProjectRel(X=[+(CASE(>($0, 60), 1, 0), CASE(>($0, 60), 1, 0))], ctx=[])
       OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
 ]]>
         </Resource>
diff --git a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SumExprPlannerTest.xml b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SumExprPlannerTest.xml
index 0b523080aa..b112b5ab17 100644
--- a/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SumExprPlannerTest.xml
+++ b/src/kylin-it/src/test/resources/org/apache/kylin/query/engine/SumExprPlannerTest.xml
@@ -424,8 +424,8 @@ OlapToEnumerableConverter
   OlapUnionRel(all=[true], ctx=[], all=[true])
     OlapProjectRel(EXPR=[$0], PRI=[CAST(/($1, $2)):BIGINT], PPP=[CAST(/(-($3, /(*($4, $4), $5)), $5)):BIGINT], ctx=[])
       OlapAggregateRel(group-set=[[]], groups=[null], EXPR=[SUM($0)], agg#1=[SUM($1)], agg#2=[COUNT($1)], agg#3=[SUM($2)], agg#4=[SUM($3)], agg#5=[COUNT($3)], ctx=[])
-        OlapProjectRel($f0=[$0], $f1=[$1], $f3=[*($2, $2)], PRI=[$2], ctx=[])
-          OlapProjectRel($f0=[*($0, 2)], $f1=[*(/($1, $2), 2)], PRI=[/($1, $2)], ctx=[])
+        OlapProjectRel($f0=[*($0, 2)], $f1=[*($2, 2)], $f3=[*($2, $2)], PRI=[$2], ctx=[])
+          OlapProjectRel(A1=[$0], A2=[$1], PRI=[/($1, $2)], ctx=[])
             OlapAggregateRel(group-set=[[]], groups=[null], A1=[SUM($0)], A2=[SUM($1)], agg#2=[COUNT($1)], ctx=[])
               OlapProjectRel(PRICE=[$8], ITEM_COUNT=[$9], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
@@ -444,8 +444,8 @@ OlapToEnumerableConverter
   OlapUnionRel(all=[true], ctx=[], all=[true])
     OlapProjectRel(EXPR=[$0], PRI=[CAST(/($1, $2)):BIGINT], PPP=[CAST(/(-($3, /(*($4, $4), $5)), $5)):BIGINT], ctx=[])
       OlapAggregateRel(group-set=[[]], groups=[null], EXPR=[SUM($0)], agg#1=[SUM($1)], agg#2=[COUNT($1)], agg#3=[SUM($2)], agg#4=[SUM($3)], agg#5=[COUNT($3)], ctx=[])
-        OlapProjectRel($f0=[$0], $f1=[$1], $f3=[*($2, $2)], PRI=[$2], ctx=[])
-          OlapProjectRel($f0=[*($0, 2)], $f1=[*(/($1, $2), 2)], PRI=[/($1, $2)], ctx=[])
+        OlapProjectRel($f0=[*($0, 2)], $f1=[*($2, 2)], $f3=[*($2, $2)], PRI=[$2], ctx=[])
+          OlapProjectRel(A1=[$0], A2=[$1], PRI=[/($1, $2)], ctx=[])
             OlapAggregateRel(group-set=[[]], groups=[null], A1=[SUM($0)], A2=[SUM($1)], agg#2=[COUNT($1)], ctx=[])
               OlapProjectRel(PRICE=[$8], ITEM_COUNT=[$9], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38]])
diff --git a/src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushdownRuleTest.xml b/src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushDownRuleTest.xml
similarity index 91%
rename from src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushdownRuleTest.xml
rename to src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushDownRuleTest.xml
index 840f5da5d0..a1e346e839 100644
--- a/src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushdownRuleTest.xml
+++ b/src/kylin-it/src/test/resources/org/apache/kylin/query/rules/AggPushDownRuleTest.xml
@@ -24,12 +24,12 @@
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -39,14 +39,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -55,12 +55,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0, 1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], LSTG_FORMAT_NAME=[$16], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -70,14 +70,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0, 1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($1, 164000), '[0,164000)', <($1, 166000), '[164000, 166000)', '[166000, +∞')], LSTG_FORMAT_NAME=[$0], PRICE=[$2], ctx=[])
       OlapAggregateRel(group-set=[[1, 2]], groups=[null], usr_GMV_SUM_ok=[SUM($3)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], LSTG_FORMAT_NAME0=[$2], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -86,11 +86,11 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($1, 164000), '[0,164000)', <($1, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$10], ctx=[])
-      OlapFilterRel(condition=[<>($5, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($5, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($0, $5)], joinType=[inner], ctx=[])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
@@ -106,7 +106,7 @@ OlapToEnumerableConverter
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
@@ -117,14 +117,14 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($22, 164000), '[0,164000)', <($22, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $21)], joinType=[inner], ctx=[])
           OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
             OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
             OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
                   OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
                   OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
@@ -136,7 +136,7 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
@@ -145,7 +145,7 @@ OlapToEnumerableConverter
                   OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
                       OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
                       OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
@@ -156,12 +156,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[$17], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -169,14 +169,14 @@ OlapToEnumerableConverter
             <![CDATA[
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-    OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+    OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
       OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
         OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
           OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
             OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -185,12 +185,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(AND(<($17, 164000), =($16, 'ABIN')), '[0,164000)', AND(<($17, 166000), =($16, 'ABIN')), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -200,14 +200,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(AND(<($1, 164000), =($0, 'ABIN')), '[0,164000)', AND(<($1, 166000), =($0, 'ABIN')), '[164000, 166000)', '[166000, +∞')], PRICE=[$2], ctx=[])
       OlapAggregateRel(group-set=[[1, 2]], groups=[null], usr_GMV_SUM_ok=[SUM($3)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], LSTG_FORMAT_NAME0=[$2], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -216,12 +216,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_COUNT_ok=[COUNT($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -231,14 +231,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_COUNT_ok=[$SUM0($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_COUNT_ok=[$SUM0($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_COUNT_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_COUNT_ok=[COUNT($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -249,12 +249,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -264,14 +264,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], $1=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -280,12 +280,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0, 1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], LSTG_FORMAT_NAME=[$16], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -295,14 +295,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0, 1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($1, 164000), '[0,164000)', <($1, 166000), '[164000, 166000)', '[166000, +∞')], LSTG_FORMAT_NAME=[$0], $2=[$2], ctx=[])
       OlapAggregateRel(group-set=[[1, 2]], groups=[null], usr_GMV_SUM_ok=[SUM($3)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], LSTG_FORMAT_NAME0=[$2], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -311,11 +311,11 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($1, 164000), '[0,164000)', <($1, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$10], ctx=[])
-      OlapFilterRel(condition=[<>($5, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($5, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($0, $5)], joinType=[inner], ctx=[])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
@@ -326,12 +326,12 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], $1=[$1], ctx=[])
       OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-        OlapFilterRel(condition=[<>($1, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($1, 'Auction'))], ctx=[])
           OlapProjectRel(X_measure__0=[$1], LSTG_FORMAT_NAME=[$2], usr_GMV_SUM_ok=[$3], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
@@ -342,14 +342,14 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($22, 164000), '[0,164000)', <($22, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $21)], joinType=[inner], ctx=[])
           OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
             OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
             OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
                   OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
                   OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
@@ -361,7 +361,7 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], $1=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
@@ -370,7 +370,7 @@ OlapToEnumerableConverter
                   OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapJoinRel(condition=[=($7, $16)], joinType=[inner], ctx=[])
                       OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
                       OlapTableScan(table=[[DEFAULT, TEST_ACCOUNT]], ctx=[], fields=[[0, 1, 2, 3, 4]])
@@ -381,12 +381,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[$17], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -394,14 +394,14 @@ OlapToEnumerableConverter
             <![CDATA[
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_SUM_ok=[SUM($2)], ctx=[])
-    OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+    OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
       OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
         OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
           OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
             OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -410,12 +410,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(AND(<($17, 164000), =($16, 'ABIN')), '[0,164000)', AND(<($17, 166000), =($16, 'ABIN')), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -425,14 +425,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_SUM_ok=[SUM($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(AND(<($1, 164000), =($0, 'ABIN')), '[0,164000)', AND(<($1, 166000), =($0, 'ABIN')), '[164000, 166000)', '[166000, +∞')], $2=[$2], ctx=[])
       OlapAggregateRel(group-set=[[1, 2]], groups=[null], usr_GMV_SUM_ok=[SUM($3)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], LSTG_FORMAT_NAME0=[$2], X_measure__0=[$3], usr_GMV_SUM_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_SUM_ok=[SUM($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -441,12 +441,12 @@ OlapToEnumerableConverter
 OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_COUNT_ok=[COUNT($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($17, 164000), '[0,164000)', <($17, 166000), '[164000, 166000)', '[166000, +∞')], PRICE=[$8], ctx=[])
-      OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+      OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
         OlapJoinRel(condition=[=($3, $16)], joinType=[inner], ctx=[])
           OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
           OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
             OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-              OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+              OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
@@ -456,14 +456,14 @@ OlapToEnumerableConverter
   OlapAggregateRel(group-set=[[0]], groups=[null], usr_GMV_COUNT_ok=[$SUM0($1)], ctx=[])
     OlapProjectRel(Calculation_1162491713472385025=[CASE(<($0, 164000), '[0,164000)', <($0, 166000), '[164000, 166000)', '[166000, +∞')], $1=[$1], ctx=[])
       OlapAggregateRel(group-set=[[1]], groups=[null], usr_GMV_COUNT_ok=[$SUM0($2)], ctx=[])
-        OlapFilterRel(condition=[<>($0, 'Auction')], ctx=[])
+        OlapFilterRel(condition=[NOT(=($0, 'Auction'))], ctx=[])
           OlapProjectRel(LSTG_FORMAT_NAME=[$0], X_measure__0=[$3], usr_GMV_COUNT_ok=[$1], ctx=[])
             OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])
               OlapAggregateRel(group-set=[[3]], groups=[null], usr_GMV_COUNT_ok=[COUNT($8)], ctx=[])
                 OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
               OlapAggregateRel(group-set=[[0]], groups=[null], X_measure__0=[SUM($1)], ctx=[])
                 OlapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], ctx=[])
-                  OlapFilterRel(condition=[<>($3, 'Auction')], ctx=[])
+                  OlapFilterRel(condition=[NOT(=($3, 'Auction'))], ctx=[])
                     OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]])
 ]]>
         </Resource>
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
index 4b36536dd7..eaae502b61 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/ContextUtil.java
@@ -85,27 +85,27 @@ public class ContextUtil {
         _resultType.remove();
     }
 
-    public static void amendAllColsIfNoAgg(RelNode kapRel) {
-        if (kapRel == null || ((OlapRel) kapRel).getContext() == null || kapRel instanceof OlapTableScan) {
+    public static void amendAllColsIfNoAgg(RelNode rel) {
+        if (rel == null || ((OlapRel) rel).getContext() == null || rel instanceof OlapTableScan) {
             return;
         }
 
-        OlapContext context = ((OlapRel) kapRel).getContext();
+        OlapContext context = ((OlapRel) rel).getContext();
         // add columns of context's TopNode to context when there are no agg rel
-        if (kapRel instanceof OlapProjectRel && !((OlapProjectRel) kapRel).isMerelyPermutation()) {
-            ((OlapRel) kapRel).getColumnRowType().getSourceColumns().stream().flatMap(Collection::stream)
+        if (rel instanceof OlapProjectRel && !((OlapProjectRel) rel).isMerelyPermutation()) {
+            ((OlapRel) rel).getColumnRowType().getSourceColumns().stream().flatMap(Collection::stream)
                     .filter(context::isOriginAndBelongToCtxTables).forEach(context.getAllColumns()::add);
-        } else if (kapRel instanceof OlapValuesRel) {
-            ((OlapRel) kapRel).getColumnRowType().getAllColumns().stream().filter(context::isOriginAndBelongToCtxTables)
+        } else if (rel instanceof OlapValuesRel) {
+            ((OlapRel) rel).getColumnRowType().getAllColumns().stream().filter(context::isOriginAndBelongToCtxTables)
                     .forEach(context.getAllColumns()::add);
-        } else if (kapRel instanceof OlapWindowRel) {
-            ((OlapWindowRel) kapRel).getGroupingColumns().stream().filter(context::isOriginAndBelongToCtxTables)
+        } else if (rel instanceof OlapWindowRel) {
+            ((OlapWindowRel) rel).getGroupingColumns().stream().filter(context::isOriginAndBelongToCtxTables)
                     .forEach(context.getAllColumns()::add);
-        } else if (kapRel instanceof OlapJoinRel) {
-            amendAllColsIfNoAgg(kapRel.getInput(0));
-            amendAllColsIfNoAgg(kapRel.getInput(1));
+        } else if (rel instanceof OlapJoinRel) {
+            amendAllColsIfNoAgg(rel.getInput(0));
+            amendAllColsIfNoAgg(rel.getInput(1));
         } else {
-            amendAllColsIfNoAgg(kapRel.getInput(0));
+            amendAllColsIfNoAgg(rel.getInput(0));
         }
     }
 
@@ -304,8 +304,8 @@ public class ContextUtil {
 
     public static boolean qualifiedForAggInfoPushDown(RelNode currentRel, OlapContext subContext) {
         // 1. the parent node of TopRel in subContext is not NULL and is instance Of OlapJoinRel.
-        // 2. the TopNode of subContext is NOT instance of KapAggregateRel.
-        // 3. JoinRels in the path from currentNode to the ParentOfContextTopRel 
+        // 2. the TopNode of subContext is NOT instance of OlapAggregateRel.
+        // 3. JoinRels in the path from currentNode to the ParentOfContextTopRel
         //    node are all the same type (left/inner/cross)
         // 4. all aggregate is derived from the same subContext
         return (subContext.getParentOfTopNode() instanceof OlapJoinRel
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapAggregateRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapAggregateRel.java
index 326230ed1b..c6ff0e37f9 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapAggregateRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapAggregateRel.java
@@ -188,7 +188,7 @@ public class OlapAggregateRel extends Aggregate implements OlapRel {
         ContextVisitorState tempState = ContextVisitorState.init();
         contextImpl.visitChild(getInput(), this, tempState);
         if (tempState.hasFreeTable()) {
-            // since SINGLE_VALUE agg doesn't participant in any computation, 
+            // since SINGLE_VALUE agg doesn't participant in any computation,
             // context is allocated to the input rel
             if (CollectionUtils.exists(aggregateCalls,
                     aggCall -> ((AggregateCall) aggCall).getAggregation().getKind() == SqlKind.SINGLE_VALUE)) {
@@ -225,10 +225,10 @@ public class OlapAggregateRel extends Aggregate implements OlapRel {
         }
         RelOptCost cost;
         if (getGroupType() == Group.SIMPLE) {
-            cost = super.computeSelfCost(planner, mq).multiplyBy(.05);
+            cost = super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
         } else {
-            cost = super.computeSelfCost(planner, mq).multiplyBy(.05).plus(planner.getCost(getInput(), mq))
-                    .multiplyBy(groupSets.size() * 1.5);
+            cost = super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR)
+                    .plus(planner.getCost(getInput(), mq)).multiplyBy(groupSets.size() * 1.5);
         }
         return cost;
     }
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapFilterRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapFilterRel.java
index c6ff508241..1dd88ed42a 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapFilterRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapFilterRel.java
@@ -245,7 +245,16 @@ public class OlapFilterRel extends Filter implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR).multiplyBy(calcComplexity());
+    }
+
+    // For example:
+    // 1) AND(>=($11, 2021-10-28 00:00:00), <($11, 2021-11-05 00:00:00))
+    // 2) AND(>=($11, CAST('2021-10-28'):TIMESTAMP(3) NOT NULL), <($11, CAST('2021-11-05'):TIMESTAMP(3) NOT NULL))
+    // the first condition is better than the second condition.
+    private double calcComplexity() {
+        int complexity = 1 + getCondition().toString().length();
+        return Math.exp(-1.0 / complexity);
     }
 
     @Override
@@ -415,8 +424,8 @@ public class OlapFilterRel extends Filter implements OlapRel {
             FilterVisitor visitor = new FilterVisitor(this.columnRowType, filterColumns);
             this.condition.accept(visitor);
             if (isHeterogeneousSegmentOrMultiPartEnabled(subCtx)) {
-                subCtx.getExpandedFilterConditions()
-                        .addAll(new FilterConditionExpander(subCtx, this).convert(this.condition));
+                List<RexNode> convert = new FilterConditionExpander(subCtx, this).convert(this.condition);
+                subCtx.getExpandedFilterConditions().addAll(convert);
             }
             if (isJoinMatchOptimizationEnabled()) {
                 collectNotNullTableWithFilterCondition(subCtx);
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapJoinRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapJoinRel.java
index 093f5df4fd..983fe55c7a 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapJoinRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapJoinRel.java
@@ -76,6 +76,7 @@ import lombok.val;
 @Getter
 public class OlapJoinRel extends EnumerableJoin implements OlapRel {
 
+    static final double LARGE_JOIN_FACTOR = 100.0;
     static final String[] COLUMN_ARRAY_MARKER = new String[0];
 
     private OlapContext context;
@@ -101,11 +102,11 @@ public class OlapJoinRel extends EnumerableJoin implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        // assign a huge cost on right join and cross join so that the swapped 
+        // assign a huge cost on right join and cross join so that the swapped
         // left join and inner join will win in the optimization
         return joinType == JoinRelType.RIGHT || condition.isAlwaysTrue()
-                ? super.computeSelfCost(planner, mq).multiplyBy(100)
-                : super.computeSelfCost(planner, mq).multiplyBy(.05);
+                ? super.computeSelfCost(planner, mq).multiplyBy(OlapJoinRel.LARGE_JOIN_FACTOR)
+                : super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapLimitRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapLimitRel.java
index ec000a979a..8563ee5bb6 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapLimitRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapLimitRel.java
@@ -77,7 +77,7 @@ public class OlapLimitRel extends SingleRel implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapMinusRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapMinusRel.java
index f7c44f360a..37e3fbff7d 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapMinusRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapMinusRel.java
@@ -24,11 +24,14 @@ import java.util.Set;
 
 import org.apache.calcite.adapter.enumerable.EnumerableRel;
 import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelOptCost;
+import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.RelTrait;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.Minus;
 import org.apache.calcite.rel.core.SetOp;
+import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.kylin.guava30.shaded.common.collect.Sets;
 import org.apache.kylin.metadata.model.TblColRef;
 import org.apache.kylin.query.util.ICutContextStrategy;
@@ -139,6 +142,11 @@ public class OlapMinusRel extends Minus implements OlapRel {
         return false;
     }
 
+    @Override
+    public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
+    }
+
     @Override
     public RelTraitSet replaceTraitSet(RelTrait trait) {
         RelTraitSet oldTraitSet = this.traitSet;
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapNonEquiJoinRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapNonEquiJoinRel.java
index 7661010ee1..39671da83d 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapNonEquiJoinRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapNonEquiJoinRel.java
@@ -381,7 +381,7 @@ public class OlapNonEquiJoinRel extends EnumerableThetaJoin implements OlapRel {
     public boolean pushRelInfoToContext(OlapContext context) {
         if (this.context != null)
             return false;
-        // if non-equiv-join is the direct parent of the context, 
+        // if non-equiv-join is the direct parent of the context,
         // there is no need to push context further down
         // otherwise try push context down to both side
         if (this == context.getParentOfTopNode() || ((OlapRel) getLeft()).pushRelInfoToContext(context)
@@ -416,8 +416,9 @@ public class OlapNonEquiJoinRel extends EnumerableThetaJoin implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return joinType == JoinRelType.RIGHT ? super.computeSelfCost(planner, mq).multiplyBy(100)
-                : super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return joinType == JoinRelType.RIGHT //
+                ? super.computeSelfCost(planner, mq).multiplyBy(OlapJoinRel.LARGE_JOIN_FACTOR)
+                : super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapProjectRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapProjectRel.java
index b0c7eff9ae..b1eb6deb43 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapProjectRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapProjectRel.java
@@ -218,12 +218,25 @@ public class OlapProjectRel extends Project implements OlapRel {
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
         boolean hasRexOver = RexOver.containsOver(getProjects(), null);
-        RelOptCost relOptCost = super.computeSelfCost(planner, mq).multiplyBy(.05)
+        RelOptCost relOptCost = super.computeSelfCost(planner, mq) //
+                .multiplyBy(OlapRel.OLAP_COST_FACTOR) //
+                .multiplyBy(getComplexity()) //
                 .multiplyBy(getProjects().size() * (hasRexOver ? 50.0 : 1.0))
                 .plus(planner.getCostFactory().makeCost(0.1 * caseCount, 0, 0));
         return planner.getCostFactory().makeCost(relOptCost.getRows(), 0, 0);
     }
 
+    // Simplified OlapProjectRel has lower cost. For example:
+    // RexNode(1+1) will be converted to RexNode(2) by ReduceExpressionRule,
+    // thus we should choose the latter because it has lower complexity.
+    private double getComplexity() {
+        int complexity = 1;
+        for (RexNode rexNode : getProjects()) {
+            complexity += rexNode.toString().length();
+        }
+        return Math.exp(-1.0 / complexity);
+    }
+
     @Override
     public Project copy(RelTraitSet traitSet, RelNode child, List<RexNode> exps, RelDataType rowType) {
         return new OlapProjectRel(getCluster(), traitSet, child, exps, rowType);
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapRel.java
index 5ebf5e916e..f51eafd3a3 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapRel.java
@@ -55,6 +55,8 @@ public interface OlapRel extends RelNode {
 
     // Calling convention for relational operations that occur in OLAP.
     Convention CONVENTION = new Convention.Impl("OLAP", OlapRel.class);
+    // olapRel default cost factor
+    double OLAP_COST_FACTOR = 0.05;
 
     /** get olap context */
     OlapContext getContext();
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapSortRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapSortRel.java
index 67bdfc7258..b7be8c9e33 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapSortRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapSortRel.java
@@ -74,7 +74,7 @@ public class OlapSortRel extends Sort implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
@@ -97,8 +97,10 @@ public class OlapSortRel extends Sort implements OlapRel {
         } else if (needPushToSubCtx) {
             List<Set<TblColRef>> sourceColumns = this.columnRowType.getSourceColumns();
             if (CollectionUtils.isNotEmpty(sourceColumns)) {
-                ContextUtil.updateSubContexts(
-                        sourceColumns.stream().flatMap(Collection::stream).collect(Collectors.toSet()), subContexts);
+                Set<TblColRef> colRefs = sourceColumns.stream().flatMap(Collection::stream)
+                        .filter(tblColRef -> !tblColRef.getName().startsWith("_KY_")) //
+                        .collect(Collectors.toSet());
+                ContextUtil.updateSubContexts(colRefs, subContexts);
             }
         }
     }
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapTableScan.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapTableScan.java
index 43dc813121..319131b81a 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapTableScan.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapTableScan.java
@@ -118,7 +118,7 @@ public class OlapTableScan extends TableScan implements EnumerableRel, OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapToEnumerableConverter.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapToEnumerableConverter.java
index 97acf135f2..4a9135afcd 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapToEnumerableConverter.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapToEnumerableConverter.java
@@ -40,7 +40,7 @@ public class OlapToEnumerableConverter extends ConverterImpl implements Enumerab
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
         // huge cost to ensure OlapToEnumerableConverter only appears once in rel tree
-        return super.computeSelfCost(planner, mq).multiplyBy(0.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     public OlapToEnumerableConverter(RelOptCluster cluster, RelTraitSet traits, RelNode input) {
@@ -53,7 +53,7 @@ public class OlapToEnumerableConverter extends ConverterImpl implements Enumerab
     }
 
     /**
-     * The implement of CalciteQueryExec (compared with the current SparderQueryExec), 
+     * The implement of CalciteQueryExec (compared with the current SparderQueryExec),
      * pay less attention.
      */
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapUnionRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapUnionRel.java
index 30666b5e15..b6aa044556 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapUnionRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapUnionRel.java
@@ -72,7 +72,7 @@ public class OlapUnionRel extends Union implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapValuesRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapValuesRel.java
index 6b2c351ff5..030234d844 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapValuesRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapValuesRel.java
@@ -64,7 +64,7 @@ public class OlapValuesRel extends Values implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        RelOptCost relOptCost = super.computeSelfCost(planner, mq).multiplyBy(0.05);
+        RelOptCost relOptCost = super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
         return planner.getCostFactory().makeCost(relOptCost.getRows(), 0, 0);
     }
 
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapWindowRel.java b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapWindowRel.java
index 44caac1991..6d7afe0e1f 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapWindowRel.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/relnode/OlapWindowRel.java
@@ -69,7 +69,7 @@ public class OlapWindowRel extends Window implements OlapRel {
 
     @Override
     public RelOptCost computeSelfCost(RelOptPlanner planner, RelMetadataQuery mq) {
-        return super.computeSelfCost(planner, mq).multiplyBy(.05);
+        return super.computeSelfCost(planner, mq).multiplyBy(OlapRel.OLAP_COST_FACTOR);
     }
 
     @Override
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/util/KapRelUtil.java b/src/query-common/src/main/java/org/apache/kylin/query/util/OlapRelUtil.java
similarity index 96%
rename from src/query-common/src/main/java/org/apache/kylin/query/util/KapRelUtil.java
rename to src/query-common/src/main/java/org/apache/kylin/query/util/OlapRelUtil.java
index 85e410cd7c..cd55012857 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/util/KapRelUtil.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/util/OlapRelUtil.java
@@ -26,11 +26,11 @@ import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rex.RexNode;
 import org.apache.kylin.common.util.Pair;
 
-public class KapRelUtil {
+public class OlapRelUtil {
 
     private static final String CTX = "ctx=";
 
-    private KapRelUtil() {
+    private OlapRelUtil() {
     }
 
     public static String getDigestWithoutRelNodeId(String digest, long layoutId, String modelId) {
@@ -70,7 +70,7 @@ public class KapRelUtil {
                 while (digestArray[i + 1] != ',' && digestArray[i + 1] != ')') {
                     i = i + 1;
                 }
-                digestBuilder.append(modelId + "_" + layoutId);
+                digestBuilder.append(modelId).append("_").append(layoutId);
             } else {
                 digestBuilder.append(c1);
             }
diff --git a/src/query-common/src/main/java/org/apache/kylin/query/util/RelAggPushDownUtil.java b/src/query-common/src/main/java/org/apache/kylin/query/util/RelAggPushDownUtil.java
index c800613361..5548e5b0ee 100644
--- a/src/query-common/src/main/java/org/apache/kylin/query/util/RelAggPushDownUtil.java
+++ b/src/query-common/src/main/java/org/apache/kylin/query/util/RelAggPushDownUtil.java
@@ -116,23 +116,23 @@ public class RelAggPushDownUtil {
         }
     }
 
-    public static OlapJoinRel collectFirstJoinRel(RelNode kapRel) {
-        if (kapRel == null || CollectionUtils.isEmpty(kapRel.getInputs())) {
+    public static OlapJoinRel collectFirstJoinRel(RelNode relNode) {
+        if (relNode == null || CollectionUtils.isEmpty(relNode.getInputs())) {
             return null;
         }
-        if (kapRel instanceof OlapJoinRel) {
-            return (OlapJoinRel) kapRel;
+        if (relNode instanceof OlapJoinRel) {
+            return (OlapJoinRel) relNode;
         } else {
-            return collectFirstJoinRel(kapRel.getInput(0));
+            return collectFirstJoinRel(relNode.getInput(0));
         }
     }
 
     // only for test
-    public static void collectAllJoinRel(RelNode kapRel) {
-        if (kapRel instanceof OlapJoinRel) {
-            QueryContext.current().getUnmatchedJoinDigest().put(handleDigest(kapRel.getDigest()), true);
+    public static void collectAllJoinRel(RelNode relNode) {
+        if (relNode instanceof OlapJoinRel) {
+            QueryContext.current().getUnmatchedJoinDigest().put(handleDigest(relNode.getDigest()), true);
         }
-        for (RelNode rel : kapRel.getInputs()) {
+        for (RelNode rel : relNode.getInputs()) {
             collectAllJoinRel(rel);
         }
     }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapOLAPToEnumerableConverterRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/KapOLAPToEnumerableConverterRule.java
deleted file mode 100644
index 9c41f3943c..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapOLAPToEnumerableConverterRule.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.adapter.enumerable.EnumerableConvention;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.kylin.query.relnode.OlapRel;
-import org.apache.kylin.query.relnode.OlapToEnumerableConverter;
-
-/**
- */
-public class KapOLAPToEnumerableConverterRule extends ConverterRule {
-
-    public static final ConverterRule INSTANCE = new KapOLAPToEnumerableConverterRule();
-
-    public KapOLAPToEnumerableConverterRule() {
-        super(RelNode.class, OlapRel.CONVENTION, EnumerableConvention.INSTANCE, "KapOLAPToEnumerableConverterRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        RelTraitSet newTraitSet = rel.getTraitSet().replace(getOutConvention());
-        return new OlapToEnumerableConverter(rel.getCluster(), newTraitSet, rel);
-    }
-
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapUnionRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/KapUnionRule.java
deleted file mode 100644
index 2a729832ff..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapUnionRule.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import java.util.List;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.core.Union;
-import org.apache.kylin.query.relnode.OlapRel;
-import org.apache.kylin.query.relnode.OlapUnionRel;
-
-/**
- */
-public class KapUnionRule extends ConverterRule {
-
-    public static final KapUnionRule INSTANCE = new KapUnionRule();
-
-    public KapUnionRule() {
-        super(Union.class, Convention.NONE, OlapRel.CONVENTION, "KapUnionRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        final Union union = (Union) rel;
-        final RelTraitSet traitSet = union.getTraitSet().replace(OlapRel.CONVENTION);
-        final List<RelNode> inputs = union.getInputs();
-        return new OlapUnionRel(rel.getCluster(), traitSet, convertList(inputs, OlapRel.CONVENTION), union.all);
-    }
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPAggregateRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPAggregateRule.java
deleted file mode 100644
index 576e83fcde..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPAggregateRule.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.InvalidRelException;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.core.AggregateCall;
-import org.apache.calcite.rel.logical.LogicalAggregate;
-import org.apache.calcite.sql.SqlAggFunction;
-import org.apache.calcite.sql.fun.SqlAvgAggFunction;
-import org.apache.kylin.query.relnode.OlapAggregateRel;
-import org.apache.kylin.query.relnode.OlapRel;
-
-/**
- */
-public class OLAPAggregateRule extends ConverterRule {
-
-    public static final ConverterRule INSTANCE = new OLAPAggregateRule();
-
-    public OLAPAggregateRule() {
-        super(LogicalAggregate.class, Convention.NONE, OlapRel.CONVENTION, "OLAPAggregateRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        LogicalAggregate agg = (LogicalAggregate) rel;
-
-        // AVG() will be transformed into SUM()/COUNT() by AggregateReduceFunctionsRule.
-        // Here only let the transformed plan pass.
-        if (containsAvg(agg)) {
-            return null;
-        }
-
-        RelTraitSet traitSet = agg.getTraitSet().replace(OlapRel.CONVENTION);
-        try {
-            return new OlapAggregateRel(agg.getCluster(), traitSet, convert(agg.getInput(), OlapRel.CONVENTION),
-                    agg.indicator, agg.getGroupSet(), agg.getGroupSets(), agg.getAggCallList());
-        } catch (InvalidRelException e) {
-            throw new IllegalStateException("Can't create OLAPAggregateRel!", e);
-        }
-    }
-
-    private boolean containsAvg(LogicalAggregate agg) {
-        for (AggregateCall call : agg.getAggCallList()) {
-            SqlAggFunction func = call.getAggregation();
-            if (func instanceof SqlAvgAggFunction)
-                return true;
-        }
-        return false;
-    }
-
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPFilterRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPFilterRule.java
deleted file mode 100644
index 60b2af0ac0..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPFilterRule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelOptRule;
-import org.apache.calcite.plan.RelOptUtil;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.logical.LogicalFilter;
-import org.apache.kylin.query.relnode.OlapFilterRel;
-import org.apache.kylin.query.relnode.OlapRel;
-
-/**
- */
-public class OLAPFilterRule extends ConverterRule {
-
-    public static final RelOptRule INSTANCE = new OLAPFilterRule();
-
-    public OLAPFilterRule() {
-        super(LogicalFilter.class, RelOptUtil.FILTER_PREDICATE, Convention.NONE, OlapRel.CONVENTION, "OLAPFilterRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        LogicalFilter filter = (LogicalFilter) rel;
-
-        RelTraitSet origTraitSet = filter.getTraitSet();
-        RelTraitSet traitSet = origTraitSet.replace(OlapRel.CONVENTION).simplify();
-
-        return new OlapFilterRel(filter.getCluster(), traitSet,
-                convert(filter.getInput(), filter.getInput().getTraitSet().replace(OlapRel.CONVENTION)),
-                filter.getCondition());
-    }
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPJoinRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPJoinRule.java
deleted file mode 100644
index fd888c1536..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPJoinRule.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelOptCluster;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.InvalidRelException;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.core.JoinInfo;
-import org.apache.calcite.rel.core.JoinRelType;
-import org.apache.calcite.rel.logical.LogicalJoin;
-import org.apache.kylin.query.relnode.OlapFilterRel;
-import org.apache.kylin.query.relnode.OlapJoinRel;
-import org.apache.kylin.query.relnode.OlapRel;
-
-/**
- */
-public class OLAPJoinRule extends ConverterRule {
-
-    public static final ConverterRule INSTANCE = new OLAPJoinRule();
-
-    public OLAPJoinRule() {
-        super(LogicalJoin.class, Convention.NONE, OlapRel.CONVENTION, "OLAPJoinRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        LogicalJoin join = (LogicalJoin) rel;
-        RelNode left = join.getInput(0);
-        RelNode right = join.getInput(1);
-
-        RelTraitSet traitSet = join.getTraitSet().replace(OlapRel.CONVENTION);
-        left = convert(left, left.getTraitSet().replace(OlapRel.CONVENTION));
-        right = convert(right, right.getTraitSet().replace(OlapRel.CONVENTION));
-
-        final JoinInfo info = JoinInfo.of(left, right, join.getCondition());
-        if (!info.isEqui() && join.getJoinType() != JoinRelType.INNER) {
-            // EnumerableJoinRel only supports equi-join. We can put a filter on top
-            // if it is an inner join.
-            return null;
-        }
-
-        RelOptCluster cluster = join.getCluster();
-        RelNode newRel;
-        try {
-            newRel = new OlapJoinRel(cluster, traitSet, left, right, //
-                    info.getEquiCondition(left, right, cluster.getRexBuilder()), //
-                    info.leftKeys, info.rightKeys, join.getVariablesSet(), join.getJoinType());
-        } catch (InvalidRelException e) {
-            // Semantic error not possible. Must be a bug. Convert to internal error.
-            throw new AssertionError(e);
-            // LOGGER.fine(e.toString());
-            // return null;
-        }
-        if (!info.isEqui()) {
-            newRel = new OlapFilterRel(cluster, newRel.getTraitSet(), newRel,
-                    info.getRemaining(cluster.getRexBuilder()));
-        }
-        return newRel;
-    }
-
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPLimitRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPLimitRule.java
deleted file mode 100644
index cfadd63f06..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPLimitRule.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.RelOptRule;
-import org.apache.calcite.plan.RelOptRuleCall;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.core.Sort;
-import org.apache.kylin.query.relnode.OlapLimitRel;
-import org.apache.kylin.query.relnode.OlapRel;
-
-/**
- */
-public class OLAPLimitRule extends RelOptRule {
-
-    public static final RelOptRule INSTANCE = new OLAPLimitRule();
-
-    public OLAPLimitRule() {
-        super(operand(Sort.class, any()), "OLAPLimitRule");
-    }
-
-    @Override
-    public void onMatch(RelOptRuleCall call) {
-        final Sort sort = call.rel(0);
-        if (sort.offset == null && sort.fetch == null) {
-            return;
-        }
-
-        RelTraitSet origTraitSet = sort.getTraitSet();
-        RelTraitSet traitSet = origTraitSet.replace(OlapRel.CONVENTION).simplify();
-
-        RelNode input = sort.getInput();
-        if (!sort.getCollation().getFieldCollations().isEmpty()) {
-            // Create a sort with the same sort key, but no offset or fetch.
-            input = sort.copy(sort.getTraitSet(), input, sort.getCollation(), null, null);
-        }
-        RelNode x = convert(input, input.getTraitSet().replace(OlapRel.CONVENTION));
-        call.transformTo(new OlapLimitRel(sort.getCluster(), traitSet, x, sort.offset, sort.fetch));
-    }
-
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPProjectRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPProjectRule.java
deleted file mode 100644
index d7030e647d..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPProjectRule.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelOptCluster;
-import org.apache.calcite.plan.RelOptRule;
-import org.apache.calcite.plan.RelOptUtil;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelCollationTraitDef;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.logical.LogicalProject;
-import org.apache.calcite.rel.metadata.RelMdCollation;
-import org.apache.kylin.query.relnode.OlapProjectRel;
-import org.apache.kylin.query.relnode.OlapRel;
-
-/**
- */
-public class OLAPProjectRule extends ConverterRule {
-
-    public static final RelOptRule INSTANCE = new OLAPProjectRule();
-
-    public OLAPProjectRule() {
-        super(LogicalProject.class, RelOptUtil.PROJECT_PREDICATE, Convention.NONE, OlapRel.CONVENTION,
-                "OLAPProjectRule");
-    }
-
-    @Override
-    public RelNode convert(final RelNode rel) {
-
-        //  KYLIN-3281
-        //  OLAPProjectRule can't normal working with projectRel[input=sortRel]
-        final LogicalProject project = (LogicalProject) rel;
-        final RelNode convertChild = convert(project.getInput(),
-                project.getInput().getTraitSet().replace(OlapRel.CONVENTION));
-        final RelOptCluster cluster = convertChild.getCluster();
-        final RelTraitSet traitSet = cluster.traitSet().replace(OlapRel.CONVENTION)
-                .replaceIfs(RelCollationTraitDef.INSTANCE, () -> //  CALCITE-88
-                RelMdCollation.project(cluster.getMetadataQuery(), convertChild, project.getProjects()));
-        return new OlapProjectRel(convertChild.getCluster(), traitSet, convertChild, project.getProjects(),
-                project.getRowType());
-    }
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPSortRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPSortRule.java
deleted file mode 100644
index d56881f3f7..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPSortRule.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.core.Sort;
-import org.apache.kylin.query.relnode.OlapRel;
-import org.apache.kylin.query.relnode.OlapSortRel;
-
-/**
- */
-public class OLAPSortRule extends ConverterRule {
-
-    public static final OLAPSortRule INSTANCE = new OLAPSortRule();
-
-    public OLAPSortRule() {
-        super(Sort.class, Convention.NONE, OlapRel.CONVENTION, "OLAPSortRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        final Sort sort = (Sort) rel;
-        if (sort.offset != null || sort.fetch != null) {
-            return null;
-        }
-        final RelTraitSet traitSet = sort.getTraitSet().replace(OlapRel.CONVENTION);
-        final RelNode input = sort.getInput();
-        return new OlapSortRel(rel.getCluster(), traitSet,
-                convert(input, input.getTraitSet().replace(OlapRel.CONVENTION)), sort.getCollation(), sort.offset,
-                sort.fetch);
-    }
-
-}
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPWindowRule.java b/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPWindowRule.java
deleted file mode 100644
index ec01456fa4..0000000000
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPWindowRule.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-
-package io.kyligence.kap.query.optrule;
-
-import org.apache.calcite.plan.Convention;
-import org.apache.calcite.plan.RelTraitSet;
-import org.apache.calcite.rel.RelNode;
-import org.apache.calcite.rel.convert.ConverterRule;
-import org.apache.calcite.rel.core.Window;
-import org.apache.kylin.query.relnode.OlapRel;
-import org.apache.kylin.query.relnode.OlapWindowRel;
-
-/**
- */
-public class OLAPWindowRule extends ConverterRule {
-
-    public static final OLAPWindowRule INSTANCE = new OLAPWindowRule();
-
-    public OLAPWindowRule() {
-        super(Window.class, Convention.NONE, OlapRel.CONVENTION, "OLAPWindowRule");
-    }
-
-    @Override
-    public RelNode convert(RelNode rel) {
-        final Window window = (Window) rel;
-        final RelTraitSet traitSet = window.getTraitSet().replace(OlapRel.CONVENTION);
-        final RelNode input = window.getInput();
-        return new OlapWindowRel(rel.getCluster(), traitSet, convert(input, OlapRel.CONVENTION), window.constants,
-                window.getRowType(), window.groups);
-    }
-}
diff --git a/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java b/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
index ec1c4a1701..6ed45272fd 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/PlannerFactory.java
@@ -68,30 +68,28 @@ import org.apache.kylin.common.debug.BackdoorToggles;
 import org.apache.kylin.guava30.shaded.common.base.Function;
 import org.apache.kylin.guava30.shaded.common.collect.ImmutableList;
 import org.apache.kylin.query.engine.meta.PlannerContext;
+import org.apache.kylin.query.optrule.AggregateMultipleExpandRule;
+import org.apache.kylin.query.optrule.AggregateProjectReduceRule;
+import org.apache.kylin.query.optrule.CorrReduceFunctionRule;
+import org.apache.kylin.query.optrule.OlapAggregateReduceFunctionsRule;
+import org.apache.kylin.query.optrule.OlapAggregateRule;
+import org.apache.kylin.query.optrule.OlapFilterJoinRule;
+import org.apache.kylin.query.optrule.OlapFilterRule;
+import org.apache.kylin.query.optrule.OlapJoinRule;
+import org.apache.kylin.query.optrule.OlapLimitRule;
+import org.apache.kylin.query.optrule.OlapMinusRule;
+import org.apache.kylin.query.optrule.OlapModelViewRule;
+import org.apache.kylin.query.optrule.OlapProjectJoinTransposeRule;
+import org.apache.kylin.query.optrule.OlapProjectMergeRule;
+import org.apache.kylin.query.optrule.OlapProjectRule;
+import org.apache.kylin.query.optrule.OlapSortRule;
+import org.apache.kylin.query.optrule.OlapToEnumerableConverterRule;
+import org.apache.kylin.query.optrule.OlapUnionRule;
+import org.apache.kylin.query.optrule.OlapValuesRule;
+import org.apache.kylin.query.optrule.OlapWindowRule;
+import org.apache.kylin.query.optrule.RightJoinToLeftJoinRule;
 import org.apache.kylin.query.relnode.ContextUtil;
 
-import io.kyligence.kap.query.optrule.AggregateMultipleExpandRule;
-import io.kyligence.kap.query.optrule.AggregateProjectReduceRule;
-import io.kyligence.kap.query.optrule.CorrReduceFunctionRule;
-import io.kyligence.kap.query.optrule.KAPValuesRule;
-import io.kyligence.kap.query.optrule.KapAggregateReduceFunctionsRule;
-import io.kyligence.kap.query.optrule.KapAggregateRule;
-import io.kyligence.kap.query.optrule.KapFilterJoinRule;
-import io.kyligence.kap.query.optrule.KapFilterRule;
-import io.kyligence.kap.query.optrule.KapJoinRule;
-import io.kyligence.kap.query.optrule.KapLimitRule;
-import io.kyligence.kap.query.optrule.KapMinusRule;
-import io.kyligence.kap.query.optrule.KapModelViewRule;
-import io.kyligence.kap.query.optrule.KapOLAPToEnumerableConverterRule;
-import io.kyligence.kap.query.optrule.KapProjectJoinTransposeRule;
-import io.kyligence.kap.query.optrule.KapProjectMergeRule;
-import io.kyligence.kap.query.optrule.KapProjectRule;
-import io.kyligence.kap.query.optrule.KapSortRule;
-import io.kyligence.kap.query.optrule.KapUnionRule;
-import io.kyligence.kap.query.optrule.KapWindowRule;
-import io.kyligence.kap.query.optrule.RightJoinToLeftJoinRule;
-import io.kyligence.kap.query.optrule.SumConstantConvertRule;
-
 /**
  * factory that create optimizers and register opt rules
  * TODO sort and register only necessary rules
@@ -113,7 +111,7 @@ public class PlannerFactory {
             AggregateStarTableRule.INSTANCE2, TableScanRule.INSTANCE, ProjectMergeRule.INSTANCE,
             FilterTableScanRule.INSTANCE, ProjectFilterTransposeRule.INSTANCE, FilterProjectTransposeRule.INSTANCE,
             FilterJoinRule.FILTER_ON_JOIN, JoinPushExpressionsRule.INSTANCE,
-            AggregateExpandDistinctAggregatesRule.INSTANCE, KapAggregateReduceFunctionsRule.INSTANCE,
+            AggregateExpandDistinctAggregatesRule.INSTANCE, OlapAggregateReduceFunctionsRule.INSTANCE,
             FilterAggregateTransposeRule.INSTANCE, ProjectWindowTransposeRule.INSTANCE, JoinCommuteRule.INSTANCE,
             JoinPushThroughJoinRule.RIGHT, JoinPushThroughJoinRule.LEFT, SortProjectTransposeRule.INSTANCE,
             SortJoinTransposeRule.INSTANCE, SortUnionTransposeRule.INSTANCE);
@@ -157,22 +155,20 @@ public class PlannerFactory {
         // force clear the query context before traversal relational operators
         ContextUtil.clearThreadLocalContexts();
         // register OLAP rules
-        //        addRules(planner, kylinConfig.getCalciteAddRule());
-        // register OLAP rules
-        planner.addRule(KapOLAPToEnumerableConverterRule.INSTANCE);
-        planner.addRule(KapFilterRule.INSTANCE);
-        planner.addRule(KapProjectRule.INSTANCE);
-        planner.addRule(KapAggregateRule.INSTANCE);
+        planner.addRule(OlapToEnumerableConverterRule.INSTANCE);
+        planner.addRule(OlapFilterRule.INSTANCE);
+        planner.addRule(OlapProjectRule.INSTANCE);
+        planner.addRule(OlapAggregateRule.INSTANCE);
         planner.addRule(selectJoinRuleByConfig());
-        planner.addRule(KapLimitRule.INSTANCE);
-        planner.addRule(KapSortRule.INSTANCE);
-        planner.addRule(KapUnionRule.INSTANCE);
-        planner.addRule(KapWindowRule.INSTANCE);
-        planner.addRule(KAPValuesRule.INSTANCE);
-        planner.addRule(KapMinusRule.INSTANCE);
-        planner.addRule(KapModelViewRule.INSTANCE);
+        planner.addRule(OlapLimitRule.INSTANCE);
+        planner.addRule(OlapSortRule.INSTANCE);
+        planner.addRule(OlapUnionRule.INSTANCE);
+        planner.addRule(OlapWindowRule.INSTANCE);
+        planner.addRule(OlapValuesRule.INSTANCE);
+        planner.addRule(OlapMinusRule.INSTANCE);
+        planner.addRule(OlapModelViewRule.INSTANCE);
         planner.removeRule(ProjectMergeRule.INSTANCE);
-        planner.addRule(KapProjectMergeRule.INSTANCE);
+        planner.addRule(OlapProjectMergeRule.INSTANCE);
 
         // Support translate the grouping aggregate into union of simple aggregates
         // if it's the auto-modeling dry run, then do not add the CorrReduceFunctionRule
@@ -185,10 +181,6 @@ public class PlannerFactory {
         }
         planner.addRule(AggregateProjectReduceRule.INSTANCE);
 
-        if (!kylinConfig.isConvertSumExpressionEnabled()) {
-            planner.addRule(SumConstantConvertRule.INSTANCE);
-        }
-
         // CalcitePrepareImpl.CONSTANT_REDUCTION_RULES
         if (kylinConfig.isReduceExpressionsRulesEnabled()) {
             planner.addRule(ReduceExpressionsRule.PROJECT_INSTANCE);
@@ -210,8 +202,8 @@ public class PlannerFactory {
         // since join is the entry point, we can't push filter past join
         planner.removeRule(FilterJoinRule.FILTER_ON_JOIN);
         planner.removeRule(FilterJoinRule.JOIN);
-        planner.addRule(KapFilterJoinRule.KAP_FILTER_ON_JOIN_JOIN);
-        planner.addRule(KapFilterJoinRule.KAP_FILTER_ON_JOIN_SCAN);
+        planner.addRule(OlapFilterJoinRule.OLAP_FILTER_ON_JOIN_JOIN);
+        planner.addRule(OlapFilterJoinRule.OLAP_FILTER_ON_JOIN_SCAN);
         // since we don't have statistic of table, the optimization of join is too cost
         planner.removeRule(JoinCommuteRule.INSTANCE);
         planner.removeRule(JoinPushThroughJoinRule.LEFT);
@@ -242,11 +234,11 @@ public class PlannerFactory {
         planner.removeRule(UnionMergeRule.INSTANCE);
 
         if (!kylinConfig.isConvertSumExpressionEnabled()) {
-            planner.addRule(KapProjectJoinTransposeRule.INSTANCE);
+            planner.addRule(OlapProjectJoinTransposeRule.INSTANCE);
         }
         planner.removeRule(ProjectRemoveRule.INSTANCE);
 
-        // skip corr expandsion during model suggestion
+        // skip corr expansion during model suggestion
         if (!KylinConfig.getInstanceFromEnv().getSkipCorrReduceRule()) {
             planner.addRule(CorrReduceFunctionRule.INSTANCE);
         }
@@ -255,8 +247,8 @@ public class PlannerFactory {
     private ConverterRule selectJoinRuleByConfig() {
         return (kylinConfig.isQueryNonEquiJoinModelEnabled() && !BackdoorToggles.getIsQueryFromAutoModeling())
                 || (kylinConfig.isNonEquiJoinRecommendationEnabled() && BackdoorToggles.getIsQueryFromAutoModeling()) //
-                        ? KapJoinRule.NON_EQUI_INSTANCE
-                        : KapJoinRule.INSTANCE;
+                        ? OlapJoinRule.NON_EQUI_INSTANCE
+                        : OlapJoinRule.INSTANCE;
     }
 
     protected void removeRules(final RelOptPlanner planner, List<String> rules) {
diff --git a/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java b/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
index a2e4b2f8a2..775069338e 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/QueryExec.java
@@ -68,6 +68,7 @@ import org.apache.kylin.query.engine.exec.SparderPlanExec;
 import org.apache.kylin.query.engine.meta.SimpleDataContext;
 import org.apache.kylin.query.engine.view.ViewAnalyzer;
 import org.apache.kylin.query.mask.QueryResultMasks;
+import org.apache.kylin.query.optrule.SumConstantConvertRule;
 import org.apache.kylin.query.relnode.ContextUtil;
 import org.apache.kylin.query.relnode.OlapAggregateRel;
 import org.apache.kylin.query.relnode.OlapContext;
@@ -265,6 +266,8 @@ public class QueryExec {
      */
     public List<RelNode> postOptimize(RelNode node) {
         Collection<RelOptRule> postOptRules = new LinkedHashSet<>();
+        // It will definitely work if it were put here
+        postOptRules.add(SumConstantConvertRule.INSTANCE);
         if (kylinConfig.isConvertSumExpressionEnabled()) {
             postOptRules.addAll(HepUtils.SumExprRules);
         }
diff --git a/src/query/src/main/java/org/apache/kylin/query/engine/QueryOptimizer.java b/src/query/src/main/java/org/apache/kylin/query/engine/QueryOptimizer.java
index 4d02c4211c..42d4e053ee 100644
--- a/src/query/src/main/java/org/apache/kylin/query/engine/QueryOptimizer.java
+++ b/src/query/src/main/java/org/apache/kylin/query/engine/QueryOptimizer.java
@@ -33,8 +33,7 @@ import org.apache.calcite.rel.core.TableScan;
 import org.apache.calcite.rel.core.Union;
 import org.apache.calcite.tools.Program;
 import org.apache.calcite.tools.Programs;
-
-import io.kyligence.kap.query.optrule.KapProjectJoinTransposeRule;
+import org.apache.kylin.query.optrule.OlapProjectJoinTransposeRule;
 
 public class QueryOptimizer {
 
@@ -63,7 +62,7 @@ public class QueryOptimizer {
                 if (node instanceof Union) {
                     // @see https://olapio.atlassian.net/browse/AL-2127
                     // the optimize step is extremely slow with this rule
-                    planner.removeRule(KapProjectJoinTransposeRule.INSTANCE);
+                    planner.removeRule(OlapProjectJoinTransposeRule.INSTANCE);
                 }
                 super.visit(node, ordinal, parent);
             }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/AbstractAggCaseWhenFunctionRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/AbstractAggCaseWhenFunctionRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/AbstractAggCaseWhenFunctionRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/AbstractAggCaseWhenFunctionRule.java
index c3e8c566ad..31c3b55353 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/AbstractAggCaseWhenFunctionRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/AbstractAggCaseWhenFunctionRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateMultipleExpandRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateMultipleExpandRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java
index 03320938e0..20ab7efe88 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateMultipleExpandRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/AggregateMultipleExpandRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateProjectReduceRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/AggregateProjectReduceRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateProjectReduceRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/AggregateProjectReduceRule.java
index b604731d2a..742216dd8a 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/AggregateProjectReduceRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/AggregateProjectReduceRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/CorrReduceFunctionRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/CorrReduceFunctionRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/CorrReduceFunctionRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/CorrReduceFunctionRule.java
index 7fd955ed34..53291daf81 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/CorrReduceFunctionRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/CorrReduceFunctionRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/CountDistinctCaseWhenFunctionRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/CountDistinctCaseWhenFunctionRule.java
similarity index 91%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/CountDistinctCaseWhenFunctionRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/CountDistinctCaseWhenFunctionRule.java
index fda6a16236..8857a94d31 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/CountDistinctCaseWhenFunctionRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/CountDistinctCaseWhenFunctionRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,21 +63,6 @@ import org.apache.kylin.query.util.RuleUtils;
 /**
  * COUNT(DISTINCT (CASE WHEN ... THEN COLUMN ELSE NULL))
  * only support the form COUNT(DISTINCT (CASE WHEN ... THEN COLUMN ELSE NULL))
- *
- * e.g. sql:
- * EXECUTION PLAN BEFORE
- * KapOLAPToEnumerableConverter
- *   KapAggregateRel(group-set=[[]], groups=[null], EXPR$0=[COUNT(DISTINCT $0)], ctx=[])
- *     KapProjectRel($f0=[CASE(=($3, 'foo'), $8, null)], ctx=[])
- *       KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, ...]])
- *
- * EXECUTION PLAN CONVERTED
- * KapOLAPToEnumerableConverter
- *   KapAggregateRel(group-set=[[]], groups=[null], AGG$0=[BITMAP_COUNT($0)], ctx=[])
- *     KapProjectRel($f0=[CASE(=($0, 'foo'), $1, null)], ctx=[])
- *       KapAggregateRel(group-set=[[0]], groups=[null], COUNT_DISTINCT$0$0=[BITMAP_UUID($1)], ctx=[])
- *         KapProjectRel(LSTG_FORMAT_NAME=[$3], PRICE=[$8], $f2=[0], ctx=[])
- *           KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0, 1, 2, ...]])
  */
 public class CountDistinctCaseWhenFunctionRule extends AbstractAggCaseWhenFunctionRule {
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/ExtensionOlapJoinRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/ExtensionOlapJoinRule.java
index 03b306c6b7..36c654c4d2 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/ExtensionOlapJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/ExtensionOlapJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 import java.util.Set;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/FilterJoinConditionMergeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/FilterJoinConditionMergeRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/FilterJoinConditionMergeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/FilterJoinConditionMergeRule.java
index 5a1c1ab273..1172592448 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/FilterJoinConditionMergeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/FilterJoinConditionMergeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/FilterSimplifyRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/FilterSimplifyRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/FilterSimplifyRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/FilterSimplifyRule.java
index 9b82cae651..789b1c11bf 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/FilterSimplifyRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/FilterSimplifyRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/JoinFilterRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/JoinFilterRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/JoinFilterRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/JoinFilterRule.java
index d8d216d477..1f4ff2062c 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/JoinFilterRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/JoinFilterRule.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggFilterTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggFilterTransposeRule.java
similarity index 91%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggFilterTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggFilterTransposeRule.java
index 046fca4048..c7ccd09494 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggFilterTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggFilterTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 
@@ -47,20 +47,20 @@ import org.apache.kylin.query.util.RuleUtils;
 /**
  * agg-filter-join -> agg-filter-agg-join
  */
-public class KapAggFilterTransposeRule extends RelOptRule {
-    public static final KapAggFilterTransposeRule AGG_FILTER_JOIN = new KapAggFilterTransposeRule(
-            operand(OlapAggregateRel.class, operand(OlapFilterRel.class, operand(OlapJoinRel.class, any()))),
-            RelFactories.LOGICAL_BUILDER, "KapAggFilterTransposeRule:agg-filter-join");
+public class OlapAggFilterTransposeRule extends RelOptRule {
+    public static final OlapAggFilterTransposeRule AGG_FILTER_JOIN = new OlapAggFilterTransposeRule(
+            operand(OlapAggregateRel.class, operand(OlapFilterRel.class, operand(OlapJoinRel.class, RelOptRule.any()))),
+            RelFactories.LOGICAL_BUILDER, "OlapAggFilterTransposeRule:agg-filter-join");
 
-    public KapAggFilterTransposeRule(RelOptRuleOperand operand) {
+    public OlapAggFilterTransposeRule(RelOptRuleOperand operand) {
         super(operand);
     }
 
-    public KapAggFilterTransposeRule(RelOptRuleOperand operand, String description) {
+    public OlapAggFilterTransposeRule(RelOptRuleOperand operand, String description) {
         super(operand, description);
     }
 
-    public KapAggFilterTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+    public OlapAggFilterTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
             String description) {
         super(operand, relBuilderFactory, description);
     }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggJoinTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggJoinTransposeRule.java
similarity index 97%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggJoinTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggJoinTransposeRule.java
index c6a0a13203..e237a18a71 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggJoinTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggJoinTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -64,23 +64,24 @@ import org.apache.kylin.query.util.RuleUtils;
 
 import com.google.common.collect.ImmutableList;
 
-public class KapAggJoinTransposeRule extends RelOptRule {
+public class OlapAggJoinTransposeRule extends RelOptRule {
 
     private static final String STAR_TOKEN = "*";
 
-    public static final KapAggJoinTransposeRule INSTANCE_JOIN_RIGHT_AGG = new KapAggJoinTransposeRule(
+    public static final OlapAggJoinTransposeRule INSTANCE_JOIN_RIGHT_AGG = new OlapAggJoinTransposeRule(
             operand(OlapAggregateRel.class, operand(OlapJoinRel.class, any())), RelFactories.LOGICAL_BUILDER,
-            "KapAggJoinTransposeRule:agg-join-rightAgg");
+            "OlapAggJoinTransposeRule:agg-join-rightAgg");
 
-    public KapAggJoinTransposeRule(RelOptRuleOperand operand) {
+    public OlapAggJoinTransposeRule(RelOptRuleOperand operand) {
         super(operand);
     }
 
-    public KapAggJoinTransposeRule(RelOptRuleOperand operand, String description) {
+    public OlapAggJoinTransposeRule(RelOptRuleOperand operand, String description) {
         super(operand, description);
     }
 
-    public KapAggJoinTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
+    public OlapAggJoinTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+            String description) {
         super(operand, relBuilderFactory, description);
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectMergeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectMergeRule.java
similarity index 90%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectMergeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectMergeRule.java
index a48b8dc0bf..5922f87ca8 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectMergeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectMergeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.HashMap;
 import java.util.List;
@@ -44,25 +44,25 @@ import org.apache.kylin.query.util.RuleUtils;
 
 import com.google.common.collect.ImmutableList;
 
-public class KapAggProjectMergeRule extends RelOptRule {
-    public static final KapAggProjectMergeRule AGG_PROJECT_JOIN = new KapAggProjectMergeRule(
+public class OlapAggProjectMergeRule extends RelOptRule {
+    public static final OlapAggProjectMergeRule AGG_PROJECT_JOIN = new OlapAggProjectMergeRule(
             operand(OlapAggregateRel.class, operand(OlapProjectRel.class, operand(OlapJoinRel.class, any()))),
-            RelFactories.LOGICAL_BUILDER, "KapAggProjectMergeRule:agg-project-join");
+            RelFactories.LOGICAL_BUILDER, "OlapAggProjectMergeRule:agg-project-join");
 
-    public static final KapAggProjectMergeRule AGG_PROJECT_FILTER_JOIN = new KapAggProjectMergeRule(
+    public static final OlapAggProjectMergeRule AGG_PROJECT_FILTER_JOIN = new OlapAggProjectMergeRule(
             operand(OlapAggregateRel.class,
                     operand(OlapProjectRel.class, operand(OlapFilterRel.class, operand(OlapJoinRel.class, any())))),
-            RelFactories.LOGICAL_BUILDER, "KapAggProjectMergeRule:agg-project-filter-join");
+            RelFactories.LOGICAL_BUILDER, "OlapAggProjectMergeRule:agg-project-filter-join");
 
-    public KapAggProjectMergeRule(RelOptRuleOperand operand) {
+    public OlapAggProjectMergeRule(RelOptRuleOperand operand) {
         super(operand);
     }
 
-    public KapAggProjectMergeRule(RelOptRuleOperand operand, String description) {
+    public OlapAggProjectMergeRule(RelOptRuleOperand operand, String description) {
         super(operand, description);
     }
 
-    public KapAggProjectMergeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
+    public OlapAggProjectMergeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
         super(operand, relBuilderFactory, description);
     }
 
@@ -87,7 +87,7 @@ public class KapAggProjectMergeRule extends RelOptRule {
         ImmutableBitSet hasUseInAgg = immutableBitSetBuilder.build();
         for (int i = 0; i < project.getProjects().size(); i++) {
             RexNode rexNode = project.getProjects().get(i);
-            // group by column is RexInputRef or group by column is expression 
+            // group by column is RexInputRef or group by column is expression
             // and the expression has not imported by topNode
             if (!(rexNode instanceof RexInputRef) && hasUseInAgg.get(i)) {
                 return false;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectTransposeRule.java
similarity index 93%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectTransposeRule.java
index c120653f44..34822357fa 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggProjectTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggProjectTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -57,25 +57,25 @@ import org.apache.kylin.query.util.RuleUtils;
  * agg-project-join  ->  agg-project-agg-join
  * agg-project-filter-join -> agg-project-filter-agg-join
  */
-public class KapAggProjectTransposeRule extends RelOptRule {
-    public static final KapAggProjectTransposeRule AGG_PROJECT_FILTER_JOIN = new KapAggProjectTransposeRule(
+public class OlapAggProjectTransposeRule extends RelOptRule {
+    public static final OlapAggProjectTransposeRule AGG_PROJECT_FILTER_JOIN = new OlapAggProjectTransposeRule(
             operand(OlapAggregateRel.class,
                     operand(OlapProjectRel.class, operand(OlapFilterRel.class, operand(OlapJoinRel.class, any())))),
-            RelFactories.LOGICAL_BUILDER, "KapAggProjectTransposeRule:agg-project-filter-join");
+            RelFactories.LOGICAL_BUILDER, "OlapAggProjectTransposeRule:agg-project-filter-join");
 
-    public static final KapAggProjectTransposeRule AGG_PROJECT_JOIN = new KapAggProjectTransposeRule(
+    public static final OlapAggProjectTransposeRule AGG_PROJECT_JOIN = new OlapAggProjectTransposeRule(
             operand(OlapAggregateRel.class, operand(OlapProjectRel.class, operand(OlapJoinRel.class, any()))),
-            RelFactories.LOGICAL_BUILDER, "KapAggProjectTransposeRule:agg-project-join");
+            RelFactories.LOGICAL_BUILDER, "OlapAggProjectTransposeRule:agg-project-join");
 
-    public KapAggProjectTransposeRule(RelOptRuleOperand operand) {
+    public OlapAggProjectTransposeRule(RelOptRuleOperand operand) {
         super(operand);
     }
 
-    public KapAggProjectTransposeRule(RelOptRuleOperand operand, String description) {
+    public OlapAggProjectTransposeRule(RelOptRuleOperand operand, String description) {
         super(operand, description);
     }
 
-    public KapAggProjectTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+    public OlapAggProjectTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
             String description) {
         super(operand, relBuilderFactory, description);
     }
@@ -111,7 +111,7 @@ public class KapAggProjectTransposeRule extends RelOptRule {
         for (int i = 0; i < project.getProjects().size(); i++) {
             RexNode rexNode = project.getProjects().get(i);
             // Only handle "GROUP BY expression"
-            // If without expression, see KapAggProjectMergeRule
+            // If without expression, see OlapAggProjectMergeRule
             if (rexNode instanceof RexCall && aggregate.getRewriteGroupKeys().contains(i)) {
                 return true;
             }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggSumCastRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggSumCastRule.java
similarity index 87%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggSumCastRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggSumCastRule.java
index 5a6c4e2636..d5cfbd2378 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggSumCastRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggSumCastRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,41 +55,25 @@ import org.slf4j.LoggerFactory;
 
 /**
  * sum(cast(expr as double))  ->  cast(sum(expr) as double)
- *
+ * <p>
  * sum(expr)'s return type must match expr's return type, ordinarily, there types is equal
  * but need notice:
- *      when expr return type is int, sum(expr) return type is bigint
- *      when expr return type is smallint, sum(expr) return type is bigint
- *      when expr return type is tinyint, sum(expr) return type is bigint
- *
- * limit: expr return type must be number
- *
- * eg:
- * SELECT SUM(CAST(PRICE AS DOUBLE))
- * FROM "TEST_KYLIN_FACT" AS "TEST_KYLIN_FACT"
- *
- * beforePlan:
- * KapOLAPToEnumerableConverter
- *   KapAggregateRel(group-set=[[]], groups=[null], EXPR$0=[SUM($0)], ctx=[])
- *     KapProjectRel($f0=[CAST($7):DOUBLE], ctx=[])
- *       KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0...38]])
- *
- * afterPlan:
- * KapOLAPToEnumerableConverter
- *   KapProjectRel(EXPR$0=[CAST($0):DOUBLE], ctx=[])
- *     KapAggregateRel(group-set=[[]], groups=[null], EXPR$0=[SUM($0)], ctx=[])
- *       KapProjectRel(SELLER_ID=[$7], ctx=[])
- *         KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[], fields=[[0...38]])
+ * <li> when expr return type is int, sum(expr) return type is bigint
+ * <li> when expr return type is smallint, sum(expr) return type is bigint
+ * <li> when expr return type is tinyint, sum(expr) return type is bigint
+ * <p>
+ * <p/>
+ * Limitation: return type of expression must be number.
  */
-public class KapAggSumCastRule extends RelOptRule {
+public class OlapAggSumCastRule extends RelOptRule {
 
-    public static final KapAggSumCastRule INSTANCE = new KapAggSumCastRule(
+    public static final OlapAggSumCastRule INSTANCE = new OlapAggSumCastRule(
             operand(OlapAggregateRel.class, operand(OlapProjectRel.class, null,
                     input -> !AggExpressionUtil.hasAggInput(input), RelOptRule.any())),
-            RelFactories.LOGICAL_BUILDER, "KapAggSumCastRule");
-    private static final Logger logger = LoggerFactory.getLogger(KapAggSumCastRule.class);
+            RelFactories.LOGICAL_BUILDER, "OlapAggSumCastRule");
+    private static final Logger logger = LoggerFactory.getLogger(OlapAggSumCastRule.class);
 
-    public KapAggSumCastRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
+    public OlapAggSumCastRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
         super(operand, relBuilderFactory, description);
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateReduceFunctionsRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateReduceFunctionsRule.java
similarity index 85%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateReduceFunctionsRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateReduceFunctionsRule.java
index c160db9edc..fb50d2707d 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateReduceFunctionsRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateReduceFunctionsRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.RelOptRuleOperand;
 import org.apache.calcite.rel.core.RelFactories;
@@ -25,15 +25,15 @@ import org.apache.calcite.rel.rules.AggregateReduceFunctionsRule;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.tools.RelBuilderFactory;
 
-public class KapAggregateReduceFunctionsRule extends AggregateReduceFunctionsRule {
+public class OlapAggregateReduceFunctionsRule extends AggregateReduceFunctionsRule {
     /** The singleton. */
-    public static final AggregateReduceFunctionsRule INSTANCE = new KapAggregateReduceFunctionsRule(
+    public static final AggregateReduceFunctionsRule INSTANCE = new OlapAggregateReduceFunctionsRule(
             operand(LogicalAggregate.class, any()), RelFactories.LOGICAL_BUILDER);
 
     //~ Constructors -----------------------------------------------------------
 
     /** Creates an AggregateReduceFunctionsRule. */
-    private KapAggregateReduceFunctionsRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory) {
+    private OlapAggregateReduceFunctionsRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory) {
         super(operand, relBuilderFactory);
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateRule.java
similarity index 89%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateRule.java
index 568c8f7b72..79089195df 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapAggregateRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapAggregateRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import static org.apache.kylin.query.relnode.OlapRel.CONVENTION;
 
@@ -32,14 +32,12 @@ import org.apache.calcite.sql.SqlAggFunction;
 import org.apache.calcite.sql.fun.SqlAvgAggFunction;
 import org.apache.kylin.query.relnode.OlapAggregateRel;
 
-/**
- */
-public class KapAggregateRule extends ConverterRule {
+public class OlapAggregateRule extends ConverterRule {
 
-    public static final ConverterRule INSTANCE = new KapAggregateRule();
+    public static final ConverterRule INSTANCE = new OlapAggregateRule();
 
-    public KapAggregateRule() {
-        super(LogicalAggregate.class, Convention.NONE, CONVENTION, "KapAggregateRule");
+    public OlapAggregateRule() {
+        super(LogicalAggregate.class, Convention.NONE, CONVENTION, "OlapAggregateRule");
     }
 
     @Override
@@ -59,7 +57,7 @@ public class KapAggregateRule extends ConverterRule {
             return new OlapAggregateRel(agg.getCluster(), traitSet, convertedInput, agg.indicator, agg.getGroupSet(),
                     agg.getGroupSets(), agg.getAggCallList());
         } catch (InvalidRelException e) {
-            throw new IllegalStateException("Can't create OLAPAggregateRel!", e);
+            throw new IllegalStateException("Can't create OlapAggregateRel!", e);
         }
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapCountDistinctJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapCountDistinctJoinRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapCountDistinctJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapCountDistinctJoinRule.java
index ef685b1fa6..99e0fa9051 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapCountDistinctJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapCountDistinctJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,17 +43,17 @@ import org.apache.kylin.query.util.RuleUtils;
  * agg-join  ->  agg(CD)-agg(other-agg)-join
  * agg-project-join  ->  agg(CD)-agg(other-agg)-project-join
  */
-public class KapCountDistinctJoinRule extends RelOptRule {
+public class OlapCountDistinctJoinRule extends RelOptRule {
 
-    public static final KapCountDistinctJoinRule COUNT_DISTINCT_JOIN_ONE_SIDE_AGG = new KapCountDistinctJoinRule(
+    public static final OlapCountDistinctJoinRule COUNT_DISTINCT_JOIN_ONE_SIDE_AGG = new OlapCountDistinctJoinRule(
             operand(OlapAggregateRel.class, operand(OlapJoinRel.class, any())), RelFactories.LOGICAL_BUILDER,
-            "KapCountDistinctJoinRule:agg(contain-count-distinct)-join-oneSideAgg");
+            "OlapCountDistinctJoinRule:agg(contain-count-distinct)-join-oneSideAgg");
 
-    public static final KapCountDistinctJoinRule COUNT_DISTINCT_AGG_PROJECT_JOIN = new KapCountDistinctJoinRule(
+    public static final OlapCountDistinctJoinRule COUNT_DISTINCT_AGG_PROJECT_JOIN = new OlapCountDistinctJoinRule(
             operand(OlapAggregateRel.class, operand(OlapProjectRel.class, operand(OlapJoinRel.class, any()))),
-            RelFactories.LOGICAL_BUILDER, "KapCountDistinctJoinRule:agg(contain-count-distinct)-agg-project-join");
+            RelFactories.LOGICAL_BUILDER, "OlapCountDistinctJoinRule:agg(contain-count-distinct)-agg-project-join");
 
-    public KapCountDistinctJoinRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+    public OlapCountDistinctJoinRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
             String description) {
         super(operand, relBuilderFactory, description);
     }
@@ -73,7 +73,7 @@ public class KapCountDistinctJoinRule extends RelOptRule {
     @Override
     public void onMatch(RelOptRuleCall call) {
         final OlapAggregateRel aggregate = call.rel(0);
-        final OlapRel inputKapRel = call.rel(1);
+        final OlapRel inputRel = call.rel(1);
 
         // build bottom aggRelNode
         final ImmutableList.Builder<AggregateCall> bottomAggCallsBuilder = ImmutableList.builder();
@@ -91,7 +91,7 @@ public class KapCountDistinctJoinRule extends RelOptRule {
         ImmutableBitSet bottomGroupSetBuild = bottomGroupSetBuilder.build();
         ImmutableList<AggregateCall> bottomAggCallsBuild = bottomAggCallsBuilder.build();
         List<Integer> bottomGroupSets = bottomGroupSetBuild.asList();
-        final Aggregate bottomAggregate = aggregate.copy(aggregate.getTraitSet(), inputKapRel, aggregate.indicator,
+        final Aggregate bottomAggregate = aggregate.copy(aggregate.getTraitSet(), inputRel, aggregate.indicator,
                 bottomGroupSetBuild, null, bottomAggCallsBuild);
 
         // build top aggRelNode
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapEquiJoinConditionFixRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapEquivJoinConditionFixRule.java
similarity index 89%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapEquiJoinConditionFixRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapEquivJoinConditionFixRule.java
index d4c44ab05c..ca6d05c202 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapEquiJoinConditionFixRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapEquivJoinConditionFixRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 
@@ -35,12 +35,12 @@ import org.apache.kylin.query.util.RexUtils;
  * 1. Remove casts. This rule will search the join conditions
  * and replace condition like cast(col1 as ...) = col2 with col1 = col2
  */
-public class KapEquiJoinConditionFixRule extends RelOptRule {
+public class OlapEquivJoinConditionFixRule extends RelOptRule {
 
-    public static final KapEquiJoinConditionFixRule INSTANCE = new KapEquiJoinConditionFixRule();
+    public static final OlapEquivJoinConditionFixRule INSTANCE = new OlapEquivJoinConditionFixRule();
 
-    private KapEquiJoinConditionFixRule() {
-        super(operand(OlapJoinRel.class, any()), RelFactories.LOGICAL_BUILDER, "KapEquiJoinConditionFixRule:join");
+    private OlapEquivJoinConditionFixRule() {
+        super(operand(OlapJoinRel.class, any()), RelFactories.LOGICAL_BUILDER, "OlapEquivJoinConditionFixRule:join");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterJoinRule.java
similarity index 93%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterJoinRule.java
index 0221567eea..b04d65b991 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -55,26 +55,25 @@ import org.apache.kylin.query.util.RexUtils;
  *  rewrite the cross join to the equal-semantic inner Join.
  *
  */
-public class KapFilterJoinRule extends RelOptRule {
-    public static final KapFilterJoinRule KAP_FILTER_ON_JOIN_JOIN = new KapFilterJoinRule(operand(Filter.class,
-            operand(Join.class,
-                    operand(Join.class, operand(RelNode.class, RelOptRule.any()),
-                            operand(RelNode.class, RelOptRule.any())),
-                    operand(RelNode.class, null, input -> !(input instanceof Join), RelOptRule.any()))),
-            RelFactories.LOGICAL_BUILDER, true, "KapFilterJoinRule:filter-join-join");
-
-    public static final KapFilterJoinRule KAP_FILTER_ON_JOIN_SCAN = new KapFilterJoinRule(
+public class OlapFilterJoinRule extends RelOptRule {
+    public static final OlapFilterJoinRule OLAP_FILTER_ON_JOIN_JOIN = new OlapFilterJoinRule(
             operand(Filter.class,
                     operand(Join.class,
-                            operand(RelNode.class, null, input -> !(input instanceof Join), RelOptRule.any()),
+                            operand(Join.class, operand(RelNode.class, RelOptRule.any()),
+                                    operand(RelNode.class, RelOptRule.any())),
                             operand(RelNode.class, null, input -> !(input instanceof Join), RelOptRule.any()))),
-            RelFactories.LOGICAL_BUILDER, false, "KapFilterJoinRule:filter-join-scan");
+            RelFactories.LOGICAL_BUILDER, true, "OlapFilterJoinRule:filter-join-join");
+
+    public static final OlapFilterJoinRule OLAP_FILTER_ON_JOIN_SCAN = new OlapFilterJoinRule(operand(Filter.class,
+            operand(Join.class, operand(RelNode.class, null, input -> !(input instanceof Join), RelOptRule.any()),
+                    operand(RelNode.class, null, input -> !(input instanceof Join), RelOptRule.any()))),
+            RelFactories.LOGICAL_BUILDER, false, "OlapFilterJoinRule:filter-join-scan");
 
-    private boolean needTranspose;
+    private final boolean needTranspose;
 
-    private KapFilterJoinRule(RelOptRuleOperand relOptRuleOperand, RelBuilderFactory relBuilderFactory,
-            boolean needTranspose, String discription) {
-        super(relOptRuleOperand, relBuilderFactory, discription);
+    private OlapFilterJoinRule(RelOptRuleOperand relOptRuleOperand, RelBuilderFactory relBuilderFactory,
+            boolean needTranspose, String description) {
+        super(relOptRuleOperand, relBuilderFactory, description);
         this.needTranspose = needTranspose;
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterRule.java
index 15ac200746..23a6dd04b3 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapFilterRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapFilterRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptRule;
@@ -29,14 +29,12 @@ import org.apache.calcite.rel.logical.LogicalFilter;
 import org.apache.kylin.query.relnode.OlapFilterRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-/**
- */
-public class KapFilterRule extends ConverterRule {
+public class OlapFilterRule extends ConverterRule {
 
-    public static final RelOptRule INSTANCE = new KapFilterRule();
+    public static final RelOptRule INSTANCE = new OlapFilterRule();
 
-    public KapFilterRule() {
-        super(LogicalFilter.class, RelOptUtil.FILTER_PREDICATE, Convention.NONE, OlapRel.CONVENTION, "KapFilterRule");
+    public OlapFilterRule() {
+        super(LogicalFilter.class, RelOptUtil.FILTER_PREDICATE, Convention.NONE, OlapRel.CONVENTION, "OlapFilterRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinProjectTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinProjectTransposeRule.java
similarity index 95%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinProjectTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinProjectTransposeRule.java
index 7a7f3ab545..3d1df981d5 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinProjectTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinProjectTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
@@ -28,9 +28,9 @@ import org.apache.kylin.query.relnode.OlapJoinRel;
 import org.apache.kylin.query.relnode.OlapNonEquiJoinRel;
 import org.apache.kylin.query.relnode.OlapProjectRel;
 
-public class KapJoinProjectTransposeRule extends RelOptRule {
+public class OlapJoinProjectTransposeRule extends RelOptRule {
 
-    private KapJoinProjectTransposeRule(RelOptRuleOperand operand) {
+    private OlapJoinProjectTransposeRule(RelOptRuleOperand operand) {
         super(operand);
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinRule.java
similarity index 97%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinRule.java
index 999032e769..5697920c48 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -55,7 +55,7 @@ import org.apache.kylin.query.relnode.OlapJoinRel;
 import org.apache.kylin.query.relnode.OlapNonEquiJoinRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-public class KapJoinRule extends ConverterRule {
+public class OlapJoinRule extends ConverterRule {
 
     private static final Set<Set<SqlOperator>> ALLOWED_PAIRS = ImmutableSet.of(
             ImmutableSet.of(SqlStdOperatorTable.GREATER_THAN, SqlStdOperatorTable.LESS_THAN_OR_EQUAL),
@@ -75,21 +75,21 @@ public class KapJoinRule extends ConverterRule {
         return null;
     }
 
-    public static final ConverterRule INSTANCE = new KapJoinRule();
-    public static final ConverterRule NON_EQUI_INSTANCE = new KapJoinRule(true, false);
-    public static final ConverterRule EQUAL_NULL_SAFE_INSTANT = new KapJoinRule(false, true);
+    public static final ConverterRule INSTANCE = new OlapJoinRule();
+    public static final ConverterRule NON_EQUI_INSTANCE = new OlapJoinRule(true, false);
+    public static final ConverterRule EQUAL_NULL_SAFE_INSTANT = new OlapJoinRule(false, true);
     private static final ImmutableSet<SqlKind> SCD2_KINDS = ImmutableSet.of(SqlKind.GREATER_THAN, SqlKind.LESS_THAN,
             SqlKind.GREATER_THAN_OR_EQUAL, SqlKind.LESS_THAN_OR_EQUAL);
 
     private final boolean isScd2Enabled;
     private final boolean joinCondEqualNullSafe;
 
-    public KapJoinRule() {
+    public OlapJoinRule() {
         this(false, false);
     }
 
-    public KapJoinRule(boolean isScd2Enabled, boolean joinCondEqualNullSafe) {
-        super(LogicalJoin.class, Convention.NONE, OlapRel.CONVENTION, "KapJoinRule");
+    public OlapJoinRule(boolean isScd2Enabled, boolean joinCondEqualNullSafe) {
+        super(LogicalJoin.class, Convention.NONE, OlapRel.CONVENTION, "OlapJoinRule");
         this.isScd2Enabled = isScd2Enabled;
         this.joinCondEqualNullSafe = joinCondEqualNullSafe;
     }
@@ -113,7 +113,7 @@ public class KapJoinRule extends ConverterRule {
         }
 
         // usually non-equiv-join can not be converted to equiv-join + filter
-        // keep KapNonEquiJoinRel and cut to small OlapContexts in the class of KapNonEquiJoinRel
+        // keep OlapNonEquiJoinRel and cut to small OlapContexts in the class of OlapNonEquiJoinRel
         try {
             RexBuilder rexBuilder = join.getCluster().getRexBuilder();
             RexNode cnfCondition = RexUtil.toCnf(rexBuilder, join.getCondition());
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapLimitRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapLimitRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapLimitRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapLimitRule.java
index 3bf3d97ee5..feac5fe7ee 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapLimitRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapLimitRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
@@ -26,14 +26,12 @@ import org.apache.calcite.rel.core.Sort;
 import org.apache.kylin.query.relnode.OlapLimitRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-/**
- */
-public class KapLimitRule extends RelOptRule {
+public class OlapLimitRule extends RelOptRule {
 
-    public static final RelOptRule INSTANCE = new KapLimitRule();
+    public static final RelOptRule INSTANCE = new OlapLimitRule();
 
-    public KapLimitRule() {
-        super(operand(Sort.class, any()), "KapLimitRule");
+    public OlapLimitRule() {
+        super(operand(Sort.class, any()), "OlapLimitRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapMinusRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapMinusRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapMinusRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapMinusRule.java
index 9fb5e73c35..4972c9cf74 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapMinusRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapMinusRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 
@@ -28,14 +28,12 @@ import org.apache.calcite.rel.core.Minus;
 import org.apache.kylin.query.relnode.OlapMinusRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-/**
- */
-public class KapMinusRule extends ConverterRule {
+public class OlapMinusRule extends ConverterRule {
 
-    public static final KapMinusRule INSTANCE = new KapMinusRule();
+    public static final OlapMinusRule INSTANCE = new OlapMinusRule();
 
-    public KapMinusRule() {
-        super(Minus.class, Convention.NONE, OlapRel.CONVENTION, "KapMinusRule");
+    public OlapMinusRule() {
+        super(Minus.class, Convention.NONE, OlapRel.CONVENTION, "OlapMinusRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapModelViewRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapModelViewRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapModelViewRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapModelViewRule.java
index 29fc87a69c..449552897b 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapModelViewRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapModelViewRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptRule;
@@ -28,14 +28,12 @@ import org.apache.kylin.guava30.shaded.common.collect.Lists;
 import org.apache.kylin.query.relnode.OlapModelViewRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-/**
- */
-public class KapModelViewRule extends ConverterRule {
+public class OlapModelViewRule extends ConverterRule {
 
-    public static final RelOptRule INSTANCE = new KapModelViewRule();
+    public static final RelOptRule INSTANCE = new OlapModelViewRule();
 
-    public KapModelViewRule() {
-        super(OlapModelViewRel.class, Convention.NONE, OlapRel.CONVENTION, "KapModelViewRule");
+    public OlapModelViewRule() {
+        super(OlapModelViewRel.class, Convention.NONE, OlapRel.CONVENTION, "OlapModelViewRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectJoinTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectJoinTransposeRule.java
similarity index 93%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectJoinTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectJoinTransposeRule.java
index 51807ba73f..b2c715bacc 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectJoinTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectJoinTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -37,16 +37,16 @@ import org.apache.calcite.rex.RexOver;
 import org.apache.calcite.runtime.PredicateImpl;
 import org.apache.calcite.tools.RelBuilderFactory;
 
-public class KapProjectJoinTransposeRule extends RelOptRule {
-    private static class SkipOverConidtion extends PredicateImpl<RexNode> implements PushProjector.ExprCondition {
+public class OlapProjectJoinTransposeRule extends RelOptRule {
+    private static class SkipOverCondition extends PredicateImpl<RexNode> implements PushProjector.ExprCondition {
         @Override
         public boolean test(RexNode expr) {
             return !(expr instanceof RexOver);
         }
     }
 
-    public static final KapProjectJoinTransposeRule INSTANCE = new KapProjectJoinTransposeRule(new SkipOverConidtion(),
-            RelFactories.LOGICAL_BUILDER);
+    public static final OlapProjectJoinTransposeRule INSTANCE = new OlapProjectJoinTransposeRule(
+            new SkipOverCondition(), RelFactories.LOGICAL_BUILDER);
 
     public static final String KY = "_KY_";
 
@@ -65,7 +65,7 @@ public class KapProjectJoinTransposeRule extends RelOptRule {
      * @param preserveExprCondition Condition for expressions that should be
      *                              preserved in the projection
      */
-    public KapProjectJoinTransposeRule(PushProjector.ExprCondition preserveExprCondition,
+    public OlapProjectJoinTransposeRule(PushProjector.ExprCondition preserveExprCondition,
             RelBuilderFactory relFactory) {
         super(operand(Project.class, operand(Join.class, any())), relFactory, null);
         this.preserveExprCondition = preserveExprCondition;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectMergeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectMergeRule.java
similarity index 91%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectMergeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectMergeRule.java
index 91976e3583..6b33361aaf 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectMergeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectMergeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@ import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.guava30.shaded.common.collect.Sets;
 
 /**
- * Introduce KapProjectMergeRule in replacement of Calcite's ProjectMergeRule to fix OOM issue: KAP-4899
+ * Introduce OlapProjectMergeRule in replacement of Calcite's ProjectMergeRule to fix OOM issue: KAP-4899
  *
  * Change point, simplify(): simplify "CASE(=($2, 0), null, CASE(=($2, 0), null, $1))" to be "CASE(=($2, 0), null, $1)"
  *
@@ -48,13 +48,15 @@ import org.apache.kylin.guava30.shaded.common.collect.Sets;
  *
  * see also:
  *   https://issues.apache.org/jira/browse/CALCITE-2223
- *   https://issues.apache.org/jira/browse/DRILL-6212 and https://github.com/apache/drill/pull/1319/files
+ *   https://issues.apache.org/jira/browse/DRILL-6212
+ *   and https://github.com/apache/drill/pull/1319/files
  *
  * @author yifanzhang
  *
  */
-public class KapProjectMergeRule extends RelOptRule {
-    public static final KapProjectMergeRule INSTANCE = new KapProjectMergeRule(true, RelFactories.LOGICAL_BUILDER);
+public class OlapProjectMergeRule extends RelOptRule {
+    public static final OlapProjectMergeRule INSTANCE = new OlapProjectMergeRule(true, RelFactories.LOGICAL_BUILDER);
+    private static final Set<String> NON_MERGEABLE_FUNCTION = Sets.newHashSet("EXPLODE");
 
     //~ Instance fields --------------------------------------------------------
 
@@ -68,14 +70,14 @@ public class KapProjectMergeRule extends RelOptRule {
      *
      * @param force Whether to always merge projects
      */
-    public KapProjectMergeRule(boolean force, RelBuilderFactory relBuilderFactory) {
+    public OlapProjectMergeRule(boolean force, RelBuilderFactory relBuilderFactory) {
         super(operand(Project.class, operand(Project.class, any())), relBuilderFactory,
-                "KapProjectMergeRule" + (force ? ":force_mode" : ""));
+                "OlapProjectMergeRule" + (force ? ":force_mode" : ""));
         this.force = force;
     }
 
     @Deprecated // to be removed before 2.0
-    public KapProjectMergeRule(boolean force, RelFactories.ProjectFactory projectFactory) {
+    public OlapProjectMergeRule(boolean force, RelFactories.ProjectFactory projectFactory) {
         this(force, RelBuilder.proto(projectFactory));
     }
 
@@ -177,8 +179,6 @@ public class KapProjectMergeRule extends RelOptRule {
         };
     }
 
-    private static Set<String> NON_MERGEABLE_FUNCTION = Sets.newHashSet("EXPLODE");
-
     private boolean containsNonMergeableExprs(Project project) {
         for (RexNode expr : project.getProjects()) {
             if (containsNonMergeableExprs(expr)) {
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectRule.java
similarity index 83%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectRule.java
index 4e6ad0981b..b4c2dfd8e6 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapProjectRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapProjectRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptCluster;
@@ -33,15 +33,13 @@ import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.kylin.query.relnode.OlapProjectRel;
 import org.apache.kylin.query.relnode.OlapRel;
 
-/**
- */
-public class KapProjectRule extends ConverterRule {
+public class OlapProjectRule extends ConverterRule {
 
-    public static final RelOptRule INSTANCE = new KapProjectRule();
+    public static final RelOptRule INSTANCE = new OlapProjectRule();
 
-    public KapProjectRule() {
+    public OlapProjectRule() {
         super(LogicalProject.class, RelOptUtil.PROJECT_PREDICATE, Convention.NONE, OlapRel.CONVENTION,
-                "KapProjectRule");
+                "OlapProjectRule");
     }
 
     @Override
@@ -56,8 +54,7 @@ public class KapProjectRule extends ConverterRule {
         final RelTraitSet traitSet = cluster.traitSet().replace(OlapRel.CONVENTION).replaceIfs(
                 RelCollationTraitDef.INSTANCE, () -> RelMdCollation.project(mq, convertedInput, project.getProjects()));
 
-        OlapProjectRel kapProjectRel = new OlapProjectRel(convertedInput.getCluster(), traitSet, convertedInput,
-                project.getProjects(), project.getRowType());
-        return kapProjectRel;
+        return new OlapProjectRel(convertedInput.getCluster(), traitSet, convertedInput, project.getProjects(),
+                project.getRowType());
     }
 }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapRuleUtils.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapRuleUtils.java
similarity index 93%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapRuleUtils.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapRuleUtils.java
index 17f1e46431..724facfa15 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapRuleUtils.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapRuleUtils.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.rex.RexCall;
 import org.apache.calcite.rex.RexNode;
@@ -24,11 +24,9 @@ import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlOperator;
 import org.apache.calcite.sql.validate.SqlUserDefinedFunction;
 
-/**
- */
-public class KapRuleUtils {
+public class OlapRuleUtils {
 
-    private KapRuleUtils() {
+    private OlapRuleUtils() {
         throw new IllegalStateException("Utility class");
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSortRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSortRule.java
similarity index 89%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapSortRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapSortRule.java
index eefa5e3d12..f1102a09f1 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSortRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSortRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelTraitSet;
@@ -26,14 +26,12 @@ import org.apache.calcite.rel.core.Sort;
 import org.apache.kylin.query.relnode.OlapRel;
 import org.apache.kylin.query.relnode.OlapSortRel;
 
-/**
- */
-public class KapSortRule extends ConverterRule {
+public class OlapSortRule extends ConverterRule {
 
-    public static final KapSortRule INSTANCE = new KapSortRule();
+    public static final OlapSortRule INSTANCE = new OlapSortRule();
 
-    public KapSortRule() {
-        super(Sort.class, Convention.NONE, OlapRel.CONVENTION, "KapSortRule");
+    public OlapSortRule() {
+        super(Sort.class, Convention.NONE, OlapRel.CONVENTION, "OlapSortRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumCastTransposeRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumCastTransposeRule.java
similarity index 94%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumCastTransposeRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumCastTransposeRule.java
index 1ec32a2606..59464183bf 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumCastTransposeRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumCastTransposeRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -55,15 +55,16 @@ import org.apache.kylin.query.util.RuleUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class KapSumCastTransposeRule extends RelOptRule {
-    private static final Logger logger = LoggerFactory.getLogger(KapSumCastTransposeRule.class);
+public class OlapSumCastTransposeRule extends RelOptRule {
+    private static final Logger logger = LoggerFactory.getLogger(OlapSumCastTransposeRule.class);
 
-    public static final KapSumCastTransposeRule INSTANCE = new KapSumCastTransposeRule(
+    public static final OlapSumCastTransposeRule INSTANCE = new OlapSumCastTransposeRule(
             operand(OlapAggregateRel.class,
-                    operand(OlapProjectRel.class, null, KapSumCastTransposeRule::needSumCastTranspose, any())),
-            RelFactories.LOGICAL_BUILDER, "KapSumTransCastToThenRule");
+                    operand(OlapProjectRel.class, null, OlapSumCastTransposeRule::needSumCastTranspose, any())),
+            RelFactories.LOGICAL_BUILDER, "OlapSumTransCastToThenRule");
 
-    public KapSumCastTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory, String description) {
+    public OlapSumCastTransposeRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+            String description) {
         super(operand, relBuilderFactory, description);
     }
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumTransCastToThenRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumTransCastToThenRule.java
similarity index 92%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumTransCastToThenRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumTransCastToThenRule.java
index a186db59cb..f65534541a 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapSumTransCastToThenRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapSumTransCastToThenRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 import java.util.Set;
@@ -50,14 +50,16 @@ import org.apache.kylin.query.util.AggExpressionUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class KapSumTransCastToThenRule extends RelOptRule {
+import lombok.Getter;
 
-    private static final Logger logger = LoggerFactory.getLogger(KapSumTransCastToThenRule.class);
+public class OlapSumTransCastToThenRule extends RelOptRule {
 
-    public static final KapSumTransCastToThenRule INSTANCE = new KapSumTransCastToThenRule(
+    private static final Logger logger = LoggerFactory.getLogger(OlapSumTransCastToThenRule.class);
+
+    public static final OlapSumTransCastToThenRule INSTANCE = new OlapSumTransCastToThenRule(
             operand(OlapAggregateRel.class,
-                    operand(OlapProjectRel.class, null, KapSumTransCastToThenRule::existCastCase, any())),
-            RelFactories.LOGICAL_BUILDER, "KapSumTransCastToThenRule");
+                    operand(OlapProjectRel.class, null, OlapSumTransCastToThenRule::existCastCase, any())),
+            RelFactories.LOGICAL_BUILDER, "OlapSumTransCastToThenRule");
 
     public static boolean existCastCase(Project logicalProject) {
         List<RexNode> childExps = logicalProject.getChildExps();
@@ -79,7 +81,7 @@ public class KapSumTransCastToThenRule extends RelOptRule {
         return SqlKind.CASE == ((RexCall) rexNode).operands.get(0).getKind();
     }
 
-    public KapSumTransCastToThenRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
+    public OlapSumTransCastToThenRule(RelOptRuleOperand operand, RelBuilderFactory relBuilderFactory,
             String description) {
         super(operand, relBuilderFactory, description);
     }
@@ -103,8 +105,8 @@ public class KapSumTransCastToThenRule extends RelOptRule {
             }
         }
         List<AggregateCall> aggCalls = logicalAggregate.getAggCallList();
-        for (int i = 0; i < aggCalls.size(); i++) {
-            if (checkAggNeedToRewrite(aggCalls.get(i), castIndexs)) {
+        for (AggregateCall aggCall : aggCalls) {
+            if (checkAggNeedToRewrite(aggCall, castIndexs)) {
                 return true;
             }
         }
@@ -129,10 +131,10 @@ public class KapSumTransCastToThenRule extends RelOptRule {
                 }
                 break;
             default:
-                return;
+                // do nothing
             }
         } catch (Exception e) {
-            logger.error("KapSumTransCastToThenRule apply failed", e);
+            logger.error("OlapSumTransCastToThenRule apply failed", e);
         }
     }
 
@@ -365,18 +367,19 @@ public class KapSumTransCastToThenRule extends RelOptRule {
     public enum InnerCastType {
         HAS_COLUMN_NOT_NUMBER(3), HAS_COLUMN_NUMBER(2), OTHER(1);
 
-        private int weight;
+        private final int weight;
 
         InnerCastType(int weight) {
             this.weight = weight;
         }
     }
 
+    @Getter
     public static class CastInfo {
-        private int index;
-        private RelDataType columnType;
-        private RelDataType castType;
-        private boolean allConstants;
+        private final int index;
+        private final RelDataType columnType;
+        private final RelDataType castType;
+        private final boolean allConstants;
 
         public CastInfo(int index, RelDataType columnType, RelDataType castType, boolean allConstants) {
             this.index = index;
@@ -384,21 +387,5 @@ public class KapSumTransCastToThenRule extends RelOptRule {
             this.castType = castType;
             this.allConstants = allConstants;
         }
-
-        public int getIndex() {
-            return index;
-        }
-
-        public RelDataType getColumnType() {
-            return columnType;
-        }
-
-        public RelDataType getCastType() {
-            return castType;
-        }
-
-        public boolean isAllConstants() {
-            return allConstants;
-        }
     }
 }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPToEnumerableConverterRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapToEnumerableConverterRule.java
similarity index 84%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPToEnumerableConverterRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapToEnumerableConverterRule.java
index 25e7ffa53c..86c1b8695a 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPToEnumerableConverterRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapToEnumerableConverterRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.adapter.enumerable.EnumerableConvention;
 import org.apache.calcite.plan.RelTraitSet;
@@ -25,14 +25,12 @@ import org.apache.calcite.rel.convert.ConverterRule;
 import org.apache.kylin.query.relnode.OlapRel;
 import org.apache.kylin.query.relnode.OlapToEnumerableConverter;
 
-/**
- */
-public class OLAPToEnumerableConverterRule extends ConverterRule {
+public class OlapToEnumerableConverterRule extends ConverterRule {
 
-    public static final ConverterRule INSTANCE = new OLAPToEnumerableConverterRule();
+    public static final ConverterRule INSTANCE = new OlapToEnumerableConverterRule();
 
-    public OLAPToEnumerableConverterRule() {
-        super(RelNode.class, OlapRel.CONVENTION, EnumerableConvention.INSTANCE, "OLAPToEnumerableConverterRule");
+    public OlapToEnumerableConverterRule() {
+        super(RelNode.class, OlapRel.CONVENTION, EnumerableConvention.INSTANCE, "OlapToEnumerableConverterRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPUnionRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapUnionRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPUnionRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapUnionRule.java
index eead00e676..f16dbd4b33 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/OLAPUnionRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapUnionRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.List;
 
@@ -28,14 +28,12 @@ import org.apache.calcite.rel.core.Union;
 import org.apache.kylin.query.relnode.OlapRel;
 import org.apache.kylin.query.relnode.OlapUnionRel;
 
-/**
- */
-public class OLAPUnionRule extends ConverterRule {
+public class OlapUnionRule extends ConverterRule {
 
-    public static final OLAPUnionRule INSTANCE = new OLAPUnionRule();
+    public static final OlapUnionRule INSTANCE = new OlapUnionRule();
 
-    public OLAPUnionRule() {
-        super(Union.class, Convention.NONE, OlapRel.CONVENTION, "OLAPUnionRule");
+    public OlapUnionRule() {
+        super(Union.class, Convention.NONE, OlapRel.CONVENTION, "OlapUnionRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KAPValuesRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapValuesRule.java
similarity index 89%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KAPValuesRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapValuesRule.java
index e2fb8f61bb..89fdb55a40 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KAPValuesRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapValuesRule.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelOptCluster;
@@ -27,11 +27,11 @@ import org.apache.calcite.rel.type.RelDataType;
 import org.apache.kylin.query.relnode.OlapRel;
 import org.apache.kylin.query.relnode.OlapValuesRel;
 
-public class KAPValuesRule extends ConverterRule {
-    public static final KAPValuesRule INSTANCE = new KAPValuesRule();
+public class OlapValuesRule extends ConverterRule {
+    public static final OlapValuesRule INSTANCE = new OlapValuesRule();
 
-    KAPValuesRule() {
-        super(Values.class, Convention.NONE, OlapRel.CONVENTION, "KapValuesRule");
+    OlapValuesRule() {
+        super(Values.class, Convention.NONE, OlapRel.CONVENTION, "OlapValuesRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapWindowRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapWindowRule.java
similarity index 88%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/KapWindowRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/OlapWindowRule.java
index e623b7e0f0..4c220cd42e 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/KapWindowRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/OlapWindowRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.Convention;
 import org.apache.calcite.plan.RelTraitSet;
@@ -26,14 +26,12 @@ import org.apache.calcite.rel.core.Window;
 import org.apache.kylin.query.relnode.OlapRel;
 import org.apache.kylin.query.relnode.OlapWindowRel;
 
-/**
- */
-public class KapWindowRule extends ConverterRule {
+public class OlapWindowRule extends ConverterRule {
 
-    public static final KapWindowRule INSTANCE = new KapWindowRule();
+    public static final OlapWindowRule INSTANCE = new OlapWindowRule();
 
-    public KapWindowRule() {
-        super(Window.class, Convention.NONE, OlapRel.CONVENTION, "KapWindowRule");
+    public OlapWindowRule() {
+        super(Window.class, Convention.NONE, OlapRel.CONVENTION, "OlapWindowRule");
     }
 
     @Override
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/RightJoinToLeftJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/RightJoinToLeftJoinRule.java
similarity index 97%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/RightJoinToLeftJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/RightJoinToLeftJoinRule.java
index d6f8a3e5fe..2250ec6157 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/RightJoinToLeftJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/RightJoinToLeftJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleCall;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/ScalarSubqueryJoinRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/ScalarSubqueryJoinRule.java
similarity index 99%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/ScalarSubqueryJoinRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/ScalarSubqueryJoinRule.java
index 42f8816cdd..a22b049448 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/ScalarSubqueryJoinRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/ScalarSubqueryJoinRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.math.BigDecimal;
 import java.util.Collections;
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/SumBasicOperatorRule.java
similarity index 95%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/SumBasicOperatorRule.java
index c9f50ed9e8..4248476099 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumBasicOperatorRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/SumBasicOperatorRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.Arrays;
 import java.util.List;
@@ -56,22 +56,10 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableList;
 
 /**
- * sql: select sum(price*3) from KYLIN_SALES;
- *
- * EXECUTION PLAN:
- * OLAPAggregateRel(group=[{}], EXPR$0=[SUM($0)], ctx=[0@null])
- *   OLAPProjectRel($f0=[*($6, 3)], ctx=[0@null])
- *
- * However in this execution plan, only computed column can answer this sql.
- * So apply this rule to convert execution plan.
- * After convert:
- *
- * OLAPProjectRel($f0=[*($0, 3)], ctx=[0@null])
- *   OLAPAggregateRel(group=[{}], EXPR$0=[SUM($0)], ctx=[0@null])
- *     OLAPProjectRel(PRICE=$6, ctx=[0@null])
- *
- * Limitation: issue #11656
- * if the column has null, then sum(1) isn't equal count(*)
+ * sql: select sum(price*3) from KYLIN_SALES; <p>
+ * equivalent transformed sql: select 3 * sum(price) from KYLIN_SALES <p>
+ * Limitation: issue #11656.
+ * If the column has null, then sum(1) isn't equal count(*).
  * like sql: select sum(price+1) from KYLIN_SALES;
  * and it doesn't support sum(column * column)
  * like sql: select sum(price*item_count) from KYLIN_SALES;
@@ -311,7 +299,7 @@ public class SumBasicOperatorRule extends RelOptRule {
             return true;
 
         if (SqlKind.PLUS == expr.getKind() || SqlKind.MINUS == expr.getKind() || SqlKind.TIMES == expr.getKind()
-                || KapRuleUtils.isDivide(expr)) {
+                || OlapRuleUtils.isDivide(expr)) {
             if (!(expr instanceof RexCall)) {
                 return false;
             }
@@ -354,7 +342,7 @@ public class SumBasicOperatorRule extends RelOptRule {
         default:
         }
 
-        if (KapRuleUtils.isDivide(exprCall)) {
+        if (OlapRuleUtils.isDivide(exprCall)) {
             verifyDivide(exprCall);
         }
     }
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumCaseWhenFunctionRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/SumCaseWhenFunctionRule.java
similarity index 82%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/SumCaseWhenFunctionRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/SumCaseWhenFunctionRule.java
index 7454d257b8..37a465fde6 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumCaseWhenFunctionRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/SumCaseWhenFunctionRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptRuleOperand;
@@ -36,25 +36,23 @@ import org.apache.kylin.query.util.AggExpressionUtil;
 import org.apache.kylin.query.util.AggExpressionUtil.AggExpression;
 
 /**
- * sql: select sum(case when LSTG_FORMAT_NAME='ABIN' then price else null end) from KYLIN_SALES;
+ * sql: select sum(case when LSTG_FORMAT_NAME='ABIN' then price else null end) from KYLIN_SALES;<p>
  *
- * EXECUTION PLAN:
- * OLAPAggregateRel(group=[{}], EXPR$0=[SUM($0)], ctx=[0@null])
- *   OLAPProjectRel($f0=[CASE(=($2, 'ABIN'), $6, null)], ctx=[0@null])
- *
- * However in this execution plan, only computed column can answer this sql.
- * So apply this rule to convert execution plan.
- * After convert:
- *
- * OLAPAggregateRel(group=[{}], EXPR$0=[SUM($0)], ctx=[0@null])
- *   OLAPProjectRel($f0=[CASE(=($0, 'ABIN'), $1, null)], ctx=[0@null])
- *     OLAPAggregateRel(group=[{0}], EXPR$0=[SUM($1)], ctx=[0@null])
- *       OLAPProjectRel(LSTG_FORMAT_NAME=$2,PRICE=$6, ctx=[0@null])
- *
- * Limitation: issue #11663
- * Add other functions in sql could make mistake.
- * like sql: select count(distinct TEST_COUNT_DISTINCT_BITMAP)
- *    ,sum(case when LSTG_FORMAT_NAME='ABIN' then price else null end) from KYLIN_SALES;
+ * The equivalent sql:<p>
+ *     select sum(tmp) from (
+ *         select case when LSTG_FORMAT_NAME='ABIN' then sum_price else null end as tmp
+ *         from (
+ *            select LSTG_FORMAT_NAME, sum(price) as sum_price
+ *            from KYLIN_SALES group by LSTG_FORMAT_NAME
+ *         )
+ *     )
+ * <p>
+ * If the sql is as follows:
+ *     select count(distinct TEST_COUNT_DISTINCT_BITMAP),
+ *            sum(case when LSTG_FORMAT_NAME='ABIN' then price else null end)
+ *     from KYLIN_SALES;
+ * <p>
+ * Please refer to CountDistinctCaseWhenFunctionRule
  */
 public class SumCaseWhenFunctionRule extends AbstractAggCaseWhenFunctionRule {
 
diff --git a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumConstantConvertRule.java b/src/query/src/main/java/org/apache/kylin/query/optrule/SumConstantConvertRule.java
similarity index 96%
rename from src/query/src/main/java/io/kyligence/kap/query/optrule/SumConstantConvertRule.java
rename to src/query/src/main/java/org/apache/kylin/query/optrule/SumConstantConvertRule.java
index 9380c2f5c1..2aeab92d84 100644
--- a/src/query/src/main/java/io/kyligence/kap/query/optrule/SumConstantConvertRule.java
+++ b/src/query/src/main/java/org/apache/kylin/query/optrule/SumConstantConvertRule.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.kyligence.kap.query.optrule;
+package org.apache.kylin.query.optrule;
 
 import java.util.Arrays;
 import java.util.List;
@@ -54,19 +54,10 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableList;
 
 /**
- * sql: select sum(3) from KYLIN_SALES;
- *
- * EXECUTION PLAN:
- *  OLAPAggregateRel(group=[{}], EXPR$0=[SUM($0)], ctx=[0@null])
- *    OLAPProjectRel($f0=[3], ctx=[0@null])
- *
- * Apply this rule to convert execution plan.
- * After convert:
- *
- * OLAPProjectRel($f0=[*($0, 3)], ctx=[0@null])
- *   OLAPAggregateRel(group=[{}], EXPR$0=[COUNT()], ctx=[0@null])
- *     OLAPProjectRel(ctx=[0@null])
+ * sql: select sum(3) from KYLIN_SALES;<p>
  *
+ * The equivalent sql:<p>
+ *     select 3 * count(*) from KYLIN_SALES
  */
 
 public class SumConstantConvertRule extends RelOptRule {
diff --git a/src/query/src/main/java/org/apache/kylin/query/util/HepUtils.java b/src/query/src/main/java/org/apache/kylin/query/util/HepUtils.java
index f0072a94a5..c4b81759af 100644
--- a/src/query/src/main/java/org/apache/kylin/query/util/HepUtils.java
+++ b/src/query/src/main/java/org/apache/kylin/query/util/HepUtils.java
@@ -30,31 +30,30 @@ import org.apache.calcite.rel.rules.FilterMergeRule;
 import org.apache.calcite.rel.rules.ProjectMergeRule;
 import org.apache.calcite.rel.rules.ProjectRemoveRule;
 import org.apache.kylin.guava30.shaded.common.collect.ImmutableList;
-
-import io.kyligence.kap.query.optrule.AggregateProjectReduceRule;
-import io.kyligence.kap.query.optrule.CountDistinctCaseWhenFunctionRule;
-import io.kyligence.kap.query.optrule.FilterJoinConditionMergeRule;
-import io.kyligence.kap.query.optrule.FilterSimplifyRule;
-import io.kyligence.kap.query.optrule.JoinFilterRule;
-import io.kyligence.kap.query.optrule.KapAggFilterTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggJoinTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectMergeRule;
-import io.kyligence.kap.query.optrule.KapAggProjectTransposeRule;
-import io.kyligence.kap.query.optrule.KapAggSumCastRule;
-import io.kyligence.kap.query.optrule.KapAggregateRule;
-import io.kyligence.kap.query.optrule.KapCountDistinctJoinRule;
-import io.kyligence.kap.query.optrule.KapEquiJoinConditionFixRule;
-import io.kyligence.kap.query.optrule.KapFilterRule;
-import io.kyligence.kap.query.optrule.KapJoinProjectTransposeRule;
-import io.kyligence.kap.query.optrule.KapJoinRule;
-import io.kyligence.kap.query.optrule.KapProjectMergeRule;
-import io.kyligence.kap.query.optrule.KapProjectRule;
-import io.kyligence.kap.query.optrule.KapSumCastTransposeRule;
-import io.kyligence.kap.query.optrule.KapSumTransCastToThenRule;
-import io.kyligence.kap.query.optrule.ScalarSubqueryJoinRule;
-import io.kyligence.kap.query.optrule.SumBasicOperatorRule;
-import io.kyligence.kap.query.optrule.SumCaseWhenFunctionRule;
-import io.kyligence.kap.query.optrule.SumConstantConvertRule;
+import org.apache.kylin.query.optrule.AggregateProjectReduceRule;
+import org.apache.kylin.query.optrule.CountDistinctCaseWhenFunctionRule;
+import org.apache.kylin.query.optrule.FilterJoinConditionMergeRule;
+import org.apache.kylin.query.optrule.FilterSimplifyRule;
+import org.apache.kylin.query.optrule.JoinFilterRule;
+import org.apache.kylin.query.optrule.OlapAggFilterTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggJoinTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectMergeRule;
+import org.apache.kylin.query.optrule.OlapAggProjectTransposeRule;
+import org.apache.kylin.query.optrule.OlapAggSumCastRule;
+import org.apache.kylin.query.optrule.OlapAggregateRule;
+import org.apache.kylin.query.optrule.OlapCountDistinctJoinRule;
+import org.apache.kylin.query.optrule.OlapEquivJoinConditionFixRule;
+import org.apache.kylin.query.optrule.OlapFilterRule;
+import org.apache.kylin.query.optrule.OlapJoinProjectTransposeRule;
+import org.apache.kylin.query.optrule.OlapJoinRule;
+import org.apache.kylin.query.optrule.OlapProjectMergeRule;
+import org.apache.kylin.query.optrule.OlapProjectRule;
+import org.apache.kylin.query.optrule.OlapSumCastTransposeRule;
+import org.apache.kylin.query.optrule.OlapSumTransCastToThenRule;
+import org.apache.kylin.query.optrule.ScalarSubqueryJoinRule;
+import org.apache.kylin.query.optrule.SumBasicOperatorRule;
+import org.apache.kylin.query.optrule.SumCaseWhenFunctionRule;
+import org.apache.kylin.query.optrule.SumConstantConvertRule;
 
 /**
  * Hep planner help utils
@@ -62,49 +61,58 @@ import io.kyligence.kap.query.optrule.SumConstantConvertRule;
 public class HepUtils {
     public static final ImmutableList<RelOptRule> CUBOID_OPT_RULES = ImmutableList.of(
             // Transpose Rule
-            KapJoinProjectTransposeRule.BOTH_PROJECT, KapJoinProjectTransposeRule.LEFT_PROJECT,
-            KapJoinProjectTransposeRule.RIGHT_PROJECT,
-            KapJoinProjectTransposeRule.LEFT_PROJECT_INCLUDE_OUTER,
-            KapJoinProjectTransposeRule.RIGHT_PROJECT_INCLUDE_OUTER,
-            KapJoinProjectTransposeRule.NON_EQUI_LEFT_PROJECT_INCLUDE_OUTER,
-            KapJoinProjectTransposeRule.NON_EQUI_RIGHT_PROJECT_INCLUDE_OUTER,
-            KapEquiJoinConditionFixRule.INSTANCE,
-            KapProjectRule.INSTANCE, KapFilterRule.INSTANCE,
-            JoinFilterRule.JOIN_LEFT_FILTER, JoinFilterRule.JOIN_RIGHT_FILTER, JoinFilterRule.JOIN_BOTH_FILTER,
+            OlapJoinProjectTransposeRule.BOTH_PROJECT, //
+            OlapJoinProjectTransposeRule.LEFT_PROJECT, //
+            OlapJoinProjectTransposeRule.RIGHT_PROJECT, //
+            OlapJoinProjectTransposeRule.LEFT_PROJECT_INCLUDE_OUTER, //
+            OlapJoinProjectTransposeRule.RIGHT_PROJECT_INCLUDE_OUTER, //
+            OlapJoinProjectTransposeRule.NON_EQUI_LEFT_PROJECT_INCLUDE_OUTER, //
+            OlapJoinProjectTransposeRule.NON_EQUI_RIGHT_PROJECT_INCLUDE_OUTER, //
+            OlapEquivJoinConditionFixRule.INSTANCE, //
+            OlapProjectRule.INSTANCE, //
+            OlapFilterRule.INSTANCE, //
+            JoinFilterRule.JOIN_LEFT_FILTER, //
+            JoinFilterRule.JOIN_RIGHT_FILTER, //
+            JoinFilterRule.JOIN_BOTH_FILTER, //
             JoinFilterRule.LEFT_JOIN_LEFT_FILTER,
             // Merge Rule
-            KapProjectMergeRule.INSTANCE, FilterMergeRule.INSTANCE, ProjectRemoveRule.INSTANCE);
+            OlapProjectMergeRule.INSTANCE, //
+            FilterMergeRule.INSTANCE, //
+            ProjectRemoveRule.INSTANCE //
+    );
 
     public static final ImmutableList<RelOptRule> SumExprRules = ImmutableList.of(
-            SumCaseWhenFunctionRule.INSTANCE,
-            SumBasicOperatorRule.INSTANCE,
-            SumConstantConvertRule.INSTANCE,
-            KapSumTransCastToThenRule.INSTANCE,
-            KapSumCastTransposeRule.INSTANCE,
-            KapProjectRule.INSTANCE,
-            KapAggregateRule.INSTANCE,
-            KapJoinRule.EQUAL_NULL_SAFE_INSTANT
+            // sum expression rules
+            SumCaseWhenFunctionRule.INSTANCE, //
+            SumBasicOperatorRule.INSTANCE, //
+            SumConstantConvertRule.INSTANCE, //
+            OlapSumTransCastToThenRule.INSTANCE, //
+            OlapSumCastTransposeRule.INSTANCE, //
+            OlapProjectRule.INSTANCE, //
+            OlapAggregateRule.INSTANCE, //
+            OlapJoinRule.EQUAL_NULL_SAFE_INSTANT //
     );
 
     public static final ImmutableList<RelOptRule> AggPushDownRules = ImmutableList.of(
-            KapAggProjectMergeRule.AGG_PROJECT_JOIN,
-            KapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN,
-            KapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN,
-            KapAggProjectTransposeRule.AGG_PROJECT_JOIN,
-            KapAggFilterTransposeRule.AGG_FILTER_JOIN,
-            KapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG,
-            KapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG,
-            KapCountDistinctJoinRule.COUNT_DISTINCT_AGG_PROJECT_JOIN,
-            KapProjectRule.INSTANCE,
-            KapAggregateRule.INSTANCE,
-            KapJoinRule.INSTANCE
+            // aggregation push down rules
+            OlapAggProjectMergeRule.AGG_PROJECT_JOIN, //
+            OlapAggProjectMergeRule.AGG_PROJECT_FILTER_JOIN, //
+            OlapAggProjectTransposeRule.AGG_PROJECT_FILTER_JOIN, //
+            OlapAggProjectTransposeRule.AGG_PROJECT_JOIN, //
+            OlapAggFilterTransposeRule.AGG_FILTER_JOIN, //
+            OlapAggJoinTransposeRule.INSTANCE_JOIN_RIGHT_AGG, //
+            OlapCountDistinctJoinRule.COUNT_DISTINCT_JOIN_ONE_SIDE_AGG, //
+            OlapCountDistinctJoinRule.COUNT_DISTINCT_AGG_PROJECT_JOIN, //
+            OlapProjectRule.INSTANCE, //
+            OlapAggregateRule.INSTANCE, //
+            OlapJoinRule.INSTANCE //
     );
 
     public static final ImmutableList<RelOptRule> ScalarSubqueryJoinRules = ImmutableList.of(
             // base rules
-            KapAggregateRule.INSTANCE, //
-            KapProjectRule.INSTANCE, //
-            KapJoinRule.INSTANCE, //
+            OlapAggregateRule.INSTANCE, //
+            OlapProjectRule.INSTANCE, //
+            OlapJoinRule.INSTANCE, //
             // relative rules
             ProjectMergeRule.INSTANCE, //
             AggregateProjectMergeRule.INSTANCE, //
@@ -112,29 +120,31 @@ public class HepUtils {
             // target rules
             ScalarSubqueryJoinRule.AGG_JOIN, //
             ScalarSubqueryJoinRule.AGG_PRJ_JOIN, //
-            ScalarSubqueryJoinRule.AGG_PRJ_FLT_JOIN
+            ScalarSubqueryJoinRule.AGG_PRJ_FLT_JOIN //
     );
 
     public static final ImmutableList<RelOptRule> CountDistinctExprRules = ImmutableList.of(
-            CountDistinctCaseWhenFunctionRule.INSTANCE,
-            KapProjectRule.INSTANCE,
-            KapAggregateRule.INSTANCE,
-            KapJoinRule.EQUAL_NULL_SAFE_INSTANT
+            // count distinct rules
+            CountDistinctCaseWhenFunctionRule.INSTANCE, //
+            OlapProjectRule.INSTANCE, //
+            OlapAggregateRule.INSTANCE, //
+            OlapJoinRule.EQUAL_NULL_SAFE_INSTANT //
     );
 
     public static final ImmutableList<RelOptRule> SumCastDoubleRules = ImmutableList.of(
-            KapAggSumCastRule.INSTANCE,
-            KapProjectRule.INSTANCE,
-            KapAggregateRule.INSTANCE
+            // sum cast rules
+            OlapAggSumCastRule.INSTANCE, //
+            OlapProjectRule.INSTANCE, //
+            OlapAggregateRule.INSTANCE //
     );
 
     public static final ImmutableList<RelOptRule> FilterReductionRules = ImmutableList.of(
-            FilterJoinConditionMergeRule.INSTANCE,
-            FilterSimplifyRule.INSTANCE,
-            KapFilterRule.INSTANCE
+            // filter reduction rules
+            FilterJoinConditionMergeRule.INSTANCE, //
+            FilterSimplifyRule.INSTANCE, //
+            OlapFilterRule.INSTANCE //
     );
 
-
     private HepUtils() {
     }
 
diff --git a/src/query/src/test/java/org/apache/kylin/query/util/KapRelUtilTest.java b/src/query/src/test/java/org/apache/kylin/query/util/KapRelUtilTest.java
deleted file mode 100644
index c8ebceadcd..0000000000
--- a/src/query/src/test/java/org/apache/kylin/query/util/KapRelUtilTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kylin.query.util;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-public class KapRelUtilTest {
-
-    @Test
-    public void removeDigestCtxValueTest() {
-        String digestSrc = "KapLimitRel(ctx=[], fetch=[500])\n"
-                + "    KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=[])\n"
-                + "      KapUnionRel(all=[true], ctx=[], all=[true])\n"
-                + "        KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=[])\n"
-                + "          KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[0], ctx=[])\n"
-                + "            KapProjectRel(LSTG_FORMAT_NAME=[$0], 封样合格率(款)__max__1=[$1], AGG$0=[$3], AGG$1=[$4], ctx=[])\n"
-                + "              KapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])\n"
-                + "                KapAggregateRel(group-set=[[0]], groups=[null], 封样合格率(款)__max__1=[COUNT(DISTINCT $1)], ctx=[0@null])\n"
-                + "                  KapProjectRel(LSTG_FORMAT_NAME=[$0], $f1=[CASE(=($1, 100), $0, null)], $f2=[CAST(0):BIGINT], $f3=[CAST(0):BIGINT], ctx=[0@null])\n"
-                + "                    KapFilterRel(condition=[>($1, 0)], ctx=[0@null])\n"
-                + "                      KapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=[0@null])\n"
-                + "                        KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[0@null], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
-                + "                KapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[SUM($2)], ctx=[])\n"
-                + "                  KapProjectRel(LSTG_FORMAT_NAME=[$0], 实际收货配套累计量__sum__2=[$2], $f2=[CASE(>($1, 0), $3, $4)], ctx=[])\n"
-                + "                    KapAggregateRel(group-set=[[0, 1]], groups=[null], TOP_AGG$0=[SUM($2)], TOP_AGG$1=[SUM($3)], TOP_AGG$2=[SUM($4)], ctx=[])\n"
-                + "                      KapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$1], 实际收货配套累计量__sum__2=[$2], $f3=[*(0, $3)], SUM_CASE$0$1=[$4], ctx=[1@null])\n"
-                + "                        KapAggregateRel(group-set=[[0, 1]], groups=[null], 实际收货配套累计量__sum__2=[SUM($2)], SUM_CONST$1=[COUNT()], SUM_CASE$0$1=[SUM($3)], ctx=[1@null])\n"
-                + "                          KapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$2], TRANS_ID0=[$2], ORDER_ID=[$1], ctx=[1@null])\n"
-                + "                            KapFilterRel(condition=[>($1, 0)], ctx=[1@null])\n"
-                + "                              KapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=[1@null])\n"
-                + "                                KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[1@null], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
-                + "        KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], 实际收货配套累计占比__max__3=[$3], __grouping_id=[$4], ctx=[2@null])\n"
-                + "          KapProjectRel(针梭织__0=['aa'], 封样合格率(款)__max__1=[0.1], 实际收货配套累计量__sum__2=[0.2], 实际收货配套累计占比__max__3=[33], __grouping_id=[1], ctx=[2@null])\n"
-                + "            KapValuesRel(tuples=[[{ 0 }]])";
-        String digestResult = KapRelUtil.replaceDigestCtxValueByLayoutIdAndModelId(digestSrc, 10001,
-                "6748hdsjf-e612-1b91-e7a0-1237f02ec9i2");
-        String digestExpected = "KapLimitRel(ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fetch=[500])\n"
-                + "    KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "      KapUnionRel(all=[true], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, all=[true])\n"
-                + "        KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "          KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "            KapProjectRel(LSTG_FORMAT_NAME=[$0], 封样合格率(款)__max__1=[$1], AGG$0=[$3], AGG$1=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "              KapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                KapAggregateRel(group-set=[[0]], groups=[null], 封样合格率(款)__max__1=[COUNT(DISTINCT $1)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                  KapProjectRel(LSTG_FORMAT_NAME=[$0], $f1=[CASE(=($1, 100), $0, null)], $f2=[CAST(0):BIGINT], $f3=[CAST(0):BIGINT], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                    KapFilterRel(condition=[>($1, 0)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                      KapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                        KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
-                + "                KapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[SUM($2)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                  KapProjectRel(LSTG_FORMAT_NAME=[$0], 实际收货配套累计量__sum__2=[$2], $f2=[CASE(>($1, 0), $3, $4)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                    KapAggregateRel(group-set=[[0, 1]], groups=[null], TOP_AGG$0=[SUM($2)], TOP_AGG$1=[SUM($3)], TOP_AGG$2=[SUM($4)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                      KapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$1], 实际收货配套累计量__sum__2=[$2], $f3=[*(0, $3)], SUM_CASE$0$1=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                        KapAggregateRel(group-set=[[0, 1]], groups=[null], 实际收货配套累计量__sum__2=[SUM($2)], SUM_CONST$1=[COUNT()], SUM_CASE$0$1=[SUM($3)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                          KapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$2], TRANS_ID0=[$2], ORDER_ID=[$1], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                            KapFilterRel(condition=[>($1, 0)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                              KapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "                                KapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
-                + "        KapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], 实际收货配套累计占比__max__3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "          KapProjectRel(针梭织__0=['aa'], 封样合格率(款)__max__1=[0.1], 实际收货配套累计量__sum__2=[0.2], 实际收货配套累计占比__max__3=[33], __grouping_id=[1], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
-                + "            KapValuesRel(tuples=[[{ 0 }]])";
-        Assert.assertEquals(digestExpected, digestResult);
-    }
-
-}
diff --git a/src/query/src/test/java/org/apache/kylin/query/util/OlapRelUtilTest.java b/src/query/src/test/java/org/apache/kylin/query/util/OlapRelUtilTest.java
new file mode 100644
index 0000000000..275cd54120
--- /dev/null
+++ b/src/query/src/test/java/org/apache/kylin/query/util/OlapRelUtilTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+
+package org.apache.kylin.query.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class OlapRelUtilTest {
+
+    @Test
+    public void removeDigestCtxValueTest() {
+        String digestSrc = "OlapLimitRel(ctx=[], fetch=[500])\n"
+                + "    OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=[])\n"
+                + "      OlapUnionRel(all=[true], ctx=[], all=[true])\n"
+                + "        OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=[])\n"
+                + "          OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[0], ctx=[])\n"
+                + "            OlapProjectRel(LSTG_FORMAT_NAME=[$0], 封样合格率(款)__max__1=[$1], AGG$0=[$3], AGG$1=[$4], ctx=[])\n"
+                + "              OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=[])\n"
+                + "                OlapAggregateRel(group-set=[[0]], groups=[null], 封样合格率(款)__max__1=[COUNT(DISTINCT $1)], ctx=[0@null])\n"
+                + "                  OlapProjectRel(LSTG_FORMAT_NAME=[$0], $f1=[CASE(=($1, 100), $0, null)], $f2=[CAST(0):BIGINT], $f3=[CAST(0):BIGINT], ctx=[0@null])\n"
+                + "                    OlapFilterRel(condition=[>($1, 0)], ctx=[0@null])\n"
+                + "                      OlapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=[0@null])\n"
+                + "                        OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[0@null], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
+                + "                OlapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[SUM($2)], ctx=[])\n"
+                + "                  OlapProjectRel(LSTG_FORMAT_NAME=[$0], 实际收货配套累计量__sum__2=[$2], $f2=[CASE(>($1, 0), $3, $4)], ctx=[])\n"
+                + "                    OlapAggregateRel(group-set=[[0, 1]], groups=[null], TOP_AGG$0=[SUM($2)], TOP_AGG$1=[SUM($3)], TOP_AGG$2=[SUM($4)], ctx=[])\n"
+                + "                      OlapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$1], 实际收货配套累计量__sum__2=[$2], $f3=[*(0, $3)], SUM_CASE$0$1=[$4], ctx=[1@null])\n"
+                + "                        OlapAggregateRel(group-set=[[0, 1]], groups=[null], 实际收货配套累计量__sum__2=[SUM($2)], SUM_CONST$1=[COUNT()], SUM_CASE$0$1=[SUM($3)], ctx=[1@null])\n"
+                + "                          OlapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$2], TRANS_ID0=[$2], ORDER_ID=[$1], ctx=[1@null])\n"
+                + "                            OlapFilterRel(condition=[>($1, 0)], ctx=[1@null])\n"
+                + "                              OlapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=[1@null])\n"
+                + "                                OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=[1@null], fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
+                + "        OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], 实际收货配套累计占比__max__3=[$3], __grouping_id=[$4], ctx=[2@null])\n"
+                + "          OlapProjectRel(针梭织__0=['aa'], 封样合格率(款)__max__1=[0.1], 实际收货配套累计量__sum__2=[0.2], 实际收货配套累计占比__max__3=[33], __grouping_id=[1], ctx=[2@null])\n"
+                + "            OlapValuesRel(tuples=[[{ 0 }]])";
+        String digestResult = OlapRelUtil.replaceDigestCtxValueByLayoutIdAndModelId(digestSrc, 10001,
+                "6748hdsjf-e612-1b91-e7a0-1237f02ec9i2");
+        String digestExpected = "OlapLimitRel(ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fetch=[500])\n"
+                + "    OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "      OlapUnionRel(all=[true], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, all=[true])\n"
+                + "        OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "          OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], EXPR$3=[$3], __grouping_id=[0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "            OlapProjectRel(LSTG_FORMAT_NAME=[$0], 封样合格率(款)__max__1=[$1], AGG$0=[$3], AGG$1=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "              OlapJoinRel(condition=[=($0, $2)], joinType=[inner], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                OlapAggregateRel(group-set=[[0]], groups=[null], 封样合格率(款)__max__1=[COUNT(DISTINCT $1)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                  OlapProjectRel(LSTG_FORMAT_NAME=[$0], $f1=[CASE(=($1, 100), $0, null)], $f2=[CAST(0):BIGINT], $f3=[CAST(0):BIGINT], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                    OlapFilterRel(condition=[>($1, 0)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                      OlapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                        OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
+                + "                OlapAggregateRel(group-set=[[0]], groups=[null], AGG$0=[SUM($1)], AGG$1=[SUM($2)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                  OlapProjectRel(LSTG_FORMAT_NAME=[$0], 实际收货配套累计量__sum__2=[$2], $f2=[CASE(>($1, 0), $3, $4)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                    OlapAggregateRel(group-set=[[0, 1]], groups=[null], TOP_AGG$0=[SUM($2)], TOP_AGG$1=[SUM($3)], TOP_AGG$2=[SUM($4)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                      OlapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$1], 实际收货配套累计量__sum__2=[$2], $f3=[*(0, $3)], SUM_CASE$0$1=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                        OlapAggregateRel(group-set=[[0, 1]], groups=[null], 实际收货配套累计量__sum__2=[SUM($2)], SUM_CONST$1=[COUNT()], SUM_CASE$0$1=[SUM($3)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                          OlapProjectRel(LSTG_FORMAT_NAME=[$0], TRANS_ID=[$2], TRANS_ID0=[$2], ORDER_ID=[$1], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                            OlapFilterRel(condition=[>($1, 0)], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                              OlapProjectRel(LSTG_FORMAT_NAME=[$3], ORDER_ID=[$1], TRANS_ID=[$0], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "                                OlapTableScan(table=[[DEFAULT, TEST_KYLIN_FACT]], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001, fields=[[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14]])\n"
+                + "        OlapProjectRel(针梭织__0=[$0], 封样合格率(款)__max__1=[$1], 实际收货配套累计量__sum__2=[$2], 实际收货配套累计占比__max__3=[$3], __grouping_id=[$4], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "          OlapProjectRel(针梭织__0=['aa'], 封样合格率(款)__max__1=[0.1], 实际收货配套累计量__sum__2=[0.2], 实际收货配套累计占比__max__3=[33], __grouping_id=[1], ctx=6748hdsjf-e612-1b91-e7a0-1237f02ec9i2_10001)\n"
+                + "            OlapValuesRel(tuples=[[{ 0 }]])";
+        Assert.assertEquals(digestExpected, digestResult);
+    }
+
+}
diff --git a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/JoinPlan.scala b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/JoinPlan.scala
index 973dce44e0..27775df4a8 100644
--- a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/JoinPlan.scala
+++ b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/JoinPlan.scala
@@ -24,7 +24,7 @@ import org.apache.calcite.rex.RexCall
 import org.apache.kylin.engine.spark.utils.LogEx
 import org.apache.kylin.query.relnode.{OlapJoinRel, OlapNonEquiJoinRel}
 import org.apache.kylin.query.runtime.SparderRexVisitor
-import org.apache.kylin.query.util.KapRelUtil
+import org.apache.kylin.query.util.OlapRelUtil
 import org.apache.spark.sql.catalyst.plans.logical.{Join, JoinHint, LogicalPlan}
 import org.apache.spark.sql.catalyst.plans.{Cross, JoinType}
 import org.apache.spark.sql.functions.col
@@ -48,7 +48,7 @@ object JoinPlan extends LogEx {
       dataContext)
     val pairs = new util.ArrayList[org.apache.kylin.common.util.Pair[Integer, Integer]]()
     val filterNuls = new util.ArrayList[java.lang.Boolean]()
-    val actRemaining = KapRelUtil.isNotDistinctFrom(rel.getInput(0), rel.getInput(1), rel.getCondition, pairs, filterNuls)
+    val actRemaining = OlapRelUtil.isNotDistinctFrom(rel.getInput(0), rel.getInput(1), rel.getCondition, pairs, filterNuls)
     if (filterNuls.contains(java.lang.Boolean.FALSE)) {
       var equalCond = makeEqualCond(col(visitor.inputFieldNames.apply(pairs.get(0).getFirst)),
         col(visitor.inputFieldNames.apply(pairs.get(0).getSecond)), !filterNuls.get(0))
diff --git a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ResultPlan.scala b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ResultPlan.scala
index 74fca0e85b..940b884282 100644
--- a/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ResultPlan.scala
+++ b/src/spark-project/sparder/src/main/scala/org/apache/kylin/query/runtime/plan/ResultPlan.scala
@@ -36,7 +36,7 @@ import org.apache.kylin.metadata.state.QueryShareStateManager
 import org.apache.kylin.query.engine.RelColumnMetaDataExtractor
 import org.apache.kylin.query.engine.exec.ExecuteResult
 import org.apache.kylin.query.pushdown.SparkSqlClient.readPushDownResultRow
-import org.apache.kylin.query.relnode.{ContextUtil, OlapContext}
+import org.apache.kylin.query.relnode.ContextUtil
 import org.apache.kylin.query.util.{AsyncQueryUtil, QueryInterruptChecker, SparkJobTrace, SparkQueryJobManager}
 import org.apache.poi.xssf.usermodel.{XSSFSheet, XSSFWorkbook}
 import org.apache.spark.SparkConf