You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/10/22 08:07:54 UTC

[2/5] incubator-kylin git commit: debuging

debuging


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

Branch: refs/heads/KYLIN-942
Commit: bd56ab360bab374fc4febd2b50d0450c464e3d8b
Parents: 4541752
Author: honma <ho...@ebay.com>
Authored: Thu Oct 15 15:20:16 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Oct 15 15:20:16 2015 +0800

----------------------------------------------------------------------
 .../test/java/org/apache/kylin/query/test/ITKylinQueryTest.java | 2 +-
 .../org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java    | 5 ++++-
 .../apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bd56ab36/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
index eaa716e..2f53fd7 100644
--- a/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/ITKylinQueryTest.java
@@ -95,7 +95,7 @@ public class ITKylinQueryTest extends KylinTestBase {
     @Test
     public void testSingleRunQuery() throws Exception {
 
-        String queryFileName = "src/test/resources/query/sql_orderby/query02.sql";
+        String queryFileName = "src/test/resources/query/sql/query10.sql";
 
         File sqlFile = new File(queryFileName);
         if (sqlFile.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bd56ab36/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
index 97a7284..91228cf 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseRPC.java
@@ -84,8 +84,11 @@ public abstract class CubeHBaseRPC {
 
         for (short i = 0; i < cuboidShardNum; ++i) {
             short shard = ShardingHash.normalize(cubeSeg.getCuboidBaseShard(cuboid.getId()), i, cubeSeg.getTotalShards());
+
             byte[] shardStart = Arrays.copyOf(start, start.length);
-            byte[] shardEnd = Arrays.copyOf(end, end.length);
+            byte[] shardEnd = new byte[end.length + 1];//append extra 0 to the end key to make it inclusive while scanning
+            System.arraycopy(end, 0, shardEnd, 0, end.length);
+
             BytesUtil.writeShort(shard, shardStart, 0, RowConstants.ROWKEY_SHARDID_LEN);
             BytesUtil.writeShort(shard, shardEnd, 0, RowConstants.ROWKEY_SHARDID_LEN);
 

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/bd56ab36/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
index 21881a6..d49de56 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
@@ -221,8 +221,8 @@ public class CubeSegmentScanner implements IGTScanner {
 
                         try {
 
-                            CubeHBaseRPC rpc = new CubeHBaseEndpointRPC(cubeSeg, cuboid, info);
-                            //CubeHBaseRPC rpc = new CubeHBaseScanRPC(cubeSeg, cuboid, info);
+                            //CubeHBaseRPC rpc = new CubeHBaseEndpointRPC(cubeSeg, cuboid, info);
+                            CubeHBaseRPC rpc = new CubeHBaseScanRPC(cubeSeg, cuboid, info);
 
                             //change previous line to CubeHBaseRPC rpc = new CubeHBaseScanRPC(cubeSeg, cuboid, info);
                             //to debug locally