This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 24d0a6d59d7 Revise pr #18789 (#18817)
24d0a6d59d7 is described below
commit 24d0a6d59d786c029c3fe415fbd14d87bafcee8c
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Jul 4 13:56:21 2022 +0800
Revise pr #18789 (#18817)
* Revise pr #18789
* Revise pr #18789
---
.../ddl/ShardingCreateIndexStatementValidatorTest.java | 6 +++---
.../ddl/ShardingRenameTableStatementValidatorTest.java | 2 +-
.../visitor/statement/impl/MySQLDDLStatementSQLVisitor.java | 2 +-
.../visitor/statement/impl/MySQLTCLStatementSQLVisitor.java | 8 ++++----
.../statement/impl/OpenGaussDDLStatementSQLVisitor.java | 4 ++--
.../visitor/statement/impl/OracleDDLStatementSQLVisitor.java | 8 ++++----
.../visitor/statement/impl/OracleDMLStatementSQLVisitor.java | 6 +++---
.../statement/impl/PostgreSQLDDLStatementSQLVisitor.java | 2 +-
.../statement/impl/PostgreSQLTCLStatementSQLVisitor.java | 2 +-
.../statement/impl/SQLServerDDLStatementSQLVisitor.java | 2 +-
.../sql/parser/sql/common/segment/generic/ModelSegment.java | 4 ++--
.../sql/common/statement/ddl/CreateIndexStatement.java | 2 +-
.../sql/common/statement/ddl/RenameTableStatement.java | 2 +-
.../sql/parser/sql/common/statement/dml/SelectStatement.java | 4 ++--
.../statement/mysql/dcl/MySQLCreateUserStatement.java | 2 +-
.../statement/mysql/segment/CacheTableIndexSegment.java | 2 +-
.../sql/dialect/statement/mysql/tcl/MySQLLockStatement.java | 2 +-
.../statement/postgresql/tcl/PostgreSQLLockStatement.java | 2 +-
.../asserts/segment/model/ModelClauseAssert.java | 12 ++++++------
.../asserts/statement/tcl/impl/LockStatementAssert.java | 2 +-
20 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateIndexStatementValidatorTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateIndexStatementValidatorTest.java
index 79a8aedd3f2..4ad66aec3ed 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateIndexStatementValidatorTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingCreateIndexStatementValidatorTest.java
@@ -95,7 +95,7 @@ public final class ShardingCreateIndexStatementValidatorTest {
public void
assertPreValidateCreateIndexWithoutIndexNameWhenTableExistIndexNotExistForPostgreSQL()
{
PostgreSQLCreateIndexStatement sqlStatement = new
PostgreSQLCreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("t_order"))));
- sqlStatement.setColumns(Collections.singletonList(new ColumnSegment(0,
0, new IdentifierValue("content"))));
+ sqlStatement.getColumns().add(new ColumnSegment(0, 0, new
IdentifierValue("content")));
sqlStatement.setGeneratedIndexStartIndex(10);
when(database.getSchemas().get("public").containsTable("t_order")).thenReturn(true);
ShardingSphereTable table = mock(ShardingSphereTable.class);
@@ -109,7 +109,7 @@ public final class
ShardingCreateIndexStatementValidatorTest {
public void
assertPreValidateCreateIndexWithoutIndexNameWhenTableNotExistIndexNotExistForPostgreSQL()
{
PostgreSQLCreateIndexStatement sqlStatement = new
PostgreSQLCreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("t_order"))));
- sqlStatement.setColumns(Collections.singletonList(new ColumnSegment(0,
0, new IdentifierValue("content"))));
+ sqlStatement.getColumns().add(new ColumnSegment(0, 0, new
IdentifierValue("content")));
sqlStatement.setGeneratedIndexStartIndex(10);
when(database.getSchemas().get("public").containsTable("t_order")).thenReturn(false);
new ShardingCreateIndexStatementValidator().preValidate(shardingRule,
new CreateIndexStatementContext(sqlStatement), Collections.emptyList(),
database);
@@ -119,7 +119,7 @@ public final class
ShardingCreateIndexStatementValidatorTest {
public void
assertPreValidateCreateIndexWithoutIndexNameWhenTableExistIndexExistForPostgreSQL()
{
PostgreSQLCreateIndexStatement sqlStatement = new
PostgreSQLCreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("t_order"))));
- sqlStatement.setColumns(Collections.singletonList(new ColumnSegment(0,
0, new IdentifierValue("content"))));
+ sqlStatement.getColumns().add(new ColumnSegment(0, 0, new
IdentifierValue("content")));
sqlStatement.setGeneratedIndexStartIndex(10);
when(database.getSchemas().get("public").containsTable("t_order")).thenReturn(true);
ShardingSphereTable table = mock(ShardingSphereTable.class);
diff --git
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
index 32a7c6b3c41..5f8b0d7b98b 100644
---
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
+++
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/ShardingRenameTableStatementValidatorTest.java
@@ -109,7 +109,7 @@ public final class
ShardingRenameTableStatementValidatorTest {
RenameTableDefinitionSegment renameTableDefinitionSegment = new
RenameTableDefinitionSegment(0, 0);
renameTableDefinitionSegment.setTable(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue(originTableName))));
renameTableDefinitionSegment.setRenameTable(new SimpleTableSegment(new
TableNameSegment(0, 0, new IdentifierValue(newTableName))));
-
sqlStatement.setRenameTables(Collections.singletonList(renameTableDefinitionSegment));
+ sqlStatement.getRenameTables().add(renameTableDefinitionSegment);
return new RenameTableStatementContext(sqlStatement);
}
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
index 7ff2f696850..8e00e8b8877 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDDLStatementSQLVisitor.java
@@ -549,7 +549,7 @@ public final class MySQLDDLStatementSQLVisitor extends
MySQLStatementSQLVisitor
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
IndexNameSegment indexName = new
IndexNameSegment(ctx.indexName().start.getStartIndex(),
ctx.indexName().stop.getStopIndex(), new
IdentifierValue(ctx.indexName().getText()));
result.setIndex(new
IndexSegment(ctx.indexName().start.getStartIndex(),
ctx.indexName().stop.getStopIndex(), indexName));
- result.setColumns(((CollectionValue)
visit(ctx.keyListWithExpression())).getValue());
+ result.getColumns().addAll(((CollectionValue)
visit(ctx.keyListWithExpression())).getValue());
return result;
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
index abbf038fd9c..e93669b845e 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLTCLStatementSQLVisitor.java
@@ -22,15 +22,15 @@ import org.antlr.v4.runtime.Token;
import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import
org.apache.shardingsphere.sql.parser.api.visitor.operation.SQLStatementVisitor;
import org.apache.shardingsphere.sql.parser.api.visitor.type.TCLSQLVisitor;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableLockContext;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LockContext;
-import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnlockContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.BeginTransactionContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.CommitContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.LockContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.RollbackContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SavepointContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SetAutoCommitContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.SetTransactionContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.TableLockContext;
+import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.UnlockContext;
import
org.apache.shardingsphere.sql.parser.autogen.MySQLStatementParser.XaContext;
import org.apache.shardingsphere.sql.parser.sql.common.constant.OperationScope;
import
org.apache.shardingsphere.sql.parser.sql.common.constant.TransactionAccessType;
@@ -153,7 +153,7 @@ public final class MySQLTCLStatementSQLVisitor extends
MySQLStatementSQLVisitor
public ASTNode visitLock(final LockContext ctx) {
MySQLLockStatement result = new MySQLLockStatement();
if (null != ctx.tableLock()) {
- result.setTables(getLockTables(ctx.tableLock()));
+ result.getTables().addAll(getLockTables(ctx.tableLock()));
}
return result;
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussDDLStatementSQLVisitor.java
index 44271d67d2c..8b23f637f9b 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussDDLStatementSQLVisitor.java
@@ -87,7 +87,6 @@ import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.Cur
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.CursorNameContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DeallocateContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DeclareContext;
-import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropServerContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropCastContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropColumnSpecificationContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropConstraintSpecificationContext;
@@ -104,6 +103,7 @@ import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.Dro
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropRuleContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropSchemaContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropSequenceContext;
+import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropServerContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropSynonymContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.OpenGaussStatementParser.DropTablespaceContext;
@@ -509,7 +509,7 @@ public final class OpenGaussDDLStatementSQLVisitor extends
OpenGaussStatementSQL
public ASTNode visitCreateIndex(final CreateIndexContext ctx) {
OpenGaussCreateIndexStatement result = new
OpenGaussCreateIndexStatement();
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setColumns(((CollectionValue<ColumnSegment>)
visit(ctx.indexParams())).getValue());
+ result.getColumns().addAll(((CollectionValue<ColumnSegment>)
visit(ctx.indexParams())).getValue());
if (null != ctx.indexName()) {
result.setIndex((IndexSegment) visit(ctx.indexName()));
} else {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
index 6284c74ce04..d38ff1caf57 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDDLStatementSQLVisitor.java
@@ -31,9 +31,10 @@ import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterD
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterDefinitionClauseContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterDimensionContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterFlashbackArchiveContext;
+import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterIndexContext;
+import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterInmemoryJoinGroupContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterLibraryContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterMaterializedZonemapContext;
-import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterIndexContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterOutlineContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterPackageContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterSequenceContext;
@@ -43,7 +44,6 @@ import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterS
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterTableContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterTriggerContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterViewContext;
-import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AlterInmemoryJoinGroupContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AnalyzeContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AssociateStatisticsContext;
import
org.apache.shardingsphere.sql.parser.autogen.OracleStatementParser.AuditContext;
@@ -144,6 +144,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.Ora
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterDimensionStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterFlashbackArchiveStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterIndexStatement;
+import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterInmemoryJoinGroupStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterLibraryStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterMaterializedZonemapStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterOutlineStatement;
@@ -155,7 +156,6 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.Ora
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterTableStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterTriggerStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterViewStatement;
-import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAlterInmemoryJoinGroupStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAnalyzeStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAssociateStatisticsStatement;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.oracle.ddl.OracleAuditStatement;
@@ -521,7 +521,7 @@ public final class OracleDDLStatementSQLVisitor extends
OracleStatementSQLVisito
OracleCreateIndexStatement result = new OracleCreateIndexStatement();
if (null != ctx.createIndexDefinitionClause().tableIndexClause()) {
result.setTable((SimpleTableSegment)
visit(ctx.createIndexDefinitionClause().tableIndexClause().tableName()));
- result.setColumns(((CollectionValue)
visit(ctx.createIndexDefinitionClause().tableIndexClause().indexExpressions())).getValue());
+ result.getColumns().addAll(((CollectionValue)
visit(ctx.createIndexDefinitionClause().tableIndexClause().indexExpressions())).getValue());
}
result.setIndex((IndexSegment) visit(ctx.indexName()));
return result;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
index d496bc76f79..1cbc11e0268 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/statement/impl/OracleDMLStatementSQLVisitor.java
@@ -514,7 +514,7 @@ public final class OracleDMLStatementSQLVisitor extends
OracleStatementSQLVisito
ModelSegment result = new ModelSegment(ctx.start.getStartIndex(),
ctx.stop.getStopIndex());
if (null != ctx.referenceModel()) {
for (ReferenceModelContext each : ctx.referenceModel()) {
- result.getReferenceModelSelect().add((SubquerySegment)
visit(each));
+ result.getReferenceModelSelects().add((SubquerySegment)
visit(each));
}
}
if (null != ctx.mainModel().modelRulesClause().orderByClause()) {
@@ -526,11 +526,11 @@ public final class OracleDMLStatementSQLVisitor extends
OracleStatementSQLVisito
result.getCellAssignmentColumns().add((ColumnSegment)
visit(each.measureColumn().columnName()));
if (null != each.singleColumnForLoop()) {
result.getCellAssignmentColumns().addAll(extractColumnValuesFromSingleColumnForLoop(each.singleColumnForLoop()));
-
result.getCellAsssignmentSelect().addAll(extractSelectSubqueryValuesFromSingleColumnForLoop(each.singleColumnForLoop()));
+
result.getCellAssignmentSelects().addAll(extractSelectSubqueryValuesFromSingleColumnForLoop(each.singleColumnForLoop()));
}
if (null != each.multiColumnForLoop()) {
result.getCellAssignmentColumns().addAll(extractColumnValuesFromMultiColumnForLoop(each.multiColumnForLoop()));
-
result.getCellAsssignmentSelect().add(extractSelectSubqueryValueFromMultiColumnForLoop(each.multiColumnForLoop()));
+
result.getCellAssignmentSelects().add(extractSelectSubqueryValueFromMultiColumnForLoop(each.multiColumnForLoop()));
}
}
return result;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
index d4fb03410a9..4858a9b00f9 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDDLStatementSQLVisitor.java
@@ -608,7 +608,7 @@ public final class PostgreSQLDDLStatementSQLVisitor extends
PostgreSQLStatementS
public ASTNode visitCreateIndex(final CreateIndexContext ctx) {
PostgreSQLCreateIndexStatement result = new
PostgreSQLCreateIndexStatement();
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
- result.setColumns(((CollectionValue<ColumnSegment>)
visit(ctx.indexParams())).getValue());
+ result.getColumns().addAll(((CollectionValue<ColumnSegment>)
visit(ctx.indexParams())).getValue());
if (null != ctx.indexName()) {
result.setIndex((IndexSegment) visit(ctx.indexName()));
} else {
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLTCLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLTCLStatementSQLVisitor.java
index ffbfc56ae02..b0754b22770 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLTCLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLTCLStatementSQLVisitor.java
@@ -141,7 +141,7 @@ public final class PostgreSQLTCLStatementSQLVisitor extends
PostgreSQLStatementS
public ASTNode visitLock(final LockContext ctx) {
PostgreSQLLockStatement result = new PostgreSQLLockStatement();
if (null != ctx.relationExprList()) {
-
result.setTables(getLockTables(ctx.relationExprList().relationExpr()));
+
result.getTables().addAll(getLockTables(ctx.relationExprList().relationExpr()));
}
return result;
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerDDLStatementSQLVisitor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerDDLStatementSQLVisitor.java
index cc16295a9e5..f5e736dafb4 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerDDLStatementSQLVisitor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/statement/impl/SQLServerDDLStatementSQLVisitor.java
@@ -327,7 +327,7 @@ public final class SQLServerDDLStatementSQLVisitor extends
SQLServerStatementSQL
SQLServerCreateIndexStatement result = new
SQLServerCreateIndexStatement();
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
result.setIndex((IndexSegment) visit(ctx.indexName()));
- result.setColumns(((CollectionValue)
visit(ctx.columnNamesWithSort())).getValue());
+ result.getColumns().addAll(((CollectionValue)
visit(ctx.columnNamesWithSort())).getValue());
return result;
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/ModelSegment.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/ModelSegment.java
index 97cb5c11d32..c81c81356bc 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/ModelSegment.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/generic/ModelSegment.java
@@ -38,11 +38,11 @@ public final class ModelSegment implements SQLSegment {
private final int stopIndex;
- private final List<SubquerySegment> referenceModelSelect = new
LinkedList<>();
+ private final List<SubquerySegment> referenceModelSelects = new
LinkedList<>();
private final List<OrderBySegment> orderBySegments = new LinkedList<>();
private final List<ColumnSegment> cellAssignmentColumns = new
LinkedList<>();
- private final List<SubquerySegment> cellAsssignmentSelect = new
LinkedList<>();
+ private final List<SubquerySegment> cellAssignmentSelects = new
LinkedList<>();
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateIndexStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateIndexStatement.java
index 0ba74f5104d..16d20f3a41e 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateIndexStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/CreateIndexStatement.java
@@ -40,5 +40,5 @@ public abstract class CreateIndexStatement extends
AbstractSQLStatement implemen
private SimpleTableSegment table;
- private Collection<ColumnSegment> columns = new LinkedList<>();
+ private final Collection<ColumnSegment> columns = new LinkedList<>();
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/RenameTableStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/RenameTableStatement.java
index 678a74e0807..7dc1109619a 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/RenameTableStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/ddl/RenameTableStatement.java
@@ -34,5 +34,5 @@ import java.util.LinkedList;
@ToString
public abstract class RenameTableStatement extends AbstractSQLStatement
implements DDLStatement {
- private Collection<RenameTableDefinitionSegment> renameTables = new
LinkedList<>();
+ private final Collection<RenameTableDefinitionSegment> renameTables = new
LinkedList<>();
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/SelectStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/SelectStatement.java
index 4f53b42378a..86f83cf314a 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/SelectStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/statement/dml/SelectStatement.java
@@ -20,12 +20,12 @@ package
org.apache.shardingsphere.sql.parser.sql.common.statement.dml;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
+import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.combine.CombineSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionsSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.GroupBySegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.OrderBySegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.HavingSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
-import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.combine.CombineSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableSegment;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.AbstractSQLStatement;
@@ -53,7 +53,7 @@ public abstract class SelectStatement extends
AbstractSQLStatement implements DM
private OrderBySegment orderBy;
- private Collection<CombineSegment> combines = new LinkedList<>();
+ private final Collection<CombineSegment> combines = new LinkedList<>();
/**
* Get where.
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dcl/MySQLCreateUserStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dcl/MySQLCreateUserStatement.java
index 62f2f19163f..f8e89527512 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dcl/MySQLCreateUserStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/dcl/MySQLCreateUserStatement.java
@@ -37,7 +37,7 @@ import java.util.LinkedList;
@Setter
public final class MySQLCreateUserStatement extends CreateUserStatement
implements MySQLStatement {
- private Collection<String> defaultRoles = new LinkedList<>();
+ private final Collection<String> defaultRoles = new LinkedList<>();
private TLSOptionSegment tlsOptionSegment;
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CacheTableIndexSegment.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CacheTableIndexSegment.java
index a9d38807336..6bd2baeb7e8 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CacheTableIndexSegment.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/segment/CacheTableIndexSegment.java
@@ -30,7 +30,7 @@ import java.util.LinkedList;
@Getter
public final class CacheTableIndexSegment extends TableIndexSegment {
- private Collection<IndexSegment> indexes = new LinkedList<>();
+ private final Collection<IndexSegment> indexes = new LinkedList<>();
public CacheTableIndexSegment(final int startIndex, final int stopIndex,
final SimpleTableSegment table) {
super(startIndex, stopIndex, table);
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/tcl/MySQLLockStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/tcl/MySQLLockStatement.java
index 0eed3987d46..0d776ad6dff 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/tcl/MySQLLockStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/mysql/tcl/MySQLLockStatement.java
@@ -35,5 +35,5 @@ import java.util.LinkedList;
@ToString
public final class MySQLLockStatement extends LockStatement implements
MySQLStatement {
- private Collection<SimpleTableSegment> tables = new LinkedList<>();
+ private final Collection<SimpleTableSegment> tables = new LinkedList<>();
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/tcl/PostgreSQLLockStatement.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/tcl/PostgreSQLLockStatement.java
index 780cbdd0aa5..1aec19dd68c 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/tcl/PostgreSQLLockStatement.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/tcl/PostgreSQLLockStatement.java
@@ -35,5 +35,5 @@ import java.util.LinkedList;
@ToString
public final class PostgreSQLLockStatement extends LockStatement implements
PostgreSQLStatement {
- private Collection<SimpleTableSegment> tables = new LinkedList<>();
+ private final Collection<SimpleTableSegment> tables = new LinkedList<>();
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/model/ModelClauseAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/model/ModelClauseAssert.java
index 5fc83fd392a..e7e4de49a03 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/model/ModelClauseAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/segment/model/ModelClauseAssert.java
@@ -54,9 +54,9 @@ public final class ModelClauseAssert {
public static void assertIs(final SQLCaseAssertContext assertContext,
final ModelSegment actual, final ExpectedModelClause expected) {
SQLSegmentAssert.assertIs(assertContext, actual, expected);
if (null != expected.getReferenceModelSelect()) {
- assertNotNull(assertContext.getText("Actual reference model select
subquery should exist."), actual.getReferenceModelSelect());
- assertThat(assertContext.getText("Actual reference model select
subquery size assertion error: "), actual.getReferenceModelSelect().size(),
is(expected.getReferenceModelSelect().size()));
- assertReferenceModelSelectStatements(assertContext,
actual.getReferenceModelSelect(), expected.getReferenceModelSelect());
+ assertNotNull(assertContext.getText("Actual reference model select
subquery should exist."), actual.getReferenceModelSelects());
+ assertThat(assertContext.getText("Actual reference model select
subquery size assertion error: "), actual.getReferenceModelSelects().size(),
is(expected.getReferenceModelSelect().size()));
+ assertReferenceModelSelectStatements(assertContext,
actual.getReferenceModelSelects(), expected.getReferenceModelSelect());
}
if (null != expected.getOrderBySegments()) {
assertNotNull(assertContext.getText("Actual order by segments
should exist."), actual.getOrderBySegments());
@@ -69,9 +69,9 @@ public final class ModelClauseAssert {
assertCellAssignmentColumns(assertContext,
actual.getCellAssignmentColumns(), expected.getCellAssignmentColumns());
}
if (null != expected.getCellAssignmentSelect()) {
- assertNotNull(assertContext.getText("Actual cell assignment select
subquery should exist."), actual.getCellAsssignmentSelect());
- assertThat(assertContext.getText("Actual cell assignment select
size assertion error: "), actual.getCellAsssignmentSelect().size(),
is(expected.getCellAssignmentSelect().size()));
- assertCellAssignmentSelectStatements(assertContext,
actual.getCellAsssignmentSelect(), expected.getCellAssignmentSelect());
+ assertNotNull(assertContext.getText("Actual cell assignment select
subquery should exist."), actual.getCellAssignmentSelects());
+ assertThat(assertContext.getText("Actual cell assignment select
size assertion error: "), actual.getCellAssignmentSelects().size(),
is(expected.getCellAssignmentSelect().size()));
+ assertCellAssignmentSelectStatements(assertContext,
actual.getCellAssignmentSelects(), expected.getCellAssignmentSelect());
}
}
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/tcl/impl/LockStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/tcl/impl/LockStatementAssert.java
index b590d3146ca..4dac7450f39 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/tcl/impl/LockStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/tcl/impl/LockStatementAssert.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue;
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class LockStatementAssert {
-
+
/**
* Assert lock statement is correct with expected parser result.
*
