remove sqlCommentParseEnabled config in test case

apache · Dec 28, 2023 · f440f80 · f440f80
1 parent 68f29b0
commit f440f80
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 31 deletions.
diff --git a/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json b/.../org.apache.shardingsphere/shardingsphere-infra-reachability-metadata/reflect-config.json
@@ -565,7 +565,7 @@
   "name":"org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setParseTreeCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }, {"name":"setSqlCommentParseEnabled","parameterTypes":["boolean"] }, {"name":"setSqlStatementCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"setParseTreeCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }, {"name":"setSqlStatementCache","parameterTypes":["org.apache.shardingsphere.parser.yaml.config.YamlSQLParserCacheOptionRuleConfiguration"] }]
 },
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.infra.yaml.config.shortcut.YamlRuleConfigurationShortcuts"},
@@ -575,7 +575,7 @@
   "condition":{"typeReachable":"org.apache.shardingsphere.parser.yaml.swapper.NewYamlSQLParserRuleConfigurationSwapper"},
   "name":"org.apache.shardingsphere.parser.yaml.config.YamlSQLParserRuleConfiguration",
   "allDeclaredFields":true,
-  "methods":[{"name":"getParseTreeCache","parameterTypes":[] }, {"name":"getSqlStatementCache","parameterTypes":[] }, {"name":"isSqlCommentParseEnabled","parameterTypes":[] }]
+  "methods":[{"name":"getParseTreeCache","parameterTypes":[] }, {"name":"getSqlStatementCache","parameterTypes":[] }]
 },
 {
   "condition":{"typeReachable":"org.apache.shardingsphere.infra.util.yaml.YamlEngine"},

diff --git a/kernel/sql-parser/distsql/parser/src/main/antlr4/imports/parser/RALStatement.g4 b/kernel/sql-parser/distsql/parser/src/main/antlr4/imports/parser/RALStatement.g4
@@ -39,10 +39,6 @@ sqlStatementCacheDefinition
     : SQL_STATEMENT_CACHE LP_ cacheOption RP_
     ;
 
-sqlCommentParseEnabled
-    : TRUE | FALSE
-    ;
-
 cacheOption
     : (INITIAL_CAPACITY EQ_ initialCapacity)? (COMMA_? MAXIMUM_SIZE EQ_ maximumSize)?
     ;

diff --git a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/.../sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/server.yaml b/.../sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/...l/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/server.yaml b/...l/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/...test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/server.yaml b/...test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/...t/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/server.yaml b/...t/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/...es/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/server.yaml b/...es/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/...env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/server.yaml b/...env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/conf/mysql/config-tbl.yaml
@@ -87,6 +87,3 @@ rules:
   tables:
     - t_broadcast_table
     - t_broadcast_table_for_ddl
-
-- !SQL_PARSER
-  sqlCommentParseEnabled: true
diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/server.yaml
@@ -35,7 +35,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/server.yaml b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/server.yaml
@@ -23,7 +23,6 @@ authority:
     type: ALL_PERMITTED
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 2000
     maximumSize: 65535

diff --git a/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml b/test/e2e/sql/src/test/resources/env/scenario/tbl/rules.yaml
@@ -80,9 +80,6 @@ sqlFederation:
   executionPlanCache:
     initialCapacity: 2000
     maximumSize: 65535
-
-sqlParser:
-  sqlCommentParseEnabled: true
 
 props:
   sql-show: true

diff --git a/.../it/sql/parser/internal/cases/parser/jaxb/segment/impl/distsql/ExpectedSQLParserRule.java b/.../it/sql/parser/internal/cases/parser/jaxb/segment/impl/distsql/ExpectedSQLParserRule.java
@@ -21,7 +21,6 @@
 import lombok.Setter;
 import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.segment.AbstractExpectedIdentifierSQLSegment;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 
 /**
@@ -31,9 +30,6 @@
 @Setter
 public final class ExpectedSQLParserRule extends AbstractExpectedIdentifierSQLSegment {
 
-    @XmlAttribute(name = "sql-comment-parse-enabled")
-    private boolean sqlCommentParseEnabled;
-
     @XmlElement(name = "parse-tree-cache")
     private ExpectedCacheOption parseTreeCache;
 

diff --git a/test/native/src/test/resources/test-native/yaml/features/shadow.yaml b/test/native/src/test/resources/test-native/yaml/features/shadow.yaml
@@ -76,7 +76,6 @@ rules:
   defaultShadowAlgorithmName: sql-hint-algorithm
 
 sqlParser:
-  sqlCommentParseEnabled: true
   sqlStatementCache:
     initialCapacity: 128
     maximumSize: 1024