You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by lu...@apache.org on 2015/01/15 13:26:21 UTC
[05/50] [abbrv] incubator-kylin git commit: stop supporting simple
query with cube
stop supporting simple query with cube
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b8650af9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b8650af9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b8650af9
Branch: refs/heads/inverted-index
Commit: b8650af992fb8025f07138358b0470b92edb1f09
Parents: 94352ae
Author: honma <ho...@ebay.com>
Authored: Tue Jan 13 10:06:54 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Tue Jan 13 10:07:15 2015 +0800
----------------------------------------------------------------------
examples/test_case_data/localmeta/kylin.properties | 1 +
.../test/java/com/kylinolap/query/test/KylinQueryTest.java | 1 +
.../src/main/java/com/kylinolap/storage/StorageContext.java | 8 --------
.../java/com/kylinolap/storage/hbase/CubeStorageEngine.java | 2 +-
.../storage/hbase/coprocessor/observer/ObserverEnabler.java | 4 ----
5 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b8650af9/examples/test_case_data/localmeta/kylin.properties
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties
index 46ae494..40ff005 100644
--- a/examples/test_case_data/localmeta/kylin.properties
+++ b/examples/test_case_data/localmeta/kylin.properties
@@ -49,6 +49,7 @@ kylin.job.yarn.app.rest.check.status.url=http://sandbox:8088/ws/v1/cluster/apps/
kylin.job.yarn.app.rest.check.interval.seconds=10
+
## Config for Restful APP ##
# database connection settings:
ldap.server=
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b8650af9/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
index afe5aa8..f6eb96c 100644
--- a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
+++ b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
@@ -252,6 +252,7 @@ public class KylinQueryTest extends KylinTestBase {
execAndCompDynamicQuery("src/test/resources/query/sql_dynamic", null, true);
}
+ @Ignore("simple query will be supported by ii")
@Test
public void testLimitEnabled() throws Exception {
runSqlFile("src/test/resources/query/sql_optimize/enable-limit01.sql");
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b8650af9/storage/src/main/java/com/kylinolap/storage/StorageContext.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/com/kylinolap/storage/StorageContext.java b/storage/src/main/java/com/kylinolap/storage/StorageContext.java
index d1ed04e..3f4cfc0 100644
--- a/storage/src/main/java/com/kylinolap/storage/StorageContext.java
+++ b/storage/src/main/java/com/kylinolap/storage/StorageContext.java
@@ -177,14 +177,6 @@ public class StorageContext {
this.partialResultReturned = partialResultReturned;
}
- public boolean isAvoidAggregation() {
- return avoidAggregation;
- }
-
- public void markAvoidAggregation() {
- this.avoidAggregation = true;
- }
-
public void setExactAggregation(boolean isExactAggregation) {
this.exactAggregation = isExactAggregation;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b8650af9/storage/src/main/java/com/kylinolap/storage/hbase/CubeStorageEngine.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/com/kylinolap/storage/hbase/CubeStorageEngine.java b/storage/src/main/java/com/kylinolap/storage/hbase/CubeStorageEngine.java
index 117ad20..8a5c821 100644
--- a/storage/src/main/java/com/kylinolap/storage/hbase/CubeStorageEngine.java
+++ b/storage/src/main/java/com/kylinolap/storage/hbase/CubeStorageEngine.java
@@ -599,7 +599,7 @@ public class CubeStorageEngine implements IStorageEngine {
}
private void setLimit(TupleFilter filter, StorageContext context) {
- boolean goodAggr = context.isExactAggregation() || context.isAvoidAggregation();
+ boolean goodAggr = context.isExactAggregation() ;
boolean goodFilter = filter == null || (TupleFilter.isEvaluableRecursively(filter) && context.isCoprocessorEnabled());
boolean goodSort = context.hasSort() == false;
if (goodAggr && goodFilter && goodSort) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b8650af9/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/observer/ObserverEnabler.java
----------------------------------------------------------------------
diff --git a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/observer/ObserverEnabler.java b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/observer/ObserverEnabler.java
index 8f6d74d..91eff67 100644
--- a/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/observer/ObserverEnabler.java
+++ b/storage/src/main/java/com/kylinolap/storage/hbase/coprocessor/observer/ObserverEnabler.java
@@ -88,10 +88,6 @@ public class ObserverEnabler {
private static boolean isCoprocessorBeneficial(CubeInstance cube, Collection<TblColRef> groupBy, Collection<RowValueDecoder> rowValueDecoders, StorageContext context) {
- if (context.isAvoidAggregation()) {
- logger.info("Coprocessor is disabled because context tells to avoid aggregation");
- return false;
- }
String forceFlag = System.getProperty(FORCE_COPROCESSOR);
if (forceFlag != null) {