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 5d5ed368020 Refactor SQLStatement (#35667)
5d5ed368020 is described below
commit 5d5ed36802088ac8cc587d6481441229d3c1adfd
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jun 11 00:16:40 2025 +0800
Refactor SQLStatement (#35667)
---
.../statement/dal/ExplainStatementBinder.java | 4 +--
.../dal/OptimizeTableStatementBinder.java | 4 +--
.../statement/dal/ShowColumnsStatementBinder.java | 4 +--
.../dal/ShowCreateTableStatementBinder.java | 4 +--
.../statement/dal/ShowIndexStatementBinder.java | 4 +--
.../statement/dcl/DenyUserStatementBinder.java | 4 +--
.../statement/ddl/AlterIndexStatementBinder.java | 4 +--
.../statement/ddl/AlterTableStatementBinder.java | 4 +--
.../statement/ddl/AlterViewStatementBinder.java | 4 +--
.../statement/ddl/CreateIndexStatementBinder.java | 4 +--
.../statement/ddl/CreateTableStatementBinder.java | 6 ++---
.../statement/ddl/CreateViewStatementBinder.java | 4 +--
.../statement/ddl/CursorStatementBinder.java | 4 +--
.../statement/ddl/DropIndexStatementBinder.java | 4 +--
.../statement/ddl/DropTableStatementBinder.java | 4 +--
.../statement/ddl/DropViewStatementBinder.java | 4 +--
.../statement/ddl/RenameTableStatementBinder.java | 4 +--
.../statement/ddl/TruncateStatementBinder.java | 4 +--
.../engine/statement/dml/CopyStatementBinder.java | 4 +--
.../statement/dml/DeleteStatementBinder.java | 4 +--
.../statement/dml/InsertStatementBinder.java | 4 +--
.../statement/dml/LoadDataStatementBinder.java | 4 +--
.../statement/dml/LoadXMLStatementBinder.java | 4 +--
.../statement/dml/SelectStatementBinder.java | 4 +--
.../statement/dml/UpdateStatementBinder.java | 4 +--
.../statement/SQLStatementContextFactoryTest.java | 4 +--
.../type/dml/InsertStatementContextTest.java | 2 +-
.../type/ClickHouseDMLStatementVisitor.java | 8 +++---
.../visitor/statement/DorisStatementVisitor.java | 14 +++++-----
.../statement/type/DorisDALStatementVisitor.java | 26 +++++++++----------
.../type/FirebirdDMLStatementVisitor.java | 8 +++---
.../statement/type/HiveDMLStatementVisitor.java | 10 ++++----
.../visitor/statement/MySQLStatementVisitor.java | 14 +++++-----
.../statement/type/MySQLDALStatementVisitor.java | 26 +++++++++----------
.../statement/OpenGaussStatementVisitor.java | 8 +++---
.../statement/type/OracleDALStatementVisitor.java | 2 +-
.../statement/type/OracleDDLStatementVisitor.java | 2 +-
.../statement/type/OracleDMLStatementVisitor.java | 30 +++++++++++-----------
.../statement/PostgreSQLStatementVisitor.java | 8 +++---
.../statement/type/PrestoDMLStatementVisitor.java | 10 ++++----
.../statement/type/SQL92DMLStatementVisitor.java | 8 +++---
.../statement/SQLServerStatementVisitor.java | 8 +++---
.../sql/parser/api/SQLStatementVisitorEngine.java | 2 +-
.../core/statement/AbstractSQLStatement.java | 10 ++++----
.../statement/core/statement/SQLStatement.java | 10 ++++----
.../prepare/MySQLComStmtPrepareExecutor.java | 2 +-
...ySQLComStmtPrepareParameterMarkerExtractor.java | 2 +-
.../describe/PostgreSQLComDescribeExecutor.java | 2 +-
.../extended/parse/PostgreSQLComParseExecutor.java | 4 +--
.../PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
.../asserts/statement/comment/CommentAssert.java | 6 ++---
51 files changed, 165 insertions(+), 165 deletions(-)
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
index 9465f7deaba..0de3331fe9a 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ExplainStatementBinder.java
@@ -54,8 +54,8 @@ public final class ExplainStatementBinder implements
SQLStatementBinder<ExplainS
@SneakyThrows(ReflectiveOperationException.class)
private ExplainStatement copy(final ExplainStatement sqlStatement) {
ExplainStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
sqlStatement.getSimpleTable().ifPresent(result::setSimpleTable);
sqlStatement.getColumnWild().ifPresent(result::setColumnWild);
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/OptimizeTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/OptimizeTableStatementBinder.java
index 190b62c08e2..038c88dbfc4 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/OptimizeTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/OptimizeTableStatementBinder.java
@@ -43,8 +43,8 @@ public final class OptimizeTableStatementBinder implements
SQLStatementBinder<Op
private OptimizeTableStatement copy(final OptimizeTableStatement
sqlStatement) {
OptimizeTableStatement result = new OptimizeTableStatement(new
LinkedList<>());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowColumnsStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowColumnsStatementBinder.java
index 825b17b50a6..e8a72773174 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowColumnsStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowColumnsStatementBinder.java
@@ -47,8 +47,8 @@ public final class ShowColumnsStatementBinder implements
SQLStatementBinder<Show
private ShowColumnsStatement copy(final ShowColumnsStatement sqlStatement,
final SimpleTableSegment table, final ShowFilterSegment filter) {
ShowColumnsStatement result = new ShowColumnsStatement(table,
sqlStatement.getFromDatabase().orElse(null), filter);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowCreateTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowCreateTableStatementBinder.java
index e256928d7e0..bda67420b93 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowCreateTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowCreateTableStatementBinder.java
@@ -40,8 +40,8 @@ public final class ShowCreateTableStatementBinder implements
SQLStatementBinder<
private ShowCreateTableStatement copy(final ShowCreateTableStatement
sqlStatement, final SimpleTableSegment table) {
ShowCreateTableStatement result = new ShowCreateTableStatement(table);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowIndexStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowIndexStatementBinder.java
index dd805fb6414..c4522bac746 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowIndexStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dal/ShowIndexStatementBinder.java
@@ -40,8 +40,8 @@ public final class ShowIndexStatementBinder implements
SQLStatementBinder<ShowIn
private ShowIndexStatement copy(final ShowIndexStatement sqlStatement,
final SimpleTableSegment table) {
ShowIndexStatement result = new ShowIndexStatement(table,
sqlStatement.getFromDatabase().orElse(null));
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dcl/DenyUserStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dcl/DenyUserStatementBinder.java
index e552adac7c0..37771173994 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dcl/DenyUserStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dcl/DenyUserStatementBinder.java
@@ -46,8 +46,8 @@ public final class DenyUserStatementBinder implements
SQLStatementBinder<DenyUse
private static DenyUserStatement copy(final DenyUserStatement
sqlStatement) {
DenyUserStatement result = new DenyUserStatement();
result.setTable(sqlStatement.getTable());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterIndexStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterIndexStatementBinder.java
index 55533ab06ed..d7d5c440571 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterIndexStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterIndexStatementBinder.java
@@ -48,8 +48,8 @@ public final class AlterIndexStatementBinder implements
SQLStatementBinder<Alter
AlterIndexStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
sqlStatement.getIndex().ifPresent(result::setIndex);
sqlStatement.getSimpleTable().ifPresent(result::setSimpleTable);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterTableStatementBinder.java
index 1373f80147f..6759a027470 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterTableStatementBinder.java
@@ -58,8 +58,8 @@ public final class AlterTableStatementBinder implements
SQLStatementBinder<Alter
result.getRenameColumnDefinitions().addAll(sqlStatement.getRenameColumnDefinitions());
result.getRenameIndexDefinitions().addAll(sqlStatement.getRenameIndexDefinitions());
sqlStatement.getModifyCollectionRetrieval().ifPresent(result::setModifyCollectionRetrieval);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterViewStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterViewStatementBinder.java
index ba455bf0204..0fae4aeec32 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterViewStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/AlterViewStatementBinder.java
@@ -48,8 +48,8 @@ public final class AlterViewStatementBinder implements
SQLStatementBinder<AlterV
AlterViewStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
sqlStatement.getViewDefinition().ifPresent(result::setViewDefinition);
sqlStatement.getConstraintDefinition().ifPresent(result::setConstraintDefinition);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
index 33dd8e4ee1e..d164373b4d5 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
@@ -52,8 +52,8 @@ public final class CreateIndexStatementBinder implements
SQLStatementBinder<Crea
result.setIfNotExists(sqlStatement.isIfNotExists());
sqlStatement.getAlgorithmType().ifPresent(result::setAlgorithmType);
sqlStatement.getLockTable().ifPresent(result::setLockTable);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateTableStatementBinder.java
index 2310493a943..d03f909b002 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateTableStatementBinder.java
@@ -48,13 +48,13 @@ public final class CreateTableStatementBinder implements
SQLStatementBinder<Crea
private static CreateTableStatement copy(final CreateTableStatement
sqlStatement) {
CreateTableStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
result.getConstraintDefinitions().addAll(sqlStatement.getConstraintDefinitions());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
result.setIfNotExists(sqlStatement.isIfNotExists());
result.getColumns().addAll(sqlStatement.getColumns());
sqlStatement.getLikeTable().ifPresent(result::setLikeTable);
sqlStatement.getCreateTableOption().ifPresent(result::setCreateTableOption);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
index 0526097d9f1..8a50415b50b 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateViewStatementBinder.java
@@ -47,8 +47,8 @@ public final class CreateViewStatementBinder implements
SQLStatementBinder<Creat
private static CreateViewStatement copy(final CreateViewStatement
sqlStatement) {
CreateViewStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
result.setViewDefinition(sqlStatement.getViewDefinition());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CursorStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CursorStatementBinder.java
index 2b551e57251..92262299705 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CursorStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CursorStatementBinder.java
@@ -35,8 +35,8 @@ public final class CursorStatementBinder implements
SQLStatementBinder<CursorSta
private static CursorStatement copy(final CursorStatement sqlStatement,
final SelectStatement boundSelectStatement) {
CursorStatement result = new
CursorStatement(sqlStatement.getCursorName(), boundSelectStatement);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropIndexStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropIndexStatementBinder.java
index 56b7ec3b139..e9c259eb0af 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropIndexStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropIndexStatementBinder.java
@@ -51,8 +51,8 @@ public final class DropIndexStatementBinder implements
SQLStatementBinder<DropIn
sqlStatement.getAlgorithmType().ifPresent(result::setAlgorithmType);
sqlStatement.getLockTable().ifPresent(result::setLockTable);
result.setIfExists(sqlStatement.isIfExists());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropTableStatementBinder.java
index 9d463ebc2d0..8495ec8fbe1 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropTableStatementBinder.java
@@ -45,8 +45,8 @@ public final class DropTableStatementBinder implements
SQLStatementBinder<DropTa
DropTableStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
result.setIfExists(sqlStatement.isIfExists());
result.setContainsCascade(sqlStatement.isContainsCascade());
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropViewStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropViewStatementBinder.java
index 1e9d2e57906..d492df330dd 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropViewStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/DropViewStatementBinder.java
@@ -43,8 +43,8 @@ public final class DropViewStatementBinder implements
SQLStatementBinder<DropVie
@SneakyThrows(ReflectiveOperationException.class)
private static DropViewStatement copy(final DropViewStatement
sqlStatement) {
DropViewStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/RenameTableStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/RenameTableStatementBinder.java
index 05a5b670fc6..ae79fc696a9 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/RenameTableStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/RenameTableStatementBinder.java
@@ -45,8 +45,8 @@ public final class RenameTableStatementBinder implements
SQLStatementBinder<Rena
private static RenameTableStatement copy(final RenameTableStatement
sqlStatement, final Collection<RenameTableDefinitionSegment> boundRenameTables)
{
RenameTableStatement result = new
RenameTableStatement(boundRenameTables);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/TruncateStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/TruncateStatementBinder.java
index f9a9969f71c..2a937295cb4 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/TruncateStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/TruncateStatementBinder.java
@@ -43,8 +43,8 @@ public final class TruncateStatementBinder implements
SQLStatementBinder<Truncat
@SneakyThrows(ReflectiveOperationException.class)
private static TruncateStatement copy(final TruncateStatement
sqlStatement) {
TruncateStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/CopyStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/CopyStatementBinder.java
index 3d7f6c11941..1cedff83ddc 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/CopyStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/CopyStatementBinder.java
@@ -54,8 +54,8 @@ public final class CopyStatementBinder implements
SQLStatementBinder<CopyStateme
private CopyStatement copy(final CopyStatement sqlStatement,
final SimpleTableSegment boundTable, final
Collection<ColumnSegment> boundColumns, final PrepareStatementQuerySegment
boundPrepareStatementQuery) {
CopyStatement result = new CopyStatement(boundTable, boundColumns,
boundPrepareStatementQuery);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinder.java
index b0a16a9254f..9303a106cea 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinder.java
@@ -52,8 +52,8 @@ public final class DeleteStatementBinder implements
SQLStatementBinder<DeleteSta
DeleteStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
sqlStatement.getLimit().ifPresent(result::setLimit);
sqlStatement.getOutputSegment().ifPresent(result::setOutputSegment);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinder.java
index 85754503cdb..6c56a7c13fa 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinder.java
@@ -69,8 +69,8 @@ public final class InsertStatementBinder implements
SQLStatementBinder<InsertSta
sqlStatement.getMultiTableInsertIntoSegment().ifPresent(result::setMultiTableInsertIntoSegment);
sqlStatement.getMultiTableConditionalIntoSegment().ifPresent(result::setMultiTableConditionalIntoSegment);
sqlStatement.getReturningSegment().ifPresent(result::setReturningSegment);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadDataStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadDataStatementBinder.java
index aaac5207bfa..8de45116f17 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadDataStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadDataStatementBinder.java
@@ -40,8 +40,8 @@ public final class LoadDataStatementBinder implements
SQLStatementBinder<LoadDat
private LoadDataStatement copy(final LoadDataStatement sqlStatement, final
SimpleTableSegment boundTableSegment) {
LoadDataStatement result = new LoadDataStatement(boundTableSegment);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadXMLStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadXMLStatementBinder.java
index 73a3a7cf80e..6837a2ec081 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadXMLStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/LoadXMLStatementBinder.java
@@ -40,8 +40,8 @@ public final class LoadXMLStatementBinder implements
SQLStatementBinder<LoadXMLS
private LoadXMLStatement copy(final LoadXMLStatement sqlStatement, final
SimpleTableSegment boundTableSegment) {
LoadXMLStatement result = new LoadXMLStatement(boundTableSegment);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinder.java
index c98087a7436..037aad8fe0a 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinder.java
@@ -93,8 +93,8 @@ public final class SelectStatementBinder implements
SQLStatementBinder<SelectSta
sqlStatement.getWindow().ifPresent(result::setWindow);
sqlStatement.getModelSegment().ifPresent(result::setModelSegment);
sqlStatement.getSubqueryType().ifPresent(result::setSubqueryType);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinder.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinder.java
index 0b76b619a93..a86f343fa90 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinder.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinder.java
@@ -54,8 +54,8 @@ public final class UpdateStatementBinder implements
SQLStatementBinder<UpdateSta
private UpdateStatement copy(final UpdateStatement sqlStatement) {
UpdateStatement result =
sqlStatement.getClass().getDeclaredConstructor().newInstance();
sqlStatement.getLimit().ifPresent(result::setLimit);
-
result.addParameterMarkerSegments(sqlStatement.getParameterMarkerSegments());
- result.getCommentSegments().addAll(sqlStatement.getCommentSegments());
+ result.addParameterMarkers(sqlStatement.getParameterMarkers());
+ result.getComments().addAll(sqlStatement.getComments());
result.getVariableNames().addAll(sqlStatement.getVariableNames());
return result;
}
diff --git
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
index e0c5c9aa2a8..4a2a1ff9fb1 100644
---
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
+++
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactoryTest.java
@@ -89,9 +89,9 @@ class SQLStatementContextFactoryTest {
SelectStatement selectStatement = mock(SelectStatement.class,
RETURNS_DEEP_STUBS);
when(selectStatement.getProjections().isDistinctRow()).thenReturn(false);
when(selectStatement.getProjections().getProjections()).thenReturn(Collections.emptyList());
-
when(selectStatement.getCommentSegments()).thenReturn(Collections.emptyList());
+
when(selectStatement.getComments()).thenReturn(Collections.emptyList());
when(cursorStatement.getSelect()).thenReturn(selectStatement);
-
when(cursorStatement.getCommentSegments()).thenReturn(Collections.emptyList());
+
when(cursorStatement.getComments()).thenReturn(Collections.emptyList());
SQLStatementContext actual = new SQLBindEngine(mockMetaData(),
"foo_db", new HintValueContext()).bind(databaseType, cursorStatement,
Collections.emptyList());
assertThat(actual, instanceOf(CursorStatementContext.class));
}
diff --git
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/type/dml/InsertStatementContextTest.java
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/type/dml/InsertStatementContextTest.java
index ee52e119eb0..e34319709dd 100644
---
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/type/dml/InsertStatementContextTest.java
+++
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/type/dml/InsertStatementContextTest.java
@@ -132,7 +132,7 @@ class InsertStatementContextTest {
void assertInsertSelect() {
InsertStatement insertStatement = new InsertStatement();
SelectStatement selectStatement = new SelectStatement();
- selectStatement.addParameterMarkerSegments(Collections.singleton(new
ParameterMarkerExpressionSegment(0, 0, 0, ParameterMarkerType.QUESTION)));
+ selectStatement.addParameterMarkers(Collections.singleton(new
ParameterMarkerExpressionSegment(0, 0, 0, ParameterMarkerType.QUESTION)));
selectStatement.setProjections(new ProjectionsSegment(0, 0));
SubquerySegment insertSelect = new SubquerySegment(0, 0,
selectStatement, "");
insertStatement.setInsertSelect(insertSelect);
diff --git
a/parser/sql/dialect/clickhouse/src/main/java/org/apache/shardingsphere/sql/parser/clickhouse/visitor/statement/type/ClickHouseDMLStatementVisitor.java
b/parser/sql/dialect/clickhouse/src/main/java/org/apache/shardingsphere/sql/parser/clickhouse/visitor/statement/type/ClickHouseDMLStatementVisitor.java
index 6d676cf34a3..4049b17aafe 100644
---
a/parser/sql/dialect/clickhouse/src/main/java/org/apache/shardingsphere/sql/parser/clickhouse/visitor/statement/type/ClickHouseDMLStatementVisitor.java
+++
b/parser/sql/dialect/clickhouse/src/main/java/org/apache/shardingsphere/sql/parser/clickhouse/visitor/statement/type/ClickHouseDMLStatementVisitor.java
@@ -83,7 +83,7 @@ public final class ClickHouseDMLStatementVisitor extends
ClickHouseStatementVisi
public ASTNode visitInsert(final InsertContext ctx) {
InsertStatement result = (InsertStatement)
visit(ctx.insertValuesClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -118,7 +118,7 @@ public final class ClickHouseDMLStatementVisitor extends
ClickHouseStatementVisi
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -167,7 +167,7 @@ public final class ClickHouseDMLStatementVisitor extends
ClickHouseStatementVisi
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -184,7 +184,7 @@ public final class ClickHouseDMLStatementVisitor extends
ClickHouseStatementVisi
public ASTNode visitSelect(final ClickHouseStatementParser.SelectContext
ctx) {
// TODO :Unsupported for withClause.
SelectStatement result = (SelectStatement) visit(ctx.combineClause());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
index fe190e43519..123bd51e60d 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/DorisStatementVisitor.java
@@ -692,7 +692,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
if (null != ctx.lockClauseList()) {
result.setLock((LockSegment) visit(ctx.lockClauseList()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1442,7 +1442,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.onDuplicateKeyClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1464,7 +1464,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
private SubquerySegment createInsertSelectSegment(final
InsertSelectClauseContext ctx) {
SelectStatement selectStatement = (SelectStatement)
visit(ctx.select());
-
selectStatement.addParameterMarkerSegments(getParameterMarkerSegments());
+ selectStatement.addParameterMarkers(getParameterMarkerSegments());
return new SubquerySegment(ctx.select().start.getStartIndex(),
ctx.select().stop.getStopIndex(), selectStatement,
getOriginalText(ctx.select()));
}
@@ -1514,7 +1514,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setAssignmentsClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1578,7 +1578,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1645,7 +1645,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1688,7 +1688,7 @@ public abstract class DorisStatementVisitor extends
DorisStatementBaseVisitor<AS
} else {
result = (SelectStatement) visit(ctx.getChild(0));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
index 979a64c1fbe..5cda4b88ae3 100644
---
a/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
+++
b/parser/sql/dialect/doris/src/main/java/org/apache/shardingsphere/sql/parser/doris/visitor/statement/type/DorisDALStatementVisitor.java
@@ -253,7 +253,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowStatus(final ShowStatusContext ctx) {
MySQLShowStatusStatement result = new MySQLShowStatusStatement(null ==
ctx.showFilter() ? null : (ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -547,7 +547,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowDatabases(final ShowDatabasesContext ctx) {
ShowDatabasesStatement result = new ShowDatabasesStatement(null ==
ctx.showFilter() ? null : (ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -555,7 +555,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowEvents(final ShowEventsContext ctx) {
MySQLShowEventsStatement result = new MySQLShowEventsStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -563,7 +563,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowTables(final ShowTablesContext ctx) {
ShowTablesStatement result = new ShowTablesStatement(null ==
ctx.fromDatabase() ? null : (FromDatabaseSegment) visit(ctx.fromDatabase()),
null == ctx.showFilter() ? null : (ShowFilterSegment)
visit(ctx.showFilter()), null != ctx.FULL());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -571,7 +571,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowTriggers(final ShowTriggersContext ctx) {
MySQLShowTriggersStatement result = new MySQLShowTriggersStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -584,7 +584,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowTableStatus(final ShowTableStatusContext ctx) {
ShowTableStatusStatement result = new ShowTableStatusStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -592,7 +592,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowColumns(final ShowColumnsContext ctx) {
ShowColumnsStatement result = new ShowColumnsStatement(null ==
ctx.fromTable() ? null : ((FromTableSegment) visit(ctx.fromTable())).getTable(),
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -680,35 +680,35 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
@Override
public ASTNode visitShowVariables(final ShowVariablesContext ctx) {
MySQLShowVariablesStatement result = new
MySQLShowVariablesStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowCharacterSet(final ShowCharacterSetContext ctx) {
MySQLShowCharacterSetStatement result = new
MySQLShowCharacterSetStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowCollation(final ShowCollationContext ctx) {
MySQLShowCollationStatement result = new
MySQLShowCollationStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowFunctionStatus(final ShowFunctionStatusContext
ctx) {
MySQLShowFunctionStatusStatement result = new
MySQLShowFunctionStatusStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowProcedureStatus(final ShowProcedureStatusContext
ctx) {
MySQLShowProcedureStatusStatement result = new
MySQLShowProcedureStatusStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -716,7 +716,7 @@ public final class DorisDALStatementVisitor extends
DorisStatementVisitor implem
public ASTNode visitShowOpenTables(final ShowOpenTablesContext ctx) {
MySQLShowOpenTablesStatement result = new MySQLShowOpenTablesStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/firebird/src/main/java/org/apache/shardingsphere/sql/parser/firebird/visitor/statement/type/FirebirdDMLStatementVisitor.java
b/parser/sql/dialect/firebird/src/main/java/org/apache/shardingsphere/sql/parser/firebird/visitor/statement/type/FirebirdDMLStatementVisitor.java
index ebe7396d6c5..d9ff6d04ee0 100644
---
a/parser/sql/dialect/firebird/src/main/java/org/apache/shardingsphere/sql/parser/firebird/visitor/statement/type/FirebirdDMLStatementVisitor.java
+++
b/parser/sql/dialect/firebird/src/main/java/org/apache/shardingsphere/sql/parser/firebird/visitor/statement/type/FirebirdDMLStatementVisitor.java
@@ -111,7 +111,7 @@ public final class FirebirdDMLStatementVisitor extends
FirebirdStatementVisitor
public ASTNode visitInsert(final InsertContext ctx) {
InsertStatement result = (InsertStatement)
visit(ctx.insertValuesClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -154,7 +154,7 @@ public final class FirebirdDMLStatementVisitor extends
FirebirdStatementVisitor
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -206,7 +206,7 @@ public final class FirebirdDMLStatementVisitor extends
FirebirdStatementVisitor
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -226,7 +226,7 @@ public final class FirebirdDMLStatementVisitor extends
FirebirdStatementVisitor
public ASTNode visitSelect(final SelectContext ctx) {
// TODO :Unsupported for withClause.
SelectStatement result = (SelectStatement) visit(ctx.combineClause());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/hive/src/main/java/org/apache/shardingsphere/sql/parser/hive/visitor/statement/type/HiveDMLStatementVisitor.java
b/parser/sql/dialect/hive/src/main/java/org/apache/shardingsphere/sql/parser/hive/visitor/statement/type/HiveDMLStatementVisitor.java
index 63cedd1b3bc..368eb763d10 100644
---
a/parser/sql/dialect/hive/src/main/java/org/apache/shardingsphere/sql/parser/hive/visitor/statement/type/HiveDMLStatementVisitor.java
+++
b/parser/sql/dialect/hive/src/main/java/org/apache/shardingsphere/sql/parser/hive/visitor/statement/type/HiveDMLStatementVisitor.java
@@ -214,7 +214,7 @@ public final class HiveDMLStatementVisitor extends
HiveStatementVisitor implemen
if (null != ctx.lockClauseList()) {
result.setLock((LockSegment) visit(ctx.lockClauseList()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -862,7 +862,7 @@ public final class HiveDMLStatementVisitor extends
HiveStatementVisitor implemen
result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.onDuplicateKeyClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -943,7 +943,7 @@ public final class HiveDMLStatementVisitor extends
HiveStatementVisitor implemen
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1006,7 +1006,7 @@ public final class HiveDMLStatementVisitor extends
HiveStatementVisitor implemen
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1050,7 +1050,7 @@ public final class HiveDMLStatementVisitor extends
HiveStatementVisitor implemen
} else {
result = (SelectStatement) visit(ctx.getChild(0));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
index 08d98758506..bac6c709dfe 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/MySQLStatementVisitor.java
@@ -700,7 +700,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
if (null != ctx.lockClauseList()) {
result.setLock((LockSegment) visit(ctx.lockClauseList()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1456,7 +1456,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.onDuplicateKeyClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -1481,7 +1481,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
private SubquerySegment createInsertSelectSegment(final
InsertSelectClauseContext ctx) {
SelectStatement selectStatement = (SelectStatement)
visit(ctx.select());
-
selectStatement.addParameterMarkerSegments(getParameterMarkerSegments());
+ selectStatement.addParameterMarkers(getParameterMarkerSegments());
return new SubquerySegment(ctx.select().start.getStartIndex(),
ctx.select().stop.getStopIndex(), selectStatement,
getOriginalText(ctx.select()));
}
@@ -1531,7 +1531,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
result.setSetAssignment((SetAssignmentSegment)
visit(ctx.setAssignmentsClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -1601,7 +1601,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
if (null != ctx.withClause()) {
result.setWithSegment((WithSegment) visit(ctx.withClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1663,7 +1663,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
@@ -1712,7 +1712,7 @@ public abstract class MySQLStatementVisitor extends
MySQLStatementBaseVisitor<AS
} else {
result = (SelectStatement) visit(ctx.getChild(0));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
index 21ea884295c..2b923a4827e 100644
---
a/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
+++
b/parser/sql/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/type/MySQLDALStatementVisitor.java
@@ -253,7 +253,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowStatus(final ShowStatusContext ctx) {
MySQLShowStatusStatement result = new MySQLShowStatusStatement(null ==
ctx.showFilter() ? null : (ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -560,7 +560,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowDatabases(final ShowDatabasesContext ctx) {
ShowDatabasesStatement result = new ShowDatabasesStatement(null ==
ctx.showFilter() ? null : (ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -568,7 +568,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowEvents(final ShowEventsContext ctx) {
MySQLShowEventsStatement result = new MySQLShowEventsStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -576,7 +576,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowTables(final ShowTablesContext ctx) {
ShowTablesStatement result = new ShowTablesStatement(null ==
ctx.fromDatabase() ? null : (FromDatabaseSegment) visit(ctx.fromDatabase()),
null == ctx.showFilter() ? null : (ShowFilterSegment)
visit(ctx.showFilter()), null != ctx.FULL());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -584,7 +584,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowTriggers(final ShowTriggersContext ctx) {
MySQLShowTriggersStatement result = new MySQLShowTriggersStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -597,7 +597,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowTableStatus(final ShowTableStatusContext ctx) {
ShowTableStatusStatement result = new ShowTableStatusStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -605,7 +605,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowColumns(final ShowColumnsContext ctx) {
ShowColumnsStatement result = new ShowColumnsStatement(null ==
ctx.fromTable() ? null : ((FromTableSegment) visit(ctx.fromTable())).getTable(),
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -693,35 +693,35 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
@Override
public ASTNode visitShowVariables(final ShowVariablesContext ctx) {
MySQLShowVariablesStatement result = new
MySQLShowVariablesStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowCharacterSet(final ShowCharacterSetContext ctx) {
MySQLShowCharacterSetStatement result = new
MySQLShowCharacterSetStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowCollation(final ShowCollationContext ctx) {
MySQLShowCollationStatement result = new
MySQLShowCollationStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowFunctionStatus(final ShowFunctionStatusContext
ctx) {
MySQLShowFunctionStatusStatement result = new
MySQLShowFunctionStatusStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitShowProcedureStatus(final ShowProcedureStatusContext
ctx) {
MySQLShowProcedureStatusStatement result = new
MySQLShowProcedureStatusStatement(null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -729,7 +729,7 @@ public final class MySQLDALStatementVisitor extends
MySQLStatementVisitor implem
public ASTNode visitShowOpenTables(final ShowOpenTablesContext ctx) {
MySQLShowOpenTablesStatement result = new MySQLShowOpenTablesStatement(
null == ctx.fromDatabase() ? null : (FromDatabaseSegment)
visit(ctx.fromDatabase()), null == ctx.showFilter() ? null :
(ShowFilterSegment) visit(ctx.showFilter()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
index 5f98b48ddc0..15cb552308b 100644
---
a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
+++
b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/OpenGaussStatementVisitor.java
@@ -705,7 +705,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -899,7 +899,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
if (null != ctx.fromClause()) {
result.setFrom((TableSegment) visit(ctx.fromClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -917,7 +917,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -930,7 +930,7 @@ public abstract class OpenGaussStatementVisitor extends
OpenGaussStatementBaseVi
public ASTNode visitSelect(final SelectContext ctx) {
// TODO :Unsupported for withClause.
SelectStatement result = (SelectStatement) visit(ctx.selectNoParens());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementVisitor.java
index 161105fbbaf..0fa39ed4efb 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDALStatementVisitor.java
@@ -56,7 +56,7 @@ public final class OracleDALStatementVisitor extends
OracleStatementVisitor impl
} else if (null != ctx.select()) {
result.setSqlStatement((SQLStatement) visitor.visit(ctx.select()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
return result;
}
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
index 97027d237f6..c20a97347cb 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -378,7 +378,7 @@ public final class OracleDDLStatementVisitor extends
OracleStatementVisitor impl
result.setView((SimpleTableSegment) visit(ctx.viewName()));
result.setSelect((SelectStatement) visitor.visit(ctx.select()));
result.setViewDefinition(getOriginalText(ctx.select()));
- result.addParameterMarkerSegments(getGlobalParameterMarkerSegments());
+ result.addParameterMarkers(getGlobalParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
index bca9d68771c..6571a3bbbd8 100644
---
a/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
+++
b/parser/sql/dialect/oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDMLStatementVisitor.java
@@ -210,7 +210,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
return result;
}
@@ -303,7 +303,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
public ASTNode visitInsert(final InsertContext ctx) {
// TODO :FIXME, since there is no segment for insertValuesClause,
insertStatement is created by sub rule.
InsertStatement result = (InsertStatement) (null ==
ctx.insertSingleTable() ? visit(ctx.insertMultiTable()) :
visit(ctx.insertSingleTable()));
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
return result;
}
@@ -362,7 +362,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
private void addParameterMarkerSegments(final
Collection<ParameterMarkerSegment> addedSegments, final InsertStatement
insertStatement) {
for (ParameterMarkerSegment parameterMarkerSegment :
popAllStatementParameterMarkerSegments()) {
if (addedSegments.add(parameterMarkerSegment)) {
-
insertStatement.addParameterMarkerSegments(Collections.singletonList(parameterMarkerSegment));
+
insertStatement.addParameterMarkers(Collections.singletonList(parameterMarkerSegment));
}
}
}
@@ -405,7 +405,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
return result;
}
@@ -444,7 +444,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
result.setOrderBy((OrderBySegment) visit(ctx.orderByClause()));
}
// TODO Visit rowLimitingClause
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
return result;
}
@@ -455,14 +455,14 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.insertValuesClause()) {
result.getValues().addAll(createInsertValuesSegments(ctx.insertValuesClause().assignmentValues()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
return result;
}
@Override
public ASTNode visitSelect(final SelectContext ctx) {
SelectStatement result = (SelectStatement) visit(ctx.selectSubquery());
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
if (null != ctx.forUpdateClause()) {
result.setLock((LockSegment) visit(ctx.forUpdateClause()));
@@ -594,7 +594,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.orderByClause()) {
result.setOrderBy((OrderBySegment) visit(ctx.orderByClause()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
result.getVariableNames().addAll(getVariableNames());
return result;
}
@@ -613,8 +613,8 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
SelectStatement right = (SelectStatement) visit(ctx.selectSubquery(1));
result.setCombine(new CombineSegment(ctx.getStart().getStartIndex(),
ctx.getStop().getStopIndex(), createSubquerySegment(ctx.selectSubquery(0),
left), combineType,
createSubquerySegment(ctx.selectSubquery(1), right)));
- result.addParameterMarkerSegments(left.getParameterMarkerSegments());
- result.addParameterMarkerSegments(right.getParameterMarkerSegments());
+ result.addParameterMarkers(left.getParameterMarkers());
+ result.addParameterMarkers(right.getParameterMarkers());
}
private SubquerySegment createSubquerySegment(final SelectSubqueryContext
ctx, final SelectStatement selectStatement) {
@@ -1305,7 +1305,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.mergeUpdateClause() && null != ctx.mergeInsertClause()
&& ctx.mergeUpdateClause().start.getStartIndex() >
ctx.mergeInsertClause().start.getStartIndex()) {
result.setInsert((InsertStatement)
visitMergeInsertClause(ctx.mergeInsertClause()));
result.setUpdate((UpdateStatement)
visitMergeUpdateClause(ctx.mergeUpdateClause()));
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
return result;
}
if (null != ctx.mergeUpdateClause()) {
@@ -1314,7 +1314,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.mergeInsertClause()) {
result.setInsert((InsertStatement)
visitMergeInsertClause(ctx.mergeInsertClause()));
}
- result.addParameterMarkerSegments(ctx.getParent() instanceof
ExecuteContext ? getGlobalParameterMarkerSegments() :
popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(ctx.getParent() instanceof ExecuteContext ?
getGlobalParameterMarkerSegments() : popAllStatementParameterMarkerSegments());
return result;
}
@@ -1331,7 +1331,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
-
result.addParameterMarkerSegments(popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(popAllStatementParameterMarkerSegments());
return result;
}
@@ -1400,7 +1400,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
}
SelectStatement subquery = (SelectStatement) visit(ctx.subquery());
SubquerySegment subquerySegment = new
SubquerySegment(ctx.subquery().start.getStartIndex(),
ctx.subquery().stop.getStopIndex(), subquery, getOriginalText(ctx.subquery()));
-
subquerySegment.getSelect().addParameterMarkerSegments(popAllStatementParameterMarkerSegments());
+
subquerySegment.getSelect().addParameterMarkers(popAllStatementParameterMarkerSegments());
SubqueryTableSegment result = new
SubqueryTableSegment(ctx.subquery().start.getStartIndex(),
ctx.subquery().stop.getStopIndex(), subquerySegment);
if (null != ctx.alias()) {
result.setAlias((AliasSegment) visit(ctx.alias()));
@@ -1418,7 +1418,7 @@ public final class OracleDMLStatementVisitor extends
OracleStatementVisitor impl
if (null != ctx.deleteWhereClause()) {
result.setDeleteWhere((WhereSegment)
visit(ctx.deleteWhereClause()));
}
-
result.addParameterMarkerSegments(popAllStatementParameterMarkerSegments());
+ result.addParameterMarkers(popAllStatementParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
index e7b79f3f67c..849716a6127 100644
---
a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
+++
b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/PostgreSQLStatementVisitor.java
@@ -702,7 +702,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
if (null != ctx.returningClause()) {
result.setReturningSegment((ReturningSegment)
visit(ctx.returningClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -868,7 +868,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
if (null != ctx.fromClause()) {
result.setFrom((TableSegment) visit(ctx.fromClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -886,7 +886,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
if (null != ctx.whereOrCurrentClause()) {
result.setWhere((WhereSegment) visit(ctx.whereOrCurrentClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -899,7 +899,7 @@ public abstract class PostgreSQLStatementVisitor extends
PostgreSQLStatementPars
public ASTNode visitSelect(final SelectContext ctx) {
// TODO :Unsupported for withClause.
SelectStatement result = (SelectStatement) visit(ctx.selectNoParens());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/presto/src/main/java/org/apache/shardingsphere/sql/parser/presto/visitor/statement/type/PrestoDMLStatementVisitor.java
b/parser/sql/dialect/presto/src/main/java/org/apache/shardingsphere/sql/parser/presto/visitor/statement/type/PrestoDMLStatementVisitor.java
index 8b6341d8ed6..ec7389d996e 100644
---
a/parser/sql/dialect/presto/src/main/java/org/apache/shardingsphere/sql/parser/presto/visitor/statement/type/PrestoDMLStatementVisitor.java
+++
b/parser/sql/dialect/presto/src/main/java/org/apache/shardingsphere/sql/parser/presto/visitor/statement/type/PrestoDMLStatementVisitor.java
@@ -210,7 +210,7 @@ public final class PrestoDMLStatementVisitor extends
PrestoStatementVisitor impl
if (null != ctx.lockClauseList()) {
result.setLock((LockSegment) visit(ctx.lockClauseList()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -821,7 +821,7 @@ public final class PrestoDMLStatementVisitor extends
PrestoStatementVisitor impl
result.setOnDuplicateKeyColumns((OnDuplicateKeyColumnsSegment)
visit(ctx.onDuplicateKeyClause()));
}
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -902,7 +902,7 @@ public final class PrestoDMLStatementVisitor extends
PrestoStatementVisitor impl
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -969,7 +969,7 @@ public final class PrestoDMLStatementVisitor extends
PrestoStatementVisitor impl
if (null != ctx.limitClause()) {
result.setLimit((LimitSegment) visit(ctx.limitClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1013,7 +1013,7 @@ public final class PrestoDMLStatementVisitor extends
PrestoStatementVisitor impl
} else {
result = (SelectStatement) visit(ctx.getChild(0));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
index 105f9c197a5..7efcbcf079c 100644
---
a/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
+++
b/parser/sql/dialect/sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/statement/type/SQL92DMLStatementVisitor.java
@@ -107,7 +107,7 @@ public final class SQL92DMLStatementVisitor extends
SQL92StatementVisitor implem
public ASTNode visitInsert(final InsertContext ctx) {
InsertStatement result = (InsertStatement)
visit(ctx.insertValuesClause());
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -142,7 +142,7 @@ public final class SQL92DMLStatementVisitor extends
SQL92StatementVisitor implem
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -191,7 +191,7 @@ public final class SQL92DMLStatementVisitor extends
SQL92StatementVisitor implem
if (null != ctx.whereClause()) {
result.setWhere((WhereSegment) visit(ctx.whereClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -208,7 +208,7 @@ public final class SQL92DMLStatementVisitor extends
SQL92StatementVisitor implem
public ASTNode visitSelect(final SelectContext ctx) {
// TODO :Unsupported for withClause.
SelectStatement result = (SelectStatement) visit(ctx.combineClause());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
index d520bd157a8..9eb710157ef 100644
---
a/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
+++
b/parser/sql/dialect/sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/SQLServerStatementVisitor.java
@@ -955,7 +955,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
@Override
public ASTNode visitSelect(final SelectContext ctx) {
SelectStatement result = (SelectStatement)
visit(ctx.aggregationClause());
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1151,7 +1151,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
if (null != ctx.rowSetFunction()) {
result.setRowSetFunctionSegment((FunctionSegment)
visit(ctx.rowSetFunction()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1349,7 +1349,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
if (null != ctx.outputClause()) {
result.setOutputSegment((OutputSegment) visit(ctx.outputClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
@@ -1414,7 +1414,7 @@ public abstract class SQLServerStatementVisitor extends
SQLServerStatementBaseVi
if (null != ctx.outputClause()) {
result.setOutputSegment((OutputSegment) visit(ctx.outputClause()));
}
- result.addParameterMarkerSegments(getParameterMarkerSegments());
+ result.addParameterMarkers(getParameterMarkerSegments());
return result;
}
diff --git
a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
index c79f5ac19b4..ad7d274123e 100644
---
a/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
+++
b/parser/sql/engine/src/main/java/org/apache/shardingsphere/sql/parser/api/SQLStatementVisitorEngine.java
@@ -57,7 +57,7 @@ public final class SQLStatementVisitorEngine {
private <T> void appendSQLComments(final ParseASTNode parseASTNode, final
T visitResult) {
if (visitResult instanceof AbstractSQLStatement) {
for (Token each : parseASTNode.getHiddenTokens()) {
- ((SQLStatement) visitResult).getCommentSegments().add(new
CommentSegment(each.getText(), each.getStartIndex(), each.getStopIndex()));
+ ((SQLStatement) visitResult).getComments().add(new
CommentSegment(each.getText(), each.getStartIndex(), each.getStopIndex()));
}
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/AbstractSQLStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/AbstractSQLStatement.java
index 48adfc5b76f..129d56b3c56 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/AbstractSQLStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/AbstractSQLStatement.java
@@ -34,11 +34,11 @@ public class AbstractSQLStatement implements SQLStatement {
private final Collection<Integer> uniqueParameterIndexes = new
LinkedHashSet<>();
- private final Collection<ParameterMarkerSegment> parameterMarkerSegments =
new LinkedList<>();
+ private final Collection<ParameterMarkerSegment> parameterMarkers = new
LinkedList<>();
private final Collection<String> variableNames = new
CaseInsensitiveSet<>();
- private final Collection<CommentSegment> commentSegments = new
LinkedList<>();
+ private final Collection<CommentSegment> comments = new LinkedList<>();
@Override
public final int getParameterCount() {
@@ -46,9 +46,9 @@ public class AbstractSQLStatement implements SQLStatement {
}
@Override
- public final void addParameterMarkerSegments(final
Collection<ParameterMarkerSegment> parameterMarkerSegments) {
- for (ParameterMarkerSegment each : parameterMarkerSegments) {
- this.parameterMarkerSegments.add(each);
+ public final void addParameterMarkers(final
Collection<ParameterMarkerSegment> segments) {
+ for (ParameterMarkerSegment each : segments) {
+ parameterMarkers.add(each);
uniqueParameterIndexes.add(each.getParameterIndex());
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/SQLStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/SQLStatement.java
index bac2cbcb9e6..5458cd04891 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/SQLStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/SQLStatement.java
@@ -40,14 +40,14 @@ public interface SQLStatement extends ASTNode {
*
* @return parameter marker segments
*/
- Collection<ParameterMarkerSegment> getParameterMarkerSegments();
+ Collection<ParameterMarkerSegment> getParameterMarkers();
/**
- * Add parameter marker segment.
+ * Add parameter marker segments.
*
- * @param parameterMarkerSegments parameter marker segment collection
+ * @param segments parameter marker segments
*/
- void addParameterMarkerSegments(Collection<ParameterMarkerSegment>
parameterMarkerSegments);
+ void addParameterMarkers(Collection<ParameterMarkerSegment> segments);
/**
* Get variable names.
@@ -61,5 +61,5 @@ public interface SQLStatement extends ASTNode {
*
* @return comment segments
*/
- Collection<CommentSegment> getCommentSegments();
+ Collection<CommentSegment> getComments();
}
diff --git
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
index 4e4a2001564..4cf75b94a58 100644
---
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
+++
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutor.java
@@ -127,7 +127,7 @@ public final class MySQLComStmtPrepareExecutor implements
CommandExecutor {
final MySQLServerPreparedStatement serverPreparedStatement) {
List<ShardingSphereColumn> columnsOfParameterMarkers =
MySQLComStmtPrepareParameterMarkerExtractor.findColumnsOfParameterMarkers(sqlStatementContext.getSqlStatement(),
getSchema(sqlStatementContext));
- Collection<ParameterMarkerSegment> parameterMarkerSegments =
sqlStatementContext.getSqlStatement().getParameterMarkerSegments();
+ Collection<ParameterMarkerSegment> parameterMarkerSegments =
sqlStatementContext.getSqlStatement().getParameterMarkers();
Collection<MySQLPacket> result = new
ArrayList<>(parameterMarkerSegments.size());
Collection<Integer> paramColumnDefinitionFlags = new
ArrayList<>(parameterMarkerSegments.size());
for (int index = 0; index < parameterMarkerSegments.size(); index++) {
diff --git
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractor.java
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractor.java
index d53ae67e751..3a2fad57bf1 100644
---
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractor.java
+++
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractor.java
@@ -74,7 +74,7 @@ public final class
MySQLComStmtPrepareParameterMarkerExtractor {
}
private static List<ShardingSphereColumn> getParameterMarkerColumns(final
InsertStatement insertStatement, final ShardingSphereTable table, final
List<String> columnNamesOfInsert) {
- List<ShardingSphereColumn> result = new
ArrayList<>(insertStatement.getParameterMarkerSegments().size());
+ List<ShardingSphereColumn> result = new
ArrayList<>(insertStatement.getParameterMarkers().size());
for (InsertValuesSegment each : insertStatement.getValues()) {
result.addAll(getParameterMarkerColumns(table,
columnNamesOfInsert, each));
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
index 635c88e14e2..fb10916d55d 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
@@ -127,7 +127,7 @@ public final class PostgreSQLComDescribeExecutor implements
CommandExecutor {
InsertStatement insertStatement = (InsertStatement)
preparedStatement.getSqlStatementContext().getSqlStatement();
Collection<Integer> unspecifiedTypeParameterIndexes =
getUnspecifiedTypeParameterIndexes(preparedStatement);
Optional<ReturningSegment> returningSegment =
insertStatement.getReturningSegment();
- if (insertStatement.getParameterMarkerSegments().isEmpty() &&
unspecifiedTypeParameterIndexes.isEmpty() && !returningSegment.isPresent()) {
+ if (insertStatement.getParameterMarkers().isEmpty() &&
unspecifiedTypeParameterIndexes.isEmpty() && !returningSegment.isPresent()) {
return;
}
String logicTableName = insertStatement.getTable().map(optional ->
optional.getTableName().getIdentifier().getValue()).orElse("");
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
index 6f2893a804a..bb10f3f3a3f 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/parse/PostgreSQLComParseExecutor.java
@@ -68,9 +68,9 @@ public final class PostgreSQLComParseExecutor implements
CommandExecutor {
sqlStatement = sqlParserEngine.parse(escapedSql, true);
sql = escapedSql;
}
- List<Integer> actualParameterMarkerIndexes = new
ArrayList<>(sqlStatement.getParameterMarkerSegments().size());
+ List<Integer> actualParameterMarkerIndexes = new
ArrayList<>(sqlStatement.getParameterMarkers().size());
if (sqlStatement.getParameterCount() > 0) {
- List<ParameterMarkerSegment> parameterMarkerSegments = new
ArrayList<>(sqlStatement.getParameterMarkerSegments());
+ List<ParameterMarkerSegment> parameterMarkerSegments = new
ArrayList<>(sqlStatement.getParameterMarkers());
for (ParameterMarkerSegment each : parameterMarkerSegments) {
actualParameterMarkerIndexes.add(each.getParameterIndex());
}
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index 12c156a8843..8b31db126c0 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -121,7 +121,7 @@ class PostgreSQLBatchedStatementsExecutorTest {
InsertStatement insertStatement = mock(InsertStatement.class,
RETURNS_DEEP_STUBS);
when(insertStatement.getTable()).thenReturn(Optional.of(new
SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t")))));
when(insertStatement.getValues()).thenReturn(Collections.emptyList());
-
when(insertStatement.getCommentSegments()).thenReturn(Collections.emptyList());
+
when(insertStatement.getComments()).thenReturn(Collections.emptyList());
InsertStatementContext result = mock(InsertStatementContext.class);
when(result.getDatabaseType()).thenReturn(databaseType);
when(result.getSqlStatement()).thenReturn(insertStatement);
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
index 762ed44e7e2..6bd6b6d3280 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/comment/CommentAssert.java
@@ -56,14 +56,14 @@ public final class CommentAssert {
private static void assertEmptyComment(final SQLCaseAssertContext
assertContext, final SQLStatement actual) {
if (actual instanceof AbstractSQLStatement) {
- assertTrue(actual.getCommentSegments().isEmpty(),
assertContext.getText("Comment should be empty."));
+ assertTrue(actual.getComments().isEmpty(),
assertContext.getText("Comment should be empty."));
}
}
private static void assertCorrectComment(final SQLCaseAssertContext
assertContext, final SQLStatement actual, final SQLParserTestCase expected) {
assertInstanceOf(AbstractSQLStatement.class, actual,
assertContext.getText("Comment should exist."));
- assertThat(assertContext.getText("Comments size assertion error: "),
actual.getCommentSegments().size(), is(expected.getComments().size()));
- Iterator<CommentSegment> actualIterator =
actual.getCommentSegments().iterator();
+ assertThat(assertContext.getText("Comments size assertion error: "),
actual.getComments().size(), is(expected.getComments().size()));
+ Iterator<CommentSegment> actualIterator =
actual.getComments().iterator();
for (ExpectedComment each : expected.getComments()) {
assertThat(assertContext.getText("Comments assertion error: "),
actualIterator.next().getText(), is(each.getText()));
}
