You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/10/21 11:25:25 UTC
[shardingsphere] branch master updated: add SQLParsedResultCache
(#7874)
This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 140c10b add SQLParsedResultCache (#7874)
140c10b is described below
commit 140c10b2073ed5703a6e26d0c57c2f52499e5802
Author: Juan Pan(Trista) <pa...@apache.org>
AuthorDate: Wed Oct 21 19:25:01 2020 +0800
add SQLParsedResultCache (#7874)
---
.../EncryptSQLRewriterParameterizedTest.java | 4 +--
.../MixSQLRewriterParameterizedTest.java | 4 +--
.../ShardingSQLRewriterParameterizedTest.java | 4 +--
.../engine/type/standard/AbstractSQLRouteTest.java | 4 +--
.../engine/ShardingSphereSQLParserEngine.java | 4 +--
.../SQLParsedResultCache.java} | 32 +++++++-------------
.../ast/ASTSQLParseResultCache.java} | 35 ++++++++--------------
.../standard/StandardSQLParsedResultCache.java} | 27 +++++------------
.../{ => standard}/StandardSQLParserEngine.java | 8 ++---
.../StandardSQLParserEngineFactory.java | 2 +-
.../sql/parser/SQLParseEngineFactoryTest.java | 2 +-
....java => StandardSQLParsedResultCacheTest.java} | 17 ++++++-----
.../engine/SQLParserParameterizedTest.java | 2 +-
.../UnsupportedSQLParserParameterizedTest.java | 2 +-
14 files changed, 57 insertions(+), 90 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 1eb6b02..3a24829 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
@@ -44,8 +44,8 @@ import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
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 cdfb5b9..b0446df 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
@@ -47,8 +47,8 @@ import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
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 8b1b498..9318096 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
@@ -47,8 +47,8 @@ import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.yaml.config.YamlRootRuleConfigurations;
import org.apache.shardingsphere.infra.yaml.engine.YamlEngine;
import org.apache.shardingsphere.infra.yaml.swapper.YamlRuleConfigurationSwapperEngine;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngine;
import org.junit.runners.Parameterized.Parameters;
import java.io.File;
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 9c418ad..686a677 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
@@ -36,8 +36,8 @@ import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.schema.ShardingSphereSchema;
import org.apache.shardingsphere.sharding.route.engine.fixture.AbstractRoutingEngineTest;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngine;
import java.sql.Types;
import java.util.Arrays;
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 85ade0b..f84cd29 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
@@ -18,9 +18,9 @@
package org.apache.shardingsphere.rdl.parser.engine;
import org.apache.shardingsphere.rdl.parser.engine.engine.RDLSQLParserEngine;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.engine.statement.StatementSQLParserEngine;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngine;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParsedResultCache.java
similarity index 52%
copy from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
copy to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParsedResultCache.java
index 8635c6b..8bcd20e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/SQLParsedResultCache.java
@@ -15,45 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.cache;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+package org.apache.shardingsphere.sql.parser.engine;
import java.util.Optional;
/**
- * SQL parse result cache.
+ * SQL parsed result cache.
*/
-public final class SQLParseResultCache {
-
- private final Cache<String, SQLStatement> cache = CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
+public interface SQLParsedResultCache<T> {
/**
- * Put SQL and parse result into cache.
+ * Put SQL and parsed result into cache.
*
* @param sql SQL
- * @param sqlStatement SQL statement
+ * @param parsedResult parsed result
*/
- public void put(final String sql, final SQLStatement sqlStatement) {
- cache.put(sql, sqlStatement);
- }
+ void put(String sql, T parsedResult);
/**
- * Get SQL statement.
+ * Get parsed result.
*
* @param sql SQL
- * @return SQL statement
+ * @return parsed result
*/
- public Optional<SQLStatement> getSQLStatement(final String sql) {
- return Optional.ofNullable(cache.getIfPresent(sql));
- }
+ Optional<T> get(String sql);
/**
* Clear cache.
*/
- public synchronized void clear() {
- cache.invalidateAll();
- }
+ void clear();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
similarity index 58%
copy from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
copy to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
index 8635c6b..a56c617 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
@@ -15,44 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.cache;
+package org.apache.shardingsphere.sql.parser.engine.ast;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import org.antlr.v4.runtime.tree.ParseTree;
+import org.apache.shardingsphere.sql.parser.engine.SQLParsedResultCache;
import java.util.Optional;
/**
- * SQL parse result cache.
+ * AST SQL parsed result cache.
*/
-public final class SQLParseResultCache {
+public final class ASTSQLParseResultCache implements SQLParsedResultCache<ParseTree> {
- private final Cache<String, SQLStatement> cache = CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
+ private final Cache<String, ParseTree> cache = CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
- /**
- * Put SQL and parse result into cache.
- *
- * @param sql SQL
- * @param sqlStatement SQL statement
- */
- public void put(final String sql, final SQLStatement sqlStatement) {
- cache.put(sql, sqlStatement);
+ @Override
+ public void put(final String sql, final ParseTree parseTree) {
+ cache.put(sql, parseTree);
}
- /**
- * Get SQL statement.
- *
- * @param sql SQL
- * @return SQL statement
- */
- public Optional<SQLStatement> getSQLStatement(final String sql) {
+ @Override
+ public Optional<ParseTree> get(final String sql) {
return Optional.ofNullable(cache.getIfPresent(sql));
}
- /**
- * Clear cache.
- */
+ @Override
public synchronized void clear() {
cache.invalidateAll();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParsedResultCache.java
similarity index 75%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParsedResultCache.java
index 8635c6b..6b68019 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCache.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParsedResultCache.java
@@ -15,44 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.cache;
+package org.apache.shardingsphere.sql.parser.engine.statement.standard;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import org.apache.shardingsphere.sql.parser.engine.SQLParsedResultCache;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Optional;
/**
- * SQL parse result cache.
+ * Standard SQL parsed result cache.
*/
-public final class SQLParseResultCache {
+public final class StandardSQLParsedResultCache implements SQLParsedResultCache<SQLStatement> {
private final Cache<String, SQLStatement> cache = CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
- /**
- * Put SQL and parse result into cache.
- *
- * @param sql SQL
- * @param sqlStatement SQL statement
- */
+ @Override
public void put(final String sql, final SQLStatement sqlStatement) {
cache.put(sql, sqlStatement);
}
- /**
- * Get SQL statement.
- *
- * @param sql SQL
- * @return SQL statement
- */
- public Optional<SQLStatement> getSQLStatement(final String sql) {
+ @Override
+ public Optional<SQLStatement> get(final String sql) {
return Optional.ofNullable(cache.getIfPresent(sql));
}
- /**
- * Clear cache.
- */
+ @Override
public synchronized void clear() {
cache.invalidateAll();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngine.java
similarity index 92%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngine.java
index f93535b..b2a3405 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngine.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngine.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine.statement;
+package org.apache.shardingsphere.sql.parser.engine.statement.standard;
import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.shardingsphere.sql.parser.cache.SQLParseResultCache;
+import org.apache.shardingsphere.sql.parser.engine.statement.StatementSQLParserEngine;
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;
@@ -36,7 +36,7 @@ public final class StandardSQLParserEngine implements StatementSQLParserEngine {
private final String databaseTypeName;
- private final SQLParseResultCache cache = new SQLParseResultCache();
+ private final StandardSQLParsedResultCache cache = new StandardSQLParsedResultCache();
private final ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
@@ -64,7 +64,7 @@ public final class StandardSQLParserEngine implements StatementSQLParserEngine {
private SQLStatement parse0(final String sql, final boolean useCache) {
if (useCache) {
- Optional<SQLStatement> cachedSQLStatement = cache.getSQLStatement(sql);
+ Optional<SQLStatement> cachedSQLStatement = cache.get(sql);
if (cachedSQLStatement.isPresent()) {
return cachedSQLStatement.get();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
similarity index 96%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
index 38264cd..763bc76 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StandardSQLParserEngineFactory.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine.statement;
+package org.apache.shardingsphere.sql.parser.engine.statement.standard;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
index 4b45eb0..25b5e3d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/SQLParseEngineFactoryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sql.parser;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCacheTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/StandardSQLParsedResultCacheTest.java
similarity index 73%
rename from shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCacheTest.java
rename to shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/StandardSQLParsedResultCacheTest.java
index 472ab98..16bdcdd 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/SQLParseResultCacheTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/test/java/org/apache/shardingsphere/sql/parser/cache/StandardSQLParsedResultCacheTest.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.sql.parser.cache;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParsedResultCache;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLSelectStatement;
import org.junit.Test;
@@ -26,31 +27,31 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
-public final class SQLParseResultCacheTest {
+public final class StandardSQLParsedResultCacheTest {
@Test
public void assertGetSQLStatementWithinCache() {
- SQLParseResultCache actual = new SQLParseResultCache();
+ StandardSQLParsedResultCache actual = new StandardSQLParsedResultCache();
SQLStatement selectStatement = new MySQLSelectStatement();
actual.put("SELECT 1", selectStatement);
- assertTrue(actual.getSQLStatement("SELECT 1").isPresent());
- assertThat(actual.getSQLStatement("SELECT 1").get(), is(selectStatement));
+ assertTrue(actual.get("SELECT 1").isPresent());
+ assertThat(actual.get("SELECT 1").get(), is(selectStatement));
}
@Test
public void assertGetSQLStatementWithoutCache() {
- SQLParseResultCache actual = new SQLParseResultCache();
+ StandardSQLParsedResultCache actual = new StandardSQLParsedResultCache();
SQLStatement selectStatement = new MySQLSelectStatement();
actual.put("SELECT 1", selectStatement);
- assertFalse(actual.getSQLStatement("SELECT 2").isPresent());
+ assertFalse(actual.get("SELECT 2").isPresent());
}
@Test
public void assertClear() {
- SQLParseResultCache actual = new SQLParseResultCache();
+ StandardSQLParsedResultCache actual = new StandardSQLParsedResultCache();
SQLStatement selectStatement = new MySQLSelectStatement();
actual.put("SELECT 1", selectStatement);
actual.clear();
- assertFalse(actual.getSQLStatement("SELECT 1").isPresent());
+ assertFalse(actual.get("SELECT 1").isPresent());
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
index 0c512a0..9945be6 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.engine;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.SQLStatementAssert;
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
index 208f39c..a1f1c26 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/UnsupportedSQLParserParameterizedTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.sql.parser.parameterized.engine;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.sql.parser.engine.statement.StandardSQLParserEngineFactory;
+import org.apache.shardingsphere.sql.parser.engine.statement.standard.StandardSQLParserEngineFactory;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.loader.SQLCasesLoader;