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 5e171f6ca85 Rename TableAvailable.getSimpleTables() (#31620)
5e171f6ca85 is described below
commit 5e171f6ca85047fe77ce279949025eb93f83a1d2
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jun 7 14:56:07 2024 +0800
Rename TableAvailable.getSimpleTables() (#31620)
---
.../apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java | 4 ++--
.../broadcast/route/engine/BroadcastRouteEngineFactory.java | 6 +++---
.../encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java | 4 ++--
.../encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java | 4 ++--
.../parameter/rewriter/EncryptAssignmentParameterRewriter.java | 2 +-
.../rewrite/token/generator/EncryptAssignmentTokenGenerator.java | 2 +-
.../rewrite/token/generator/EncryptProjectionTokenGenerator.java | 2 +-
.../encrypt/merge/dal/EncryptDALResultDecoratorTest.java | 6 +++---
.../merge/dal/show/DecoratedEncryptShowColumnsMergedResultTest.java | 2 +-
.../dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java | 2 +-
.../merge/dal/show/MergedEncryptShowColumnsMergedResultTest.java | 2 +-
.../dal/show/MergedEncryptShowCreateTableMergedResultTest.java | 2 +-
.../encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java | 2 +-
.../token/generator/EncryptAssignmentTokenGeneratorTest.java | 4 ++--
.../route/engine/dml/AbstractShadowDMLStatementRouteEngine.java | 2 +-
.../sharding/merge/dql/groupby/GroupByMemoryMergedResult.java | 2 +-
.../shardingsphere/sharding/merge/dql/orderby/OrderByValue.java | 2 +-
.../rewrite/context/ShardingSQLRewriteContextDecorator.java | 2 +-
.../rewrite/token/generator/impl/OrderByTokenGenerator.java | 2 +-
.../sharding/rewrite/token/generator/impl/TableTokenGenerator.java | 2 +-
.../sharding/route/engine/type/ShardingRouteEngineFactory.java | 4 ++--
.../validator/ddl/impl/ShardingAlterTableStatementValidator.java | 2 +-
.../validator/ddl/impl/ShardingRenameTableStatementValidator.java | 2 +-
.../sharding/rewrite/token/generator/TableTokenGeneratorTest.java | 2 +-
.../sharding/route/engine/type/ShardingRouteEngineFactoryTest.java | 4 ++--
.../binder/context/statement/dal/AnalyzeTableStatementContext.java | 2 +-
.../infra/binder/context/statement/dal/ExplainStatementContext.java | 2 +-
.../infra/binder/context/statement/dal/FlushStatementContext.java | 2 +-
.../binder/context/statement/dal/OptimizeTableStatementContext.java | 2 +-
.../binder/context/statement/dal/ShowColumnsStatementContext.java | 2 +-
.../context/statement/dal/ShowCreateTableStatementContext.java | 2 +-
.../binder/context/statement/dal/ShowIndexStatementContext.java | 2 +-
.../binder/context/statement/dcl/DenyUserStatementContext.java | 2 +-
.../infra/binder/context/statement/dcl/GrantStatementContext.java | 2 +-
.../infra/binder/context/statement/dcl/RevokeStatementContext.java | 2 +-
.../binder/context/statement/ddl/AlterIndexStatementContext.java | 2 +-
.../binder/context/statement/ddl/AlterTableStatementContext.java | 2 +-
.../binder/context/statement/ddl/AlterViewStatementContext.java | 2 +-
.../infra/binder/context/statement/ddl/CommentStatementContext.java | 2 +-
.../binder/context/statement/ddl/CreateIndexStatementContext.java | 2 +-
.../binder/context/statement/ddl/CreateTableStatementContext.java | 2 +-
.../binder/context/statement/ddl/CreateViewStatementContext.java | 2 +-
.../infra/binder/context/statement/ddl/CursorStatementContext.java | 2 +-
.../binder/context/statement/ddl/DropIndexStatementContext.java | 2 +-
.../binder/context/statement/ddl/DropTableStatementContext.java | 2 +-
.../binder/context/statement/ddl/DropViewStatementContext.java | 2 +-
.../infra/binder/context/statement/ddl/PrepareStatementContext.java | 2 +-
.../binder/context/statement/ddl/RenameTableStatementContext.java | 2 +-
.../binder/context/statement/ddl/TruncateStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/CopyStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/DeleteStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/InsertStatementContext.java | 2 +-
.../binder/context/statement/dml/LoadDataStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/LoadXMLStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/SelectStatementContext.java | 2 +-
.../infra/binder/context/statement/dml/UpdateStatementContext.java | 2 +-
.../shardingsphere/infra/binder/context/type/TableAvailable.java | 6 +++---
.../context/statement/dal/AnalyzeTableStatementContextTest.java | 2 +-
.../binder/context/statement/dal/ExplainStatementContextTest.java | 2 +-
.../context/statement/dal/OptimizeTableStatementContextTest.java | 2 +-
.../context/statement/dal/ShowColumnsStatementContextTest.java | 2 +-
.../context/statement/dal/ShowCreateTableStatementContextTest.java | 2 +-
.../binder/context/statement/dal/ShowIndexStatementContextTest.java | 2 +-
.../binder/context/statement/dcl/DenyUserStatementContextTest.java | 2 +-
.../binder/context/statement/dcl/GrantStatementContextTest.java | 2 +-
.../binder/context/statement/dcl/RevokeStatementContextTest.java | 2 +-
.../context/statement/ddl/AlterIndexStatementContextTest.java | 2 +-
.../context/statement/ddl/AlterTableStatementContextTest.java | 2 +-
.../binder/context/statement/ddl/AlterViewStatementContextTest.java | 2 +-
.../context/statement/ddl/CreateIndexStatementContextTest.java | 2 +-
.../context/statement/ddl/CreateTableStatementContextTest.java | 2 +-
.../binder/context/statement/ddl/DropIndexStatementContextTest.java | 2 +-
.../binder/context/statement/ddl/DropTableStatementContextTest.java | 2 +-
.../binder/context/statement/ddl/PrepareStatementContextTest.java | 2 +-
.../binder/context/statement/ddl/TruncateStatementContextTest.java | 2 +-
.../binder/context/statement/dml/DeleteStatementContextTest.java | 2 +-
.../binder/context/statement/dml/InsertStatementContextTest.java | 4 ++--
.../binder/context/statement/dml/SelectStatementContextTest.java | 2 +-
.../binder/context/statement/dml/UpdateStatementContextTest.java | 2 +-
.../rewrite/sql/token/generator/generic/RemoveTokenGenerator.java | 2 +-
.../data/pipeline/core/metadata/generator/PipelineDDLGenerator.java | 2 +-
.../shardingsphere/proxy/backend/connector/ProxySQLExecutor.java | 4 ++--
.../hbase/converter/type/HBaseRegionReloadOperationConverter.java | 2 +-
83 files changed, 97 insertions(+), 97 deletions(-)
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java
index dd6db5e3e8e..1326f388f5d 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/BroadcastSQLRouter.java
@@ -121,7 +121,7 @@ public final class BroadcastSQLRouter implements
SQLRouter<BroadcastRule> {
}
private Collection<String> getTableNames(final TableAvailable
sqlStatementContext) {
- Collection<SimpleTableSegment> tableSegments =
sqlStatementContext.getAllTables();
+ Collection<SimpleTableSegment> tableSegments =
sqlStatementContext.getSimpleTables();
Collection<String> result = new LinkedHashSet<>(tableSegments.size());
for (SimpleTableSegment each : tableSegments) {
result.add(each.getTableName().getIdentifier().getValue());
@@ -146,7 +146,7 @@ public final class BroadcastSQLRouter implements
SQLRouter<BroadcastRule> {
private boolean isDCLForSingleTable(final SQLStatementContext
sqlStatementContext) {
if (sqlStatementContext instanceof TableAvailable) {
TableAvailable tableSegmentsAvailable = (TableAvailable)
sqlStatementContext;
- return 1 == tableSegmentsAvailable.getAllTables().size() &&
!"*".equals(tableSegmentsAvailable.getAllTables().iterator().next().getTableName().getIdentifier().getValue());
+ return 1 == tableSegmentsAvailable.getSimpleTables().size() &&
!"*".equals(tableSegmentsAvailable.getSimpleTables().iterator().next().getTableName().getIdentifier().getValue());
}
return false;
}
diff --git
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
index 668594abab1..242b78f0873 100644
---
a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
+++
b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
@@ -92,7 +92,7 @@ public final class BroadcastRouteEngineFactory {
return new BroadcastDatabaseBroadcastRoutingEngine();
}
Collection<String> tableNames = sqlStatementContext instanceof
TableAvailable
- ? ((TableAvailable)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
+ ? ((TableAvailable)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
: sqlStatementContext.getTablesContext().getTableNames();
if (broadcastRule.isAllBroadcastTables(tableNames)) {
return new BroadcastUnicastRoutingEngine(sqlStatementContext,
tableNames, connectionContext);
@@ -111,7 +111,7 @@ public final class BroadcastRouteEngineFactory {
private static Collection<String> getTableNames(final
ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext)
{
Collection<String> tableNames = sqlStatementContext instanceof
TableAvailable
- ? ((TableAvailable)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
+ ? ((TableAvailable)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
: sqlStatementContext.getTablesContext().getTableNames();
if (!tableNames.isEmpty()) {
return tableNames;
@@ -155,7 +155,7 @@ public final class BroadcastRouteEngineFactory {
private static boolean isDCLForSingleTable(final SQLStatementContext
sqlStatementContext) {
if (sqlStatementContext instanceof TableAvailable) {
TableAvailable tableSegmentsAvailable = (TableAvailable)
sqlStatementContext;
- return 1 == tableSegmentsAvailable.getAllTables().size() &&
!"*".equals(tableSegmentsAvailable.getAllTables().iterator().next().getTableName().getIdentifier().getValue());
+ return 1 == tableSegmentsAvailable.getSimpleTables().size() &&
!"*".equals(tableSegmentsAvailable.getSimpleTables().iterator().next().getTableName().getIdentifier().getValue());
}
return false;
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
index 8bd9da8237d..f56c4780753 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowColumnsMergedResult.java
@@ -44,9 +44,9 @@ public abstract class EncryptShowColumnsMergedResult
implements MergedResult {
private final EncryptRule encryptRule;
protected EncryptShowColumnsMergedResult(final SQLStatementContext
sqlStatementContext, final EncryptRule encryptRule) {
- ShardingSpherePreconditions.checkState(sqlStatementContext instanceof
TableAvailable && 1 == ((TableAvailable)
sqlStatementContext).getAllTables().size(),
+ ShardingSpherePreconditions.checkState(sqlStatementContext instanceof
TableAvailable && 1 == ((TableAvailable)
sqlStatementContext).getSimpleTables().size(),
() -> new UnsupportedEncryptSQLException("SHOW COLUMNS FOR
MULTI TABLE"));
- tableName = ((TableAvailable)
sqlStatementContext).getAllTables().iterator().next().getTableName().getIdentifier().getValue();
+ tableName = ((TableAvailable)
sqlStatementContext).getSimpleTables().iterator().next().getTableName().getIdentifier().getValue();
this.encryptRule = encryptRule;
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
index 01ff9de1456..f6f215f3f38 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/show/EncryptShowCreateTableMergedResult.java
@@ -56,9 +56,9 @@ public abstract class EncryptShowCreateTableMergedResult
implements MergedResult
private final SQLParserEngine sqlParserEngine;
protected EncryptShowCreateTableMergedResult(final RuleMetaData
globalRuleMetaData, final SQLStatementContext sqlStatementContext, final
EncryptRule encryptRule) {
- ShardingSpherePreconditions.checkState(sqlStatementContext instanceof
TableAvailable && 1 == ((TableAvailable)
sqlStatementContext).getAllTables().size(),
+ ShardingSpherePreconditions.checkState(sqlStatementContext instanceof
TableAvailable && 1 == ((TableAvailable)
sqlStatementContext).getSimpleTables().size(),
() -> new UnsupportedEncryptSQLException("SHOW CREATE TABLE
FOR MULTI TABLE"));
- tableName = ((TableAvailable)
sqlStatementContext).getAllTables().iterator().next().getTableName().getIdentifier().getValue();
+ tableName = ((TableAvailable)
sqlStatementContext).getSimpleTables().iterator().next().getTableName().getIdentifier().getValue();
this.encryptRule = encryptRule;
sqlParserEngine =
globalRuleMetaData.getSingleRule(SQLParserRule.class).getSQLParserEngine(sqlStatementContext.getDatabaseType());
}
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
index 5470724bce9..d12fd5149ad 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
@@ -69,7 +69,7 @@ public final class EncryptAssignmentParameterRewriter
implements ParameterRewrit
@Override
public void rewrite(final ParameterBuilder paramBuilder, final
SQLStatementContext sqlStatementContext, final List<Object> params) {
- String tableName = ((TableAvailable)
sqlStatementContext).getAllTables().iterator().next().getTableName().getIdentifier().getValue();
+ String tableName = ((TableAvailable)
sqlStatementContext).getSimpleTables().iterator().next().getTableName().getIdentifier().getValue();
String schemaName =
sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() -> new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(databaseName));
for (ColumnAssignmentSegment each :
getSetAssignmentSegment(sqlStatementContext.getSqlStatement()).getAssignments())
{
String columnName =
each.getColumns().get(0).getIdentifier().getValue();
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
index f7394194f32..973b4ee2dc8 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGenerator.java
@@ -67,7 +67,7 @@ public final class EncryptAssignmentTokenGenerator implements
CollectionSQLToken
@Override
public Collection<SQLToken> generateSQLTokens(final SQLStatementContext
sqlStatementContext) {
Collection<SQLToken> result = new LinkedList<>();
- String tableName = ((TableAvailable)
sqlStatementContext).getAllTables().iterator().next().getTableName().getIdentifier().getValue();
+ String tableName = ((TableAvailable)
sqlStatementContext).getSimpleTables().iterator().next().getTableName().getIdentifier().getValue();
EncryptTable encryptTable = encryptRule.getEncryptTable(tableName);
String schemaName =
sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() -> new
DatabaseTypeRegistry(sqlStatementContext.getDatabaseType()).getDefaultSchemaName(databaseName));
for (ColumnAssignmentSegment each :
getSetAssignmentSegment(sqlStatementContext.getSqlStatement()).getAssignments())
{
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
index 45f496d8246..f48ed7bb72e 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptProjectionTokenGenerator.java
@@ -68,7 +68,7 @@ public final class EncryptProjectionTokenGenerator implements
CollectionSQLToken
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return sqlStatementContext instanceof SelectStatementContext &&
!((SelectStatementContext) sqlStatementContext).getAllTables().isEmpty()
+ return sqlStatementContext instanceof SelectStatementContext &&
!((SelectStatementContext) sqlStatementContext).getSimpleTables().isEmpty()
|| sqlStatementContext instanceof InsertStatementContext &&
null != ((InsertStatementContext) sqlStatementContext).getInsertSelectContext();
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java
index 76565afbb98..0bf70ae35f3 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecoratorTest.java
@@ -99,7 +99,7 @@ class EncryptDALResultDecoratorTest {
private SQLStatementContext getDescribeStatementContext() {
ExplainStatementContext result = mock(ExplainStatementContext.class);
SimpleTableSegment simpleTableSegment = getSimpleTableSegment();
-
when(result.getAllTables()).thenReturn(Collections.singleton(simpleTableSegment));
+
when(result.getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));
when(result.getSqlStatement()).thenReturn(mock(MySQLExplainStatement.class));
return result;
}
@@ -107,7 +107,7 @@ class EncryptDALResultDecoratorTest {
private SQLStatementContext getShowColumnsStatementContext() {
ShowColumnsStatementContext result =
mock(ShowColumnsStatementContext.class);
SimpleTableSegment simpleTableSegment = getSimpleTableSegment();
-
when(result.getAllTables()).thenReturn(Collections.singleton(simpleTableSegment));
+
when(result.getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));
when(result.getSqlStatement()).thenReturn(mock(MySQLShowColumnsStatement.class));
return result;
}
@@ -116,7 +116,7 @@ class EncryptDALResultDecoratorTest {
ShowCreateTableStatementContext result =
mock(ShowCreateTableStatementContext.class);
when(result.getDatabaseType()).thenReturn(databaseType);
SimpleTableSegment simpleTableSegment = getSimpleTableSegment();
-
when(result.getAllTables()).thenReturn(Collections.singleton(simpleTableSegment));
+
when(result.getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));
when(result.getSqlStatement()).thenReturn(new
MySQLShowCreateTableStatement());
return result;
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowColumnsMergedResultTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowColumnsMergedResultTest.java
index 03df83117bb..eabe33c9d6b 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowColumnsMergedResultTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowColumnsMergedResultTest.java
@@ -135,7 +135,7 @@ class DecoratedEncryptShowColumnsMergedResultTest {
private DecoratedEncryptShowColumnsMergedResult
createDecoratedEncryptShowColumnsMergedResult(final MergedResult mergedResult,
final EncryptRule encryptRule) {
ShowColumnsStatementContext showColumnsStatementContext =
mock(ShowColumnsStatementContext.class);
-
when(showColumnsStatementContext.getAllTables()).thenReturn(Collections.singleton(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_encrypt")))));
+
when(showColumnsStatementContext.getSimpleTables()).thenReturn(Collections.singleton(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_encrypt")))));
return new DecoratedEncryptShowColumnsMergedResult(mergedResult,
showColumnsStatementContext, encryptRule);
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
index 51affd0926d..9f07a946d28 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/DecoratedEncryptShowCreateTableMergedResultTest.java
@@ -145,7 +145,7 @@ class DecoratedEncryptShowCreateTableMergedResultTest {
IdentifierValue identifierValue = new IdentifierValue("t_encrypt");
TableNameSegment tableNameSegment = new TableNameSegment(1, 4,
identifierValue);
SimpleTableSegment simpleTableSegment = new
SimpleTableSegment(tableNameSegment);
-
when(sqlStatementContext.getAllTables()).thenReturn(Collections.singleton(simpleTableSegment));
+
when(sqlStatementContext.getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
RuleMetaData ruleMetaData = mock(RuleMetaData.class);
when(ruleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(new
SQLParserRule(new SQLParserRuleConfiguration(new CacheOption(128, 1024L), new
CacheOption(2000, 65535L))));
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowColumnsMergedResultTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowColumnsMergedResultTest.java
index dd71bc219a9..24c0efeaf36 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowColumnsMergedResultTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowColumnsMergedResultTest.java
@@ -135,7 +135,7 @@ class MergedEncryptShowColumnsMergedResultTest {
private MergedEncryptShowColumnsMergedResult
createMergedEncryptColumnsMergedResult(final QueryResult queryResult, final
EncryptRule encryptRule) {
SelectStatementContext sqlStatementContext =
mock(SelectStatementContext.class);
-
when(sqlStatementContext.getAllTables()).thenReturn(Collections.singleton(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_encrypt")))));
+
when(sqlStatementContext.getSimpleTables()).thenReturn(Collections.singleton(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_encrypt")))));
return new MergedEncryptShowColumnsMergedResult(queryResult,
sqlStatementContext, encryptRule);
}
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
index 118c50eb77d..025dc2f28d7 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/show/MergedEncryptShowCreateTableMergedResultTest.java
@@ -126,7 +126,7 @@ class MergedEncryptShowCreateTableMergedResultTest {
IdentifierValue identifierValue = new IdentifierValue("t_encrypt");
TableNameSegment tableNameSegment = new TableNameSegment(1, 4,
identifierValue);
SimpleTableSegment simpleTableSegment = new
SimpleTableSegment(tableNameSegment);
-
when(sqlStatementContext.getAllTables()).thenReturn(Collections.singleton(simpleTableSegment));
+
when(sqlStatementContext.getSimpleTables()).thenReturn(Collections.singleton(simpleTableSegment));
when(sqlStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
RuleMetaData ruleMetaData = mock(RuleMetaData.class);
when(ruleMetaData.getSingleRule(SQLParserRule.class)).thenReturn(new
SQLParserRule(new SQLParserRuleConfiguration(new CacheOption(128, 1024L), new
CacheOption(2000, 65535L))));
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
index 6b7430269ae..c5ef7bd9ba5 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/EncryptTokenGenerateBuilderTest.java
@@ -54,7 +54,7 @@ class EncryptTokenGenerateBuilderTest {
@Test
void assertGetSQLTokenGenerators() {
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
-
when(selectStatementContext.getAllTables().isEmpty()).thenReturn(false);
+
when(selectStatementContext.getSimpleTables().isEmpty()).thenReturn(false);
when(selectStatementContext.getTablesContext().getTableNames()).thenReturn(Collections.singleton("table"));
when(selectStatementContext.getOrderByContext().getItems()).thenReturn(Collections.singleton(mock(OrderByItem.class)));
when(selectStatementContext.getGroupByContext().getItems()).thenReturn(Collections.emptyList());
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGeneratorTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGeneratorTest.java
index 39166f26cf6..1abf298afff 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGeneratorTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAssignmentTokenGeneratorTest.java
@@ -70,10 +70,10 @@ class EncryptAssignmentTokenGeneratorTest {
@BeforeEach
void setup() {
tokenGenerator.setEncryptRule(mockEncryptRule());
-
when(updateStatement.getAllTables().iterator().next().getTableName().getIdentifier().getValue()).thenReturn("table");
+
when(updateStatement.getSimpleTables().iterator().next().getTableName().getIdentifier().getValue()).thenReturn("table");
when(updateStatement.getSqlStatement().getSetAssignment().getAssignments()).thenReturn(Collections.singleton(assignmentSegment));
when(assignmentSegment.getColumns().get(0).getIdentifier().getValue()).thenReturn("columns");
-
when(insertStatement.getAllTables().iterator().next().getTableName().getIdentifier().getValue()).thenReturn("table");
+
when(insertStatement.getSimpleTables().iterator().next().getTableName().getIdentifier().getValue()).thenReturn("table");
when(setAssignmentSegment.getAssignments()).thenReturn(Collections.singleton(assignmentSegment));
}
diff --git
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/AbstractShadowDMLStatementRouteEngine.java
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/AbstractShadowDMLStatementRouteEngine.java
index 40dfc3a7a9d..88044078bf6 100644
---
a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/AbstractShadowDMLStatementRouteEngine.java
+++
b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/AbstractShadowDMLStatementRouteEngine.java
@@ -60,7 +60,7 @@ public abstract class AbstractShadowDMLStatementRouteEngine
implements ShadowRou
@Override
public final void route(final RouteContext routeContext, final ShadowRule
rule) {
-
tableAliasNameMappings.putAll(getTableAliasNameMappings(((TableAvailable)
sqlStatementContext).getAllTables()));
+
tableAliasNameMappings.putAll(getTableAliasNameMappings(((TableAvailable)
sqlStatementContext).getSimpleTables()));
decorateRouteContext(routeContext, rule,
findShadowDataSourceMappings(rule));
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
index abc4e61bfb5..c8a67083163 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
@@ -128,7 +128,7 @@ public final class GroupByMemoryMergedResult extends
MemoryMergedResult<Sharding
private boolean getValueCaseSensitiveFromTables(final QueryResult
queryResult,
final
SelectStatementContext selectStatementContext, final ShardingSphereSchema
schema, final int columnIndex) throws SQLException {
- for (SimpleTableSegment each : selectStatementContext.getAllTables()) {
+ for (SimpleTableSegment each :
selectStatementContext.getSimpleTables()) {
String tableName = each.getTableName().getIdentifier().getValue();
ShardingSpherePreconditions.checkState(schema.containsTable(tableName), () ->
new NoSuchTableException(tableName));
ShardingSphereTable table = schema.getTable(tableName);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
index 54f3bbcfa71..98be742dc75 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
@@ -69,7 +69,7 @@ public final class OrderByValue implements
Comparable<OrderByValue> {
}
private boolean getOrderValuesCaseSensitiveFromTables(final
ShardingSphereSchema schema, final OrderByItem eachOrderByItem) throws
SQLException {
- for (SimpleTableSegment each : selectStatementContext.getAllTables()) {
+ for (SimpleTableSegment each :
selectStatementContext.getSimpleTables()) {
String tableName = each.getTableName().getIdentifier().getValue();
ShardingSphereTable table = schema.getTable(tableName);
OrderByItemSegment orderByItemSegment =
eachOrderByItem.getSegment();
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
index 6cd2601294d..4513e26c7ca 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
@@ -68,7 +68,7 @@ public final class ShardingSQLRewriteContextDecorator
implements SQLRewriteConte
private boolean containsShardingTable(final ShardingRule shardingRule,
final SQLStatementContext sqlStatementContext) {
Collection<SimpleTableSegment> tableSegments =
- sqlStatementContext instanceof TableAvailable ?
((TableAvailable) sqlStatementContext).getAllTables() :
sqlStatementContext.getTablesContext().getSimpleTables();
+ sqlStatementContext instanceof TableAvailable ?
((TableAvailable) sqlStatementContext).getSimpleTables() :
sqlStatementContext.getTablesContext().getSimpleTables();
for (SimpleTableSegment each : tableSegments) {
if
(shardingRule.isShardingTable(each.getTableName().getIdentifier().getValue())) {
return true;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
index ee36cf90e00..cdf2e9fa068 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
@@ -70,7 +70,7 @@ public final class OrderByTokenGenerator implements
OptionalSQLTokenGenerator<Se
} else if (sqlStatement.getWhere().isPresent()) {
stopIndex = sqlStatement.getWhere().get().getStopIndex();
} else {
- stopIndex =
selectStatementContext.getAllTables().stream().mapToInt(SimpleTableSegment::getStopIndex).max().orElse(0);
+ stopIndex =
selectStatementContext.getSimpleTables().stream().mapToInt(SimpleTableSegment::getStopIndex).max().orElse(0);
}
return stopIndex + 1;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/TableTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/TableTokenGenerator.java
index e41d81bcb49..ee4c67676cc 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/TableTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/TableTokenGenerator.java
@@ -61,7 +61,7 @@ public final class TableTokenGenerator implements
CollectionSQLTokenGenerator<SQ
private Collection<SQLToken> generateSQLTokens(final TableAvailable
sqlStatementContext) {
Collection<SQLToken> result = new LinkedList<>();
- for (SimpleTableSegment each : sqlStatementContext.getAllTables()) {
+ for (SimpleTableSegment each : sqlStatementContext.getSimpleTables()) {
TableNameSegment tableName = each.getTableName();
if
(shardingRule.findShardingTable(tableName.getIdentifier().getValue()).isPresent())
{
result.add(new TableToken(tableName.getStartIndex(),
tableName.getStopIndex(), tableName.getIdentifier(), (SQLStatementContext)
sqlStatementContext, shardingRule));
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
index f7acad9c8c4..2bfb746bed3 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
@@ -125,7 +125,7 @@ public final class ShardingRouteEngineFactory {
return new
ShardingInstanceBroadcastRoutingEngine(database.getResourceMetaData());
}
Collection<String> tableNames = sqlStatementContext instanceof
TableAvailable
- ? ((TableAvailable)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
+ ? ((TableAvailable)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
: sqlStatementContext.getTablesContext().getTableNames();
Collection<String> shardingRuleTableNames =
shardingRule.getShardingRuleTableNames(tableNames);
// TODO remove this logic when jdbc adapter can support executing
create logic view
@@ -200,7 +200,7 @@ public final class ShardingRouteEngineFactory {
private static boolean isDCLForSingleTable(final SQLStatementContext
sqlStatementContext) {
if (sqlStatementContext instanceof TableAvailable) {
TableAvailable tableSegmentsAvailable = (TableAvailable)
sqlStatementContext;
- return 1 == tableSegmentsAvailable.getAllTables().size() &&
!"*".equals(tableSegmentsAvailable.getAllTables().iterator().next().getTableName().getIdentifier().getValue());
+ return 1 == tableSegmentsAvailable.getSimpleTables().size() &&
!"*".equals(tableSegmentsAvailable.getSimpleTables().iterator().next().getTableName().getIdentifier().getValue());
}
return false;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
index 5c48bad27f0..29f828bb36f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
@@ -44,7 +44,7 @@ public final class ShardingAlterTableStatementValidator
extends ShardingDDLState
public void preValidate(final ShardingRule shardingRule, final
SQLStatementContext sqlStatementContext,
final List<Object> params, final
ShardingSphereDatabase database, final ConfigurationProperties props) {
Collection<String> tableNames = sqlStatementContext instanceof
TableAvailable
- ? ((TableAvailable)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
+ ? ((TableAvailable)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
: sqlStatementContext.getTablesContext().getTableNames();
Optional<SimpleTableSegment> renameTable = ((AlterTableStatement)
sqlStatementContext.getSqlStatement()).getRenameTable();
if (renameTable.isPresent() &&
shardingRule.containsShardingTable(tableNames)) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
index d1e4571fbce..d61ffe9501b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
@@ -44,7 +44,7 @@ public final class ShardingRenameTableStatementValidator
extends ShardingDDLStat
public void preValidate(final ShardingRule shardingRule, final
SQLStatementContext sqlStatementContext, final List<Object> params, final
ShardingSphereDatabase database,
final ConfigurationProperties props) {
Collection<String> tableNames = sqlStatementContext instanceof
TableAvailable
- ? ((TableAvailable)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
+ ? ((TableAvailable)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
: sqlStatementContext.getTablesContext().getTableNames();
RenameTableStatement renameTableStatement = (RenameTableStatement)
sqlStatementContext.getSqlStatement();
List<SimpleTableSegment> renameTables =
renameTableStatement.getRenameTables().stream().map(RenameTableDefinitionSegment::getRenameTable).collect(Collectors.toList());
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
index 50b17077f1e..25b6c727042 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
@@ -79,7 +79,7 @@ class TableTokenGeneratorTest {
TableTokenGenerator generator = new TableTokenGenerator();
generator.setShardingRule(shardingRule);
CreateTableStatementContext sqlStatementContext =
mock(CreateTableStatementContext.class);
-
when(sqlStatementContext.getAllTables()).thenReturn(Collections.singletonList(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_order")))));
+
when(sqlStatementContext.getSimpleTables()).thenReturn(Collections.singletonList(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_order")))));
Collection<SQLToken> actual =
generator.generateSQLTokens(sqlStatementContext);
assertThat(actual.size(), is(1));
assertThat(actual.iterator().next(), instanceOf(TableToken.class));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
index 69f8267b0e9..0dec7a1b45c 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
@@ -396,7 +396,7 @@ class ShardingRouteEngineFactoryTest {
when(cursorStatementContext.getSqlStatement()).thenReturn(cursorStatement);
Collection<SimpleTableSegment> tableSegments =
createSimpleTableSegments();
Collection<String> tableNames = tableSegments.stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet());
- when(cursorStatementContext.getAllTables()).thenReturn(tableSegments);
+
when(cursorStatementContext.getSimpleTables()).thenReturn(tableSegments);
when(cursorStatementContext.getTablesContext().getTableNames()).thenReturn(tableNames);
when(shardingRule.isAllShardingTables(tableNames)).thenReturn(true);
when(shardingRule.getShardingRuleTableNames(tableNames)).thenReturn(tableNames);
@@ -413,7 +413,7 @@ class ShardingRouteEngineFactoryTest {
OpenGaussCursorStatement cursorStatement =
mock(OpenGaussCursorStatement.class);
when(cursorStatementContext.getSqlStatement()).thenReturn(cursorStatement);
Collection<SimpleTableSegment> tableSegments =
createSimpleTableSegments();
- when(cursorStatementContext.getAllTables()).thenReturn(tableSegments);
+
when(cursorStatementContext.getSimpleTables()).thenReturn(tableSegments);
QueryContext queryContext = new QueryContext(cursorStatementContext,
"", Collections.emptyList(), new HintValueContext());
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database,
queryContext, shardingConditions, props, new ConnectionContext(),
mock(RuleMetaData.class));
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContext.java
index 9e9576de021..f72ec975b1f 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContext.java
@@ -45,7 +45,7 @@ public final class AnalyzeTableStatementContext extends
CommonSQLStatementContex
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContext.java
index 86592fb1078..e3c6c298ba7 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContext.java
@@ -60,7 +60,7 @@ public final class ExplainStatementContext extends
CommonSQLStatementContext imp
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return extractTablesFromExplain(getSqlStatement());
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/FlushStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/FlushStatementContext.java
index 92e4dfd3a16..888d41d4361 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/FlushStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/FlushStatementContext.java
@@ -46,7 +46,7 @@ public final class FlushStatementContext extends
CommonSQLStatementContext imple
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return FlushStatementHandler.getSimpleTableSegment(getSqlStatement());
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContext.java
index 82322074a7a..497218e8a13 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContext.java
@@ -45,7 +45,7 @@ public final class OptimizeTableStatementContext extends
CommonSQLStatementConte
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
index 81947d488bf..2357222a11c 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContext.java
@@ -49,7 +49,7 @@ public final class ShowColumnsStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return null == getSqlStatement().getTable() ? Collections.emptyList()
: Collections.singletonList(getSqlStatement().getTable());
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContext.java
index 22abb8c0fcb..b84edb2ae62 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContext.java
@@ -46,7 +46,7 @@ public final class ShowCreateTableStatementContext extends
CommonSQLStatementCon
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return null == getSqlStatement().getTable() ? Collections.emptyList()
: Collections.singletonList(getSqlStatement().getTable());
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
index e3c1a8ddcd3..d102c75b9ac 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContext.java
@@ -49,7 +49,7 @@ public final class ShowIndexStatementContext extends
CommonSQLStatementContext i
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return null == getSqlStatement().getTable() ? Collections.emptyList()
: Collections.singletonList(getSqlStatement().getTable());
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContext.java
index 1f717cd3999..b92f09f4c9b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContext.java
@@ -46,7 +46,7 @@ public final class DenyUserStatementContext extends
CommonSQLStatementContext im
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return null == getSqlStatement().getTable() ? Collections.emptyList()
: Collections.singletonList(getSqlStatement().getTable());
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContext.java
index bf073f04e23..0b75826c0ed 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContext.java
@@ -45,7 +45,7 @@ public final class GrantStatementContext extends
CommonSQLStatementContext imple
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContext.java
index d5ecf362a24..9dd16e97259 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContext.java
@@ -45,7 +45,7 @@ public final class RevokeStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContext.java
index b03f8310243..693790c44cf 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContext.java
@@ -53,7 +53,7 @@ public final class AlterIndexStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
Optional<SimpleTableSegment> simpleTableSegment =
AlterIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
return
simpleTableSegment.map(Collections::singletonList).orElseGet(Collections::emptyList);
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContext.java
index 3e913849450..1e604afb922 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContext.java
@@ -59,7 +59,7 @@ public final class AlterTableStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
Collection<SimpleTableSegment> result = new LinkedList<>();
result.add(getSqlStatement().getTable());
if (getSqlStatement().getRenameTable().isPresent()) {
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContext.java
index c01608ce44d..2042067e25e 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContext.java
@@ -59,7 +59,7 @@ public final class AlterViewStatementContext extends
CommonSQLStatementContext i
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CommentStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CommentStatementContext.java
index b53abb7e518..6511d3820b1 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CommentStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CommentStatementContext.java
@@ -46,7 +46,7 @@ public final class CommentStatementContext extends
CommonSQLStatementContext imp
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContext.java
index 487457df16d..b1c6a73e94c 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContext.java
@@ -56,7 +56,7 @@ public final class CreateIndexStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return null == getSqlStatement().getTable() ? Collections.emptyList()
: Collections.singletonList(getSqlStatement().getTable());
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContext.java
index b1fef237902..fcef7f270ea 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContext.java
@@ -53,7 +53,7 @@ public final class CreateTableStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
Collection<SimpleTableSegment> result = new LinkedList<>();
result.add(getSqlStatement().getTable());
for (ColumnDefinitionSegment each :
getSqlStatement().getColumnDefinitions()) {
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateViewStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateViewStatementContext.java
index c5098bdeda0..e7eb724b47b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateViewStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateViewStatementContext.java
@@ -48,7 +48,7 @@ public final class CreateViewStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
index e6fa0406f4f..a72282796ab 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
@@ -77,7 +77,7 @@ public final class CursorStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContext.java
index fe955b93cf6..31d54357e9e 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContext.java
@@ -52,7 +52,7 @@ public final class DropIndexStatementContext extends
CommonSQLStatementContext i
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
Optional<SimpleTableSegment> simpleTableSegment =
DropIndexStatementHandler.getSimpleTableSegment(getSqlStatement());
return
simpleTableSegment.map(Collections::singletonList).orElseGet(Collections::emptyList);
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContext.java
index f92b3262c83..2974a0cb5fb 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContext.java
@@ -45,7 +45,7 @@ public final class DropTableStatementContext extends
CommonSQLStatementContext i
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropViewStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropViewStatementContext.java
index d33b54e431f..e145d14f55e 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropViewStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropViewStatementContext.java
@@ -45,7 +45,7 @@ public final class DropViewStatementContext extends
CommonSQLStatementContext im
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContext.java
index 6e9074bab4c..44fd1610bb2 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContext.java
@@ -47,7 +47,7 @@ public final class PrepareStatementContext extends
CommonSQLStatementContext imp
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return extractTablesFromPreparedStatement(getSqlStatement());
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/RenameTableStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/RenameTableStatementContext.java
index 46a4261b369..6682d29d1d2 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/RenameTableStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/RenameTableStatementContext.java
@@ -48,7 +48,7 @@ public final class RenameTableStatementContext extends
CommonSQLStatementContext
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
Collection<SimpleTableSegment> result = new LinkedList<>();
for (RenameTableDefinitionSegment each :
getSqlStatement().getRenameTables()) {
result.add(each.getTable());
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContext.java
index f0cfae1584d..10e532d24c9 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContext.java
@@ -45,7 +45,7 @@ public final class TruncateStatementContext extends
CommonSQLStatementContext im
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return getSqlStatement().getTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/CopyStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/CopyStatementContext.java
index 00445376265..09246d1ea90 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/CopyStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/CopyStatementContext.java
@@ -45,7 +45,7 @@ public final class CopyStatementContext extends
CommonSQLStatementContext implem
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContext.java
index 9d3a830b405..b706949fa8b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContext.java
@@ -90,7 +90,7 @@ public final class DeleteStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
index 9406cb3fac5..550aa310875 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
@@ -265,7 +265,7 @@ public final class InsertStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadDataStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadDataStatementContext.java
index 5e174a9cb72..e70449d5a7c 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadDataStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadDataStatementContext.java
@@ -45,7 +45,7 @@ public final class LoadDataStatementContext extends
CommonSQLStatementContext im
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadXMLStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadXMLStatementContext.java
index 96a2de8fc06..f7353355502 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadXMLStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/LoadXMLStatementContext.java
@@ -45,7 +45,7 @@ public final class LoadXMLStatementContext extends
CommonSQLStatementContext imp
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
index d9cc9bd3c2b..985dae29563 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
@@ -345,7 +345,7 @@ public final class SelectStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContext.java
index ee35aba9313..8422721c46a 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContext.java
@@ -68,7 +68,7 @@ public final class UpdateStatementContext extends
CommonSQLStatementContext impl
}
@Override
- public Collection<SimpleTableSegment> getAllTables() {
+ public Collection<SimpleTableSegment> getSimpleTables() {
return tablesContext.getSimpleTables();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/type/TableAvailable.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/type/TableAvailable.java
index 50f0f4a7ad4..a66ef759a3b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/type/TableAvailable.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/type/TableAvailable.java
@@ -28,11 +28,11 @@ import java.util.Collection;
public interface TableAvailable {
/**
- * Get all table segments.
+ * Get simple tables.
*
- * @return all table segments
+ * @return all simple tables
*/
- Collection<SimpleTableSegment> getAllTables();
+ Collection<SimpleTableSegment> getSimpleTables();
/**
* Get tables context.
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContextTest.java
index 908b311ba0b..d2a40b9fb66 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/AnalyzeTableStatementContextTest.java
@@ -59,6 +59,6 @@ class AnalyzeTableStatementContextTest {
AnalyzeTableStatementContext actual = new
AnalyzeTableStatementContext(analyzeTableStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(analyzeTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContextTest.java
index afa68c2d083..7822338980c 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ExplainStatementContextTest.java
@@ -52,6 +52,6 @@ class ExplainStatementContextTest {
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(explainStatement));
assertThat(actual.getSqlStatement().getStatement().orElse(null),
is(statement));
- assertThat(actual.getAllTables(), is(Collections.emptyList()));
+ assertThat(actual.getSimpleTables(), is(Collections.emptyList()));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContextTest.java
index f38cd9626e3..eded81210d8 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/OptimizeTableStatementContextTest.java
@@ -44,6 +44,6 @@ class OptimizeTableStatementContextTest {
OptimizeTableStatementContext actual = new
OptimizeTableStatementContext(optimizeTableStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(optimizeTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
index 78d60e511e2..329a5980749 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowColumnsStatementContextTest.java
@@ -50,7 +50,7 @@ class ShowColumnsStatementContextTest {
ShowColumnsStatementContext actual = new
ShowColumnsStatementContext(showColumnsStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(showColumnsStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList(tableName)));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList(tableName)));
assertThat(actual.getRemoveSegments(),
is(Collections.singletonList(fromSchema)));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContextTest.java
index 29e57435f7e..dc627c216e1 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowCreateTableStatementContextTest.java
@@ -43,6 +43,6 @@ class ShowCreateTableStatementContextTest {
ShowCreateTableStatementContext actual = new
ShowCreateTableStatementContext(showCreateTableStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(showCreateTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContextTest.java
index c8a259ab79b..1e0d06169df 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dal/ShowIndexStatementContextTest.java
@@ -43,6 +43,6 @@ class ShowIndexStatementContextTest {
ShowIndexStatementContext actual = new
ShowIndexStatementContext(showIndexStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(showIndexStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContextTest.java
index 9d0f4b2ea9f..03675e36e3a 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/DenyUserStatementContextTest.java
@@ -43,6 +43,6 @@ class DenyUserStatementContextTest {
DenyUserStatementContext actual = new
DenyUserStatementContext(sqlServerDenyUserStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(sqlServerDenyUserStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("tbl_1")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContextTest.java
index ab6fa8bd6af..b35508037de 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/GrantStatementContextTest.java
@@ -77,6 +77,6 @@ class GrantStatementContextTest {
GrantStatementContext actual = new
GrantStatementContext(grantStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(grantStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContextTest.java
index 7f6212fb6c2..0cb11219dde 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dcl/RevokeStatementContextTest.java
@@ -77,6 +77,6 @@ class RevokeStatementContextTest {
RevokeStatementContext actual = new
RevokeStatementContext(revokeStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(revokeStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContextTest.java
index 72134c8229c..331f2ce759e 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterIndexStatementContextTest.java
@@ -60,7 +60,7 @@ class AlterIndexStatementContextTest {
AlterIndexStatementContext actual = new
AlterIndexStatementContext(alterIndexStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(alterIndexStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.emptyList()));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.emptyList()));
assertThat(actual.getIndexes().stream().map(each ->
each.getIndexName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("index_1")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContextTest.java
index d2b6e58e49a..93a4306eb25 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterTableStatementContextTest.java
@@ -113,7 +113,7 @@ class AlterTableStatementContextTest {
AlterTableStatementContext actual = new
AlterTableStatementContext(alterTableStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(alterTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "rename_tbl_1", "tbl_1", "tbl_1",
"tbl_1")));
assertThat(actual.getIndexes().stream().map(each ->
each.getIndexName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("index", "drop_index")));
assertThat(actual.getConstraints().stream().map(each ->
each.getIdentifier().getValue()).collect(Collectors.toList()),
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContextTest.java
index bdab08dd096..e3a7fa66fd9 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/AlterViewStatementContextTest.java
@@ -68,6 +68,6 @@ class AlterViewStatementContextTest {
AlterViewStatementContext actual = new
AlterViewStatementContext(alterViewStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(alterViewStatement));
- assertThat(actual.getAllTables().size(), is(2));
+ assertThat(actual.getSimpleTables().size(), is(2));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContextTest.java
index e7e3de0d17b..2c722dc3248 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateIndexStatementContextTest.java
@@ -65,7 +65,7 @@ class CreateIndexStatementContextTest {
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(createIndexStatement));
assertTrue(actual.isGeneratedIndex());
- assertThat(actual.getAllTables(), is(Collections.emptyList()));
+ assertThat(actual.getSimpleTables(), is(Collections.emptyList()));
assertThat(actual.getIndexes(), is(Collections.emptyList()));
when(createIndexStatement.getIndex()).thenReturn(new IndexSegment(0,
0, new IndexNameSegment(0, 0, new IdentifierValue("index_2"))));
CreateIndexStatementContext actual2 = new
CreateIndexStatementContext(createIndexStatement);
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContextTest.java
index 17df017947d..003181d1177 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CreateTableStatementContextTest.java
@@ -87,7 +87,7 @@ class CreateTableStatementContextTest {
when(constraintDefinition.getReferencedTable()).thenReturn(Optional.of(table));
when(createTableStatement.getConstraintDefinitions()).thenReturn(Collections.singletonList(constraintDefinition));
assertThat(actual.getSqlStatement(), is(createTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_1", "tbl_1")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_1", "tbl_1")));
when(constraintDefinition.getIndexName()).thenReturn(Optional.of(new
IndexSegment(0, 0, new IndexNameSegment(0, 0, new
IdentifierValue("index_1")))));
assertThat(actual.getIndexes().stream().map(each ->
each.getIndexName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("index_1")));
assertThat(actual.getConstraints().stream().map(each ->
each.getIdentifier().getValue()).collect(Collectors.toList()),
is(Collections.singletonList("fk_1")));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContextTest.java
index 0b77e03530f..3526b06164a 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropIndexStatementContextTest.java
@@ -72,7 +72,7 @@ class DropIndexStatementContextTest {
DropIndexStatementContext actual = new
DropIndexStatementContext(dropIndexStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(dropIndexStatement));
- assertThat(actual.getAllTables(), is(Collections.emptyList()));
+ assertThat(actual.getSimpleTables(), is(Collections.emptyList()));
assertThat(actual.getIndexes().stream().map(each ->
each.getIndexName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("idx_1", "idx_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContextTest.java
index 8972a3cc931..412c2ebec3f 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/DropTableStatementContextTest.java
@@ -72,6 +72,6 @@ class DropTableStatementContextTest {
when(dropTableStatement.getTables()).thenReturn(Arrays.asList(table1,
table2));
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(dropTableStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
index 1ea14db3efc..a497cf3bb8a 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/PrepareStatementContextTest.java
@@ -69,7 +69,7 @@ class PrepareStatementContextTest {
PrepareStatementContext actual = new
PrepareStatementContext(prepareStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(prepareStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_1", "tbl_1", "tbl_1")));
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContextTest.java
index 3e02c5a48b7..47670e98d83 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/TruncateStatementContextTest.java
@@ -66,6 +66,6 @@ class TruncateStatementContextTest {
TruncateStatementContext actual = new
TruncateStatementContext(truncateStatement);
assertThat(actual, instanceOf(CommonSQLStatementContext.class));
assertThat(actual.getSqlStatement(), is(truncateStatement));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContextTest.java
index a4232c70fca..8c8702147a2 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/DeleteStatementContextTest.java
@@ -87,6 +87,6 @@ class DeleteStatementContextTest {
DeleteStatementContext actual = new
DeleteStatementContext(deleteStatement);
assertThat(actual.getTablesContext().getTableNames(), is(new
HashSet<>(Arrays.asList("tbl_1", "tbl_2"))));
assertThat(actual.getWhereSegments(),
is(Collections.singletonList(whereSegment)));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2")));
}
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
index 597d70332a5..02ede0d9bb4 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
@@ -195,8 +195,8 @@ class InsertStatementContextTest {
private void assertInsertStatementContext(final InsertStatementContext
actual) {
assertThat(actual.getTablesContext().getTableNames(), is(new
HashSet<>(Collections.singleton("tbl"))));
- assertThat(actual.getAllTables().size(), is(1));
- SimpleTableSegment simpleTableSegment =
actual.getAllTables().iterator().next();
+ assertThat(actual.getSimpleTables().size(), is(1));
+ SimpleTableSegment simpleTableSegment =
actual.getSimpleTables().iterator().next();
assertThat(simpleTableSegment.getTableName().getStartIndex(), is(0));
assertThat(simpleTableSegment.getTableName().getStopIndex(), is(0));
assertThat(simpleTableSegment.getTableName().getIdentifier().getValue(),
is("tbl"));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
index 5b90551efca..dfe17d10bba 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContextTest.java
@@ -404,7 +404,7 @@ class SelectStatementContextTest {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
SelectStatementContext actual = new
SelectStatementContext(createShardingSphereMetaData(database),
Collections.emptyList(), selectStatement, DefaultDatabase.LOGIC_NAME);
assertThat(actual.getTablesContext().getTableNames(),
is(Collections.emptySet()));
- assertThat(actual.getAllTables(), is(Collections.emptyList()));
+ assertThat(actual.getSimpleTables(), is(Collections.emptyList()));
assertThat(actual.getGroupByContext().getItems(),
is(Collections.emptyList()));
assertThat(actual.getWhereSegments(),
is(Collections.singletonList(whereSegment)));
}
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContextTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContextTest.java
index ecc5ef6fb84..4ec830005d3 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContextTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/UpdateStatementContextTest.java
@@ -69,6 +69,6 @@ class UpdateStatementContextTest {
UpdateStatementContext actual = new
UpdateStatementContext(updateStatement);
assertThat(actual.getTablesContext().getTableNames(), is(new
HashSet<>(Arrays.asList("tbl_1", "tbl_2"))));
assertThat(actual.getWhereSegments(),
is(Collections.singletonList(whereSegment)));
- assertThat(actual.getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2", "tbl_2")));
+ assertThat(actual.getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList()),
is(Arrays.asList("tbl_1", "tbl_2", "tbl_2")));
}
}
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
index 6c6e4f3dd5a..45e91e98132 100644
---
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java
@@ -76,7 +76,7 @@ public final class RemoveTokenGenerator implements
CollectionSQLTokenGenerator<S
private Collection<RemoveToken> generateTableAvailableSQLTokens(final
TableAvailable tableAvailable) {
Collection<RemoveToken> result = new LinkedList<>();
- for (SimpleTableSegment each : tableAvailable.getAllTables()) {
+ for (SimpleTableSegment each : tableAvailable.getSimpleTables()) {
if (!each.getOwner().isPresent()) {
continue;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
index 586dc208e0c..90c3c82f2ce 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/metadata/generator/PipelineDDLGenerator.java
@@ -152,7 +152,7 @@ public final class PipelineDDLGenerator {
}
private void appendFromTable(final Map<SQLSegment, String> replaceMap,
final String targetTableName, final TableAvailable sqlStatementContext) {
- for (SimpleTableSegment each : sqlStatementContext.getAllTables()) {
+ for (SimpleTableSegment each : sqlStatementContext.getSimpleTables()) {
if
(!targetTableName.equals(each.getTableName().getIdentifier().getValue())) {
replaceMap.put(each.getTableName(), targetTableName);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
index 4b0a5154597..825ca28b8e4 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutor.java
@@ -156,8 +156,8 @@ public final class ProxySQLExecutor {
}
private String getTableName(final ExecutionContext executionContext) {
- return executionContext.getSqlStatementContext() instanceof
TableAvailable && !((TableAvailable)
executionContext.getSqlStatementContext()).getAllTables().isEmpty()
- ? ((TableAvailable)
executionContext.getSqlStatementContext()).getAllTables().iterator().next().getTableName().getIdentifier().getValue()
+ return executionContext.getSqlStatementContext() instanceof
TableAvailable && !((TableAvailable)
executionContext.getSqlStatementContext()).getSimpleTables().isEmpty()
+ ? ((TableAvailable)
executionContext.getSqlStatementContext()).getSimpleTables().iterator().next().getTableName().getIdentifier().getValue()
: "unknown_table";
}
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/converter/type/HBaseRegionReloadOperationConverter.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/converter/type/HBaseRegionReloadOperationConverter.java
index ac8db634188..e5ea1e157e2 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/converter/type/HBaseRegionReloadOperationConverter.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/converter/type/HBaseRegionReloadOperationConverter.java
@@ -37,7 +37,7 @@ public final class HBaseRegionReloadOperationConverter
implements HBaseOperation
@Override
public HBaseOperation convert() {
- List<String> tables = ((FlushStatementContext)
sqlStatementContext).getAllTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList());
+ List<String> tables = ((FlushStatementContext)
sqlStatementContext).getSimpleTables().stream().map(each ->
each.getTableName().getIdentifier().getValue()).collect(Collectors.toList());
return new HBaseOperation(String.join(",", tables), new
HBaseRegionReloadOperation());
}
}
