This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 0da04d4c2f1 Upgrade Calcite to 1.31.0 to serve support parsing
parenthesized joins. (#20003)
0da04d4c2f1 is described below
commit 0da04d4c2f13d278d6c052c43c26a3578f1e1fb6
Author: Ling Hengqian <[email protected]>
AuthorDate: Tue Aug 9 11:32:36 2022 +0800
Upgrade Calcite to 1.31.0 to serve support parsing parenthesized joins.
(#20003)
---
pom.xml | 2 +-
.../src/main/release-docs/LICENSE | 8 ++++----
.../optimizer/context/planner/OptimizerPlannerContextFactory.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index eb88006f6a3..9b1a327aadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<annotation-api.version>1.3.2</annotation-api.version>
<activation-api.version>1.2.0</activation-api.version>
- <calcite.version>1.30.0</calcite.version>
+ <calcite.version>1.31.0</calcite.version>
<vertx.version>4.2.3</vertx.version>
<netty.version>4.1.73.Final</netty.version>
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
index 63ccae14aff..e2ff3c873d5 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE
@@ -219,11 +219,11 @@ The text of each license is the standard Apache 2.0
license.
aggdesigner-algorithm 6.0: Apache 2.0
apiguardian-api 1.1.0: https://github.com/apiguardian-team/apiguardian,
Apache 2.0
audience-annotations 0.5.0: https://github.com/apache/yetus, Apache 2.0
- avatica-core 1.20.0: https://calcite.apache.org/avatica, Apache 2.0
- avatica-metrics 1.20.0: https://calcite.apache.org/avatica, Apache 2.0
+ avatica-core 1.22.0: https://calcite.apache.org/avatica, Apache 2.0
+ avatica-metrics 1.22.0: https://calcite.apache.org/avatica, Apache 2.0
caffeine 2.9.2: https://github.com/ben-manes/caffeine, Apache 2.0
- calcite-core 1.30.0: https://calcite.apache.org, Apache 2.0
- calcite-linq4j 1.30.0: https://calcite.apache.org, Apache 2.0
+ calcite-core 1.31.0: https://calcite.apache.org, Apache 2.0
+ calcite-linq4j 1.31.0: https://calcite.apache.org, Apache 2.0
commons-codec 1.15: https://github.com/apache/commons-codec, Apache 2.0
commons-collections4 4.4: https://github.com/apache/commons-collections,
Apache 2.0
commons-exec 1.3: https://github.com/apache/commons-exec, Apache 2.0
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/planner/OptimizerPlannerContextFactory.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/planner/OptimizerPlannerContextFactory.java
index 72695964d7b..a85e4cf4ad7 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/planner/OptimizerPlannerContextFactory.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/context/planner/OptimizerPlannerContextFactory.java
@@ -100,7 +100,7 @@ public final class OptimizerPlannerContextFactory {
public static SqlValidator createValidator(final CalciteCatalogReader
catalogReader, final RelDataTypeFactory relDataTypeFactory, final
CalciteConnectionConfig connectionConfig) {
SqlValidator.Config validatorConfig = SqlValidator.Config.DEFAULT
.withLenientOperatorLookup(connectionConfig.lenientOperatorLookup())
- .withSqlConformance(connectionConfig.conformance())
+ .withConformance(connectionConfig.conformance())
.withDefaultNullCollation(connectionConfig.defaultNullCollation())
.withIdentifierExpansion(true);
return SqlValidatorUtil.newValidator(SqlStdOperatorTable.instance(),
catalogReader, relDataTypeFactory, validatorConfig);
