This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ed02a3e0b92 Refactor ShadowTableRuleQueryResultSet (#18539)
ed02a3e0b92 is described below
commit ed02a3e0b9217d9ca493dccca1960032831a09ec
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jun 23 15:23:25 2022 +0800
Refactor ShadowTableRuleQueryResultSet (#18539)
---
.../handler/query/ShadowTableRuleQueryResultSet.java | 6 +++---
.../distsql/query/ShadowTableRuleQueryResultSetTest.java | 14 +++++++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
index d63c4de848b..30340be643f 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShadowTableRuleQueryResultSet.java
@@ -21,6 +21,7 @@ import
org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowTableRulesStatement;
+import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.ArrayList;
@@ -46,9 +47,8 @@ public final class ShadowTableRuleQueryResultSet implements
DistSQLResultSet {
@Override
public void init(final ShardingSphereDatabase database, final SQLStatement
sqlStatement) {
- Optional<ShadowRuleConfiguration> ruleConfig =
database.getRuleMetaData().getConfigurations()
- .stream().filter(each -> each instanceof
ShadowRuleConfiguration).map(each -> (ShadowRuleConfiguration) each).findAny();
- ruleConfig.ifPresent(optional -> data =
buildData(optional).iterator());
+ Optional<ShadowRule> rule =
database.getRuleMetaData().findSingleRule(ShadowRule.class);
+ rule.ifPresent(optional -> data = buildData((ShadowRuleConfiguration)
optional.getConfiguration()).iterator());
}
private List<Map<String, String>> buildData(final ShadowRuleConfiguration
shadowRuleConfiguration) {
diff --git
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShadowTableRuleQueryResultSetTest.java
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShadowTableRuleQueryResultSetTest.java
index b8a726cb0cf..d5aecfcb4a0 100644
---
a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShadowTableRuleQueryResultSetTest.java
+++
b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-distsql/shardingsphere-shadow-distsql-handler/src/test/java/org/apache/shardingsphere/shadow/distsql/query/ShadowTableRuleQueryResultSetTest.java
@@ -25,12 +25,14 @@ import
org.apache.shardingsphere.shadow.api.config.ShadowRuleConfiguration;
import
org.apache.shardingsphere.shadow.api.config.table.ShadowTableConfiguration;
import
org.apache.shardingsphere.shadow.distsql.handler.query.ShadowTableRuleQueryResultSet;
import
org.apache.shardingsphere.shadow.distsql.parser.statement.ShowShadowAlgorithmsStatement;
+import org.apache.shardingsphere.shadow.rule.ShadowRule;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
@@ -43,16 +45,22 @@ public final class ShadowTableRuleQueryResultSetTest {
@Test
public void assertGetRowData() {
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
-
when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.singleton(createRuleConfiguration()));
DistSQLResultSet resultSet = new ShadowTableRuleQueryResultSet();
- resultSet.init(database, mock(ShowShadowAlgorithmsStatement.class));
+ resultSet.init(mockDatabase(),
mock(ShowShadowAlgorithmsStatement.class));
List<Object> actual = new ArrayList<>(resultSet.getRowData());
assertThat(actual.size(), is(2));
assertThat(actual.get(0), is("t_order"));
assertThat(actual.get(1),
is("shadowAlgorithmName_1,shadowAlgorithmName_2"));
}
+ private ShardingSphereDatabase mockDatabase() {
+ ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
+ ShadowRule rule = mock(ShadowRule.class);
+ when(rule.getConfiguration()).thenReturn(createRuleConfiguration());
+
when(result.getRuleMetaData().findSingleRule(ShadowRule.class)).thenReturn(Optional.of(rule));
+ return result;
+ }
+
private RuleConfiguration createRuleConfiguration() {
ShadowRuleConfiguration result = new ShadowRuleConfiguration();
result.getTables().put("t_order", new
ShadowTableConfiguration(Collections.emptyList(),
Arrays.asList("shadowAlgorithmName_1", "shadowAlgorithmName_2")));
