You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vl...@apache.org on 2014/12/14 21:57:33 UTC
incubator-calcite git commit: Minor cleanup in
JdbcTest#testCloneGroupBy2
Repository: incubator-calcite
Updated Branches:
refs/heads/master 076ac11a8 -> fede7e568
Minor cleanup in JdbcTest#testCloneGroupBy2
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/fede7e56
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/fede7e56
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/fede7e56
Branch: refs/heads/master
Commit: fede7e568398370ec73e8061a63c2f07f58c39d2
Parents: 076ac11
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Sun Dec 14 23:56:52 2014 +0300
Committer: Vladimir Sitnikov <si...@gmail.com>
Committed: Sun Dec 14 23:57:08 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/calcite/test/JdbcTest.java | 29 ++++++++++----------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/fede7e56/core/src/test/java/org/apache/calcite/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index 486ffb3..23b64fc 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -1050,28 +1050,29 @@ public class JdbcTest {
+ "the_year=1998; C=365; M=April\n");
}
- @Ignore
+ @Ignore("The test returns expected results. Not sure why it is disabled")
@Test public void testCloneGroupBy2() {
CalciteAssert.that()
.with(CalciteAssert.Config.FOODMART_CLONE)
.query(
"select \"time_by_day\".\"the_year\" as \"c0\", \"time_by_day\".\"quarter\" as \"c1\", \"product_class\".\"product_family\" as \"c2\", sum(\"sales_fact_1997\".\"unit_sales\") as \"m0\" from \"time_by_day\" as \"time_by_day\", \"sales_fact_1997\" as \"sales_fact_1997\", \"product_class\" as \"product_class\", \"product\" as \"product\" where \"sales_fact_1997\".\"time_id\" = \"time_by_day\".\"time_id\" and \"time_by_day\".\"the_year\" = 1997 and \"sales_fact_1997\".\"product_id\" = \"product\".\"product_id\" and \"product\".\"product_class_id\" = \"product_class\".\"product_class_id\" group by \"time_by_day\".\"the_year\", \"time_by_day\".\"quarter\", \"product_class\".\"product_family\"")
- .returns("c0=1997; c1=Q2; c2=Drink; m0=5895.0000\n"
- + "c0=1997; c1=Q1; c2=Food; m0=47809.0000\n"
- + "c0=1997; c1=Q3; c2=Drink; m0=6065.0000\n"
- + "c0=1997; c1=Q4; c2=Drink; m0=6661.0000\n"
- + "c0=1997; c1=Q4; c2=Food; m0=51866.0000\n"
- + "c0=1997; c1=Q1; c2=Drink; m0=5976.0000\n"
- + "c0=1997; c1=Q3; c2=Non-Consumable; m0=12343.0000\n"
- + "c0=1997; c1=Q4; c2=Non-Consumable; m0=13497.0000\n"
- + "c0=1997; c1=Q2; c2=Non-Consumable; m0=11890.0000\n"
- + "c0=1997; c1=Q2; c2=Food; m0=44825.0000\n"
- + "c0=1997; c1=Q3; c2=Food; m0=47440.0000\n"
- + "c0=1997; c1=Q1; c2=Non-Consumable; m0=12506.0000\n");
+ .returnsUnordered(
+ "c0=1997; c1=Q2; c2=Drink; m0=5895.0000",
+ "c0=1997; c1=Q1; c2=Food; m0=47809.0000",
+ "c0=1997; c1=Q3; c2=Drink; m0=6065.0000",
+ "c0=1997; c1=Q4; c2=Drink; m0=6661.0000",
+ "c0=1997; c1=Q4; c2=Food; m0=51866.0000",
+ "c0=1997; c1=Q1; c2=Drink; m0=5976.0000",
+ "c0=1997; c1=Q3; c2=Non-Consumable; m0=12343.0000",
+ "c0=1997; c1=Q4; c2=Non-Consumable; m0=13497.0000",
+ "c0=1997; c1=Q2; c2=Non-Consumable; m0=11890.0000",
+ "c0=1997; c1=Q2; c2=Food; m0=44825.0000",
+ "c0=1997; c1=Q3; c2=Food; m0=47440.0000",
+ "c0=1997; c1=Q1; c2=Non-Consumable; m0=12506.0000");
}
/** Tests plan for a query with 4 tables, 3 joins. */
- @Ignore
+ @Ignore("The actual and expected plan differ")
@Test public void testCloneGroupBy2Plan() {
CalciteAssert.that()
.with(CalciteAssert.Config.FOODMART_CLONE)