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 630a6427f3c Rename ShardingDALMergedResult (#35766)
630a6427f3c is described below
commit 630a6427f3c72ca562bd34d9d2ee2ea529763f66
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Fri Jun 20 19:24:28 2025 +0800
Rename ShardingDALMergedResult (#35766)
* Rename ShardingDALMergedResult
* Rename ShardingDALMergedResult
---
.../sharding/merge/dal/ShardingDALResultMerger.java | 18 +++++++++---------
...esult.java => ShardingLogicTablesMergedResult.java} | 8 ++++----
...t.java => ShardingShowCreateTableMergedResult.java} | 8 ++++----
...dResult.java => ShardingShowIndexMergedResult.java} | 8 ++++----
...t.java => ShardingShowTableStatusMergedResult.java} | 8 ++++----
.../merge/dal/ShardingDALResultMergerTest.java | 16 ++++++++--------
...t.java => ShardingLogicTablesMergedResultTest.java} | 6 +++---
...va => ShardingShowCreateTableMergedResultTest.java} | 10 +++++-----
...est.java => ShardingShowIndexMergedResultTest.java} | 6 +++---
...va => ShardingShowTableStatusMergedResultTest.java} | 6 +++---
10 files changed, 47 insertions(+), 47 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
index 97a2b6510e1..d1e19bd99af 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.infra.merge.result.impl.transparent.Transparent
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
-import
org.apache.shardingsphere.sharding.merge.dal.show.LogicTablesMergedResult;
-import
org.apache.shardingsphere.sharding.merge.dal.show.ShowCreateTableMergedResult;
-import org.apache.shardingsphere.sharding.merge.dal.show.ShowIndexMergedResult;
-import
org.apache.shardingsphere.sharding.merge.dal.show.ShowTableStatusMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingLogicTablesMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowCreateTableMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowIndexMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowTableStatusMergedResult;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.ShowCreateTableStatement;
@@ -53,7 +53,7 @@ public final class ShardingDALResultMerger implements
ResultMerger {
private final String databaseName;
- private final ShardingRule shardingRule;
+ private final ShardingRule rule;
@Override
public MergedResult merge(final List<QueryResult> queryResults, final
SQLStatementContext sqlStatementContext,
@@ -64,16 +64,16 @@ public final class ShardingDALResultMerger implements
ResultMerger {
}
ShardingSphereSchema schema = getSchema(sqlStatementContext, database);
if (dalStatement instanceof ShowTablesStatement) {
- return new LogicTablesMergedResult(shardingRule,
sqlStatementContext, schema, queryResults);
+ return new ShardingLogicTablesMergedResult(rule,
sqlStatementContext, schema, queryResults);
}
if (dalStatement instanceof ShowTableStatusStatement) {
- return new ShowTableStatusMergedResult(shardingRule,
sqlStatementContext, schema, queryResults);
+ return new ShardingShowTableStatusMergedResult(rule,
sqlStatementContext, schema, queryResults);
}
if (dalStatement instanceof ShowIndexStatement) {
- return new ShowIndexMergedResult(shardingRule,
sqlStatementContext, schema, queryResults);
+ return new ShardingShowIndexMergedResult(rule,
sqlStatementContext, schema, queryResults);
}
if (dalStatement instanceof ShowCreateTableStatement) {
- return new ShowCreateTableMergedResult(shardingRule,
sqlStatementContext, schema, queryResults);
+ return new ShardingShowCreateTableMergedResult(rule,
sqlStatementContext, schema, queryResults);
}
return new TransparentMergedResult(queryResults.get(0));
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResult.java
similarity index 90%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResult.java
index 6df02c7b513..dda33277303 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResult.java
@@ -34,12 +34,12 @@ import java.util.Map;
import java.util.Optional;
/**
- * Logic tables merged result.
+ * Sharding logic tables merged result.
*/
-public class LogicTablesMergedResult extends MemoryMergedResult<ShardingRule> {
+public class ShardingLogicTablesMergedResult extends
MemoryMergedResult<ShardingRule> {
- public LogicTablesMergedResult(final ShardingRule rule,
- final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
+ public ShardingLogicTablesMergedResult(final ShardingRule rule,
+ final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
super(rule, schema, sqlStatementContext, queryResults);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResult.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResult.java
index afffefe0e59..882cdc31e26 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResult.java
@@ -40,12 +40,12 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Merged result for show create table.
+ * Sharding merged result for show create table.
*/
-public final class ShowCreateTableMergedResult extends LogicTablesMergedResult
{
+public final class ShardingShowCreateTableMergedResult extends
ShardingLogicTablesMergedResult {
- public ShowCreateTableMergedResult(final ShardingRule rule,
- final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
+ public ShardingShowCreateTableMergedResult(final ShardingRule rule,
+ final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
super(rule, sqlStatementContext, schema, queryResults);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResult.java
similarity index 87%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResult.java
index d9d6308071a..3fb39d8522d 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResult.java
@@ -32,12 +32,12 @@ import java.util.List;
import java.util.Optional;
/**
- * Merged result for show index.
+ * Sharding merged result for show index.
*/
-public final class ShowIndexMergedResult extends
MemoryMergedResult<ShardingRule> {
+public final class ShardingShowIndexMergedResult extends
MemoryMergedResult<ShardingRule> {
- public ShowIndexMergedResult(final ShardingRule shardingRule,
- final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
+ public ShardingShowIndexMergedResult(final ShardingRule shardingRule,
+ final SQLStatementContext
sqlStatementContext, final ShardingSphereSchema schema, final List<QueryResult>
queryResults) throws SQLException {
super(shardingRule, schema, sqlStatementContext, queryResults);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResult.java
similarity index 91%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResult.java
index f70e9be7665..a942d737b01 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResult.java
@@ -34,12 +34,12 @@ import java.util.Map;
import java.util.Optional;
/**
- * Merged result for show table status.
+ * Sharding merged result for show table status.
*/
-public final class ShowTableStatusMergedResult extends
MemoryMergedResult<ShardingRule> {
+public final class ShardingShowTableStatusMergedResult extends
MemoryMergedResult<ShardingRule> {
- public ShowTableStatusMergedResult(final ShardingRule shardingRule, final
SQLStatementContext sqlStatementContext,
- final ShardingSphereSchema schema,
final List<QueryResult> queryResults) throws SQLException {
+ public ShardingShowTableStatusMergedResult(final ShardingRule
shardingRule, final SQLStatementContext sqlStatementContext,
+ final ShardingSphereSchema
schema, final List<QueryResult> queryResults) throws SQLException {
super(shardingRule, schema, sqlStatementContext, queryResults);
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
index 692e652c014..cd0f78c1715 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult;
import
org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sharding.merge.dal.show.LogicTablesMergedResult;
-import
org.apache.shardingsphere.sharding.merge.dal.show.ShowCreateTableMergedResult;
-import org.apache.shardingsphere.sharding.merge.dal.show.ShowIndexMergedResult;
-import
org.apache.shardingsphere.sharding.merge.dal.show.ShowTableStatusMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingLogicTablesMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowCreateTableMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowIndexMergedResult;
+import
org.apache.shardingsphere.sharding.merge.dal.show.ShardingShowTableStatusMergedResult;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.DALStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.ExplainStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dal.ShowCreateTableStatement;
@@ -67,25 +67,25 @@ class ShardingDALResultMergerTest {
@Test
void assertMergeForShowShowTablesStatement() throws SQLException {
SQLStatementContext sqlStatementContext =
mockSQLStatementContext(mock(ShowTablesStatement.class));
- assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(LogicTablesMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShardingLogicTablesMergedResult.class));
}
@Test
void assertMergeForShowTableStatusStatement() throws SQLException {
SQLStatementContext sqlStatementContext =
mockSQLStatementContext(mock(ShowTableStatusStatement.class));
- assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShowTableStatusMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShardingShowTableStatusMergedResult.class));
}
@Test
void assertMergeForShowIndexStatement() throws SQLException {
SQLStatementContext sqlStatementContext =
mockSQLStatementContext(mock(ShowIndexStatement.class));
- assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShowIndexMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShardingShowIndexMergedResult.class));
}
@Test
void assertMergeForShowCreateTableStatement() throws SQLException {
SQLStatementContext sqlStatementContext =
mockSQLStatementContext(mock(ShowCreateTableStatement.class));
- assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShowCreateTableMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext,
mock(), mock()), instanceOf(ShardingShowCreateTableMergedResult.class));
}
@Test
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResultTest.java
similarity index 90%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResultTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResultTest.java
index 8d4bd523941..03897e68a46 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingLogicTablesMergedResultTest.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class LogicTablesMergedResultTest {
+class ShardingLogicTablesMergedResultTest {
private ShardingRule rule;
@@ -60,12 +60,12 @@ class LogicTablesMergedResultTest {
@Test
void assertNextForEmptyQueryResult() throws SQLException {
- assertFalse(new LogicTablesMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
+ assertFalse(new ShardingLogicTablesMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
}
@Test
void assertNextForActualTableNameInTableRule() throws SQLException {
- assertTrue(new LogicTablesMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResult("table_0"))).next());
+ assertTrue(new ShardingLogicTablesMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResult("table_0"))).next());
}
private QueryResult mockQueryResult(final String value) throws
SQLException {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResultTest.java
similarity index 92%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResultTest.java
index 4136510fb20..797b8822ab8 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowCreateTableMergedResultTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShowCreateTableMergedResultTest {
+class ShardingShowCreateTableMergedResultTest {
private ShardingRule rule;
@@ -72,17 +72,17 @@ class ShowCreateTableMergedResultTest {
@Test
void assertNextForEmptyQueryResult() throws SQLException {
- assertFalse(new ShowCreateTableMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
+ assertFalse(new ShardingShowCreateTableMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
}
@Test
void assertNextWithTableRule() throws SQLException {
- assertTrue(new ShowCreateTableMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResultWithTableRule())).next());
+ assertTrue(new ShardingShowCreateTableMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResultWithTableRule())).next());
}
@Test
void assertGetValueWithTableRule() throws SQLException {
- ShowCreateTableMergedResult actual = new
ShowCreateTableMergedResult(rule, mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResultWithTableRule()));
+ ShardingShowCreateTableMergedResult actual = new
ShardingShowCreateTableMergedResult(rule, mock(SQLStatementContext.class),
schema, Collections.singletonList(mockQueryResultWithTableRule()));
assertTrue(actual.next());
assertThat(actual.getValue(1, String.class), is("foo_tbl"));
assertThat(actual.getValue(2, String.class), is("CREATE TABLE
`foo_tbl` (\n"
@@ -115,7 +115,7 @@ class ShowCreateTableMergedResultTest {
@Test
void assertGetValueWithoutTableRule() throws SQLException {
- ShowCreateTableMergedResult actual = new ShowCreateTableMergedResult(
+ ShardingShowCreateTableMergedResult actual = new
ShardingShowCreateTableMergedResult(
mock(ShardingRule.class, RETURNS_DEEP_STUBS),
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResultWithoutTableRule()));
assertTrue(actual.next());
assertThat(actual.getValue(1, String.class), is("foo_tbl"));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResultTest.java
similarity index 88%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResultTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResultTest.java
index bcad1b9e345..4ca17fd0cf7 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowIndexMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowIndexMergedResultTest.java
@@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ShowIndexMergedResultTest {
+class ShardingShowIndexMergedResultTest {
@Mock
private ShardingRule rule;
@@ -46,12 +46,12 @@ class ShowIndexMergedResultTest {
@Test
void assertNextForEmptyQueryResult() throws SQLException {
- assertFalse(new ShowIndexMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
+ assertFalse(new ShardingShowIndexMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
}
@Test
void assertNextForTableRuleIsPresent() throws SQLException {
- assertTrue(new ShowIndexMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResult())).next());
+ assertTrue(new ShardingShowIndexMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResult())).next());
}
private QueryResult mockQueryResult() throws SQLException {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResultTest.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResultTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResultTest.java
index d00a7ee4f83..979cfc1ca66 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTableStatusMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShardingShowTableStatusMergedResultTest.java
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ShowTableStatusMergedResultTest {
+class ShardingShowTableStatusMergedResultTest {
@Mock
private ShardingRule rule;
@@ -69,12 +69,12 @@ class ShowTableStatusMergedResultTest {
@Test
void assertNextForEmptyQueryResult() throws SQLException {
- assertFalse(new ShowTableStatusMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
+ assertFalse(new ShardingShowTableStatusMergedResult(rule,
mock(SQLStatementContext.class), schema, Collections.emptyList()).next());
}
@Test
void assertNextForTableRuleIsPresent() throws SQLException {
- MergedResult mergedResult = new ShowTableStatusMergedResult(rule,
mock(SQLStatementContext.class), schema,
Collections.singletonList(mockQueryResult()));
+ MergedResult mergedResult = new
ShardingShowTableStatusMergedResult(rule, mock(SQLStatementContext.class),
schema, Collections.singletonList(mockQueryResult()));
assertTrue(mergedResult.next());
assertFalse(mergedResult.next());
}
