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 2016/11/18 07:21:04 UTC
kylin git commit: KYLIN-2207 fix potential NPW in
ExtendCubeToHybridCLI
Repository: kylin
Updated Branches:
refs/heads/master 3797ade1e -> c8d4136b0
KYLIN-2207 fix potential NPW in ExtendCubeToHybridCLI
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c8d4136b
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c8d4136b
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c8d4136b
Branch: refs/heads/master
Commit: c8d4136b01a1b3d5816c9db9d9e3bad0ef575a3c
Parents: 3797ade
Author: lidongsjtu <li...@apache.org>
Authored: Fri Nov 18 15:20:28 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Fri Nov 18 15:20:34 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/metadata/MetadataManager.java | 2 +-
.../src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c8d4136b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index 5d1db9e..d0e4b42 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -486,7 +486,7 @@ public class MetadataManager {
if (null != model) {
ret.add(model);
} else {
- logger.error("Failed to load model" + modelName);
+ logger.error("Failed to load model " + modelName);
}
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/c8d4136b/tool/src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java b/tool/src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java
index dbf367f..8bd5766 100644
--- a/tool/src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/ExtendCubeToHybridCLI.java
@@ -156,7 +156,7 @@ public class ExtendCubeToHybridCLI {
logger.info("CubeSegment[" + currentSeg + "] was removed.");
}
}
- if (partitionDateStr != null && partitionDate != currentSeg.getDateRangeEnd()) {
+ if (currentSeg != null && partitionDateStr != null && partitionDate != currentSeg.getDateRangeEnd()) {
logger.error("PartitionDate must be end date of one segment.");
return;
}