You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/27 07:25:26 UTC
[13/41] incubator-kylin git commit: enable distinct count query in
IIQuery test
enable distinct count query in IIQuery test
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/c2fe3eb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c2fe3eb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c2fe3eb3
Branch: refs/heads/inverted-index
Commit: c2fe3eb3b5f9be25e1404b9e5336bd0febde8654
Parents: 579e793
Author: honma <ho...@ebay.com>
Authored: Thu Feb 12 17:39:13 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Feb 12 17:39:23 2015 +0800
----------------------------------------------------------------------
.../org/apache/kylin/query/test/IIQueryTest.java | 16 ----------------
.../org/apache/kylin/query/test/KylinQueryTest.java | 7 ++-----
.../org/apache/kylin/query/test/KylinTestBase.java | 1 -
.../query_count_distinct_on_dimension.sql | 1 -
.../query_count_distinct_on_dimension.sql.disabled | 2 ++
5 files changed, 4 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c2fe3eb3/query/src/test/java/org/apache/kylin/query/test/IIQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/IIQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/IIQueryTest.java
index d36ffb9..f5b42d5 100644
--- a/query/src/test/java/org/apache/kylin/query/test/IIQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/IIQueryTest.java
@@ -18,7 +18,6 @@
package org.apache.kylin.query.test;
-import java.io.File;
import java.util.Map;
import org.apache.kylin.metadata.realization.RealizationType;
@@ -37,7 +36,6 @@ public class IIQueryTest extends KylinQueryTest {
public static void setUp() throws Exception {
KylinQueryTest.setUp();//invoke super class
- distinctCountSupported = true;
Map<RealizationType, Integer> priorities = Maps.newHashMap();
priorities.put(RealizationType.INVERTED_INDEX, 0);
@@ -49,7 +47,6 @@ public class IIQueryTest extends KylinQueryTest {
@AfterClass
public static void tearDown() throws Exception {
KylinQueryTest.tearDown();//invoke super class
- distinctCountSupported = true;
Map<RealizationType, Integer> priorities = Maps.newHashMap();
priorities.put(RealizationType.INVERTED_INDEX, 1);
@@ -62,17 +59,4 @@ public class IIQueryTest extends KylinQueryTest {
execAndCompQuery("src/test/resources/query/sql_ii", null, true);
}
- @Test
- public void testSingleRunQuery() throws Exception {
- String queryFileName = "src/test/resources/query/sql_distinct/query00.sql";
-
- File sqlFile = new File(queryFileName);
- runSQL(sqlFile, true, true);
- runSQL(sqlFile, true, false);
- }
-
- @Test
- public void testDistinctCountQuery() throws Exception {
- super.testDistinctCountQuery();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c2fe3eb3/query/src/test/java/org/apache/kylin/query/test/KylinQueryTest.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/KylinQueryTest.java b/query/src/test/java/org/apache/kylin/query/test/KylinQueryTest.java
index bcd5e25..8c3901c 100644
--- a/query/src/test/java/org/apache/kylin/query/test/KylinQueryTest.java
+++ b/query/src/test/java/org/apache/kylin/query/test/KylinQueryTest.java
@@ -192,11 +192,7 @@ public class KylinQueryTest extends KylinTestBase {
@Test
public void testDistinctCountQuery() throws Exception {
- if (distinctCountSupported) {
- batchExecuteQuery("src/test/resources/query/sql_distinct");
- } else {
- System.out.println("distinct count query omiited");
- }
+ batchExecuteQuery("src/test/resources/query/sql_distinct");
}
@Test
@@ -247,6 +243,7 @@ public class KylinQueryTest extends KylinTestBase {
}
}
+
@Test
public void testDynamicQuery() throws Exception {
execAndCompDynamicQuery("src/test/resources/query/sql_dynamic", null, true);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c2fe3eb3/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
----------------------------------------------------------------------
diff --git a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
index 3fc649d..5f81f22 100644
--- a/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
+++ b/query/src/test/java/org/apache/kylin/query/test/KylinTestBase.java
@@ -79,7 +79,6 @@ public class KylinTestBase {
protected static final String resultTableName = "query result of ";
protected static KylinConfig config = null;
- protected static boolean distinctCountSupported = true;
protected static Connection cubeConnection = null;
protected static Connection h2Connection = null;
protected static String joinType = "default";
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c2fe3eb3/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql
----------------------------------------------------------------------
diff --git a/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql b/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql
deleted file mode 100644
index 30bbd76..0000000
--- a/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql
+++ /dev/null
@@ -1 +0,0 @@
-select count(distinct cal_dt) from test_kylin_fact
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/c2fe3eb3/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql.disabled
----------------------------------------------------------------------
diff --git a/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql.disabled b/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql.disabled
new file mode 100644
index 0000000..94f7faf
--- /dev/null
+++ b/query/src/test/resources/query/sql_invalid/query_count_distinct_on_dimension.sql.disabled
@@ -0,0 +1,2 @@
+##dd
+select count(distinct cal_dt) from test_kylin_fact
\ No newline at end of file