You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/04/24 03:49:28 UTC
[kylin] 06/07: Minor, add config for enable and disable auto merge
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 143cfdc317c4faa2289cdd84bfb3685cc17dc426
Author: nichunen <ch...@kyligence.io>
AuthorDate: Mon Apr 16 09:41:57 2018 +0800
Minor, add config for enable and disable auto merge
---
.../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 4 ++++
core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
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 458fe8d..a971f14 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
@@ -483,6 +483,10 @@ abstract public class KylinConfigBase implements Serializable {
return Integer.parseInt(getOptional("kylin.cube.gtscanrequest-serialization-level", "1"));
}
+ public boolean isAutoMergeEnabled() {
+ return Boolean.parseBoolean(getOptional("kylin.cube.is-automerge-enabled", "true"));
+ }
+
// ============================================================================
// Cube Planner
// ============================================================================
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index ea5006e..035cf7b 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -574,7 +574,7 @@ public class CubeInstance extends RootPersistentEntity implements IRealization,
if (!this.getDescriptor().getModel().getPartitionDesc().isPartitioned())
return false;
- return this.getDescriptor().getAutoMergeTimeRanges() != null
+ return this.getConfig().isAutoMergeEnabled() && this.getDescriptor().getAutoMergeTimeRanges() != null
&& this.getDescriptor().getAutoMergeTimeRanges().length > 0;
}
--
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.