[kylin] branch kylin-on-parquet-v2 updated: KYLIN-5027 Add the config of whether to build base cuboid in kylin4

[xxyu]

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

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new 2e7a4ea  KYLIN-5027 Add the config of whether to build base cuboid in 
kylin4
2e7a4ea is described below

commit 2e7a4ea307764ca08ac2d2840c7147ab1c9290cc
Author: yaqian.zhang <598593...@qq.com>
AuthorDate: Tue Jul 6 17:57:29 2021 +0800

    KYLIN-5027 Add the config of whether to build base cuboid in kylin4
---
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java        | 4 ++++
 .../org/apache/kylin/engine/spark/metadata/MetadataConverter.scala    | 1 +
 2 files changed, 5 insertions(+)

diff --git 
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 39f8eae..0d2d11e 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -3196,4 +3196,8 @@ public abstract class KylinConfigBase implements 
Serializable {
     public double skewPercentageThreshHold() {
         return 
Double.valueOf(getOptional("kylin.dictionary.data.skew.percentage.threshhold", 
"0.05"));
     }
+
+    public boolean isBuildBaseCuboid() {
+        return Boolean.valueOf(getOptional("kylin.engine.cuboid.build.base", 
"true"));
+    }
 }
diff --git 
a/kylin-spark-project/kylin-spark-metadata/src/main/scala/org/apache/kylin/engine/spark/metadata/MetadataConverter.scala
 
b/kylin-spark-project/kylin-spark-metadata/src/main/scala/org/apache/kylin/engine/spark/metadata/MetadataConverter.scala
index b0ba58e..4ccf12f 100644
--- 
a/kylin-spark-project/kylin-spark-metadata/src/main/scala/org/apache/kylin/engine/spark/metadata/MetadataConverter.scala
+++ 
b/kylin-spark-project/kylin-spark-metadata/src/main/scala/org/apache/kylin/engine/spark/metadata/MetadataConverter.scala
@@ -133,6 +133,7 @@ object MetadataConverter {
     val (columnIndexes, shardByColumnsId, idToColumnMap, measureId) = 
genIDToColumnMap(cubeInstance)
     (cubeInstance.getCuboidsByMode(cuboidMode)
       .asScala
+      .filter(id => cubeInstance.getConfig.isBuildBaseCuboid || 
!id.equals(cubeInstance.getCuboidScheduler.getBaseCuboidId))
       .map { long =>
         genLayoutEntity(columnIndexes, shardByColumnsId, idToColumnMap, 
measureId, long)
       }.toList, measureId.asScala.toMap)