[shardingsphere] branch master updated: Remove cache for RDL (#7830)

[me...@apache.org]

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 4e9da28  Remove cache for RDL (#7830)
4e9da28 is described below

commit 4e9da28c0c3eef06f5b24e42e703c272f8a2ec8b
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Oct 18 11:31:54 2020 +0800

    Remove cache for RDL (#7830)
---
 .../engine/ShardingSphereSQLParserEngine.java       |  6 +++---
 .../parser/engine/engine/RDLSQLParserEngine.java    | 21 +++------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

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 4600480..799d028 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
@@ -27,13 +27,13 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
  */
 public final class ShardingSphereSQLParserEngine implements SQLParserEngine {
     
-    private final RDLSQLParserEngine rdlsqlParserEngine;
-    
     private final StandardSQLParserEngine standardSqlParserEngine;
+
+    private final RDLSQLParserEngine rdlsqlParserEngine;
     
     public ShardingSphereSQLParserEngine(final StandardSQLParserEngine standardSqlParserEngine) {
-        rdlsqlParserEngine = new RDLSQLParserEngine();
         this.standardSqlParserEngine = standardSqlParserEngine;
+        rdlsqlParserEngine = new RDLSQLParserEngine();
     }
     
     @Override
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 2616e9e..973e82f 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
@@ -22,20 +22,15 @@ 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.SQLParserEngine;
-import org.apache.shardingsphere.sql.parser.cache.SQLParseResultCache;
 import org.apache.shardingsphere.sql.parser.hook.ParsingHookRegistry;
 import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
 
-import java.util.Optional;
-
 /**
  * RDL SQL parser engine.
  */
 @RequiredArgsConstructor
 public final class RDLSQLParserEngine implements SQLParserEngine {
     
-    private final SQLParseResultCache cache = new SQLParseResultCache();
-    
     private final ParsingHookRegistry parsingHookRegistry = ParsingHookRegistry.getInstance();
     
     // TODO check skywalking plugin
@@ -49,7 +44,7 @@ public final class RDLSQLParserEngine implements SQLParserEngine {
     public SQLStatement parse(final String sql, final boolean useCache) {
         parsingHookRegistry.start(sql);
         try {
-            SQLStatement result = parse0(sql, useCache);
+            SQLStatement result = parse0(sql);
             parsingHookRegistry.finishSuccess(result);
             return result;
             // CHECKSTYLE:OFF
@@ -60,18 +55,8 @@ public final class RDLSQLParserEngine implements SQLParserEngine {
         }
     }
     
-    private SQLStatement parse0(final String sql, final boolean useCache) {
-        if (useCache) {
-            Optional<SQLStatement> cachedSQLStatement = cache.getSQLStatement(sql);
-            if (cachedSQLStatement.isPresent()) {
-                return cachedSQLStatement.get();
-            }
-        }
+    private SQLStatement parse0(final String sql) {
         ParseTree parseTree = new RDLSQLParserExecutor(sql).execute().getRootNode();
-        SQLStatement result = (SQLStatement) new ShardingSphereVisitor().visit(parseTree);
-        if (useCache) {
-            cache.put(sql, result);
-        }
-        return result;
+        return (SQLStatement) new ShardingSphereVisitor().visit(parseTree);
     }
 }