This is an automated email from the ASF dual-hosted git repository.
panjuan 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 a8f75a2cf02 Rename SelectStatement.unions (#18198)
a8f75a2cf02 is described below
commit a8f75a2cf02eafe310a1a5f40b827915fb81677f
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jun 6 18:18:18 2022 +0800
Rename SelectStatement.unions (#18198)
---
.../infra/binder/statement/dml/SelectStatementContext.java | 2 +-
.../federation/optimizer/converter/SQLNodeConverterEngine.java | 6 +++---
.../mysql/visitor/statement/impl/MySQLStatementSQLVisitor.java | 4 ++--
.../visitor/statement/impl/OpenGaussStatementSQLVisitor.java | 2 +-
.../visitor/statement/impl/PostgreSQLStatementSQLVisitor.java | 2 +-
.../sql/parser/sql/common/extractor/TableExtractor.java | 6 +++---
.../sql/parser/sql/common/statement/dml/SelectStatement.java | 2 +-
.../asserts/statement/dml/impl/SelectStatementAssert.java | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
index 26f65d385d9..f3c7675156c 100644
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
@@ -172,7 +172,7 @@ public final class SelectStatementContext extends
CommonSQLStatementContext<Sele
* @return whether contains union or not
*/
public boolean isContainsUnion() {
- return !getSqlStatement().getUnionSegments().isEmpty();
+ return !getSqlStatement().getUnions().isEmpty();
}
/**
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/SQLNodeConverterEngine.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/SQLNodeConverterEngine.java
index 3800d2b894c..23dbe16e710 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/SQLNodeConverterEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/SQLNodeConverterEngine.java
@@ -62,8 +62,8 @@ public final class SQLNodeConverterEngine {
public static SqlNode convertToSQLNode(final SQLStatement statement) {
if (statement instanceof SelectStatement) {
SqlNode sqlNode = new
SelectStatementConverter().convertToSQLNode((SelectStatement) statement);
- if (null != ((SelectStatement) statement).getUnionSegments()) {
- for (final UnionSegment unionSegment : ((SelectStatement)
statement).getUnionSegments()) {
+ if (null != ((SelectStatement) statement).getUnions()) {
+ for (final UnionSegment unionSegment : ((SelectStatement)
statement).getUnions()) {
SqlNode unionSqlNode =
convertToSQLNode(unionSegment.getSelectStatement());
return new
SqlBasicCall(convertUnionOperator(unionSegment.getUnionType()), new
SqlNode[]{sqlNode, unionSqlNode}, SqlParserPos.ZERO);
}
@@ -88,7 +88,7 @@ public final class SQLNodeConverterEngine {
SqlNode rightSqlNode = ((SqlBasicCall)
sqlNode).getOperandList().get(1);
SelectStatement leftSelectStatement = (SelectStatement)
convertToSQLStatement(leftSqlNode);
SelectStatement rightSelectStatement = (SelectStatement)
convertToSQLStatement(rightSqlNode);
- leftSelectStatement.getUnionSegments().add(
+ leftSelectStatement.getUnions().add(
new
UnionSegment(rightSqlNode.getParserPosition().getColumnNum() - 7,
rightSqlNode.getParserPosition().getEndColumnNum() - 1,
UnionType.UNION_DISTINCT, rightSelectStatement));
return leftSelectStatement;
}
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/MySQLStatementSQLVisitor.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/MySQLStatementSQLVisitor.java
index c77a35af678..26fa3cf9d60 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/MySQLStatementSQLVisitor.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/MySQLStatementSQLVisitor.java
@@ -683,11 +683,11 @@ public abstract class MySQLStatementSQLVisitor extends
MySQLStatementBaseVisitor
}
if (null != ctx.queryExpressionBody()) {
MySQLSelectStatement result = (MySQLSelectStatement)
visit(ctx.queryExpressionBody());
- result.getUnionSegments().add((UnionSegment)
visitUnionClause(ctx.unionClause()));
+ result.getUnions().add((UnionSegment)
visitUnionClause(ctx.unionClause()));
return result;
}
MySQLSelectStatement result = (MySQLSelectStatement)
visit(ctx.queryExpressionParens());
- result.getUnionSegments().add((UnionSegment)
visitUnionClause(ctx.unionClause()));
+ result.getUnions().add((UnionSegment)
visitUnionClause(ctx.unionClause()));
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/OpenGaussStatementSQLVisitor.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/OpenGaussStatementSQLVisitor.java
index f75b7f4d652..4807718c103 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/OpenGaussStatementSQLVisitor.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/OpenGaussStatementSQLVisitor.java
@@ -863,7 +863,7 @@ public abstract class OpenGaussStatementSQLVisitor extends
OpenGaussStatementBas
}
if (null != ctx.selectClauseN() && !ctx.selectClauseN().isEmpty()) {
OpenGaussSelectStatement result = (OpenGaussSelectStatement)
visit(ctx.selectClauseN(0));
- result.getUnionSegments().add(new UnionSegment(
+ result.getUnions().add(new UnionSegment(
((TerminalNode)
ctx.getChild(1)).getSymbol().getStartIndex(), ctx.getStop().getStopIndex(),
getUnionType(ctx), (OpenGaussSelectStatement) visit(ctx.selectClauseN(1))));
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/PostgreSQLStatementSQLVisitor.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/PostgreSQLStatementSQLVisitor.java
index f47a2740d84..de71f3a4b52 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/PostgreSQLStatementSQLVisitor.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/PostgreSQLStatementSQLVisitor.java
@@ -831,7 +831,7 @@ public abstract class PostgreSQLStatementSQLVisitor extends
PostgreSQLStatementP
}
if (null != ctx.selectClauseN() && !ctx.selectClauseN().isEmpty()) {
PostgreSQLSelectStatement result = (PostgreSQLSelectStatement)
visit(ctx.selectClauseN(0));
- result.getUnionSegments().add(new UnionSegment(
+ result.getUnions().add(new UnionSegment(
((TerminalNode)
ctx.getChild(1)).getSymbol().getStartIndex(), ctx.getStop().getStopIndex(),
getUnionType(ctx), (PostgreSQLSelectStatement) visit(ctx.selectClauseN(1))));
return result;
}
diff --git
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
index 2c63e882418..7b930e3cb95 100644
---
a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
+++
b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/extractor/TableExtractor.java
@@ -91,8 +91,8 @@ public final class TableExtractor {
if
(SelectStatementHandler.getLockSegment(selectStatement).isPresent()) {
extractTablesFromLock(SelectStatementHandler.getLockSegment(selectStatement).get());
}
- if (!selectStatement.getUnionSegments().isEmpty()) {
- selectStatement.getUnionSegments().forEach(each ->
extractTablesFromSelect(each.getSelectStatement()));
+ if (!selectStatement.getUnions().isEmpty()) {
+ selectStatement.getUnions().forEach(each ->
extractTablesFromSelect(each.getSelectStatement()));
}
}
@@ -171,7 +171,7 @@ public final class TableExtractor {
rewriteTables.add(createSimpleTableSegment(ownerSegment));
}
} else if (each instanceof AggregationProjectionSegment) {
- ((AggregationProjectionSegment)
each).getParameters().forEach(expression ->
extractTablesFromExpression(expression));
+ ((AggregationProjectionSegment)
each).getParameters().forEach(this::extractTablesFromExpression);
}
}
}
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 ed5c2bfc612..43d619b09bf 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
@@ -53,7 +53,7 @@ public abstract class SelectStatement extends
AbstractSQLStatement implements DM
private OrderBySegment orderBy;
- private Collection<UnionSegment> unionSegments = new LinkedList<>();
+ private Collection<UnionSegment> unions = new LinkedList<>();
/**
* Get where.
diff --git
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
index f08f097267d..cb38e40f512 100644
---
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
+++
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/dml/impl/SelectStatementAssert.java
@@ -185,7 +185,7 @@ public final class SelectStatementAssert {
if (expected.getUnions().isEmpty()) {
return;
}
- Collection<UnionSegment> unionSegments = actual.getUnionSegments();
+ Collection<UnionSegment> unionSegments = actual.getUnions();
assertFalse(assertContext.getText("Actual union segment should
exist."), unionSegments.isEmpty());
assertThat(assertContext.getText("Union size assertion error: "),
unionSegments.size(), is(expected.getUnions().size()));
int count = 0;
