This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 58f75048b26 Add generic type of SQLVisitor (#25270)
58f75048b26 is described below
commit 58f75048b2675e3903e99131c6a41a0118077acf
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Apr 22 15:01:36 2023 +0800
Add generic type of SQLVisitor (#25270)
* Add generic type of SQLVisitor
* Add generic type of SQLVisitor
---
.../core/kernel/KernelDistSQLStatementVisitor.java | 2 +-
.../utility/UtilityDistSQLStatementVisitor.java | 2 +-
.../statement/MySQLParserStatementExample.java | 4 ++--
.../statement/OpenGaussParserStatementExample.java | 4 ++--
.../statement/OracleParserStatementExample.java | 4 ++--
.../PostgreSQLParserStatementExample.java | 4 ++--
.../statement/SQL92ParserStatementExample.java | 4 ++--
.../statement/SQLServerParserStatementExample.java | 4 ++--
.../core/EncryptDistSQLStatementVisitor.java | 2 +-
.../parser/core/MaskDistSQLStatementVisitor.java | 2 +-
.../ReadwriteSplittingDistSQLStatementVisitor.java | 2 +-
.../parser/core/ShadowDistSQLStatementVisitor.java | 2 +-
.../core/ShardingDistSQLStatementVisitor.java | 2 +-
.../core/AuthorityDistSQLStatementVisitor.java | 2 +-
.../parser/core/CDCDistSQLStatementVisitor.java | 2 +-
.../core/MigrationDistSQLStatementVisitor.java | 2 +-
.../core/SQLParserDistSQLStatementVisitor.java | 2 +-
.../core/SQLTranslatorDistSQLStatementVisitor.java | 2 +-
.../core/TrafficDistSQLStatementVisitor.java | 2 +-
.../core/TransactionDistSQLStatementVisitor.java | 2 +-
.../statement/MySQLSQLStatementVisitorFacade.java | 12 +++++------
.../type/MySQLDALStatementSQLVisitor.java | 2 +-
.../type/MySQLDCLStatementSQLVisitor.java | 2 +-
.../type/MySQLDDLStatementSQLVisitor.java | 2 +-
.../type/MySQLDMLStatementSQLVisitor.java | 2 +-
.../statement/type/MySQLRLStatementSQLVisitor.java | 2 +-
.../type/MySQLTCLStatementSQLVisitor.java | 2 +-
.../OpenGaussSQLStatementVisitorFacade.java | 12 +++++------
.../type/OpenGaussDALStatementSQLVisitor.java | 2 +-
.../type/OpenGaussDCLStatementSQLVisitor.java | 2 +-
.../type/OpenGaussDDLStatementSQLVisitor.java | 2 +-
.../type/OpenGaussDMLStatementSQLVisitor.java | 2 +-
.../type/OpenGaussTCLStatementSQLVisitor.java | 2 +-
.../statement/OracleSQLStatementVisitorFacade.java | 12 +++++------
.../type/OracleDALStatementSQLVisitor.java | 2 +-
.../type/OracleDCLStatementSQLVisitor.java | 2 +-
.../type/OracleDDLStatementSQLVisitor.java | 2 +-
.../type/OracleDMLStatementSQLVisitor.java | 2 +-
.../type/OracleTCLStatementSQLVisitor.java | 2 +-
.../PostgreSQLSQLStatementVisitorFacade.java | 12 +++++------
.../type/PostgreSQLDALStatementSQLVisitor.java | 2 +-
.../type/PostgreSQLDCLStatementSQLVisitor.java | 2 +-
.../type/PostgreSQLDDLStatementSQLVisitor.java | 2 +-
.../type/PostgreSQLDMLStatementSQLVisitor.java | 2 +-
.../type/PostgreSQLTCLStatementSQLVisitor.java | 2 +-
.../statement/SQL92SQLStatementVisitorFacade.java | 12 +++++------
.../type/SQL92DALStatementSQLVisitor.java | 2 +-
.../type/SQL92DCLStatementSQLVisitor.java | 2 +-
.../type/SQL92DDLStatementSQLVisitor.java | 2 +-
.../type/SQL92DMLStatementSQLVisitor.java | 2 +-
.../type/SQL92TCLStatementSQLVisitor.java | 2 +-
.../SQLServerSQLStatementVisitorFacade.java | 12 +++++------
.../type/SQLServerDALStatementSQLVisitor.java | 2 +-
.../type/SQLServerDCLStatementSQLVisitor.java | 2 +-
.../type/SQLServerDDLStatementSQLVisitor.java | 2 +-
.../type/SQLServerDMLStatementSQLVisitor.java | 2 +-
.../type/SQLServerTCLStatementSQLVisitor.java | 2 +-
.../sql/parser/api/SQLStatementVisitorEngine.java | 12 +++++------
.../visitor/SQLStatementVisitorFactory.java | 20 ++++++++---------
.../fixture/SQLStatementVisitorFacadeFixture.java | 25 +++++++++++-----------
.../sql/parser/api/visitor/SQLVisitor.java | 6 +++++-
.../api/visitor/format/SQLFormatVisitor.java | 2 +-
...QLTypeVisitor.java => SQLStatementVisitor.java} | 5 +++--
.../statement/{ => type}/DALSQLVisitor.java | 6 ++++--
.../statement/{ => type}/DCLSQLVisitor.java | 6 ++++--
.../statement/{ => type}/DDLSQLVisitor.java | 6 ++++--
.../statement/{ => type}/DMLSQLVisitor.java | 6 ++++--
.../visitor/statement/{ => type}/RLSQLVisitor.java | 6 ++++--
.../statement/{ => type}/TCLSQLVisitor.java | 6 ++++--
.../sql/parser/spi/SQLStatementVisitorFacade.java | 19 ++++++++++------
.../cases/cdc/DataSourceRecordConsumer.java | 4 ++--
.../sql/parser/internal/InternalSQLParserIT.java | 6 +++---
72 files changed, 170 insertions(+), 151 deletions(-)
diff --git
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
index f9d9797cbaf..3077e3e5879 100644
---
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
+++
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/kernel/KernelDistSQLStatementVisitor.java
@@ -121,7 +121,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for kernel DistSQL.
*/
-public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class KernelDistSQLStatementVisitor extends
KernelDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitRegisterStorageUnit(final RegisterStorageUnitContext
ctx) {
diff --git
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
index e9be59b8f06..3bd536b95f9 100644
---
a/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
+++
b/distsql/parser/src/main/java/org/apache/shardingsphere/distsql/parser/core/utility/UtilityDistSQLStatementVisitor.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
/**
* SQL statement visitor for utility DistSQL.
*/
-public final class UtilityDistSQLStatementVisitor extends
UtilityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class UtilityDistSQLStatementVisitor extends
UtilityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitPreviewSQL(final PreviewSQLContext ctx) {
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
index b1f2776f6c0..085966dca70 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/mysql/statement/MySQLParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.MySQLStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -58,7 +58,7 @@ public final class MySQLParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("MySQL",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(each, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("MySQL", false);
- MySQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
}
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
index e46788c55a3..9111c87bd35 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/opengauss/statement/OpenGaussParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.OpenGaussStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -56,7 +56,7 @@ public final class OpenGaussParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("openGauss",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("openGauss", false);
- OpenGaussStatement sqlStatement =
visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
}
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
index 681e667879c..3a2eaeaa916 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/oracle/statement/OracleParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.OracleStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -56,7 +56,7 @@ public final class OracleParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("Oracle",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("Oracle", false);
- OracleStatement sqlStatement = visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
}
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
index f64fa07dd49..a1d5c7e93e5 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/postgresql/statement/PostgreSQLParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.PostgreSQLStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -56,7 +56,7 @@ public final class PostgreSQLParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("PostgreSQL",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("PostgreSQL", false);
- PostgreSQLStatement sqlStatement =
visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
}
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
index 6f2e368346c..8e5a2b794b8 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sql92/statement/SQL92ParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sql92.SQL92Statement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -56,7 +56,7 @@ public final class SQL92ParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("SQL92",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQL92", false);
- SQL92Statement sqlStatement = visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement.toString());
});
}
diff --git
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
index 65b68e3609b..9cdab4367be 100644
---
a/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
+++
b/examples/shardingsphere-parser-example/src/main/java/org/apache/shardingsphere/example/parser/sqlserver/statement/SQLServerParserStatementExample.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.sqlserver.SQLServerStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
import java.util.List;
@@ -58,7 +58,7 @@ public final class SQLServerParserStatementExample {
SQLParserEngine parserEngine = new SQLParserEngine("SQLServer",
cacheOption);
ParseASTNode parseASTNode = parserEngine.parse(sql, false);
SQLStatementVisitorEngine visitorEngine = new
SQLStatementVisitorEngine("SQLServer", false);
- SQLServerStatement sqlStatement =
visitorEngine.visit(parseASTNode);
+ SQLStatement sqlStatement = visitorEngine.visit(parseASTNode);
System.out.println(sqlStatement);
});
}
diff --git
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
index 67e21820389..1f23a92ef79 100644
---
a/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
+++
b/features/encrypt/distsql/parser/src/main/java/org/apache/shardingsphere/encrypt/distsql/parser/core/EncryptDistSQLStatementVisitor.java
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for encrypt DistSQL.
*/
-public final class EncryptDistSQLStatementVisitor extends
EncryptDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class EncryptDistSQLStatementVisitor extends
EncryptDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitCreateEncryptRule(final CreateEncryptRuleContext ctx) {
diff --git
a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
index 48a7195e2aa..86fce1174ad 100644
---
a/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
+++
b/features/mask/distsql/parser/src/main/java/org/apache/shardingsphere/mask/distsql/parser/core/MaskDistSQLStatementVisitor.java
@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for mask DistSQL.
*/
-public final class MaskDistSQLStatementVisitor extends
MaskDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class MaskDistSQLStatementVisitor extends
MaskDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitCreateMaskRule(final CreateMaskRuleContext ctx) {
diff --git
a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
index 52f3d5f823c..d83e81af1ce 100644
---
a/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
+++
b/features/readwrite-splitting/distsql/parser/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/parser/core/ReadwriteSplittingDistSQLStatementVisitor.java
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for readwrite-splitting DistSQL.
*/
-public final class ReadwriteSplittingDistSQLStatementVisitor extends
ReadwriteSplittingDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class ReadwriteSplittingDistSQLStatementVisitor extends
ReadwriteSplittingDistSQLStatementBaseVisitor<ASTNode> implements
SQLVisitor<ASTNode> {
@Override
public ASTNode visitCreateReadwriteSplittingRule(final
CreateReadwriteSplittingRuleContext ctx) {
diff --git
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
index 2f1099377d1..3ca95e4f5c7 100644
---
a/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
+++
b/features/shadow/distsql/parser/src/main/java/org/apache/shardingsphere/shadow/distsql/parser/core/ShadowDistSQLStatementVisitor.java
@@ -69,7 +69,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for shadow DistSQL.
*/
-public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class ShadowDistSQLStatementVisitor extends
ShadowDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitCreateShadowRule(final CreateShadowRuleContext ctx) {
diff --git
a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
index 1f28e29eeee..62058bd0ea6 100644
---
a/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
+++
b/features/sharding/distsql/parser/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/core/ShardingDistSQLStatementVisitor.java
@@ -120,7 +120,7 @@ import java.util.stream.Collectors;
/**
* Sharding DistSQL statement visitor.
*/
-public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class ShardingDistSQLStatementVisitor extends
ShardingDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitCreateShardingTableRule(final
CreateShardingTableRuleContext ctx) {
diff --git
a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
index 3db81f8a850..07f6a50cec9 100644
---
a/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
+++
b/kernel/authority/distsql/parser/src/main/java/org/apache/shardingsphere/authority/distsql/parser/core/AuthorityDistSQLStatementVisitor.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
/**
* SQL statement visitor for authority DistSQL.
*/
-public final class AuthorityDistSQLStatementVisitor extends
AuthorityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class AuthorityDistSQLStatementVisitor extends
AuthorityDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitShowAuthorityRule(final ShowAuthorityRuleContext ctx) {
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
index cb271ad5715..cf845b97fab 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
+++
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/cdc/distsql/parser/core/CDCDistSQLStatementVisitor.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.Identifi
/**
* SQL statement visitor for CDC DistSQL.
*/
-public final class CDCDistSQLStatementVisitor extends
CDCDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class CDCDistSQLStatementVisitor extends
CDCDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitShowStreamingList(final ShowStreamingListContext ctx) {
diff --git
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
index fc564000bd3..f209c89ebf2 100644
---
a/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
+++
b/kernel/data-pipeline/distsql/parser/src/main/java/org/apache/shardingsphere/migration/distsql/parser/core/MigrationDistSQLStatementVisitor.java
@@ -78,7 +78,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for migration DistSQL.
*/
-public final class MigrationDistSQLStatementVisitor extends
MigrationDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class MigrationDistSQLStatementVisitor extends
MigrationDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitMigrateTable(final MigrateTableContext ctx) {
diff --git
a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
index e918651659b..2a7bc030a9e 100644
---
a/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
+++
b/kernel/parser/distsql/parser/src/main/java/org/apache/shardingsphere/parser/distsql/parser/core/SQLParserDistSQLStatementVisitor.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.sql.parser.sql.common.value.identifier.Identifi
/**
* SQL statement visitor for SQL parser DistSQL.
*/
-public final class SQLParserDistSQLStatementVisitor extends
SQLParserDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class SQLParserDistSQLStatementVisitor extends
SQLParserDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitShowSQLParserRule(final ShowSQLParserRuleContext ctx) {
diff --git
a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
index 2897c0b4c9d..7a30a4e1e21 100644
---
a/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
+++
b/kernel/sql-translator/distsql/parser/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/parser/core/SQLTranslatorDistSQLStatementVisitor.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.sqltranslator.distsql.parser.statement.ShowSQLT
/**
* SQL statement visitor for SQL translator DistSQL.
*/
-public final class SQLTranslatorDistSQLStatementVisitor extends
SQLTranslatorDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class SQLTranslatorDistSQLStatementVisitor extends
SQLTranslatorDistSQLStatementBaseVisitor<ASTNode> implements
SQLVisitor<ASTNode> {
@Override
public ASTNode visitShowSQLTranslatorRule(final
ShowSQLTranslatorRuleContext ctx) {
diff --git
a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
index 2b94312a617..b842f50c7f9 100644
---
a/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
+++
b/kernel/traffic/distsql/parser/src/main/java/org/apache/shardingsphere/traffic/distsql/parser/core/TrafficDistSQLStatementVisitor.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
/**
* SQL statement visitor for traffic DistSQL.
*/
-public final class TrafficDistSQLStatementVisitor extends
TrafficDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class TrafficDistSQLStatementVisitor extends
TrafficDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitAlterTrafficRule(final AlterTrafficRuleContext ctx) {
diff --git
a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
index 4dbca5c19af..54e9bc6dc7d 100644
---
a/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
+++
b/kernel/transaction/distsql/parser/src/main/java/org/apache/shardingsphere/transaction/distsql/parser/core/TransactionDistSQLStatementVisitor.java
@@ -37,7 +37,7 @@ import java.util.Properties;
/**
* SQL statement visitor for transaction DistSQL.
*/
-public final class TransactionDistSQLStatementVisitor extends
TransactionDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor {
+public final class TransactionDistSQLStatementVisitor extends
TransactionDistSQLStatementBaseVisitor<ASTNode> implements SQLVisitor<ASTNode> {
@Override
public ASTNode visitShowTransactionRule(final ShowTransactionRuleContext
ctx) {
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLSQLStatementVisitorFacade.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLSQLStatementVisitorFacade.java
index 46eea419dc5..aa1ed6cb5e0 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLSQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLSQLStatementVisitorFacade.java
@@ -19,12 +19,12 @@ package
org.apache.shardingsphere.sql.parser.mysql.visitor.statement;
import
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type.MySQLRLStatementSQLVisitor;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type.MySQLDALStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type.MySQLDCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type.MySQLDDLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementSQLVisitor.java
index 872a86b6fa9..91300540747 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AlterResourceGroupContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AnalyzeTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.BinaryLogFileIndexNumberContext;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementSQLVisitor.java
index 440adca2a57..0517941eb6c 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AccountLockPasswordExpireOptionContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AccountLockPasswordExpireOptionsContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AlterUserContext;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementSQLVisitor.java
index ef4ee94e07b..4a952fdf86c 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDDLStatementSQLVisitor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import com.google.common.base.Preconditions;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AddColumnContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AddTableConstraintContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.AlterCheckContext;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementSQLVisitor.java
index b27f9dd3fbd..fb763a1e9cc 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDMLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CallContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.DoStatementContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LoadDataStatementContext;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLRLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLRLStatementSQLVisitor.java
index e3d2ec263c6..88ad6691df4 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLRLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLRLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.ChangeMasterToContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.StartSlaveContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.StopSlaveContext;
diff --git
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLTCLStatementSQLVisitor.java
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLTCLStatementSQLVisitor.java
index 3164634a750..b02512435fe 100644
---
a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLTCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLTCLStatementSQLVisitor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.mysql.visitor.statement.type;
import org.antlr.v4.runtime.Token;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.BeginTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CommitContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LockContext;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussSQLStatementVisitorFacade.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussSQLStatementVisitorFacade.java
index e12bbcd5360..efb8daefc62 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussSQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussSQLStatementVisitorFacade.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type.OpenGaussDCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type.OpenGaussDDLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type.OpenGaussTCLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDALStatementSQLVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDALStatementSQLVisitor.java
index 724ba8223e0..2214f2fab3c 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDALStatementSQLVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDALStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AnalyzeTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.ColIdContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.ConfigurationParameterClauseContext;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementSQLVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementSQLVisitor.java
index e730acb88ec..b0408317900 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AlterRoleContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AlterUserContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CreateRoleContext;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementSQLVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementSQLVisitor.java
index 7a45e65dbef..90f8c499450 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AbsoluteCountContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AddColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AddConstraintSpecificationContext;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDMLStatementSQLVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDMLStatementSQLVisitor.java
index 9ee3537b9c0..e2930fce8e5 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDMLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CallContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CheckpointContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CopyContext;
diff --git
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussTCLStatementSQLVisitor.java
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussTCLStatementSQLVisitor.java
index 955cdd233e4..f4c911ec615 100644
---
a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussTCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussTCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.opengauss.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.AbortContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.BeginTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CommitContext;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleSQLStatementVisitorFacade.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleSQLStatementVisitorFacade.java
index 6d70bbbd570..87fdf843f4f 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleSQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/OracleSQLStatementVisitorFacade.java
@@ -19,12 +19,12 @@ package
org.apache.shardingsphere.sql.parser.oracle.visitor.statement;
import
org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type.OracleTCLStatementSQLVisitor;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type.OracleDALStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type.OracleDCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type.OracleDDLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementSQLVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementSQLVisitor.java
index 1f737b36e15..ec21fb3977d 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementSQLVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterResourceCostContext;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.dal.OracleAlterResourceCostStatement;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementSQLVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementSQLVisitor.java
index 3bfae4df532..53bf38ce769 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterRoleContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterUserContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CreateRoleContext;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementSQLVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementSQLVisitor.java
index 80861caccff..076c3c5e229 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AddColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AddConstraintSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterAnalyticViewContext;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementSQLVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementSQLVisitor.java
index aea59605453..660c83e1d94 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementSQLVisitor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type;
import org.antlr.v4.runtime.misc.Interval;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AliasContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AssignmentValueContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AssignmentValuesContext;
diff --git
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleTCLStatementSQLVisitor.java
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleTCLStatementSQLVisitor.java
index b2e6f3c8c76..291c7d5bc0c 100644
---
a/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleTCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleTCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.oracle.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.CommitContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.RollbackContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.SavepointContext;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLSQLStatementVisitorFacade.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLSQLStatementVisitorFacade.java
index 55a14f564a8..e37298f53f3 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLSQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLSQLStatementVisitorFacade.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.sql.parser.postgresql.visitor.statement;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type.PostgreSQLDALStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type.PostgreSQLDCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type.PostgreSQLDDLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDALStatementSQLVisitor.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDALStatementSQLVisitor.java
index 425fffc633c..65aaffc3f97 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDALStatementSQLVisitor.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDALStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AnalyzeTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.ColIdContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.ConfigurationParameterClauseContext;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementSQLVisitor.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementSQLVisitor.java
index 0e7b1dcf215..582e5e015e3 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterRoleContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AlterUserContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.CreateGroupContext;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementSQLVisitor.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementSQLVisitor.java
index 1c977c7cdf0..50a5fe67b16 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AbsoluteCountContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AddColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AddConstraintSpecificationContext;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDMLStatementSQLVisitor.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDMLStatementSQLVisitor.java
index f6d3ec136a0..401109374b4 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDMLStatementSQLVisitor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type;
import org.antlr.v4.runtime.misc.Interval;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.CallArgumentContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.CallContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.CheckpointContext;
diff --git
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLTCLStatementSQLVisitor.java
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLTCLStatementSQLVisitor.java
index 803b8706d40..20a6444d511 100644
---
a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLTCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLTCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.postgresql.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.AbortContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.BeginTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.PostgreSQLStatementParser.CommitContext;
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92SQLStatementVisitorFacade.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92SQLStatementVisitorFacade.java
index 5b5068b9f1b..f682d237e84 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92SQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/SQL92SQLStatementVisitorFacade.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.sql.parser.sql92.visitor.statement;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type.SQL92DALStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type.SQL92DCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type.SQL92DDLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DALStatementSQLVisitor.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DALStatementSQLVisitor.java
index 35deb977417..bbcefe3d0a1 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DALStatementSQLVisitor.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DALStatementSQLVisitor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
/**
* DAL Statement SQL visitor for SQL92.
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DCLStatementSQLVisitor.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DCLStatementSQLVisitor.java
index 1702fd1ee0d..b70275752b4 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.GrantContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.PrivilegeClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.RevokeContext;
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DDLStatementSQLVisitor.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DDLStatementSQLVisitor.java
index 7595cd27bc7..718345143da 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DDLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AddColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AddConstraintSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AlterDefinitionClauseContext;
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementSQLVisitor.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementSQLVisitor.java
index 2bdc97f836f..e5eccafc390 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementSQLVisitor.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type;
import org.antlr.v4.runtime.misc.Interval;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AliasContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AssignmentContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.AssignmentValueContext;
diff --git
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92TCLStatementSQLVisitor.java
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92TCLStatementSQLVisitor.java
index 15e94d08125..27b07df5028 100644
---
a/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92TCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92TCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sql92.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.CommitContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.RollbackContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQL92StatementParser.SetTransactionContext;
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerSQLStatementVisitorFacade.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerSQLStatementVisitorFacade.java
index 0392c8f51e6..e7006995982 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerSQLStatementVisitorFacade.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerSQLStatementVisitorFacade.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type.SQLServerDALStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type.SQLServerDCLStatementSQLVisitor;
import
org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type.SQLServerDDLStatementSQLVisitor;
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDALStatementSQLVisitor.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDALStatementSQLVisitor.java
index 5a6925f6e3b..fc283c66f8f 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDALStatementSQLVisitor.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDALStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.ExplainContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.ExplainableStatementContext;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementSQLVisitor.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementSQLVisitor.java
index 583180afc67..79651720ae4 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AlterLoginContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AlterRoleContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AlterUserContext;
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDDLStatementSQLVisitor.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDDLStatementSQLVisitor.java
index edca0380459..721e1982d93 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDDLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDDLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AddColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AlterCheckConstraintContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.AlterColumnAddOptionContext;
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDMLStatementSQLVisitor.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDMLStatementSQLVisitor.java
index afab78b4711..4a77fdd0b45 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDMLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerDMLStatementSQLVisitor.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
/**
* DML Statement SQL visitor for SQLServer.
diff --git
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerTCLStatementSQLVisitor.java
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerTCLStatementSQLVisitor.java
index 59597880f83..3072b51fc01 100644
---
a/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerTCLStatementSQLVisitor.java
+++
b/sql-parser/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/type/SQLServerTCLStatementSQLVisitor.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sql.parser.sqlserver.visitor.statement.type;
import org.apache.shardingsphere.sql.parser.api.ASTNode;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.BeginDistributedTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.BeginTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.SQLServerStatementParser.CommitContext;
diff --git
a/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
b/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
index 40a0bc5d23d..a8bfc6bc5f4 100644
---
a/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
+++
b/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
@@ -19,12 +19,13 @@ package org.apache.shardingsphere.sql.parser.api;
import lombok.RequiredArgsConstructor;
import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
import
org.apache.shardingsphere.sql.parser.core.database.visitor.SQLStatementVisitorFactory;
import
org.apache.shardingsphere.sql.parser.core.database.visitor.SQLVisitorRule;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.CommentSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
* SQL statement visitor engine.
@@ -40,16 +41,15 @@ public final class SQLStatementVisitorEngine {
* Visit parse context.
*
* @param parseASTNode parse AST node
- * @param <T> type of SQL visitor result
* @return SQL visitor result
*/
- public <T> T visit(final ParseASTNode parseASTNode) {
- ParseTreeVisitor<T> visitor =
SQLStatementVisitorFactory.newInstance(databaseType,
SQLVisitorRule.valueOf(parseASTNode.getRootNode().getClass()));
- T result = parseASTNode.getRootNode().accept(visitor);
+ public SQLStatement visit(final ParseASTNode parseASTNode) {
+ SQLStatementVisitor visitor =
SQLStatementVisitorFactory.newInstance(databaseType,
SQLVisitorRule.valueOf(parseASTNode.getRootNode().getClass()));
+ ASTNode result = parseASTNode.getRootNode().accept(visitor);
if (isParseComment) {
appendSQLComments(parseASTNode, result);
}
- return result;
+ return (SQLStatement) result;
}
private <T> void appendSQLComments(final ParseASTNode parseASTNode, final
T visitResult) {
diff --git
a/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLStatementVisitorFactory.java
b/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLStatementVisitorFactory.java
index a5140bb65af..57987069759 100644
---
a/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLStatementVisitorFactory.java
+++
b/sql-parser/engine/src/main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLStatementVisitorFactory.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.sql.parser.core.database.visitor;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatementType;
@@ -37,30 +37,28 @@ public final class SQLStatementVisitorFactory {
*
* @param databaseType database type
* @param visitorRule SQL visitor rule
- * @param <T> type of visitor result
* @return created instance
*/
- public static <T> ParseTreeVisitor<T> newInstance(final String
databaseType, final SQLVisitorRule visitorRule) {
+ public static SQLStatementVisitor newInstance(final String databaseType,
final SQLVisitorRule visitorRule) {
SQLStatementVisitorFacade facade =
TypedSPILoader.getService(SQLStatementVisitorFacade.class, databaseType);
return createParseTreeVisitor(facade, visitorRule.getType());
}
- @SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
- private static <T> ParseTreeVisitor<T> createParseTreeVisitor(final
SQLStatementVisitorFacade visitorFacade, final SQLStatementType type) {
+ private static SQLStatementVisitor createParseTreeVisitor(final
SQLStatementVisitorFacade visitorFacade, final SQLStatementType type) {
switch (type) {
case DML:
- return (ParseTreeVisitor<T>)
visitorFacade.getDMLVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getDMLVisitorClass().getConstructor().newInstance();
case DDL:
- return (ParseTreeVisitor<T>)
visitorFacade.getDDLVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getDDLVisitorClass().getConstructor().newInstance();
case TCL:
- return (ParseTreeVisitor<T>)
visitorFacade.getTCLVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getTCLVisitorClass().getConstructor().newInstance();
case DCL:
- return (ParseTreeVisitor<T>)
visitorFacade.getDCLVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getDCLVisitorClass().getConstructor().newInstance();
case DAL:
- return (ParseTreeVisitor<T>)
visitorFacade.getDALVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getDALVisitorClass().getConstructor().newInstance();
case RL:
- return (ParseTreeVisitor<T>)
visitorFacade.getRLVisitorClass().getConstructor().newInstance();
+ return
visitorFacade.getRLVisitorClass().getConstructor().newInstance();
default:
throw new SQLParsingException(type.name());
}
diff --git
a/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/fixture/SQLStatementVisitorFacadeFixture.java
b/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/fixture/SQLStatementVisitorFacadeFixture.java
index af7283f4295..cad9bd947a0 100644
---
a/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/fixture/SQLStatementVisitorFacadeFixture.java
+++
b/sql-parser/engine/src/test/java/org/apache/shardingsphere/sql/parser/fixture/SQLStatementVisitorFacadeFixture.java
@@ -17,44 +17,43 @@
package org.apache.shardingsphere.sql.parser.fixture;
-import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DALSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DDLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.DMLSQLVisitor;
-import org.apache.shardingsphere.sql.parser.api.visitor.statement.RLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.api.visitor.statement.TCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
import org.apache.shardingsphere.sql.parser.spi.SQLStatementVisitorFacade;
public final class SQLStatementVisitorFacadeFixture implements
SQLStatementVisitorFacade {
@Override
- public Class<? extends SQLVisitor> getDMLVisitorClass() {
+ public Class<? extends DMLSQLVisitor> getDMLVisitorClass() {
return DMLSQLVisitor.class;
}
@Override
- public Class<? extends SQLVisitor> getDDLVisitorClass() {
+ public Class<? extends DDLSQLVisitor> getDDLVisitorClass() {
return DDLSQLVisitor.class;
}
@Override
- public Class<? extends SQLVisitor> getTCLVisitorClass() {
+ public Class<? extends TCLSQLVisitor> getTCLVisitorClass() {
return TCLSQLVisitor.class;
}
@Override
- public Class<? extends SQLVisitor> getDCLVisitorClass() {
+ public Class<? extends DCLSQLVisitor> getDCLVisitorClass() {
return DCLSQLVisitor.class;
}
@Override
- public Class<? extends SQLVisitor> getDALVisitorClass() {
+ public Class<? extends DALSQLVisitor> getDALVisitorClass() {
return DALSQLVisitor.class;
}
@Override
- public Class<? extends SQLVisitor> getRLVisitorClass() {
+ public Class<? extends RLSQLVisitor> getRLVisitorClass() {
return RLSQLVisitor.class;
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/SQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/SQLVisitor.java
index 5c663f3a98b..c3575cdd717 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/SQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/SQLVisitor.java
@@ -17,8 +17,12 @@
package org.apache.shardingsphere.sql.parser.api.visitor;
+import org.antlr.v4.runtime.tree.ParseTreeVisitor;
+
/**
* SQL visitor.
+ *
+ * @param <T> type of visit return value
*/
-public interface SQLVisitor {
+public interface SQLVisitor<T> extends ParseTreeVisitor<T> {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/format/SQLFormatVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/format/SQLFormatVisitor.java
index 52904dec0f9..19dc1791eb6 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/format/SQLFormatVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/format/SQLFormatVisitor.java
@@ -23,5 +23,5 @@ import
org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
/**
* SQL format visitor.
*/
-public interface SQLFormatVisitor extends SQLVisitor, TypedSPI {
+public interface SQLFormatVisitor extends SQLVisitor<String>, TypedSPI {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLTypeVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLStatementVisitor.java
similarity index 86%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLTypeVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLStatementVisitor.java
index 26911d4d4eb..a9bc1bd56d6 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLTypeVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/SQLStatementVisitor.java
@@ -17,10 +17,11 @@
package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+import org.apache.shardingsphere.sql.parser.api.ASTNode;
import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
/**
- * SQL type visitor.
+ * SQL statement visitor.
*/
-public interface SQLTypeVisitor extends SQLVisitor {
+public interface SQLStatementVisitor extends SQLVisitor<ASTNode> {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DALSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DALSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DALSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DALSQLVisitor.java
index 0cfa16db83a..69d9c674d47 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DALSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DALSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* DAL SQL visitor.
*/
-public interface DALSQLVisitor extends SQLTypeVisitor {
+public interface DALSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DCLSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DCLSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DCLSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DCLSQLVisitor.java
index 4e4fde21126..1e9677a8dd4 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DCLSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DCLSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* DCL SQL visitor.
*/
-public interface DCLSQLVisitor extends SQLTypeVisitor {
+public interface DCLSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DDLSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DDLSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DDLSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DDLSQLVisitor.java
index 2394cce19f4..dc49db83f4e 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DDLSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DDLSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* DDL SQL visitor.
*/
-public interface DDLSQLVisitor extends SQLTypeVisitor {
+public interface DDLSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DMLSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DMLSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DMLSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DMLSQLVisitor.java
index f7923db6b01..237e3f09f5c 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/DMLSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/DMLSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* DML SQL visitor.
*/
-public interface DMLSQLVisitor extends SQLTypeVisitor {
+public interface DMLSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/RLSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/RLSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/RLSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/RLSQLVisitor.java
index 6d83bc82036..dcdb081305a 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/RLSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/RLSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* RL SQL visitor.
*/
-public interface RLSQLVisitor extends SQLTypeVisitor {
+public interface RLSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/TCLSQLVisitor.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/TCLSQLVisitor.java
similarity index 85%
rename from
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/TCLSQLVisitor.java
rename to
sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/TCLSQLVisitor.java
index cba88f14b9c..8308a8405f4 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/TCLSQLVisitor.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/api/visitor/statement/type/TCLSQLVisitor.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sql.parser.api.visitor.statement;
+package org.apache.shardingsphere.sql.parser.api.visitor.statement.type;
+
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.SQLStatementVisitor;
/**
* TCL SQL visitor.
*/
-public interface TCLSQLVisitor extends SQLTypeVisitor {
+public interface TCLSQLVisitor extends SQLStatementVisitor {
}
diff --git
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLStatementVisitorFacade.java
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLStatementVisitorFacade.java
index 6da7542af46..1ae555419a8 100644
---
a/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLStatementVisitorFacade.java
+++
b/sql-parser/spi/src/main/java/org/apache/shardingsphere/sql/parser/spi/SQLStatementVisitorFacade.java
@@ -18,7 +18,12 @@
package org.apache.shardingsphere.sql.parser.spi;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
-import org.apache.shardingsphere.sql.parser.api.visitor.SQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DALSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DCLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DDLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.DMLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.RLSQLVisitor;
+import
org.apache.shardingsphere.sql.parser.api.visitor.statement.type.TCLSQLVisitor;
/**
* SQL statement visitor facade.
@@ -30,40 +35,40 @@ public interface SQLStatementVisitorFacade extends TypedSPI
{
*
* @return DML visitor class
*/
- Class<? extends SQLVisitor> getDMLVisitorClass();
+ Class<? extends DMLSQLVisitor> getDMLVisitorClass();
/**
* Get DDL visitor class.
*
* @return DDL visitor class
*/
- Class<? extends SQLVisitor> getDDLVisitorClass();
+ Class<? extends DDLSQLVisitor> getDDLVisitorClass();
/**
* Get TCL visitor class.
*
* @return TCL visitor class
*/
- Class<? extends SQLVisitor> getTCLVisitorClass();
+ Class<? extends TCLSQLVisitor> getTCLVisitorClass();
/**
* Get DCL visitor class.
*
* @return DCL visitor class
*/
- Class<? extends SQLVisitor> getDCLVisitorClass();
+ Class<? extends DCLSQLVisitor> getDCLVisitorClass();
/**
* Get DAL visitor class.
*
* @return DAL visitor class
*/
- Class<? extends SQLVisitor> getDALVisitorClass();
+ Class<? extends DALSQLVisitor> getDALVisitorClass();
/**
* Get RL visitor class.
*
* @return RL visitor class
*/
- Class<? extends SQLVisitor> getRLVisitorClass();
+ Class<? extends RLSQLVisitor> getRLVisitorClass();
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
index c21aa60fcd3..527169011e5 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
@@ -125,8 +125,8 @@ public final class DataSourceRecordConsumer implements
Consumer<List<Record>> {
}
break;
case DELETE:
- TableColumn orderId =
record.getBeforeList().stream().filter(each ->
"order_id".equals(each.getName())).findFirst().orElseThrow(() ->
- new UnsupportedOperationException("No primary key
found in the t_order"));
+ TableColumn orderId =
record.getBeforeList().stream().filter(each ->
"order_id".equals(each.getName())).findFirst()
+ .orElseThrow(() -> new
UnsupportedOperationException("No primary key found in the t_order"));
preparedStatement.setObject(1,
convertValueFromAny(tableMetaData, orderId));
preparedStatement.execute();
break;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
index c0399e9caa9..ba6befe76a7 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/InternalSQLParserIT.java
@@ -53,12 +53,12 @@ public abstract class InternalSQLParserIT {
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertSupportedSQL(final String sqlCaseId, final SQLCaseType
sqlCaseType, final String databaseType) {
String sql = SQL_CASES.getSQL(sqlCaseId, sqlCaseType,
SQL_PARSER_TEST_CASES.get(sqlCaseId).getParameters());
- Object actual = parseSQLStatement("H2".equals(databaseType) ? "MySQL"
: databaseType, sql);
+ SQLStatement actual = parseSQLStatement("H2".equals(databaseType) ?
"MySQL" : databaseType, sql);
SQLParserTestCase expected = SQL_PARSER_TEST_CASES.get(sqlCaseId);
- SQLStatementAssert.assertIs(new SQLCaseAssertContext(sqlCaseId, sql,
expected.getParameters(), sqlCaseType), (SQLStatement) actual, expected);
+ SQLStatementAssert.assertIs(new SQLCaseAssertContext(sqlCaseId, sql,
expected.getParameters(), sqlCaseType), actual, expected);
}
- private Object parseSQLStatement(final String databaseType, final String
sql) {
+ private SQLStatement parseSQLStatement(final String databaseType, final
String sql) {
return "ShardingSphere".equals(databaseType)
? new DistSQLStatementParserEngine().parse(sql)
: new SQLStatementVisitorEngine(databaseType, true).visit(new
SQLParserEngine(databaseType, new CacheOption(128, 1024L)).parse(sql, false));
