[beam] branch master updated: [BEAM-6401] Upgrade to Calcite 1.19

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apilloud pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 0be2618  [BEAM-6401] Upgrade to Calcite 1.19
     new 2edde2f  Merge pull request #8142 from apilloud/calcite
0be2618 is described below

commit 0be2618fc72af3a66fecc41c882e2bb5a207b19a
Author: Andrew Pilloud <ap...@google.com>
AuthorDate: Tue Mar 26 10:02:02 2019 -0700

    [BEAM-6401] Upgrade to Calcite 1.19
---
 sdks/java/extensions/sql/build.gradle                             | 8 ++++----
 .../beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
index b077f8d..703bc76 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -58,8 +58,8 @@ configurations {
   fmppTemplates
 }
 
-def calcite_version = "1.18.0"
-def avatica_version = "1.12.0"
+def calcite_version = "1.19.0"
+def avatica_version = "1.13.0"
 def hive_version = "2.1.0"
 def netty_version = "4.1.30.Final"
 
@@ -113,8 +113,8 @@ dependencies {
   permitUnusedDeclared library.java.jackson_dataformat_yaml
 
   // Dependencies that are bundled in when we bundle Calcite
-  permitUsedUndeclared "org.codehaus.janino:janino:3.0.9"
-  permitUsedUndeclared "org.codehaus.janino:commons-compiler:3.0.9"
+  permitUsedUndeclared "org.codehaus.janino:janino:3.0.11"
+  permitUsedUndeclared "org.codehaus.janino:commons-compiler:3.0.11"
 
   // Dependencies where one or the other appears "used" depending on classpath,
   // but it doesn't matter which is used
diff --git a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
index f69f3b9..dc7c111 100644
--- a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
+++ b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslSqlStdOperatorsTest.java
@@ -701,7 +701,7 @@ public class BeamSqlDslSqlStdOperatorsTest extends BeamSqlBuiltinFunctionsIntegr
   @SqlOperatorTest(name = "CHAR_LENGTH", kind = "OTHER_FUNCTION")
   @SqlOperatorTest(name = "INITCAP", kind = "OTHER_FUNCTION")
   @SqlOperatorTest(name = "LOWER", kind = "OTHER_FUNCTION")
-  @SqlOperatorTest(name = "POSITION", kind = "OTHER_FUNCTION")
+  @SqlOperatorTest(name = "POSITION", kind = "POSITION")
   @SqlOperatorTest(name = "OVERLAY", kind = "OTHER_FUNCTION")
   @SqlOperatorTest(name = "SUBSTRING", kind = "OTHER_FUNCTION")
   @SqlOperatorTest(name = "TRIM", kind = "TRIM")