You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2021/09/24 11:05:49 UTC
[shardingsphere] branch master updated: Remove deprecated reference
of SqlParser.Config (#12690)
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 2edf83c Remove deprecated reference of SqlParser.Config (#12690)
2edf83c is described below
commit 2edf83c28f4ec7afade1ad13375b8a729a4a9fab
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Sep 24 19:05:11 2021 +0800
Remove deprecated reference of SqlParser.Config (#12690)
---
.../context/translatable/TranslatableOptimizerContext.java | 8 --------
.../translatable/TranslatableOptimizerContextFactory.java | 11 +----------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContext.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContext.java
index 53c7331..c08bb21 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContext.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.infra.optimize.context.translatable;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.calcite.schema.Schema;
-import org.apache.calcite.sql.parser.SqlParser.Config;
import org.apache.calcite.sql.validate.SqlValidator;
import org.apache.calcite.sql2rel.SqlToRelConverter;
import org.apache.shardingsphere.infra.optimize.context.filterable.FilterableOptimizerContext;
@@ -38,13 +37,6 @@ public final class TranslatableOptimizerContext {
private final Schema logicSchema;
- /**
- * Remove calcite's parser.
- * @deprecated Use ShardingSphere parser instead.
- */
- @Deprecated
- private final Config parserConfig;
-
private final SqlValidator validator;
private final SqlToRelConverter relConverter;
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContextFactory.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContextFactory.java
index f3a12d7..ab0aeec 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContextFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/translatable/TranslatableOptimizerContextFactory.java
@@ -32,9 +32,6 @@ import org.apache.calcite.rel.type.RelDataTypeFactory;
import org.apache.calcite.rex.RexBuilder;
import org.apache.calcite.schema.Schema;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.calcite.sql.parser.SqlParser;
-import org.apache.calcite.sql.parser.SqlParser.Config;
-import org.apache.calcite.sql.parser.impl.SqlParserImpl;
import org.apache.calcite.sql.validate.SqlValidator;
import org.apache.calcite.sql.validate.SqlValidatorUtil;
import org.apache.calcite.sql2rel.SqlToRelConverter;
@@ -60,17 +57,11 @@ public final class TranslatableOptimizerContextFactory {
*/
public static TranslatableOptimizerContext create(final String schemaName, final Schema logicSchema, final FilterableOptimizerContext filterableOptimizerContext) {
CalciteConnectionConfig connectionConfig = new CalciteConnectionConfigImpl(filterableOptimizerContext.getProps());
- // TODO Remove calcite's parser, Use ShardingSphere parser instead.
- Config parserConfig = SqlParser.config()
- .withLex(connectionConfig.lex())
- .withIdentifierMaxLength(SqlParser.DEFAULT_IDENTIFIER_MAX_LENGTH)
- .withConformance(connectionConfig.conformance())
- .withParserFactory(SqlParserImpl.FACTORY);
RelDataTypeFactory relDataTypeFactory = new JavaTypeFactoryImpl();
CalciteCatalogReader catalogReader = createCatalogReader(schemaName, logicSchema, relDataTypeFactory, connectionConfig);
SqlValidator validator = createValidator(catalogReader, relDataTypeFactory, connectionConfig);
SqlToRelConverter relConverter = createRelConverter(catalogReader, validator, relDataTypeFactory);
- return new TranslatableOptimizerContext(filterableOptimizerContext, schemaName, logicSchema, parserConfig, validator, relConverter);
+ return new TranslatableOptimizerContext(filterableOptimizerContext, schemaName, logicSchema, validator, relConverter);
}
private static CalciteCatalogReader createCatalogReader(final String schemaName,