kylin git commit: KYLIN-1936 fix CI

[mahongbin]

Repository: kylin
Updated Branches:
  refs/heads/master 9629fa8fb -> 6c88139d4


KYLIN-1936 fix CI


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

Branch: refs/heads/master
Commit: 6c88139d4c91c86a916846d0ac0e4f5ce106f09a
Parents: 9629fa8
Author: Hongbin Ma 
Authored: Thu Aug 18 23:09:32 2016 +0800
Committer: Hongbin Ma 
Committed: Thu Aug 18 23:09:32 2016 +0800

--
 .../org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/6c88139d/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
--
diff --git 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
index 1a2bae3..4365ee2 100644
--- 
a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
+++ 
b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeSegmentScanner.java
@@ -72,7 +72,10 @@ public class CubeSegmentScanner implements IGTScanner {
 
scanRequest.setAllowStorageAggregation(context.isNeedStorageAggregation());
 
scanRequest.setAggCacheMemThreshold(cubeSeg.getCubeInstance().getConfig().getQueryCoprocessorMemGB());
 
scanRequest.setStorageScanRowNumThreshold(context.getThreshold());//TODO: 
devide by shard number?
-
scanRequest.setStoragePushDownLimit(context.getStoragePushDownLimit());
+
+if (cubeSeg.getCubeDesc().supportsLimitPushDown()) {
+
scanRequest.setStoragePushDownLimit(context.getStoragePushDownLimit());
+}
 }
 scanner = new ScannerWorker(cubeSeg, cuboid, scanRequest, gtStorage);
 }

[2/2] kylin git commit: KYLIN-1936 fix CI

[mahongbin]

KYLIN-1936 fix CI


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

Branch: refs/heads/master
Commit: 0badf49fda295f4901d07dd0a670d3c7d6678de4
Parents: 360c8ee
Author: Hongbin Ma 
Authored: Wed Aug 17 15:16:35 2016 +0800
Committer: Hongbin Ma 
Committed: Wed Aug 17 15:18:20 2016 +0800

--
 .../src/test/java/org/apache/kylin/query/ITKylinQueryTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/0badf49f/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
--
diff --git 
a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java 
b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
index 741dd18..5db4342 100644
--- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
@@ -35,6 +35,7 @@ import org.apache.kylin.query.enumerator.OLAPQuery;
 import org.apache.kylin.query.relnode.OLAPContext;
 import org.apache.kylin.query.routing.Candidate;
 import org.apache.kylin.query.schema.OLAPSchemaFactory;
+import org.apache.kylin.storage.hbase.HBaseStorage;
 import 
org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer.ObserverEnabler;
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.IDatabaseConnection;
@@ -260,7 +261,9 @@ public class ITKylinQueryTest extends KylinTestBase {
 
 @Test
 public void testLimitCorrectness() throws Exception {
-execLimitAndValidate(getQueryFolderPrefix() + 
"src/test/resources/query/sql");
+if (HBaseStorage.overwriteStorageQuery == null) {//v1 query engine 
will not work
+execLimitAndValidate(getQueryFolderPrefix() + 
"src/test/resources/query/sql");
+}
 }
 
 @Test