This is an automated email from the ASF dual-hosted git repository. zabetak pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push: new 614b435 [CALCITE-3116] Upgrade to Avatica 1.15 614b435 is described below commit 614b4350f558a4fabaafc06fef9689ec4c267994 Author: Stamatis Zampetakis <zabe...@gmail.com> AuthorDate: Thu Jun 6 16:05:05 2019 +0200 [CALCITE-3116] Upgrade to Avatica 1.15 Remove bug for CALCITE-2776 which was fixed in Avatica 1.15. Remove bug for CALCITE-2993 which is fixed in Calcite but forgotten. --- core/src/main/java/org/apache/calcite/util/Bug.java | 11 ----------- core/src/test/java/org/apache/calcite/test/JdbcTest.java | 2 -- core/src/test/java/org/apache/calcite/test/QuidemTest.java | 2 -- core/src/test/resources/sql/struct.iq | 2 -- pom.xml | 2 +- 5 files changed, 1 insertion(+), 18 deletions(-) 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 6e167a0..689ec99 100644 --- a/core/src/main/java/org/apache/calcite/util/Bug.java +++ b/core/src/main/java/org/apache/calcite/util/Bug.java @@ -170,21 +170,10 @@ public abstract class Bug { public static final boolean CALCITE_2539_FIXED = false; /** Whether - * <a href="https://issues.apache.org/jira/browse/CALCITE-2776">[CALCITE-2776] - * Wrong value when accessing struct types with one attribute</a> is fixed. */ - public static final boolean CALCITE_2776_FIXED = false; - - /** Whether * <a href="https://issues.apache.org/jira/browse/CALCITE-2869">[CALCITE-2869] * JSON data type support</a> is fixed. */ public static final boolean CALCITE_2869_FIXED = false; - /** Whether - * <a href="https://issues.apache.org/jira/browse/CALCITE-2933">[CALCITE-2933] - * In Druid adapter, expression like "cast(cast(\"timestamp\" as timestamp) as varchar)" - * returns as epoch millisecond</a> is fixed. */ - public static final boolean CALCITE_2933_FIXED = false; - /** * Use this to flag temporary code. */ 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 921ff8c..e861dd2 100644 --- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java +++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java @@ -101,7 +101,6 @@ import com.google.common.collect.Multimap; import org.hamcrest.Matcher; import org.hsqldb.jdbcDriver; -import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; @@ -1973,7 +1972,6 @@ public class JdbcTest { } @Test public void testMultisetQueryWithSingleColumn() { - Assume.assumeTrue("[CALCITE-2776]", Bug.CALCITE_2776_FIXED); CalciteAssert.hr() .query("select multiset(\n" + " select \"deptno\" from \"hr\".\"emps\") as a\n" diff --git a/core/src/test/java/org/apache/calcite/test/QuidemTest.java b/core/src/test/java/org/apache/calcite/test/QuidemTest.java index 34087d3..77d7191 100644 --- a/core/src/test/java/org/apache/calcite/test/QuidemTest.java +++ b/core/src/test/java/org/apache/calcite/test/QuidemTest.java @@ -85,8 +85,6 @@ public abstract class QuidemTest { return Bug.CALCITE_1045_FIXED; case "calcite1048": return Bug.CALCITE_1048_FIXED; - case "calcite2776": - return Bug.CALCITE_2776_FIXED; } return null; }; diff --git a/core/src/test/resources/sql/struct.iq b/core/src/test/resources/sql/struct.iq index e386bb5..4a6b9d8 100644 --- a/core/src/test/resources/sql/struct.iq +++ b/core/src/test/resources/sql/struct.iq @@ -18,7 +18,6 @@ !use post !set outputformat mysql -!if (fixed.calcite2776) { # [CALCITE-2677] Struct types with one field are not mapped correctly to Java Classes select * from (values (1, ROW(1)), @@ -32,7 +31,6 @@ select * from (values (2 rows) !ok -!} # [CALCITE-3021] Equality of nested ROWs returns false for identical values select distinct * from (values diff --git a/pom.xml b/pom.xml index 26adc8a..13c6ed7 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ limitations under the License. <!-- This list is in alphabetical order. --> <airlift-tpch.version>0.1</airlift-tpch.version> - <avatica.version>1.13.0</avatica.version> + <avatica.version>1.15.0</avatica.version> <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version> <cassandra-driver-core.version>3.6.0</cassandra-driver-core.version> <cassandra-unit.version>3.5.0.1</cassandra-unit.version>