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/04/11 00:47:59 UTC
[22/34] incubator-kylin git commit: Kylin-663 fix bug
Kylin-663 fix bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/5a46a15b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/5a46a15b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/5a46a15b
Branch: refs/heads/streaming-localdict
Commit: 5a46a15ba44f84a4dda476f0d6f92271019de6a3
Parents: d898f3f
Author: honma <ho...@ebay.com>
Authored: Thu Apr 9 10:22:50 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Apr 9 10:22:50 2015 +0800
----------------------------------------------------------------------
.../kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java | 4 +++-
.../hbase/coprocessor/endpoint/TsConditionExtractorTest.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/5a46a15b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
index 866666a..2068fe2 100644
--- a/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
+++ b/storage/src/main/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/IIEndpoint.java
@@ -25,6 +25,7 @@ import java.util.Map;
import com.google.common.base.Preconditions;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.client.Result;
@@ -35,6 +36,7 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
+import org.apache.kylin.common.util.Array;
import org.apache.kylin.common.util.BytesUtil;
import org.apache.kylin.cube.kv.RowKeyColumnIO;
import org.apache.kylin.dict.Dictionary;
@@ -76,7 +78,7 @@ public class IIEndpoint extends IIProtos.RowsService implements Coprocessor, Cop
int shard = -1;
if (request.hasTsStart() || request.hasTsEnd()) {
byte[] regionStartKey = region.getStartKey();
- if (regionStartKey != null) {
+ if (!ArrayUtils.isEmpty(regionStartKey)) {
shard = BytesUtil.readUnsigned(regionStartKey, 0, IIKeyValueCodec.SHARD_LEN);
} else {
shard = 0;
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/5a46a15b/storage/src/test/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/TsConditionExtractorTest.java
----------------------------------------------------------------------
diff --git a/storage/src/test/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/TsConditionExtractorTest.java b/storage/src/test/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/TsConditionExtractorTest.java
index ccf3013..c285ef1 100644
--- a/storage/src/test/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/TsConditionExtractorTest.java
+++ b/storage/src/test/java/org/apache/kylin/storage/hbase/coprocessor/endpoint/TsConditionExtractorTest.java
@@ -20,7 +20,6 @@ package org.apache.kylin.storage.hbase.coprocessor.endpoint;
import java.io.IOException;
-import com.google.common.collect.Lists;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.kylin.common.util.LocalFileMetadataTestCase;
import org.apache.kylin.invertedindex.IIInstance;
@@ -31,12 +30,13 @@ import org.apache.kylin.metadata.filter.*;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.storage.hbase.coprocessor.CoprocessorFilter;
-import org.apache.kylin.storage.hbase.coprocessor.FilterDecorator;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.collect.Lists;
+
/**
* Created by Hongbin Ma(Binmahone)
*