calcite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject [1/4] incubator-calcite git commit: [CALCITE-728] Test suite hangs on Windows
Date Sun, 17 May 2015 00:14:25 GMT
Repository: incubator-calcite
Updated Branches:
  refs/heads/master bc45a2c04 -> ee68f8335


[CALCITE-728] Test suite hangs on Windows


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

Branch: refs/heads/master
Commit: a27bb57ab612fdb87d77cb073f9aaa93499ee775
Parents: bc45a2c
Author: Julian Hyde <jhyde@apache.org>
Authored: Fri May 15 10:10:16 2015 -0700
Committer: Julian Hyde <jhyde@apache.org>
Committed: Fri May 15 10:10:16 2015 -0700

----------------------------------------------------------------------
 core/src/test/java/org/apache/calcite/test/FoodmartTest.java    | 2 +-
 core/src/test/java/org/apache/calcite/test/JdbcTest.java        | 2 +-
 core/src/test/java/org/apache/calcite/tools/FrameworksTest.java | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a27bb57a/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/FoodmartTest.java b/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
index 4a4a6a5..53c8dc9 100644
--- a/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
+++ b/core/src/test/java/org/apache/calcite/test/FoodmartTest.java
@@ -109,7 +109,7 @@ public class FoodmartTest {
     if (!CalciteAssert.ENABLE_SLOW && idList == null) {
       // Avoid loading the query set in a regular test suite run. It burns too
       // much memory.
-      return ImmutableList.of(new Object[] {-1});
+      return ImmutableList.of();
     }
     final FoodMartQuerySet set = FoodMartQuerySet.instance();
     final List<Object[]> list = new ArrayList<Object[]>();

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a27bb57a/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 8f73fbd..874d21a 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -278,7 +278,7 @@ public class JdbcTest {
                         + "insert into \"adhoc\".V\n"
                         + "values ('Fred', 56, 123.4)");
                 assertThat(resultSet.next(), is(true));
-                assertThat(resultSet.getString(1),
+                assertThat(Util.toLinux(resultSet.getString(1)),
                     is(
                         "EnumerableTableModify(table=[[adhoc, MUTABLE_EMPLOYEES]], operation=[INSERT],
updateColumnList=[[]], flattened=[false])\n"
                         + "  EnumerableCalc(expr#0..2=[{inputs}], expr#3=[CAST($t1):JavaType(int)
NOT NULL], expr#4=[10], expr#5=[CAST($t0):JavaType(class java.lang.String)], expr#6=[CAST($t2):JavaType(float)
NOT NULL], expr#7=[null], empid=[$t3], deptno=[$t4], name=[$t5], salary=[$t6], commission=[$t7])\n"

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a27bb57a/core/src/test/java/org/apache/calcite/tools/FrameworksTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/tools/FrameworksTest.java b/core/src/test/java/org/apache/calcite/tools/FrameworksTest.java
index 13cc03b..9a4756b 100644
--- a/core/src/test/java/org/apache/calcite/tools/FrameworksTest.java
+++ b/core/src/test/java/org/apache/calcite/tools/FrameworksTest.java
@@ -185,7 +185,7 @@ public class FrameworksTest {
     String expandedStr =
         "SELECT `emps`.`empid`, `emps`.`deptno`, `emps`.`name`, `emps`.`salary`, `emps`.`commission`\n"
             + "FROM `hr`.`emps` AS `emps`";
-    assertThat(valStr, equalTo(expandedStr));
+    assertThat(Util.toLinux(valStr), equalTo(expandedStr));
   }
 
   /** Dummy type system, similar to Hive's, accessed via an INSTANCE member. */

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/a27bb57a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c573a84..187321d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@ limitations under the License.
       <dependency>
         <groupId>net.hydromatic</groupId>
         <artifactId>quidem</artifactId>
-        <version>0.4</version>
+        <version>0.5</version>
       </dependency>
       <dependency>
         <groupId>net.hydromatic</groupId>


Mime
View raw message