You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/11/17 15:51:32 UTC
[shardingsphere] branch master updated: Refactor SQL parser asserts (#22221)
This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 a55d57a04c6 Refactor SQL parser asserts (#22221)
a55d57a04c6 is described below
commit a55d57a04c6460f900756f5b13c55cf7fa4286c2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Nov 17 23:51:25 2022 +0800
Refactor SQL parser asserts (#22221)
* Move package of IdentifierValueAssert
* Refactor CommentAssert
* Revise javadoc
* Move package
* Remove AbstractSQLStatementAssert
---
.../ral/updatable/PrepareDistSQLStatement.java | 2 +-
.../rewrite/condition/EncryptConditionEngine.java | 2 +-
.../shardingsphere/infra/binder/QueryContext.java | 2 +-
.../database/schema/util/SystemSchemaUtil.java | 4 +-
.../engine/SingleTableRouteEngineFactory.java | 2 +-
.../binary/prepare/MySQLComStmtPrepareChecker.java | 2 +-
.../command/query/PostgreSQLCommand.java | 2 +-
.../sql/common/extractor/TableExtractor.java | 4 +-
.../SQLNodeConverterEngineParameterizedTest.java | 2 +-
.../asserts/segment/column/ColumnAssert.java | 2 +-
.../asserts/segment/database/DatabaseAssert.java | 2 +-
.../asserts/segment/distsql/DatabaseAssert.java | 2 +-
.../identifier}/IdentifierValueAssert.java | 14 +++----
.../asserts/segment/index/IndexAssert.java | 2 +-
.../asserts/segment/index/IndexTypeAssert.java | 2 +-
.../asserts/segment/orderby/OrderByItemAssert.java | 2 +-
.../asserts/segment/output/OutputClauseAssert.java | 2 +-
.../asserts/segment/owner/OwnerAssert.java | 2 +-
.../asserts/segment/packages/PackageAssert.java | 2 +-
.../segment/projection/ProjectionAssert.java | 2 +-
.../asserts/segment/table/TableAssert.java | 2 +-
.../internal/asserts/segment/type/TypeAssert.java | 2 +-
.../statement/AbstractSQLStatementAssert.java | 46 ----------------------
.../asserts/statement/comment/CommentAssert.java | 13 +++---
.../asserts/statement/dal/DALStatementAssert.java | 24 +++++------
.../dal/impl/CacheIndexStatementAssert.java | 2 +-
.../dal/impl/LoadIndexInfoStatementAssert.java | 2 +-
.../MySQLAlterResourceGroupStatementAssert.java | 2 +-
.../{ => mysql}/MySQLBinlogStatementAssert.java | 2 +-
.../MySQLChecksumTableStatementAssert.java | 2 +-
.../MySQLCreateResourceGroupStatementAssert.java | 2 +-
.../{ => mysql}/MySQLDelimiterStatementAssert.java | 2 +-
.../MySQLDropResourceGroupStatementAssert.java | 2 +-
.../MySQLOptimizeTableStatementAssert.java | 2 +-
.../MySQLRepairTableStatementAssert.java | 2 +-
.../MySQLResetPersistStatementAssert.java | 2 +-
.../{ => mysql}/MySQLResetStatementAssert.java | 2 +-
.../MySQLSetResourceGroupStatementAssert.java | 2 +-
.../impl/{ => mysql}/MySQLUseStatementAssert.java | 2 +-
.../statement/ddl/impl/CloseStatementAssert.java | 2 +-
.../statement/ddl/impl/CursorStatementAssert.java | 2 +-
.../statement/ddl/impl/DeclareStatementAssert.java | 2 +-
.../statement/ddl/impl/FetchStatementAssert.java | 2 +-
.../statement/ddl/impl/MoveStatementAssert.java | 2 +-
.../statement/distsql/DistSQLStatementAssert.java | 6 +--
.../rul/impl/sql/FormatSQLStatementAssert.java | 6 +--
.../distsql/ral/ApplyDistSQLStatementTestCase.java | 2 +-
.../ral/DiscardDistSQLStatementTestCase.java | 2 +-
.../internal/DistSQLParserParameterizedTest.java | 7 +++-
49 files changed, 78 insertions(+), 126 deletions(-)
diff --git a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
index dbe81927929..969ca01cd07 100644
--- a/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
+++ b/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/parser/statement/ral/updatable/PrepareDistSQLStatement.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.distsql.parser.statement.ral.updatable;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
/**
- * Prepare dist sql statement.
+ * Prepare Dist SQL statement.
*/
public final class PrepareDistSQLStatement extends UpdatableRALStatement {
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
index ee7e4134749..d504e71da8c 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java
@@ -85,7 +85,7 @@ public final class EncryptConditionEngine {
*
* @param whereSegments where segments
* @param columnSegments column segments
- * @param sqlStatementContext sql statement context
+ * @param sqlStatementContext SQL statement context
* @param databaseName database name
* @return encrypt conditions
*/
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
index a8462d2d953..fed80d7dba6 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
@@ -48,7 +48,7 @@ public final class QueryContext {
}
/**
- * Find sql statement database name.
+ * Find SQL statement database name.
*
* @return database name
*/
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java
index 0af66576739..85a56554a83 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SystemSchemaUtil.java
@@ -33,12 +33,12 @@ import java.util.Collection;
public class SystemSchemaUtil {
/**
- * Judge whether sql statement contains system schema or not.
+ * Judge whether SQL statement contains system schema or not.
*
* @param databaseType databaseType
* @param schemaNames schema names
* @param database database
- * @return whether sql statement contains system schema or not
+ * @return whether SQL statement contains system schema or not
*/
public static boolean containsSystemSchema(final DatabaseType databaseType, final Collection<String> schemaNames, final ShardingSphereDatabase database) {
if (database.isComplete() && !(databaseType instanceof PostgreSQLDatabaseType || databaseType instanceof OpenGaussDatabaseType)) {
diff --git a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/engine/SingleTableRouteEngineFactory.java b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/engine/SingleTableRouteEngineFactory.java
index 0e29f549fe0..acd9a3f9d83 100644
--- a/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/engine/SingleTableRouteEngineFactory.java
+++ b/kernel/single-table/core/src/main/java/org/apache/shardingsphere/singletable/route/engine/SingleTableRouteEngineFactory.java
@@ -38,7 +38,7 @@ public final class SingleTableRouteEngineFactory {
* Create new instance of single table route engine.
*
* @param singleTableNames single table names
- * @param sqlStatement sql statement
+ * @param sqlStatement SQL statement
* @return created instance
*/
public static Optional<SingleTableRouteEngine> newInstance(final Collection<QualifiedTable> singleTableNames, final SQLStatement sqlStatement) {
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
index 60ddb1a705b..2702c132bec 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareChecker.java
@@ -103,7 +103,7 @@ public final class MySQLComStmtPrepareChecker {
* Judge if SQL statement is allowed.
*
* @param sqlStatement SQL statement
- * @return sql statement is allowed or not
+ * @return SQL statement is allowed or not
*/
public static boolean isStatementAllowed(final SQLStatement sqlStatement) {
return SQL_STATEMENTS_ALLOWED.contains(sqlStatement.getClass());
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
index 20462545eab..be250965941 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/PostgreSQLCommand.java
@@ -156,7 +156,7 @@ public enum PostgreSQLCommand {
/**
* Refer to <a href="https://bugs.openjdk.java.net/browse/JDK-8161372">JDK-8161372</a>.
*
- * @param sqlStatementClass sql statement class
+ * @param sqlStatementClass SQL statement class
* @return optional PostgreSQLCommand
*/
@SuppressWarnings("OptionalAssignedToNull")
diff --git a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
index 71675f77ed7..268097dc637 100644
--- a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
+++ b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
@@ -325,9 +325,9 @@ public final class TableExtractor {
}
/**
- * Extract table that should be rewritten from sql statement.
+ * Extract table that should be rewritten from SQL statement.
*
- * @param sqlStatement sql statement
+ * @param sqlStatement SQL statement
*/
public void extractTablesFromSQLStatement(final SQLStatement sqlStatement) {
if (sqlStatement instanceof SelectStatement) {
diff --git a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
index 245fa4c9202..2968d9f2159 100644
--- a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
+++ b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
@@ -68,7 +68,7 @@ public final class SQLNodeConverterEngineParameterizedTest {
private static final Set<String> SUPPORTED_SQL_CASE_IDS = new HashSet<>();
- // TODO remove SUPPORTED_SQL_CASE_IDS when all sql statement support convert to sql node
+ // TODO remove SUPPORTED_SQL_CASE_IDS when all SQL statement support convert to SQL node
// CHECKSTYLE:OFF
static {
SUPPORTED_SQL_CASE_IDS.add("select_with_join_table_subquery");
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/column/ColumnAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/column/ColumnAssert.java
index 82004dce6fa..5189ec058c2 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/column/ColumnAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/column/ColumnAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.Column
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.column.ExpectedColumn;
import java.util.Collection;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
index 9357026fec0..c259f9258f6 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/database/DatabaseAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.schema.ExpectedDatabase;
/**
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
index a01ab0e7681..3b03a387bc3 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/distsql/DatabaseAssert.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.DatabaseSegment;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.schema.ExpectedDatabase;
/**
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/value/IdentifierValueAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/identifier/IdentifierValueAssert.java
similarity index 79%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/value/IdentifierValueAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/identifier/IdentifierValueAssert.java
index e32f82d2d59..05270749926 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/value/IdentifierValueAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/identifier/IdentifierValueAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.value;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -40,13 +40,9 @@ public final class IdentifierValueAssert {
* @param expected expected identifier
* @param type assert identifier value type
*/
- public static void assertIs(final SQLCaseAssertContext assertContext, final IdentifierValue actual,
- final ExpectedIdentifierSQLSegment expected, final String type) {
- assertThat(assertContext.getText(String.format("%s name assertion error: ", type)),
- actual.getValue(), is(expected.getName()));
- assertThat(assertContext.getText(String.format("%s start delimiter assertion error: ", type)),
- actual.getQuoteCharacter().getStartDelimiter(), is(expected.getStartDelimiter()));
- assertThat(assertContext.getText(String.format("%s end delimiter assertion error: ", type)),
- actual.getQuoteCharacter().getEndDelimiter(), is(expected.getEndDelimiter()));
+ public static void assertIs(final SQLCaseAssertContext assertContext, final IdentifierValue actual, final ExpectedIdentifierSQLSegment expected, final String type) {
+ assertThat(assertContext.getText(String.format("%s name assertion error: ", type)), actual.getValue(), is(expected.getName()));
+ assertThat(assertContext.getText(String.format("%s start delimiter assertion error: ", type)), actual.getQuoteCharacter().getStartDelimiter(), is(expected.getStartDelimiter()));
+ assertThat(assertContext.getText(String.format("%s end delimiter assertion error: ", type)), actual.getQuoteCharacter().getEndDelimiter(), is(expected.getEndDelimiter()));
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexAssert.java
index b41169fa427..f34ad891bcb 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexSe
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.index.ExpectedIndex;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexTypeAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexTypeAssert.java
index 1c185a15dd2..ee721188241 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexTypeAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/index/IndexTypeAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.index.IndexTy
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.index.ExpectedIndexType;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/orderby/OrderByItemAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/orderby/OrderByItemAssert.java
index 54b7e41580e..fd643c66100 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/orderby/OrderByItemAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/orderby/OrderByItemAssert.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertC
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.orderby.ExpectedOrderByClause;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.orderby.item.ExpectedOrderByItem;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.orderby.item.impl.ExpectedColumnOrderByItem;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/output/OutputClauseAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/output/OutputClauseAssert.java
index ff60157eabd..43cd9018b25 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/output/OutputClauseAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/output/OutputClauseAssert.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnPr
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.OutputSegment;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.output.ExpectedOutputClause;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.projection.impl.column.ExpectedColumnProjection;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/owner/OwnerAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/owner/OwnerAssert.java
index ea0c9da867b..56f90f7766f 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/owner/OwnerAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/owner/OwnerAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.OwnerSegment;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.table.ExpectedOwner;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/packages/PackageAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/packages/PackageAssert.java
index 9c590f1fbc9..35170cd6b36 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/packages/PackageAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/packages/PackageAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.packages.Pack
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.packages.ExpectedPackage;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
index 11caa98c8de..8298834a365 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/projection/ProjectionAssert.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSeg
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dml.impl.SelectStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.projection.ExpectedProjection;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.projection.ExpectedProjections;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.projection.impl.aggregation.ExpectedAggregationDistinctProjection;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/table/TableAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/table/TableAssert.java
index 6c91717e489..bb8dfeb4675 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/table/TableAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/table/TableAssert.java
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.column
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.expression.ExpressionAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dml.impl.SelectStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.column.ExpectedColumn;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.table.ExpectedJoinTable;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.table.ExpectedSimpleTable;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/type/TypeAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/type/TypeAssert.java
index 03c2db7af1c..e696109e278 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/type/TypeAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/segment/type/TypeAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.ddl.type.TypeSegm
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.owner.OwnerAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.type.ExpectedType;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/AbstractSQLStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/AbstractSQLStatementAssert.java
deleted file mode 100644
index 60850d60faf..00000000000
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/AbstractSQLStatementAssert.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.DistSQLStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.SQLParserTestCase;
-
-/**
- * Abstract sql statement assert.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class AbstractSQLStatementAssert {
-
- /**
- * Assert abstract sql statement is correct with expected parser result.
- *
- * @param assertContext assert context
- * @param actual actual abstract sql statement
- * @param expected expected abstract sql statement test case
- */
- public static void assertIs(final SQLCaseAssertContext assertContext, final SQLStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof DistSQLStatement) {
- DistSQLStatementAssert.assertIs(assertContext, (DistSQLStatement) actual, expected);
- }
- }
-}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/comment/CommentAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/comment/CommentAssert.java
index f20c46d3e73..548f59a4c9a 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/comment/CommentAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/comment/CommentAssert.java
@@ -42,30 +42,29 @@ public final class CommentAssert {
* Assert comment is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual sql statement
+ * @param actual actual SQL statement
* @param expected expected statement test case
*/
public static void assertComment(final SQLCaseAssertContext assertContext, final SQLStatement actual, final SQLParserTestCase expected) {
if (expected.getComments().isEmpty()) {
- assertCommentIsEmpty(assertContext, actual);
+ assertEmptyComment(assertContext, actual);
} else {
- assertCommentIsCorrect(assertContext, actual, expected);
+ assertCorrectComment(assertContext, actual, expected);
}
}
- private static void assertCommentIsEmpty(final SQLCaseAssertContext assertContext, final SQLStatement actual) {
+ private static void assertEmptyComment(final SQLCaseAssertContext assertContext, final SQLStatement actual) {
if (actual instanceof AbstractSQLStatement) {
assertTrue(assertContext.getText("Comment should be empty."), ((AbstractSQLStatement) actual).getCommentSegments().isEmpty());
}
}
- private static void assertCommentIsCorrect(final SQLCaseAssertContext assertContext, final SQLStatement actual, final SQLParserTestCase expected) {
+ private static void assertCorrectComment(final SQLCaseAssertContext assertContext, final SQLStatement actual, final SQLParserTestCase expected) {
assertTrue(assertContext.getText("Comment should exist."), actual instanceof AbstractSQLStatement);
assertThat(assertContext.getText("Comments size assertion error: "), ((AbstractSQLStatement) actual).getCommentSegments().size(), is(expected.getComments().size()));
Iterator<CommentSegment> actualIterator = ((AbstractSQLStatement) actual).getCommentSegments().iterator();
for (final ExpectedComment each : expected.getComments()) {
- assertThat(assertContext.getText("Comments assertion error: "), actualIterator.next().getText(),
- is(each.getText()));
+ assertThat(assertContext.getText("Comments assertion error: "), actualIterator.next().getText(), is(each.getText()));
}
}
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/DALStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/DALStatementAssert.java
index 872e2511cc9..657df11454b 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/DALStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/DALStatementAssert.java
@@ -83,18 +83,18 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.InstallPluginStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.KillStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.LoadIndexInfoStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLAlterResourceGroupStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLBinlogStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLChecksumTableStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLCreateResourceGroupStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLDelimiterStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLDropResourceGroupStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLOptimizeTableStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLRepairTableStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLResetPersistStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLResetStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLSetResourceGroupStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.MySQLUseStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLAlterResourceGroupStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLBinlogStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLChecksumTableStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLCreateResourceGroupStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLDelimiterStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLDropResourceGroupStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLOptimizeTableStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLRepairTableStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLResetPersistStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLResetStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLSetResourceGroupStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql.MySQLUseStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.ResetParameterStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.RestartStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.SetParameterStatementAssert;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/CacheIndexStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/CacheIndexStatementAssert.java
index e7ca041d518..8c2156ce604 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/CacheIndexStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/CacheIndexStatementAssert.java
@@ -28,7 +28,7 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertC
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.index.IndexAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.table.TableAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.index.ExpectedCacheTableIndex;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.index.ExpectedPartitionDefinition;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.dal.CacheIndexStatementTestCase;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/LoadIndexInfoStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/LoadIndexInfoStatementAssert.java
index ceaa3f91653..0bb50045439 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/LoadIndexInfoStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/LoadIndexInfoStatementAssert.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertC
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.index.IndexAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.table.TableAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.segment.impl.index.ExpectedLoadTableIndex;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.dal.LoadIndexInfoStatementTestCase;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLAlterResourceGroupStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLAlterResourceGroupStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLAlterResourceGroupStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLAlterResourceGroupStatementAssert.java
index b563a08f515..b6c3ae43860 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLAlterResourceGroupStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLAlterResourceGroupStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLBinlogStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLBinlogStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLBinlogStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLBinlogStatementAssert.java
index 01f6432723f..5e3b925cb91 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLBinlogStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLBinlogStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLChecksumTableStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLChecksumTableStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLChecksumTableStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLChecksumTableStatementAssert.java
index b6da97a420f..dfcf34358d4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLChecksumTableStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLChecksumTableStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLCreateResourceGroupStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLCreateResourceGroupStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLCreateResourceGroupStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLCreateResourceGroupStatementAssert.java
index 84e0c3dd971..99b9c2bc3b0 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLCreateResourceGroupStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLCreateResourceGroupStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDelimiterStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDelimiterStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDelimiterStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDelimiterStatementAssert.java
index 2125d320b83..18274c67070 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDelimiterStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDelimiterStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDropResourceGroupStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDropResourceGroupStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDropResourceGroupStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDropResourceGroupStatementAssert.java
index c352a2be23e..926647a7fbd 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLDropResourceGroupStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLDropResourceGroupStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLOptimizeTableStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLOptimizeTableStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLOptimizeTableStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLOptimizeTableStatementAssert.java
index 3cdbed1f8d1..fa3ae928982 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLOptimizeTableStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLOptimizeTableStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLRepairTableStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLRepairTableStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLRepairTableStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLRepairTableStatementAssert.java
index 208055f475b..644947f9fca 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLRepairTableStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLRepairTableStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetPersistStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetPersistStatementAssert.java
index 81a959762a0..df0f7e4b12c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetPersistStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetPersistStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetStatementAssert.java
similarity index 99%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetStatementAssert.java
index e08d2e0c7d8..23878f4c324 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLResetStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLResetStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLSetResourceGroupStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLSetResourceGroupStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLSetResourceGroupStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLSetResourceGroupStatementAssert.java
index 3c6671deb3d..2d5b7b599df 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLSetResourceGroupStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLSetResourceGroupStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLUseStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLUseStatementAssert.java
similarity index 98%
rename from test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLUseStatementAssert.java
rename to test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLUseStatementAssert.java
index 0384609bb68..9b81cb65b6e 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/MySQLUseStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/dal/impl/mysql/MySQLUseStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl;
+package org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dal.impl.mysql;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CloseStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CloseStatementAssert.java
index 2123afdd765..b342bd68c59 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CloseStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CloseStatementAssert.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CloseStatement;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.ddl.CloseStatementTestCase;
import static org.hamcrest.CoreMatchers.is;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CursorStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CursorStatementAssert.java
index 8c1590fdbf9..2c5c7eb4959 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CursorStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/CursorStatementAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.ddl.
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dml.impl.SelectStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.ddl.CursorStatementTestCase;
import static org.junit.Assert.assertNotNull;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/DeclareStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/DeclareStatementAssert.java
index 6a840244b1e..669be86431d 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/DeclareStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/DeclareStatementAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DeclareStat
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.dml.impl.SelectStatementAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.ddl.DeclareStatementTestCase;
import static org.junit.Assert.assertNotNull;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/FetchStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/FetchStatementAssert.java
index 2175c5c17c3..f5a0ef7c036 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/FetchStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/FetchStatementAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.FetchStatem
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.cursor.DirectionSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.ddl.FetchStatementTestCase;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/MoveStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/MoveStatementAssert.java
index fb98d7a7b45..82a6e729ba4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/MoveStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/ddl/impl/MoveStatementAssert.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.MoveStateme
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.SQLSegmentAssert;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.cursor.DirectionSegmentAssert;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.value.IdentifierValueAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.segment.identifier.IdentifierValueAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.ddl.MoveStatementTestCase;
import static org.junit.Assert.assertFalse;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/DistSQLStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/DistSQLStatementAssert.java
index 34e73aab081..ddc74de9823 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/DistSQLStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/DistSQLStatementAssert.java
@@ -38,11 +38,11 @@ import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.stat
public final class DistSQLStatementAssert {
/**
- * Assert dist sql statement is correct with expected parser result.
+ * Assert Dist SQL statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual dist sql statement
- * @param expected expected dist sql statement test case
+ * @param actual actual Dist SQL statement
+ * @param expected expected Dist SQL statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final DistSQLStatement actual, final SQLParserTestCase expected) {
if (actual instanceof RDLStatement) {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
index 7ecc9d7d67b..ddd0ea605a9 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/asserts/statement/distsql/rul/impl/sql/FormatSQLStatementAssert.java
@@ -32,11 +32,11 @@ import static org.hamcrest.MatcherAssert.assertThat;
public final class FormatSQLStatementAssert {
/**
- * Assert format sql statement is correct with expected parser result.
+ * Assert format SQL statement is correct with expected parser result.
*
* @param assertContext assert context
- * @param actual actual format sql statement
- * @param expected expected format sql statement test case
+ * @param actual actual format SQL statement
+ * @param expected expected format SQL statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext, final FormatStatement actual, final FormatSQLStatementTestCase expected) {
if (null == expected) {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/ApplyDistSQLStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/ApplyDistSQLStatementTestCase.java
index 355d53973b3..1b1765f3539 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/ApplyDistSQLStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/ApplyDistSQLStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.sta
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.SQLParserTestCase;
/**
- * Apply dist sql statement test case.
+ * Apply Dist SQL statement test case.
*/
public final class ApplyDistSQLStatementTestCase extends SQLParserTestCase {
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/DiscardDistSQLStatementTestCase.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/DiscardDistSQLStatementTestCase.java
index 911dc46d0ec..4cd98ab49c6 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/DiscardDistSQLStatementTestCase.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/jaxb/cases/domain/statement/distsql/ral/DiscardDistSQLStatementTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.sta
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.domain.statement.SQLParserTestCase;
/**
- * Discard dist sql statement test case.
+ * Discard Dist SQL statement test case.
*/
public final class DiscardDistSQLStatementTestCase extends SQLParserTestCase {
}
diff --git a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/DistSQLParserParameterizedTest.java b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/DistSQLParserParameterizedTest.java
index 7c65812ed85..2f2512cc1b6 100644
--- a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/DistSQLParserParameterizedTest.java
+++ b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/DistSQLParserParameterizedTest.java
@@ -19,9 +19,10 @@ package org.apache.shardingsphere.test.sql.parser.internal;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.engine.api.DistSQLStatementParserEngine;
+import org.apache.shardingsphere.distsql.parser.statement.DistSQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.test.sql.parser.internal.asserts.SQLCaseAssertContext;
-import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.AbstractSQLStatementAssert;
+import org.apache.shardingsphere.test.sql.parser.internal.asserts.statement.distsql.DistSQLStatementAssert;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.CasesRegistry;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.SQLParserTestCasesRegistry;
import org.apache.shardingsphere.test.sql.parser.internal.jaxb.cases.SQLParserTestCasesRegistryFactory;
@@ -56,6 +57,8 @@ public final class DistSQLParserParameterizedTest {
SQLParserTestCase expected = SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId);
String sql = DIST_SQL_CASES_LOADER.getCaseValue(sqlCaseId, null, SQL_PARSER_TEST_CASES_REGISTRY.get(sqlCaseId).getParameters(), null);
SQLStatement actual = ENGINE.parse(sql);
- AbstractSQLStatementAssert.assertIs(new SQLCaseAssertContext(DIST_SQL_CASES_LOADER, sqlCaseId, null, null), actual, expected);
+ if (actual instanceof DistSQLStatement) {
+ DistSQLStatementAssert.assertIs(new SQLCaseAssertContext(DIST_SQL_CASES_LOADER, sqlCaseId, null, null), (DistSQLStatement) actual, expected);
+ }
}
}