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/31 09:13:13 UTC
incubator-kylin git commit: KYLIN-911 misc small changes
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 6f302a5b9 -> 23cb3500f
KYLIN-911 misc small changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/23cb3500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/23cb3500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/23cb3500
Branch: refs/heads/0.8
Commit: 23cb3500fc1413df93a281ed79afdf1ec928f904
Parents: 6f302a5
Author: shaofengshi <sh...@apache.org>
Authored: Fri Jul 31 15:12:40 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Fri Jul 31 15:12:40 2015 +0800
----------------------------------------------------------------------
bin/metastore.sh | 10 +++++++++-
.../org/apache/kylin/job/manager/ExecutableManager.java | 3 ++-
.../apache/kylin/engine/mr/steps/MergeDictionaryStep.java | 6 +++++-
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/23cb3500/bin/metastore.sh
----------------------------------------------------------------------
diff --git a/bin/metastore.sh b/bin/metastore.sh
index f08de31..33d22d2 100644
--- a/bin/metastore.sh
+++ b/bin/metastore.sh
@@ -30,8 +30,16 @@ elif [ $1 == "reset" ]
then
hbase org.apache.hadoop.util.RunJar ${_fulljobjar} org.apache.kylin.common.persistence.ResourceTool reset
+
+elif [ $1 == "clean" ]
+then
+
+ hbase org.apache.hadoop.util.RunJar ${_fulljobjar} org.apache.kylin.engine.mr.steps.MetadataCleanupJob "${@:2}"
else
- echo "usage: metastore.sh backup or metastore.sh restore PATH_TO_LOCAL_META"
+ echo "usage: metastore.sh backup"
+ echo " metastore.sh reset"
+ echo " metastore.sh restore PATH_TO_LOCAL_META"
+ echo " metastore.sh clean [--delete true]"
exit 1
fi
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/23cb3500/core-job/src/main/java/org/apache/kylin/job/manager/ExecutableManager.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/manager/ExecutableManager.java b/core-job/src/main/java/org/apache/kylin/job/manager/ExecutableManager.java
index 05f8c8e..65abf7b 100644
--- a/core-job/src/main/java/org/apache/kylin/job/manager/ExecutableManager.java
+++ b/core-job/src/main/java/org/apache/kylin/job/manager/ExecutableManager.java
@@ -311,7 +311,8 @@ public class ExecutableManager {
}
return result;
} catch (ReflectiveOperationException e) {
- throw new IllegalArgumentException("cannot parse this job:" + executablePO.getId(), e);
+ logger.error("cannot parse this job:" + executablePO.getId(), e);
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/23cb3500/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeDictionaryStep.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeDictionaryStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeDictionaryStep.java
index 7ca16d5..130de1a 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeDictionaryStep.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeDictionaryStep.java
@@ -125,7 +125,11 @@ public class MergeDictionaryStep extends AbstractExecutable {
logger.info("Including fact table dictionary of segment : " + segment);
if (segment.getDictResPath(col) != null) {
DictionaryInfo dictInfo = dictMgr.getDictionaryInfo(segment.getDictResPath(col));
- dictInfos.add(dictInfo);
+ if (dictInfo != null) {
+ dictInfos.add(dictInfo);
+ } else {
+ logger.warn("Failed to load DictionaryInfo from " + segment.getDictResPath(col));
+ }
}
}
mergeDictionaries(dictMgr, newSeg, dictInfos, col);