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 2017/01/03 06:42:43 UTC

[07/15] kylin git commit: fix NPE in SchemaChecker

fix NPE in SchemaChecker


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

Branch: refs/heads/sparkcubing-rebase
Commit: 0b49eff2ceda02c0b2ba74245583b5184bb65955
Parents: b052d6f
Author: Billy Liu <bi...@apache.org>
Authored: Tue Jan 3 12:42:22 2017 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Tue Jan 3 12:42:22 2017 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/source/hive/SchemaChecker.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/0b49eff2/source-hive/src/main/java/org/apache/kylin/source/hive/SchemaChecker.java
----------------------------------------------------------------------
diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/SchemaChecker.java b/source-hive/src/main/java/org/apache/kylin/source/hive/SchemaChecker.java
index 3172251..e2a94fb 100644
--- a/source-hive/src/main/java/org/apache/kylin/source/hive/SchemaChecker.java
+++ b/source-hive/src/main/java/org/apache/kylin/source/hive/SchemaChecker.java
@@ -32,6 +32,7 @@ import org.apache.kylin.cube.CubeManager;
 import org.apache.kylin.metadata.MetadataManager;
 import org.apache.kylin.metadata.datatype.DataType;
 import org.apache.kylin.metadata.model.ColumnDesc;
+import org.apache.kylin.metadata.model.DataModelDesc;
 import org.apache.kylin.metadata.model.TableDesc;
 import org.apache.kylin.metadata.model.TblColRef;
 
@@ -103,7 +104,10 @@ public class SchemaChecker {
                 if (cube == null || cube.allowBrokenDescriptor()) {
                     return false;
                 }
-                return cube.getModel().containsTable(fullTableName);
+                DataModelDesc model = cube.getModel();
+                if (model == null)
+                    return false;
+                return model.containsTable(fullTableName);
             }
         });