[kylin] branch master updated: KYLIN-4731 Kylin query failing with 'NPE while executing SQL'

[xx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new e6d9fb0  KYLIN-4731 Kylin query failing with 'NPE while executing SQL'
e6d9fb0 is described below

commit e6d9fb0c3d5684d391ea1c8085e2e4bfe8f303db
Author: Zhichao Zhang <44...@qq.com>
AuthorDate: Mon Aug 31 22:34:05 2020 +0800

    KYLIN-4731 Kylin query failing with 'NPE while executing SQL'
    
    Please see the detailed info: https://issues.apache.org/jira/projects/KYLIN/issues/KYLIN-4731
---
 .../main/java/org/apache/kylin/storage/gtrecord/CubeTupleConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeTupleConverter.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeTupleConverter.java
index ae10751..9911b51 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeTupleConverter.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeTupleConverter.java
@@ -299,7 +299,7 @@ public class CubeTupleConverter implements ITupleConverter {
                     for (int i = 0; i < hostTmpIdx.length; i++) {
                         lookupKey.getData()[i] = CubeTupleConverter.toString(gtValues[hostTmpIdx[i]]);
                         // if the primary key of lookup table is date time type, do this change in case of data type inconsistency
-                        if (deriveInfo.join.getPrimaryKeyColumns()[i].getType().isDateTimeFamily()) {
+                        if (lookupKey.getData()[i] != null && deriveInfo.join.getPrimaryKeyColumns()[i].getType().isDateTimeFamily()) {
                             lookupKey.getData()[i] = String.valueOf(DateFormat.stringToMillis(lookupKey.getData()[i]));
                         }
                     }