You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by qh...@apache.org on 2015/06/18 08:36:44 UTC
incubator-kylin git commit: KYLIN-838 fix NPE
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 29d1d02e9 -> d184dd84a
KYLIN-838 fix NPE
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d184dd84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d184dd84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d184dd84
Branch: refs/heads/0.8
Commit: d184dd84a633968f1fa9b14c9eaf7281960ee5ff
Parents: 29d1d02
Author: qianhao.zhou <qi...@ebay.com>
Authored: Thu Jun 18 14:36:32 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Thu Jun 18 14:36:32 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/persistence/HBaseResourceStore.java | 2 +-
job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d184dd84/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java b/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
index f7014d9..6c5847e 100644
--- a/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
+++ b/common/src/main/java/org/apache/kylin/common/persistence/HBaseResourceStore.java
@@ -134,7 +134,7 @@ public class HBaseResourceStore extends ResourceStore {
@Override
protected List<RawResource> getAllResources(String rangeStart, String rangeEnd) throws IOException {
byte[] startRow = Bytes.toBytes(rangeStart);
- byte[] endRow = Bytes.toBytes(rangeEnd);
+ byte[] endRow = plusZero(Bytes.toBytes(rangeEnd));
Scan scan = new Scan(startRow, endRow);
scan.addColumn(B_FAMILY, B_COLUMN_TS);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d184dd84/job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java b/job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java
index 8f81973..4862bb1 100644
--- a/job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java
+++ b/job/src/main/java/org/apache/kylin/job/dao/ExecutableDao.java
@@ -98,7 +98,7 @@ public class ExecutableDao {
public List<ExecutableOutputPO> getJobOutputs() throws PersistentException {
try {
ArrayList<String> resources = store.listResources(JOB_OUTPUT_ROOT);
- if (resources == null) {
+ if (resources == null || resources.isEmpty()) {
return Collections.emptyList();
}
Collections.sort(resources);
@@ -114,7 +114,7 @@ public class ExecutableDao {
public List<ExecutablePO> getJobs() throws PersistentException {
try {
final List<String> jobIds = store.listResources(JOB_PATH_ROOT);
- if (jobIds.isEmpty()) {
+ if (jobIds == null || jobIds.isEmpty()) {
return Collections.emptyList();
}
Collections.sort(jobIds);