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 c2a7c69 add ASTSQLParserEngineFactory (#7875)
c2a7c69 is described below
commit c2a7c696319036d2f1ccd3c3d012b675a663aa35
Author: Juan Pan(Trista) <[email protected]>
AuthorDate: Thu Oct 22 13:25:11 2020 +0800
add ASTSQLParserEngineFactory (#7875)
---
...sultCache.java => ASTSQLParsedResultCache.java} | 2 +-
...rseResultCache.java => ASTSQLParserEngine.java} | 37 ++++++++++++----------
.../ASTSQLParserEngineFactory.java} | 12 +++----
.../engine/statement/StatementSQLParserEngine.java | 2 +-
.../standard/StandardSQLParserEngineFactory.java | 2 +-
5 files changed, 29 insertions(+), 26 deletions(-)
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParsedResultCache.java
similarity index 94%
copy from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
copy to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParsedResultCache.java
index a56c617..6df879c 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParsedResultCache.java
@@ -27,7 +27,7 @@ import java.util.Optional;
/**
* AST SQL parsed result cache.
*/
-public final class ASTSQLParseResultCache implements
SQLParsedResultCache<ParseTree> {
+public final class ASTSQLParsedResultCache implements
SQLParsedResultCache<ParseTree> {
private final Cache<String, ParseTree> cache =
CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngine.java
similarity index 52%
rename from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
rename to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngine.java
index a56c617..185bbec 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParseResultCache.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngine.java
@@ -17,32 +17,35 @@
package org.apache.shardingsphere.sql.parser.engine.ast;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
+import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.shardingsphere.sql.parser.engine.SQLParsedResultCache;
+import org.apache.shardingsphere.sql.parser.core.parser.SQLParserExecutor;
+import org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
import java.util.Optional;
/**
- * AST SQL parsed result cache.
+ * AST SQL parser engine.
*/
-public final class ASTSQLParseResultCache implements
SQLParsedResultCache<ParseTree> {
+@RequiredArgsConstructor
+public final class ASTSQLParserEngine implements SQLParserEngine<ParseTree> {
- private final Cache<String, ParseTree> cache =
CacheBuilder.newBuilder().softValues().initialCapacity(2000).maximumSize(65535).build();
+ private final String databaseTypeName;
- @Override
- public void put(final String sql, final ParseTree parseTree) {
- cache.put(sql, parseTree);
- }
-
- @Override
- public Optional<ParseTree> get(final String sql) {
- return Optional.ofNullable(cache.getIfPresent(sql));
- }
+ private final ASTSQLParsedResultCache cache = new
ASTSQLParsedResultCache();
@Override
- public synchronized void clear() {
- cache.invalidateAll();
+ public ParseTree parse(final String sql, final boolean useCache) {
+ if (useCache) {
+ Optional<ParseTree> parsedResult = cache.get(sql);
+ if (parsedResult.isPresent()) {
+ return parsedResult.get();
+ }
+ }
+ ParseTree result = new SQLParserExecutor(databaseTypeName,
sql).execute().getRootNode();
+ if (useCache) {
+ cache.put(sql, result);
+ }
+ return result;
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngineFactory.java
similarity index 77%
copy from
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
copy to
shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngineFactory.java
index 763bc76..915b367 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/ast/ASTSQLParserEngineFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.engine.statement.standard;
+package org.apache.shardingsphere.sql.parser.engine.ast;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -24,12 +24,12 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * SQL statement parser engine factory.
+ * AST SQL parser engine factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class StandardSQLParserEngineFactory {
+public final class ASTSQLParserEngineFactory {
- private static final Map<String, StandardSQLParserEngine> ENGINES = new
ConcurrentHashMap<>();
+ private static final Map<String, ASTSQLParserEngine> ENGINES = new
ConcurrentHashMap<>();
/**
* Get SQL parser engine.
@@ -37,7 +37,7 @@ public final class StandardSQLParserEngineFactory {
* @param databaseTypeName name of database type
* @return SQL parser engine
*/
- public static StandardSQLParserEngine getSQLParserEngine(final String
databaseTypeName) {
+ public static ASTSQLParserEngine getSQLParserEngine(final String
databaseTypeName) {
if (ENGINES.containsKey(databaseTypeName)) {
return ENGINES.get(databaseTypeName);
}
@@ -45,7 +45,7 @@ public final class StandardSQLParserEngineFactory {
if (ENGINES.containsKey(databaseTypeName)) {
return ENGINES.get(databaseTypeName);
}
- StandardSQLParserEngine result = new
StandardSQLParserEngine(databaseTypeName);
+ ASTSQLParserEngine result = new
ASTSQLParserEngine(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/statement/StatementSQLParserEngine.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
index c3342a2..04007a0 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/StatementSQLParserEngine.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.sql.parser.engine.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * SQL statement parser engine.
+ * Statement SQL parser engine.
*/
public interface StatementSQLParserEngine extends
SQLParserEngine<SQLStatement> {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
index 763bc76..3ad601d 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/engine/statement/standard/StandardSQLParserEngineFactory.java
@@ -24,7 +24,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * SQL statement parser engine factory.
+ * Standard SQL parser engine factory.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class StandardSQLParserEngineFactory {
