Repository: calcite Updated Branches: refs/heads/master e5cb1b440 -> fe3b65f50
[CALCITE-2013] Upgrade Avatica to 1.11, HSQLDB to 2.4.0, jetty to 9.2.19 [CALCITE-2154] Upgrade jackson to 2.9.4 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/fe3b65f5 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/fe3b65f5 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/fe3b65f5 Branch: refs/heads/master Commit: fe3b65f50f0d74aed7177dadf46eb4dc1bb3e940 Parents: e5cb1b4 Author: Julian Hyde <[email protected]> Authored: Thu Mar 1 17:52:07 2018 -0800 Committer: Julian Hyde <[email protected]> Committed: Fri Mar 9 13:21:55 2018 -0800 ---------------------------------------------------------------------- .../apache/calcite/jdbc/CalciteRemoteDriverTest.java | 12 ++++++++++-- .../src/test/java/org/apache/calcite/test/JdbcTest.java | 8 ++++---- pom.xml | 10 +++++----- 3 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/fe3b65f5/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java index 1e6f1a3..502f02b 100644 --- a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java +++ b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java @@ -452,13 +452,13 @@ public class CalciteRemoteDriverTest { @Test public void testRemoteStatementExecute() throws Exception { final Statement statement = remoteConnection.createStatement(); final boolean status = statement.execute("values (1, 2), (3, 4), (5, 6)"); + assertThat(status, is(true)); final ResultSet resultSet = statement.getResultSet(); int n = 0; while (resultSet.next()) { ++n; } assertThat(n, equalTo(3)); - } @Test(expected = SQLException.class) @@ -468,7 +468,15 @@ public class CalciteRemoteDriverTest { @Test(expected = SQLException.class) public void testAvaticaStatementException() throws Exception { - remoteConnection.createStatement().getMoreResults(); + try (Statement statement = remoteConnection.createStatement()) { + statement.setCursorName("foo"); + } + } + + @Test public void testAvaticaStatementGetMoreResults() throws Exception { + try (Statement statement = remoteConnection.createStatement()) { + assertThat(statement.getMoreResults(), is(false)); + } } @Test public void testRemoteExecute() throws Exception { http://git-wip-us.apache.org/repos/asf/calcite/blob/fe3b65f5/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 548d735..bf2bd81 100644 --- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java +++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java @@ -134,7 +134,6 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.NoSuchElementException; import java.util.Objects; import java.util.Properties; import java.util.Set; @@ -1521,9 +1520,10 @@ public class JdbcTest { final BigDecimal bigDecimal = a0.getBigDecimal(1); fail("expected error, got " + bigDecimal); } catch (SQLException e) { - throw new RuntimeException(e); - } catch (NoSuchElementException e) { - // ok + assertThat(e.getMessage(), + is("java.util.NoSuchElementException: Expecting cursor " + + "position to be Position.OK, actual " + + "is Position.BEFORE_START")); } try { assertTrue(a0.next()); http://git-wip-us.apache.org/repos/asf/calcite/blob/fe3b65f5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7b65343..9919c36 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,8 @@ limitations under the License. <!-- This list is in alphabetical order. --> <airlift-tpch.version>0.1</airlift-tpch.version> - <avatica.version>1.10.0</avatica.version> - <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version> + <avatica.version>1.11.0</avatica.version> + <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version> <cassandra-driver-core.version>3.4.0</cassandra-driver-core.version> <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version> <chinook-data-hsqldb.version>0.1</chinook-data-hsqldb.version> @@ -86,18 +86,18 @@ limitations under the License. <hadoop.version>2.7.0</hadoop.version> <hamcrest.version>1.3</hamcrest.version> <hppc.version>0.7.1</hppc.version> - <hsqldb.version>2.3.1</hsqldb.version> + <hsqldb.version>2.4.0</hsqldb.version> <httpclient.version>4.5.2</httpclient.version> <httpcore.version>4.4.4</httpcore.version> <hydromatic-resource.version>0.6</hydromatic-resource.version> <hydromatic-toolbox.version>0.3</hydromatic-toolbox.version> <hydromatic-tpcds.version>0.4</hydromatic-tpcds.version> - <jackson.version>2.6.3</jackson.version> + <jackson.version>2.9.4</jackson.version> <janino.version>2.7.6</janino.version> <java-diff.version>1.1</java-diff.version> <javacc-maven-plugin.version>2.4</javacc-maven-plugin.version> <jcip-annotations.version>1.0-1</jcip-annotations.version> - <jetty.version>9.2.15.v20160210</jetty.version> + <jetty.version>9.2.19.v20160908</jetty.version> <jmh.version>1.12</jmh.version> <jsoup.version>1.10.2</jsoup.version> <junit.version>4.12</junit.version>
