You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2015/04/07 22:36:16 UTC

[5/7] incubator-calcite git commit: Disable tests, pending [CALCITE-673] Timeout executing joins against MySQL

Disable tests, pending [CALCITE-673] Timeout executing joins against MySQL


Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/66b62c5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/66b62c5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/66b62c5d

Branch: refs/heads/r1.2
Commit: 66b62c5d4d47fceccd6700eb4f05494caf36d835
Parents: 65774b0
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Apr 7 13:05:50 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Apr 7 13:05:50 2015 -0700

----------------------------------------------------------------------
 core/src/main/java/org/apache/calcite/util/Bug.java       |  5 +++++
 .../calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java     | 10 ++++++++++
 2 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/66b62c5d/core/src/main/java/org/apache/calcite/util/Bug.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/util/Bug.java b/core/src/main/java/org/apache/calcite/util/Bug.java
index f2a2450..a0ced22 100644
--- a/core/src/main/java/org/apache/calcite/util/Bug.java
+++ b/core/src/main/java/org/apache/calcite/util/Bug.java
@@ -161,6 +161,11 @@ public abstract class Bug {
    * Convert more planner rules to handle grouping sets</a> is fixed. */
   public static final boolean CALCITE_461_FIXED = false;
 
+  /** Whether
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-673">[CALCITE-673]
+   * Timeout executing joins against MySQL</a> is fixed. */
+  public static final boolean CALCITE_673_FIXED = false;
+
   /**
    * Use this to flag temporary code.
    */

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/66b62c5d/core/src/test/java/org/apache/calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java b/core/src/test/java/org/apache/calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java
index 3ef4dea..3100a86 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcFrontJdbcBackLinqMiddleTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.calcite.test;
 
+import org.apache.calcite.util.Bug;
+
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -132,6 +134,10 @@ public class JdbcFrontJdbcBackLinqMiddleTest {
   }
 
   @Test public void testJoinGroupByEmpty() {
+    if (CalciteAssert.DB == CalciteAssert.DatabaseInstance.MYSQL
+        && !Bug.CALCITE_673_FIXED) {
+      return;
+    }
     that()
         .with(CalciteAssert.Config.JDBC_FOODMART)
         .query("select count(*) from (\n"
@@ -143,6 +149,10 @@ public class JdbcFrontJdbcBackLinqMiddleTest {
   }
 
   @Test public void testJoinGroupByOrderBy() {
+    if (CalciteAssert.DB == CalciteAssert.DatabaseInstance.MYSQL
+        && !Bug.CALCITE_673_FIXED) {
+      return;
+    }
     that()
         .with(CalciteAssert.Config.JDBC_FOODMART)
         .query("select count(*), c.\"state_province\",\n"