[kylin] branch 3.0.x updated: KYLIN-4340 Fix bug of get value of isSparkFactDistinctEnable for cube not correct

[nic]

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

nic pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new 04acd09  KYLIN-4340 Fix bug of get value of isSparkFactDistinctEnable 
for cube not correct
04acd09 is described below

commit 04acd097c38ee002f495d6252719ac790f20cda4
Author: weibin0516 <codingfor...@126.com>
AuthorDate: Sun Jan 19 23:43:49 2020 +0800

    KYLIN-4340 Fix bug of get value of isSparkFactDistinctEnable for cube not 
correct
---
 core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java  | 2 ++
 .../org/apache/kylin/engine/spark/SparkBatchCubingJobBuilder2.java     | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java
index 02c8106..ddec154 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigExt.java
@@ -55,6 +55,7 @@ public class KylinConfigExt extends KylinConfig {
         this.overrides = BCC.check(overrides);
     }
 
+    @Override
     public String getOptional(String prop, String dft) {
         String value = overrides.get(prop);
         if (value != null)
@@ -63,6 +64,7 @@ public class KylinConfigExt extends KylinConfig {
             return super.getOptional(prop, dft);
     }
 
+    @Override
     protected Properties getAllProperties() {
         Properties result = new Properties();
         result.putAll(super.getRawAllProperties());
diff --git 
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkBatchCubingJobBuilder2.java
 
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkBatchCubingJobBuilder2.java
index 208c7e8..7c5e2e2 100644
--- 
a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkBatchCubingJobBuilder2.java
+++ 
b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkBatchCubingJobBuilder2.java
@@ -65,8 +65,7 @@ public class SparkBatchCubingJobBuilder2 extends 
JobBuilderSupport {
         inputSide.addStepPhase1_CreateFlatTable(result);
 
         // Phase 2: Build Dictionary
-        KylinConfig config = KylinConfig.getInstanceFromEnv();
-        if (config.isSparkFactDistinctEnable()) {
+        if (seg.getConfig().isSparkFactDistinctEnable()) {
             result.addTask(createFactDistinctColumnsSparkStep(jobId));
         } else {
             result.addTask(createFactDistinctColumnsStep(jobId));