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:48 UTC
[32/50] [abbrv] incubator-kylin git commit: ii able to do more
queries, blocking at EXTRACT
ii able to do more queries, blocking at EXTRACT
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/1acf4a24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/1acf4a24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/1acf4a24
Branch: refs/heads/inverted-index
Commit: 1acf4a247208aa36c92d554a20710b8e7111fdc6
Parents: aabc3fd
Author: honma <ho...@ebay.com>
Authored: Wed Jan 14 17:42:48 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Jan 14 18:05:45 2015 +0800
----------------------------------------------------------------------
.../src/main/java/com/kylinolap/invertedindex/IIInstance.java | 7 ++++---
.../query/routing/RoutingRules/RealizationPriorityRule.java | 4 ++--
.../test/java/com/kylinolap/query/test/KylinQueryTest.java | 4 +---
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1acf4a24/invertedindex/src/main/java/com/kylinolap/invertedindex/IIInstance.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIInstance.java b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIInstance.java
index 53f5a0c..373f1e3 100644
--- a/invertedindex/src/main/java/com/kylinolap/invertedindex/IIInstance.java
+++ b/invertedindex/src/main/java/com/kylinolap/invertedindex/IIInstance.java
@@ -272,7 +272,6 @@ public class IIInstance extends RootPersistentEntity implements IRealization {
return cost;
}
-
public RealizationStatusEnum getStatus() {
return status;
}
@@ -377,10 +376,12 @@ public class IIInstance extends RootPersistentEntity implements IRealization {
return new long[] { start, end };
}
-
@Override
public boolean isCapable(SQLDigest digest) {
- //TODO: currently II is omnipotent
+ //TODO: currently II is nearly omnipotent
+ if (!digest.factTable.equalsIgnoreCase(this.getFactTable()))
+ return false;
+
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1acf4a24/query/src/main/java/com/kylinolap/query/routing/RoutingRules/RealizationPriorityRule.java
----------------------------------------------------------------------
diff --git a/query/src/main/java/com/kylinolap/query/routing/RoutingRules/RealizationPriorityRule.java b/query/src/main/java/com/kylinolap/query/routing/RoutingRules/RealizationPriorityRule.java
index 1fcbb36..37758d2 100644
--- a/query/src/main/java/com/kylinolap/query/routing/RoutingRules/RealizationPriorityRule.java
+++ b/query/src/main/java/com/kylinolap/query/routing/RoutingRules/RealizationPriorityRule.java
@@ -18,8 +18,8 @@ public class RealizationPriorityRule extends RoutingRule {
public void apply(List<IRealization> realizations, OLAPContext olapContext) {
final HashMap<RealizationType, Integer> priority = Maps.newHashMap();
- priority.put(RealizationType.CUBE, 1);
- priority.put(RealizationType.INVERTED_INDEX, 0);
+ priority.put(RealizationType.CUBE, 0);
+ priority.put(RealizationType.INVERTED_INDEX, 1);
Collections.sort(realizations, new Comparator<IRealization>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/1acf4a24/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 ec88d16..5f37c75 100644
--- a/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
+++ b/query/src/test/java/com/kylinolap/query/test/KylinQueryTest.java
@@ -133,7 +133,7 @@ public class KylinQueryTest extends KylinTestBase {
@Test
public void testSingleRunQuery() throws Exception {
- String queryFileName = "src/test/resources/query/sql_ii/query02.sql";
+ String queryFileName = "src/test/resources/query/sql/query58.sql";
File sqlFile = new File(queryFileName);
runSQL(sqlFile, true, true);
@@ -166,8 +166,6 @@ public class KylinQueryTest extends KylinTestBase {
@Test
@Ignore("ii not ready")
public void testIIQuery() throws Exception {
-
-
execAndCompQuery("src/test/resources/query/sql_ii", null, true);
}