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 2015/11/02 08:56:30 UTC
incubator-kylin git commit: enable ITIIQueryTest
Repository: incubator-kylin
Updated Branches:
refs/heads/KYLIN-1112 4355f209c -> b65c9a840
enable ITIIQueryTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b65c9a84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b65c9a84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b65c9a84
Branch: refs/heads/KYLIN-1112
Commit: b65c9a8401aa83ab7a0ba6eb1d540eead288a196
Parents: 4355f20
Author: shaofengshi <sh...@apache.org>
Authored: Mon Nov 2 15:56:22 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Nov 2 15:56:22 2015 +0800
----------------------------------------------------------------------
.../src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java | 1 -
.../apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b65c9a84/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
index 1ba5c3f..78b3d1c 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITIIQueryTest.java
@@ -36,7 +36,6 @@ import com.google.common.collect.Maps;
/**
*/
@RunWith(Parameterized.class)
-@Ignore ("Temporarily ignore this as seems II couldn't serve topN query correctly")
public class ITIIQueryTest extends ITKylinQueryTest {
@BeforeClass
public static void setUp() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b65c9a84/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
index 8aace22..b18d258 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v1/HBaseClientKVIterator.java
@@ -82,7 +82,8 @@ public class HBaseClientKVIterator implements Iterable<IIRow>, Closeable {
key.set(c.getRowArray(), c.getRowOffset(), c.getRowLength());
value.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
c = r.getColumnLatestCell(IIDesc.HBASE_FAMILY_BYTES, IIDesc.HBASE_DICTIONARY_BYTES);
- dict.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
+ if (c != null)
+ dict.set(c.getValueArray(), c.getValueOffset(), c.getValueLength());
return pair;
}