Repository: incubator-kylin
Updated Branches:
  refs/heads/2.x-staging dff549547 -> b52c1bba8


KYLIN-1152 check whether ts column is empty


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

Branch: refs/heads/2.x-staging
Commit: b52c1bba87140cd62c46ffde3ef5d933a88c86e4
Parents: dff5495
Author: shaofengshi <shaofeng...@apache.org>
Authored: Mon Nov 23 15:50:13 2015 +0800
Committer: shaofengshi <shaofeng...@apache.org>
Committed: Mon Nov 23 15:50:48 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/storage/hbase/HBaseResourceStore.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b52c1bba/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
----------------------------------------------------------------------
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
index 13c657e..6f638c4 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseResourceStore.java
@@ -192,7 +192,7 @@ public class HBaseResourceStore extends ResourceStore {
     }
 
     private long getTimestamp(Result r) {
-        if (r == null) {
+        if (r == null || r.getValue(B_FAMILY, B_COLUMN_TS) == null) {
             return 0;
         } else {
             return Bytes.toLong(r.getValue(B_FAMILY, B_COLUMN_TS));

Reply via email to