You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/08/06 10:32:26 UTC
[shardingsphere] branch master updated: Rename the interface and
implements for sql parser (#6670)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun 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 a2cedfe Rename the interface and implements for sql parser (#6670)
a2cedfe is described below
commit a2cedfe81ed45cf1ab14e759c16fa894c7a9b4bc
Author: Juan Pan(Trista) <pa...@apache.org>
AuthorDate: Thu Aug 6 18:32:13 2020 +0800
Rename the interface and implements for sql parser (#6670)
---
.../EncryptSQLRewriterParameterizedTest.java | 6 +--
.../MixSQLRewriterParameterizedTest.java | 6 +--
.../ShardingSQLRewriterParameterizedTest.java | 6 +--
.../engine/type/standard/AbstractSQLRouteTest.java | 6 +--
.../text/TextProtocolBackendHandlerFactory.java | 1 +
.../ShardingCTLExplainBackendHandlerTest.java | 4 +-
.../engine/ShardingSphereSQLParserEngine.java | 14 ++---
.../ShardingSphereSQLParserEngineFactory.java | 6 +--
.../parser/engine/engine/RDLSQLParserEngine.java | 4 +-
.../sql/parser/engine/QuerySQLParserEngine.java | 35 -------------
.../sql/parser/engine/SQLParserEngine.java | 60 +++-------------------
.../sql/parser/engine/SQLParserEngineFactory.java | 6 +--
...serEngine.java => StandardSQLParserEngine.java} | 4 +-
13 files changed, 40 insertions(+), 118 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
index 7e007c2..8cbc137 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameterized/EncryptSQLRewriterParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.encrypt.rewrite.parameterized;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
@@ -70,11 +70,11 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
YamlRootRuleConfigurations ruleConfigurations = createRuleConfigurations();
Collection<ShardingSphereRule> rules = ShardingSphereRulesBuilder.build(
new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(ruleConfigurations.getRules()), ruleConfigurations.getDataSources().keySet());
- SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
+ StandardSQLParserEngine standardSqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new ConfigurationProperties(ruleConfigurations.getProps());
RouteContext routeContext = new DataNodeRouter(metaData, props, rules).route(
- sqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
+ standardSqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
SQLRewriteResult sqlRewriteResult = new SQLRewriteEntry(metaData.getSchema().getConfiguredSchemaMetaData(),
props, rules).rewrite(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), routeContext);
return sqlRewriteResult instanceof GenericSQLRewriteResult
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
index d7f86bb..018f9f5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/MixSQLRewriterParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.rewrite.parameterized;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
import org.apache.shardingsphere.sql.parser.binder.metadata.index.IndexMetaData;
@@ -77,11 +77,11 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
YamlRootRuleConfigurations ruleConfigurations = createRuleConfigurations();
Collection<ShardingSphereRule> rules = ShardingSphereRulesBuilder.build(
new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(ruleConfigurations.getRules()), ruleConfigurations.getDataSources().keySet());
- SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
+ StandardSQLParserEngine standardSqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new ConfigurationProperties(ruleConfigurations.getProps());
RouteContext routeContext = new DataNodeRouter(metaData, props, rules).route(
- sqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
+ standardSqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
SQLRewriteResult sqlRewriteResult = new SQLRewriteEntry(metaData.getSchema().getConfiguredSchemaMetaData(),
props, rules).rewrite(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), routeContext);
return sqlRewriteResult instanceof GenericSQLRewriteResult
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
index 514a89a..d6e4087 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/ShardingSQLRewriterParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.rewrite.parameterized;
import com.google.common.base.Preconditions;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
import org.apache.shardingsphere.sql.parser.binder.metadata.index.IndexMetaData;
@@ -77,11 +77,11 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
YamlRootRuleConfigurations ruleConfigurations = createRuleConfigurations();
Collection<ShardingSphereRule> rules = ShardingSphereRulesBuilder.build(
new YamlRuleConfigurationSwapperEngine().swapToRuleConfigurations(ruleConfigurations.getRules()), ruleConfigurations.getDataSources().keySet());
- SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
+ StandardSQLParserEngine standardSqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(null == getTestParameters().getDatabaseType() ? "SQL92" : getTestParameters().getDatabaseType());
ShardingSphereMetaData metaData = createShardingSphereMetaData();
ConfigurationProperties props = new ConfigurationProperties(ruleConfigurations.getProps());
RouteContext routeContext = new DataNodeRouter(metaData, props, rules).route(
- sqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
+ standardSqlParserEngine.parse(getTestParameters().getInputSQL(), false), getTestParameters().getInputSQL(), getTestParameters().getInputParameters());
SQLRewriteResult sqlRewriteResult = new SQLRewriteEntry(metaData.getSchema().getConfiguredSchemaMetaData(),
props, rules).rewrite(getTestParameters().getInputSQL(), getTestParameters().getInputParameters(), routeContext);
return sqlRewriteResult instanceof GenericSQLRewriteResult
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index 972d8de..aca987e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.sharding.route.engine.type.standard;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.route.engine.ShardingRouteDecorator;
import org.apache.shardingsphere.sharding.route.fixture.AbstractRoutingEngineTest;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.binder.metadata.column.ColumnMetaData;
import org.apache.shardingsphere.sql.parser.binder.metadata.schema.SchemaMetaData;
@@ -51,8 +51,8 @@ public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest {
ShardingRule shardingRule = createAllShardingRule();
ShardingSphereMetaData metaData = new ShardingSphereMetaData(buildDataSourceMetas(), buildRuleSchemaMetaData());
ConfigurationProperties props = new ConfigurationProperties(new Properties());
- SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL");
- RouteContext routeContext = new DataNodeRouter(metaData, props, Collections.singletonList(shardingRule)).route(sqlParserEngine.parse(sql, false), sql, parameters);
+ StandardSQLParserEngine standardSqlParserEngine = SQLParserEngineFactory.getSQLParserEngine("MySQL");
+ RouteContext routeContext = new DataNodeRouter(metaData, props, Collections.singletonList(shardingRule)).route(standardSqlParserEngine.parse(sql, false), sql, parameters);
ShardingRouteDecorator shardingRouteDecorator = new ShardingRouteDecorator();
RouteContext result = shardingRouteDecorator.decorate(routeContext, metaData, shardingRule, props);
assertThat(result.getRouteResult().getRouteUnits().size(), is(1));
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
index 578ac3e..dd6e2cd 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/TextProtocolBackendHandlerFactory.java
@@ -62,6 +62,7 @@ public final class TextProtocolBackendHandlerFactory {
if (Strings.isNullOrEmpty(sql)) {
return new SkipBackendHandler();
}
+ // TODO : Parse sctl sql with Antlr.
String trimSQL = SCTLUtils.trimComment(sql);
if (trimSQL.toUpperCase().startsWith(ShardingCTLBackendHandlerFactory.SCTL)) {
return ShardingCTLBackendHandlerFactory.newInstance(trimSQL, backendConnection);
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
index 109e7eb..1757a36 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/explain/ShardingCTLExplainBackendHandlerTest.java
@@ -6,7 +6,7 @@ import org.apache.shardingsphere.kernel.context.runtime.RuntimeContext;
import org.apache.shardingsphere.kernel.context.schema.ShardingSphereSchema;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.rdl.parser.engine.ShardingSphereSQLParserEngine;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ public class ShardingCTLExplainBackendHandlerTest {
}
private SchemaContext createSchemaContext() {
- RuntimeContext runtimeContext = new RuntimeContext(null, null, new ShardingSphereSQLParserEngine(new SQLParserEngine("MySQL")), null);
+ RuntimeContext runtimeContext = new RuntimeContext(null, null, new ShardingSphereSQLParserEngine(new StandardSQLParserEngine("MySQL")), null);
ShardingSphereSchema schema = new ShardingSphereSchema(new MySQLDatabaseType(), Collections.emptyList(),
Collections.emptyList(), Collections.singletonMap("ds0", mock(DataSource.class)), null);
return new SchemaContext("c1", schema, runtimeContext);
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
index ce385ae..9131424 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngine.java
@@ -17,30 +17,30 @@
package org.apache.shardingsphere.rdl.parser.engine;
-import org.apache.shardingsphere.sql.parser.engine.QuerySQLParserEngine;
-import org.apache.shardingsphere.rdl.parser.engine.engine.RDLSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.rdl.parser.engine.engine.RDLSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
/**
* Sharding sphere SQL parser engine.
*/
-public final class ShardingSphereSQLParserEngine implements QuerySQLParserEngine {
+public final class ShardingSphereSQLParserEngine implements SQLParserEngine {
private final RDLSQLParserEngine rdlsqlParserEngine;
- private final SQLParserEngine sqlParserEngine;
+ private final StandardSQLParserEngine standardSqlParserEngine;
- public ShardingSphereSQLParserEngine(final SQLParserEngine sqlParserEngine) {
+ public ShardingSphereSQLParserEngine(final StandardSQLParserEngine standardSqlParserEngine) {
rdlsqlParserEngine = new RDLSQLParserEngine();
- this.sqlParserEngine = sqlParserEngine;
+ this.standardSqlParserEngine = standardSqlParserEngine;
}
@Override
public SQLStatement parse(final String sql, final boolean useCache) {
SQLStatement result;
try {
- result = sqlParserEngine.parse(sql, useCache);
+ result = standardSqlParserEngine.parse(sql, useCache);
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngineFactory.java b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngineFactory.java
index 1b869a1..946d153 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngineFactory.java
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/ShardingSphereSQLParserEngineFactory.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.rdl.parser.engine;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.engine.SQLParserEngineFactory;
/**
@@ -35,7 +35,7 @@ public final class ShardingSphereSQLParserEngineFactory {
* @return SQL parser engine
*/
public static ShardingSphereSQLParserEngine getSQLParserEngine(final String databaseTypeName) {
- SQLParserEngine sqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(databaseTypeName);
- return new ShardingSphereSQLParserEngine(sqlParserEngine);
+ StandardSQLParserEngine standardSqlParserEngine = SQLParserEngineFactory.getSQLParserEngine(databaseTypeName);
+ return new ShardingSphereSQLParserEngine(standardSqlParserEngine);
}
}
diff --git a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
index c366d1e..0839e59 100644
--- a/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
+++ b/shardingsphere-rdl-parser/shardingsphere-rdl-parser-engine/src/main/java/org/apache/shardingsphere/rdl/parser/engine/engine/RDLSQLParserEngine.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.shardingsphere.rdl.parser.engine.executor.RDLSQLParserExecutor;
import org.apache.shardingsphere.rdl.parser.sql.visitor.ShardingSphereVisitor;
-import org.apache.shardingsphere.sql.parser.engine.QuerySQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.cache.SQLParseResultCache;
import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
@@ -32,7 +32,7 @@ import java.util.Optional;
* RDL SQL parser engine.
*/
@RequiredArgsConstructor
-public final class RDLSQLParserEngine implements QuerySQLParserEngine {
+public final class RDLSQLParserEngine implements SQLParserEngine {
private final SQLParseResultCache cache = new SQLParseResultCache();
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/QuerySQLParserEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/QuerySQLParserEngine.java
deleted file mode 100644
index c5a8115..0000000
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/QuerySQLParserEngine.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.sql.parser.engine;
-
-import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
-
-/**
- * Query SQL parser engine.
- */
-public interface QuerySQLParserEngine {
-
- /**
- * Parse SQL.
- *
- * @param sql SQL
- * @param useCache use cache or not
- * @return SQL statement
- */
- SQLStatement parse(String sql, boolean useCache);
-}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java
index 141265f..ccf3ddb 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java
@@ -17,63 +17,19 @@
package org.apache.shardingsphere.sql.parser.engine;
-import lombok.RequiredArgsConstructor;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.shardingsphere.sql.parser.cache.SQLParseResultCache;
-import org.apache.shardingsphere.sql.parser.core.parser.SQLParserExecutor;
-import org.apache.shardingsphere.sql.parser.core.visitor.ParseTreeVisitorFactory;
-import org.apache.shardingsphere.sql.parser.core.visitor.VisitorRule;
-import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
-import java.util.Optional;
-
/**
- * SQL parser engine.
+ * Query SQL parser engine.
*/
-@RequiredArgsConstructor
-public final class SQLParserEngine implements QuerySQLParserEngine {
-
- private final String databaseTypeName;
-
- private final SQLParseResultCache cache = new SQLParseResultCache();
+public interface SQLParserEngine {
- private final ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
-
- // TODO check skywalking plugin
- /*
- * To make sure SkyWalking will be available at the next release of ShardingSphere,
- * a new plugin should be provided to SkyWalking project if this API changed.
+ /**
+ * Parse SQL.
*
- * @see <a href="https://github.com/apache/skywalking/blob/master/docs/en/guides/Java-Plugin-Development-Guide.md#user-content-plugin-development-guide">Plugin Development Guide</a>
+ * @param sql SQL
+ * @param useCache use cache or not
+ * @return SQL statement
*/
- @Override
- public SQLStatement parse(final String sql, final boolean useCache) {
- parsingHookRegistry.start(sql);
- try {
- SQLStatement result = parse0(sql, useCache);
- parsingHookRegistry.finishSuccess(result);
- return result;
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- parsingHookRegistry.finishFailure(ex);
- throw ex;
- }
- }
-
- private SQLStatement parse0(final String sql, final boolean useCache) {
- if (useCache) {
- Optional<SQLStatement> cachedSQLStatement = cache.getSQLStatement(sql);
- if (cachedSQLStatement.isPresent()) {
- return cachedSQLStatement.get();
- }
- }
- ParseTree parseTree = new SQLParserExecutor(databaseTypeName, sql).execute().getRootNode();
- SQLStatement result = (SQLStatement) ParseTreeVisitorFactory.newInstance(databaseTypeName, VisitorRule.valueOf(parseTree.getClass())).visit(parseTree);
- if (useCache) {
- cache.put(sql, result);
- }
- return result;
- }
+ SQLStatement parse(String sql, boolean useCache);
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngineFactory.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngineFactory.java
index 6b3ca5c..7070c4c 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngineFactory.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngineFactory.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class SQLParserEngineFactory {
- private static final Map<String, SQLParserEngine> ENGINES = new ConcurrentHashMap<>();
+ private static final Map<String, StandardSQLParserEngine> ENGINES = new ConcurrentHashMap<>();
/**
* Get SQL parser engine.
@@ -37,7 +37,7 @@ public final class SQLParserEngineFactory {
* @param databaseTypeName name of database type
* @return SQL parser engine
*/
- public static SQLParserEngine getSQLParserEngine(final String databaseTypeName) {
+ public static StandardSQLParserEngine getSQLParserEngine(final String databaseTypeName) {
if (ENGINES.containsKey(databaseTypeName)) {
return ENGINES.get(databaseTypeName);
}
@@ -45,7 +45,7 @@ public final class SQLParserEngineFactory {
if (ENGINES.containsKey(databaseTypeName)) {
return ENGINES.get(databaseTypeName);
}
- SQLParserEngine result = new SQLParserEngine(databaseTypeName);
+ StandardSQLParserEngine result = new StandardSQLParserEngine(databaseTypeName);
ENGINES.put(databaseTypeName, result);
return result;
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
similarity index 96%
copy from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java
copy to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
index 141265f..78cbf64 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParserEngine.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/StandardSQLParserEngine.java
@@ -29,10 +29,10 @@ import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement;
import java.util.Optional;
/**
- * SQL parser engine.
+ * Standard SQL parser engine.
*/
@RequiredArgsConstructor
-public final class SQLParserEngine implements QuerySQLParserEngine {
+public final class StandardSQLParserEngine implements SQLParserEngine {
private final String databaseTypeName;