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 2015/07/23 08:48:51 UTC

incubator-kylin git commit: KYLIN-875 Fix CI, NPE in DictionaryManager.decideSourceData()

Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8 c0d9f1c7f -> 382345b2e


KYLIN-875 Fix CI, NPE in DictionaryManager.decideSourceData()


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/382345b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/382345b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/382345b2

Branch: refs/heads/0.8
Commit: 382345b2e00dcdff1c7e30db913f8c8677ac14f6
Parents: c0d9f1c
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jul 23 14:48:43 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jul 23 14:48:43 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/common/persistence/ResourceStore.java    | 2 +-
 .../src/main/java/org/apache/kylin/dict/DictionaryManager.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/382345b2/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
index 3bbcb0a..630477b 100644
--- a/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
+++ b/core-common/src/main/java/org/apache/kylin/common/persistence/ResourceStore.java
@@ -68,7 +68,7 @@ abstract public class ResourceStore {
             try {
                 knownImpl.add(ClassUtil.forName("org.apache.kylin.storage.hbase.HBaseResourceStore", ResourceStore.class));
             } catch (Throwable e) {
-                logger.warn("Failed to load ResourceStore impl class", e);
+                logger.warn("Failed to load ResourceStore impl class: " + e.toString());
             }
         }
         return knownImpl;

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/382345b2/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
----------------------------------------------------------------------
diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
index a579abf..f7a407b 100644
--- a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
+++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
@@ -248,7 +248,7 @@ public class DictionaryManager {
             srcCol = col.getName();
             srcColIdx = col.getColumnDesc().getZeroBasedIndex();
             if (model.isFactTable(col.getTable())) {
-                table = factTableValueProvider.getDistinctValuesFor(col);
+                table = (factTableValueProvider == null) ? null : factTableValueProvider.getDistinctValuesFor(col);
             } else {
                 table = TableSourceFactory.createReadableTable(metaMgr.getTableDesc(col.getTable()));
             }