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/03 18:59:44 UTC

incubator-calcite git commit: [CALCITE-657] NullPointerException when executing JdbcAggregate implement method (Yuri Au Yong)

Repository: incubator-calcite
Updated Branches:
  refs/heads/master 30ae0513c -> 241f77e25


[CALCITE-657] NullPointerException when executing JdbcAggregate implement method (Yuri Au Yong)

Also, use a pool for jdbc:hsqldb:mem connections, so that tests run in parallel don't use the same database. (Julian Hyde)


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

Branch: refs/heads/master
Commit: 241f77e256a1ee7df8c9bd5c73b025d45b7e6cb5
Parents: 30ae051
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Apr 3 09:29:48 2015 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Apr 3 09:58:53 2015 -0700

----------------------------------------------------------------------
 .../apache/calcite/adapter/jdbc/JdbcRules.java  |  2 +-
 .../apache/calcite/test/JdbcAdapterTest.java    | 57 ++++++++++++++++++++
 .../java/org/apache/calcite/test/JdbcTest.java  |  6 +--
 3 files changed, 61 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/241f77e2/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
index 8558838..d519029 100644
--- a/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
+++ b/core/src/main/java/org/apache/calcite/adapter/jdbc/JdbcRules.java
@@ -706,7 +706,7 @@ public class JdbcRules {
         groupByList.add(field);
       }
       for (AggregateCall aggCall : aggCalls) {
-        addSelect(selectList, builder.context.toSql(aggCall), rowType);
+        addSelect(selectList, builder.context.toSql(aggCall), getRowType());
       }
       builder.setSelect(new SqlNodeList(selectList, POS));
       if (!groupByList.isEmpty() || aggCalls.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/241f77e2/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
index 640a933..e7faeef 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcAdapterTest.java
@@ -16,8 +16,19 @@
  */
 package org.apache.calcite.test;
 
+import org.hsqldb.jdbcDriver;
 import org.junit.Test;
 
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 /**
  * Tests for the {@code org.apache.calcite.adapter.jdbc} package.
  */
@@ -274,6 +285,52 @@ public class JdbcAdapterTest {
             + "FROM \"SCOTT\".\"EMP\"\n"
             + "WHERE CAST(\"DEPTNO\" AS INTEGER) = 20) AS \"t1\" ON \"t\".\"DEPTNO\" = \"t1\".\"DEPTNO\"");
   }
+
+  /** Test case for
+   * <a href="https://issues.apache.org/jira/browse/CALCITE-657">[CALCITE-657]
+   * NullPointerException when executing JdbcAggregate implement method</a>. */
+  @Test public void testJdbcAggregate() throws Exception {
+    final String url = MultiJdbcSchemaJoinTest.TempDb.INSTANCE.getUrl();
+    Connection baseConnection = DriverManager.getConnection(url);
+    Statement baseStmt = baseConnection.createStatement();
+    baseStmt.execute("CREATE TABLE T2 (\n"
+            + "ID INTEGER,\n"
+            + "VALS INTEGER)");
+    baseStmt.execute("INSERT INTO T2 VALUES (1, 1)");
+    baseStmt.execute("INSERT INTO T2 VALUES (2, null)");
+    baseStmt.close();
+    baseConnection.commit();
+
+    Properties info = new Properties();
+    info.put("model",
+        "inline:"
+            + "{\n"
+            + "  version: '1.0',\n"
+            + "  defaultSchema: 'BASEJDBC',\n"
+            + "  schemas: [\n"
+            + "     {\n"
+            + "       type: 'jdbc',\n"
+            + "       name: 'BASEJDBC',\n"
+            + "       jdbcDriver: '" + jdbcDriver.class.getName() + "',\n"
+            + "       jdbcUrl: '" + url + "',\n"
+            + "       jdbcCatalog: null,\n"
+            + "       jdbcSchema: null\n"
+            + "     }\n"
+            + "  ]\n"
+            + "}");
+
+    final Connection calciteConnection =
+        DriverManager.getConnection("jdbc:calcite:", info);
+    ResultSet rs = calciteConnection
+        .prepareStatement("select 10 * count(ID) from t2").executeQuery();
+
+    assertThat(rs.next(), is(true));
+    assertThat((Long) rs.getObject(1), equalTo(20L));
+    assertThat(rs.next(), is(false));
+
+    rs.close();
+    calciteConnection.close();
+  }
 }
 
 // End JdbcAdapterTest.java

http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/241f77e2/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 9ea3d08..730c672 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -1845,8 +1845,8 @@ public class JdbcTest {
 
   /** Tests accessing a column in a JDBC source whose type is ARRAY. */
   @Test public void testArray() throws Exception {
-    String hsqldbMemUrl = "jdbc:hsqldb:mem:.";
-    Connection baseConnection = DriverManager.getConnection(hsqldbMemUrl);
+    final String url = MultiJdbcSchemaJoinTest.TempDb.INSTANCE.getUrl();
+    Connection baseConnection = DriverManager.getConnection(url);
     Statement baseStmt = baseConnection.createStatement();
     baseStmt.execute("CREATE TABLE ARR_TABLE (\n"
         + "ID INTEGER,\n"
@@ -1872,7 +1872,7 @@ public class JdbcTest {
             + "       type: 'jdbc',\n"
             + "       name: 'BASEJDBC',\n"
             + "       jdbcDriver: '" + jdbcDriver.class.getName() + "',\n"
-            + "       jdbcUrl: '" + hsqldbMemUrl + "',\n"
+            + "       jdbcUrl: '" + url + "',\n"
             + "       jdbcCatalog: null,\n"
             + "       jdbcSchema: null\n"
             + "     }\n"