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 2015/07/27 09:06:43 UTC
incubator-kylin git commit: KYLIN-901 fix a NPE
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 fce90a068 -> 42a4d2b9e
KYLIN-901 fix a NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/42a4d2b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/42a4d2b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/42a4d2b9
Branch: refs/heads/0.8
Commit: 42a4d2b9e0730d560ee12cd31d39eb08a77e7345
Parents: fce90a0
Author: shaofengshi <sh...@apache.org>
Authored: Mon Jul 27 15:06:36 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 27 15:06:36 2015 +0800
----------------------------------------------------------------------
.../kylin/engine/mr/steps/MetadataCleanupJob.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/42a4d2b9/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MetadataCleanupJob.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MetadataCleanupJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MetadataCleanupJob.java
index c82ceb6..43bdf6e 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MetadataCleanupJob.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MetadataCleanupJob.java
@@ -111,15 +111,17 @@ public class MetadataCleanupJob extends AbstractHadoopJob {
for (String resourceRoot : new String[]{ResourceStore.SNAPSHOT_RESOURCE_ROOT, ResourceStore.CUBE_STATISTICS_ROOT}) {
ArrayList<String> snapshotTables = getStore().listResources(resourceRoot);
- for (String snapshotTable : snapshotTables) {
- ArrayList<String> snapshotNames = getStore().listResources(snapshotTable);
- if (snapshotNames != null)
- for (String snapshot : snapshotNames) {
- if (!activeResourceList.contains(snapshot)) {
- if (isOlderThanThreshold(getStore().getResourceTimestamp(snapshot)))
- toDeleteResource.add(snapshot);
+ if (snapshotTables != null) {
+ for (String snapshotTable : snapshotTables) {
+ ArrayList<String> snapshotNames = getStore().listResources(snapshotTable);
+ if (snapshotNames != null)
+ for (String snapshot : snapshotNames) {
+ if (!activeResourceList.contains(snapshot)) {
+ if (isOlderThanThreshold(getStore().getResourceTimestamp(snapshot)))
+ toDeleteResource.add(snapshot);
+ }
}
- }
+ }
}
}