You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by to...@apache.org on 2022/06/23 05:40:15 UTC
[shardingsphere] branch master updated: Refactor ShardingScalingRulesQueryResultSet (#18530)
This is an automated email from the ASF dual-hosted git repository.
totalo 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 5fce90aad8c Refactor ShardingScalingRulesQueryResultSet (#18530)
5fce90aad8c is described below
commit 5fce90aad8c1a2fd3f22b6983d791f0f417eb5b4
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 23 13:40:02 2022 +0800
Refactor ShardingScalingRulesQueryResultSet (#18530)
* Refactor ShardingScalingRulesQueryResultSet
* Refactor ShardingScalingRulesQueryResultSet
---
.../query/ShardingScalingRulesQueryResultSet.java | 6 ++--
.../ShardingScalingRulesQueryResultSetTest.java | 34 +++++++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
index 9e6e766d77b..957b7142bdb 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSet.java
@@ -23,6 +23,7 @@ import org.apache.shardingsphere.infra.distsql.query.DistSQLResultSet;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.scaling.distsql.statement.ShowShardingScalingRulesStatement;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
+import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
@@ -42,9 +43,8 @@ public final class ShardingScalingRulesQueryResultSet implements DistSQLResultSe
@Override
public void init(final ShardingSphereDatabase database, final SQLStatement sqlStatement) {
- Optional<ShardingRuleConfiguration> ruleConfig = database.getRuleMetaData().getConfigurations()
- .stream().filter(each -> each instanceof ShardingRuleConfiguration).map(each -> (ShardingRuleConfiguration) each).findAny();
- data = ruleConfig.map(ShardingRuleConfiguration::getScaling).orElse(Collections.emptyMap()).entrySet().iterator();
+ Optional<ShardingRule> rule = database.getRuleMetaData().findSingleRule(ShardingRule.class);
+ data = rule.map(optional -> ((ShardingRuleConfiguration) optional.getConfiguration()).getScaling().entrySet().iterator()).orElse(Collections.emptyIterator());
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSetTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSetTest.java
index ecddf3ea6f5..fc867bfbfb7 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShardingScalingRulesQueryResultSetTest.java
@@ -25,11 +25,13 @@ import org.apache.shardingsphere.infra.config.rulealtered.OnRuleAlteredActionCon
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.distsql.parser.statement.ShowShardingAlgorithmsStatement;
+import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.containsString;
@@ -43,10 +45,8 @@ public final class ShardingScalingRulesQueryResultSetTest {
@Test
public void assertGetRowData() {
- ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
- when(database.getRuleMetaData().getConfigurations()).thenReturn(Collections.singleton(createRuleConfiguration()));
ShardingScalingRulesQueryResultSet resultSet = new ShardingScalingRulesQueryResultSet();
- resultSet.init(database, mock(ShowShardingAlgorithmsStatement.class));
+ resultSet.init(mockDatabase(), mock(ShowShardingAlgorithmsStatement.class));
List<Object> actual = new ArrayList<>(resultSet.getRowData());
assertThat(actual.size(), is(6));
assertThat(actual.get(0), is("scaling_name"));
@@ -61,6 +61,14 @@ public final class ShardingScalingRulesQueryResultSetTest {
assertThat(actual.get(5).toString(), containsString("\"type\":\"DATA_MATCH\",\"props\":{\"chunk-size\":\"1000\"}"));
}
+ private ShardingSphereDatabase mockDatabase() {
+ ShardingSphereDatabase result = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
+ ShardingRule rule = mock(ShardingRule.class);
+ when(rule.getConfiguration()).thenReturn(createRuleConfiguration());
+ when(result.getRuleMetaData().findSingleRule(ShardingRule.class)).thenReturn(Optional.of(rule));
+ return result;
+ }
+
private RuleConfiguration createRuleConfiguration() {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
result.setScaling(Collections.singletonMap("scaling_name", buildCompleteConfiguration()));
@@ -68,23 +76,15 @@ public final class ShardingScalingRulesQueryResultSetTest {
}
private OnRuleAlteredActionConfiguration buildCompleteConfiguration() {
- InputConfiguration inputConfig = createInputConfiguration("QPS", newProperties("qps", "50"));
- OutputConfiguration outputConfig = createOutputConfiguration("TPS", newProperties("tps", "2000"));
- ShardingSphereAlgorithmConfiguration streamChannel = new ShardingSphereAlgorithmConfiguration("MEMORY", newProperties("block-queue-size", "10000"));
- ShardingSphereAlgorithmConfiguration completionDetector = new ShardingSphereAlgorithmConfiguration("IDLE", newProperties("incremental-task-idle-seconds-threshold", "1800"));
- ShardingSphereAlgorithmConfiguration dataConsistencyChecker = new ShardingSphereAlgorithmConfiguration("DATA_MATCH", newProperties("chunk-size", "1000"));
+ InputConfiguration inputConfig = new InputConfiguration(10, 100, 10, new ShardingSphereAlgorithmConfiguration("QPS", createProperties("qps", "50")));
+ OutputConfiguration outputConfig = new OutputConfiguration(10, 100, new ShardingSphereAlgorithmConfiguration("TPS", createProperties("tps", "2000")));
+ ShardingSphereAlgorithmConfiguration streamChannel = new ShardingSphereAlgorithmConfiguration("MEMORY", createProperties("block-queue-size", "10000"));
+ ShardingSphereAlgorithmConfiguration completionDetector = new ShardingSphereAlgorithmConfiguration("IDLE", createProperties("incremental-task-idle-seconds-threshold", "1800"));
+ ShardingSphereAlgorithmConfiguration dataConsistencyChecker = new ShardingSphereAlgorithmConfiguration("DATA_MATCH", createProperties("chunk-size", "1000"));
return new OnRuleAlteredActionConfiguration(inputConfig, outputConfig, streamChannel, completionDetector, dataConsistencyChecker);
}
- private InputConfiguration createInputConfiguration(final String type, final Properties props) {
- return new InputConfiguration(10, 100, 10, new ShardingSphereAlgorithmConfiguration(type, props));
- }
-
- private OutputConfiguration createOutputConfiguration(final String type, final Properties props) {
- return new OutputConfiguration(10, 100, new ShardingSphereAlgorithmConfiguration(type, props));
- }
-
- private Properties newProperties(final String key, final String value) {
+ private Properties createProperties(final String key, final String value) {
Properties result = new Properties();
result.setProperty(key, value);
return result;