You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by vo...@apache.org on 2018/08/28 19:23:05 UTC
calcite git commit: [CALCITE-2497] Update Janino version to 3.0.9
Repository: calcite
Updated Branches:
refs/heads/master c8e91ea1d -> 02794e2b9
[CALCITE-2497] Update Janino version to 3.0.9
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/02794e2b
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/02794e2b
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/02794e2b
Branch: refs/heads/master
Commit: 02794e2b9d55b2ff91e78e21eff105791921ea43
Parents: c8e91ea
Author: Volodymyr Vysotskyi <vv...@gmail.com>
Authored: Tue Aug 28 21:50:30 2018 +0300
Committer: Volodymyr Vysotskyi <vv...@gmail.com>
Committed: Tue Aug 28 21:50:30 2018 +0300
----------------------------------------------------------------------
core/src/main/java/org/apache/calcite/schema/SchemaPlus.java | 7 +------
pom.xml | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/02794e2b/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java b/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
index a6e0bdd..7e966fc 100644
--- a/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
+++ b/core/src/main/java/org/apache/calcite/schema/SchemaPlus.java
@@ -18,7 +18,6 @@ package org.apache.calcite.schema;
import org.apache.calcite.materialize.Lattice;
import org.apache.calcite.rel.type.RelProtoDataType;
-import org.apache.calcite.util.Bug;
import com.google.common.collect.ImmutableList;
@@ -58,11 +57,7 @@ public interface SchemaPlus extends Schema {
String getName();
// override with stricter return
- default SchemaPlus getSubSchema(String name) {
- Bug.upgrade("janino 2.7.6 does not work without this method,"
- + "see https://github.com/janino-compiler/janino/issues/47");
- throw new UnsupportedOperationException();
- }
+ SchemaPlus getSubSchema(String name);
/** Adds a schema as a sub-schema of this schema, and returns the wrapped
* object. */
http://git-wip-us.apache.org/repos/asf/calcite/blob/02794e2b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3ce9922..9ddb80d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@ limitations under the License.
<hydromatic-toolbox.version>0.3</hydromatic-toolbox.version>
<hydromatic-tpcds.version>0.4</hydromatic-tpcds.version>
<jackson.version>2.9.6</jackson.version>
- <janino.version>2.7.6</janino.version>
+ <janino.version>3.0.9</janino.version>
<java-diff.version>1.1.1</java-diff.version>
<javacc-maven-plugin.version>2.4</javacc-maven-plugin.version>
<jcip-annotations.version>1.0-1</jcip-annotations.version>