You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/22 15:42:56 UTC
[shardingsphere] branch master updated: update (#6404)
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 3cd8b22 update (#6404)
3cd8b22 is described below
commit 3cd8b2297f0f2d7599e00e7860052f1e96e49faf
Author: kimmking <ki...@163.com>
AuthorDate: Wed Jul 22 23:42:34 2020 +0800
update (#6404)
---
.../config/HeartbeatConfiguration.java | 2 +-
.../swapper/ClusterConfigurationYamlSwapper.java | 4 +--
.../yaml/YamlHeartbeatConfiguration.java | 2 +-
.../ClusterConfigurationYamlSwapperTest.java | 8 ++---
.../cluster/facade/ClusterFacade.java | 2 +-
.../cluster/facade/ClusterInitFacadeTest.java | 6 ++--
.../heartbeat/detect/AbstractHeartbeatDetect.java | 20 ++++++------
.../cluster/heartbeat/detect/HeartbeatDetect.java | 8 ++---
.../heartbeat/response/HeartbeatResult.java | 4 +--
.../heartbeat/detect/HeartbeatHandlerTest.java | 36 +++++++++++-----------
.../heartbeat/response/HeartbeatResponseTest.java | 4 +--
.../cluster/state/ClusterStateInstance.java | 12 --------
12 files changed, 47 insertions(+), 61 deletions(-)
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/config/HeartbeatConfiguration.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/config/HeartbeatConfiguration.java
index 31d179f..f7a557b 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/config/HeartbeatConfiguration.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/config/HeartbeatConfiguration.java
@@ -31,7 +31,7 @@ public final class HeartbeatConfiguration {
private Integer interval;
- private Boolean retryEnable;
+ private boolean retryEnable;
private Integer retryMaximum;
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapper.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapper.java
index e5aaf30..3b9af8f 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapper.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapper.java
@@ -35,7 +35,7 @@ public final class ClusterConfigurationYamlSwapper implements YamlSwapper<YamlCl
HeartbeatConfiguration heartbeat = clusterConfiguration.getHeartbeat();
yamlHeartBeatConfiguration.setSql(heartbeat.getSql());
yamlHeartBeatConfiguration.setInterval(heartbeat.getInterval());
- yamlHeartBeatConfiguration.setRetryEnable(heartbeat.getRetryEnable());
+ yamlHeartBeatConfiguration.setRetryEnable(heartbeat.isRetryEnable());
yamlHeartBeatConfiguration.setRetryMaximum(heartbeat.getRetryMaximum());
yamlHeartBeatConfiguration.setRetryInterval(heartbeat.getRetryInterval());
yamlHeartBeatConfiguration.setThreadCount(heartbeat.getThreadCount());
@@ -50,7 +50,7 @@ public final class ClusterConfigurationYamlSwapper implements YamlSwapper<YamlCl
YamlHeartbeatConfiguration heartbeat = yamlConfiguration.getHeartbeat();
heartBeatConfiguration.setSql(heartbeat.getSql());
heartBeatConfiguration.setInterval(heartbeat.getInterval());
- heartBeatConfiguration.setRetryEnable(heartbeat.getRetryEnable());
+ heartBeatConfiguration.setRetryEnable(heartbeat.isRetryEnable());
heartBeatConfiguration.setRetryMaximum(heartbeat.getRetryMaximum());
heartBeatConfiguration.setRetryInterval(heartbeat.getRetryInterval());
heartBeatConfiguration.setThreadCount(null == heartbeat.getThreadCount() ? Runtime.getRuntime().availableProcessors() << 1 : heartbeat.getThreadCount());
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/yaml/YamlHeartbeatConfiguration.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/yaml/YamlHeartbeatConfiguration.java
index b20128c..528f73a 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/yaml/YamlHeartbeatConfiguration.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/main/java/org/apache/shardingsphere/cluster/configuration/yaml/YamlHeartbeatConfiguration.java
@@ -32,7 +32,7 @@ public final class YamlHeartbeatConfiguration implements YamlConfiguration {
private Integer interval;
- private Boolean retryEnable;
+ private boolean retryEnable;
private Integer retryMaximum;
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/test/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapperTest.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/test/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapperTest.java
index 142b224..0179896 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/test/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapperTest.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-configuration/src/test/java/org/apache/shardingsphere/cluster/configuration/swapper/ClusterConfigurationYamlSwapperTest.java
@@ -40,7 +40,7 @@ public final class ClusterConfigurationYamlSwapperTest {
YamlHeartbeatConfiguration yamlHeartBeatConfiguration = new YamlHeartbeatConfiguration();
yamlHeartBeatConfiguration.setSql(SQL);
yamlHeartBeatConfiguration.setInterval(INTERVAL);
- yamlHeartBeatConfiguration.setRetryEnable(Boolean.TRUE);
+ yamlHeartBeatConfiguration.setRetryEnable(true);
yamlHeartBeatConfiguration.setRetryMaximum(MAXIMUM);
YamlClusterConfiguration yamlClusterConfiguration = new YamlClusterConfiguration();
yamlClusterConfiguration.setHeartbeat(yamlHeartBeatConfiguration);
@@ -48,7 +48,7 @@ public final class ClusterConfigurationYamlSwapperTest {
assertThat(clusterConfiguration.getHeartbeat().getSql(), is(SQL));
assertThat(clusterConfiguration.getHeartbeat().getInterval(), is(INTERVAL));
assertThat(clusterConfiguration.getHeartbeat().getRetryMaximum(), is(MAXIMUM));
- assertTrue(clusterConfiguration.getHeartbeat().getRetryEnable());
+ assertTrue(clusterConfiguration.getHeartbeat().isRetryEnable());
}
@Test
@@ -56,7 +56,7 @@ public final class ClusterConfigurationYamlSwapperTest {
HeartbeatConfiguration heartBeatConfiguration = new HeartbeatConfiguration();
heartBeatConfiguration.setSql(SQL);
heartBeatConfiguration.setInterval(INTERVAL);
- heartBeatConfiguration.setRetryEnable(Boolean.TRUE);
+ heartBeatConfiguration.setRetryEnable(true);
heartBeatConfiguration.setRetryMaximum(MAXIMUM);
ClusterConfiguration clusterConfiguration = new ClusterConfiguration();
clusterConfiguration.setHeartbeat(heartBeatConfiguration);
@@ -64,6 +64,6 @@ public final class ClusterConfigurationYamlSwapperTest {
assertThat(yamlClusterConfiguration.getHeartbeat().getSql(), is(SQL));
assertThat(yamlClusterConfiguration.getHeartbeat().getInterval(), is(INTERVAL));
assertThat(yamlClusterConfiguration.getHeartbeat().getRetryMaximum(), is(MAXIMUM));
- assertTrue(yamlClusterConfiguration.getHeartbeat().getRetryEnable());
+ assertTrue(yamlClusterConfiguration.getHeartbeat().isRetryEnable());
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/main/java/org/apache/shardingsphere/cluster/facade/ClusterFacade.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/main/java/org/apache/shardingsphere/cluster/facade/ClusterFacade.java
index 9153e0c..08cb2ac 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/main/java/org/apache/shardingsphere/cluster/facade/ClusterFacade.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/main/java/org/apache/shardingsphere/cluster/facade/ClusterFacade.java
@@ -105,7 +105,7 @@ public final class ClusterFacade {
DataSourceState dataSourceState = null == instanceState.getDataSources()
|| null == instanceState.getDataSources().get(dataSourceName) ? new DataSourceState()
: instanceState.getDataSources().get(dataSourceName);
- dataSourceState.setState(each.getDisabled() ? NodeState.DISABLED : each.getEnable() ? NodeState.ONLINE : NodeState.OFFLINE);
+ dataSourceState.setState(each.isDisabled() ? NodeState.DISABLED : each.isEnable() ? NodeState.ONLINE : NodeState.OFFLINE);
dataSourceState.setLastConnect(each.getDetectTimeStamp());
dataSourceStateMap.put(dataSourceName, dataSourceState);
});
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterInitFacadeTest.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterInitFacadeTest.java
index fec0aa3..50263d6 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterInitFacadeTest.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-facade/src/test/java/org/apache/shardingsphere/cluster/facade/ClusterInitFacadeTest.java
@@ -42,7 +42,7 @@ public final class ClusterInitFacadeTest {
HeartbeatConfiguration heartBeatConfiguration = new HeartbeatConfiguration();
heartBeatConfiguration.setSql("select 1");
heartBeatConfiguration.setInterval(60);
- heartBeatConfiguration.setRetryEnable(Boolean.TRUE);
+ heartBeatConfiguration.setRetryEnable(true);
heartBeatConfiguration.setRetryMaximum(3);
ClusterConfiguration clusterConfiguration = new ClusterConfiguration();
clusterConfiguration.setHeartbeat(heartBeatConfiguration);
@@ -67,7 +67,7 @@ public final class ClusterInitFacadeTest {
HeartbeatConfiguration heartBeatConfiguration = new HeartbeatConfiguration();
heartBeatConfiguration.setSql("select 2");
heartBeatConfiguration.setInterval(30);
- heartBeatConfiguration.setRetryEnable(Boolean.FALSE);
+ heartBeatConfiguration.setRetryEnable(false);
heartBeatConfiguration.setRetryMaximum(3);
ClusterConfiguration clusterConfiguration = new ClusterConfiguration();
clusterConfiguration.setHeartbeat(heartBeatConfiguration);
@@ -77,7 +77,7 @@ public final class ClusterInitFacadeTest {
@Test
public void assertEnable() {
- ClusterInitFacade.enable(Boolean.FALSE);
+ ClusterInitFacade.enable(false);
assertFalse(ClusterInitFacade.isEnabled());
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
index b9886fe..d5fd98d 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/AbstractHeartbeatDetect.java
@@ -31,20 +31,20 @@ import java.util.concurrent.Callable;
@Slf4j
public abstract class AbstractHeartbeatDetect implements Callable<Map<String, HeartbeatResult>> {
- private final Boolean retryEnable;
+ private final boolean retryEnable;
private final Integer retryMaximum;
private final Integer retryInterval;
- private final Boolean needDetect;
-
+ private final boolean needDetect;
+
/**
* Detect heart beat.
*
* @return heart beat result.
*/
- protected abstract Boolean detect();
+ protected abstract boolean detect();
/**
* Build heart beat result.
@@ -52,19 +52,17 @@ public abstract class AbstractHeartbeatDetect implements Callable<Map<String, He
* @param result heart beat result
* @return heart beat result
*/
- protected abstract Map<String, HeartbeatResult> buildResult(Boolean result);
+ protected abstract Map<String, HeartbeatResult> buildResult(boolean result);
@Override
public Map<String, HeartbeatResult> call() {
if (!needDetect) {
- return buildResult(Boolean.FALSE);
+ return buildResult(false);
}
if (retryEnable && retryMaximum > 0) {
- Boolean result = Boolean.FALSE;
for (int i = 0; i < retryMaximum; i++) {
- result = detect();
- if (result) {
- break;
+ if (detect()) {
+ return buildResult(true);
}
try {
Thread.sleep(retryInterval * 1000);
@@ -72,7 +70,7 @@ public abstract class AbstractHeartbeatDetect implements Callable<Map<String, He
log.warn("Retry heart beat detect sleep error", ex);
}
}
- return buildResult(result);
+ return buildResult(false);
} else {
return buildResult(detect());
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
index 8aaca2b..d82573a 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatDetect.java
@@ -44,11 +44,11 @@ public final class HeartbeatDetect extends AbstractHeartbeatDetect {
private final DataSource dataSource;
- private final Boolean dataSourceDisabled;
+ private final boolean dataSourceDisabled;
public HeartbeatDetect(final String schemaName, final String dataSourceName, final DataSource dataSource,
final HeartbeatConfiguration configuration, final Boolean dataSourceDisabled) {
- super(configuration.getRetryEnable(), configuration.getRetryMaximum(), configuration.getRetryInterval(), !dataSourceDisabled);
+ super(configuration.isRetryEnable(), configuration.getRetryMaximum(), configuration.getRetryInterval(), !dataSourceDisabled);
this.sql = configuration.getSql();
this.schemaName = schemaName;
this.dataSourceName = dataSourceName;
@@ -57,7 +57,7 @@ public final class HeartbeatDetect extends AbstractHeartbeatDetect {
}
@Override
- protected Boolean detect() {
+ protected boolean detect() {
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
try (ResultSet result = preparedStatement.executeQuery()) {
@@ -70,7 +70,7 @@ public final class HeartbeatDetect extends AbstractHeartbeatDetect {
}
@Override
- protected Map<String, HeartbeatResult> buildResult(final Boolean result) {
+ protected Map<String, HeartbeatResult> buildResult(final boolean result) {
Map<String, HeartbeatResult> heartBeatResultMap = new HashMap<>(1, 1);
heartBeatResultMap.put(schemaName, new HeartbeatResult(dataSourceName, result, System.currentTimeMillis(), dataSourceDisabled));
return heartBeatResultMap;
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
index da23b6e..4de0f35 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResult.java
@@ -29,9 +29,9 @@ public final class HeartbeatResult {
private final String dataSourceName;
- private final Boolean enable;
+ private final boolean enable;
private final Long detectTimeStamp;
- private final Boolean disabled;
+ private final boolean disabled;
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
index 5a4df53..999c0e1 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
@@ -57,22 +57,22 @@ public final class HeartbeatHandlerTest {
private static final String DATA_SOURCE_1 = "ds_1";
- private static Boolean enableExecuteQuery;
+ private static boolean enableExecuteQuery;
- private static Boolean multipleDataSource;
+ private static boolean multipleDataSource;
private HeartbeatHandler handler;
@Before
public void init() {
handler = HeartbeatHandler.getInstance();
- enableExecuteQuery = Boolean.TRUE;
- multipleDataSource = Boolean.FALSE;
+ enableExecuteQuery = true;
+ multipleDataSource = false;
}
@Test
public void assertHandleWithoutRetry() {
- handler.init(getHeartbeatConfiguration(Boolean.FALSE));
+ handler.init(getHeartbeatConfiguration(false));
HeartbeatResponse response = handler.handle(getSchemaContext(), Collections.emptyList());
Assert.assertNotNull(response);
Assert.assertNotNull(response.getHeartbeatResultMap());
@@ -81,13 +81,13 @@ public final class HeartbeatHandlerTest {
HeartbeatResult heartbeatResult = response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().next();
assertNotNull(heartbeatResult);
assertThat(heartbeatResult.getDataSourceName(), is(DATA_SOURCE_0));
- assertTrue(heartbeatResult.getEnable());
+ assertTrue(heartbeatResult.isEnable());
}
@Test
public void assertHandleWhenDetectExceptionWithoutRetry() {
- enableExecuteQuery = Boolean.FALSE;
- handler.init(getHeartbeatConfiguration(Boolean.FALSE));
+ enableExecuteQuery = false;
+ handler.init(getHeartbeatConfiguration(false));
HeartbeatResponse response = handler.handle(getSchemaContext(), Collections.emptyList());
Assert.assertNotNull(response);
Assert.assertNotNull(response.getHeartbeatResultMap());
@@ -96,12 +96,12 @@ public final class HeartbeatHandlerTest {
HeartbeatResult heartbeatResult = response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().next();
assertNotNull(heartbeatResult);
assertThat(heartbeatResult.getDataSourceName(), is(DATA_SOURCE_0));
- assertFalse(heartbeatResult.getEnable());
+ assertFalse(heartbeatResult.isEnable());
}
@Test
public void assertHandleWithRetry() {
- handler.init(getHeartbeatConfiguration(Boolean.TRUE));
+ handler.init(getHeartbeatConfiguration(true));
HeartbeatResponse response = handler.handle(getSchemaContext(), Collections.emptyList());
Assert.assertNotNull(response);
Assert.assertNotNull(response.getHeartbeatResultMap());
@@ -110,13 +110,13 @@ public final class HeartbeatHandlerTest {
HeartbeatResult heartbeatResult = response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().next();
assertNotNull(heartbeatResult);
assertThat(heartbeatResult.getDataSourceName(), is(DATA_SOURCE_0));
- assertTrue(heartbeatResult.getEnable());
+ assertTrue(heartbeatResult.isEnable());
}
@Test
public void assertHandleWhenDetectExceptionWithRetry() {
- enableExecuteQuery = Boolean.FALSE;
- handler.init(getHeartbeatConfiguration(Boolean.TRUE));
+ enableExecuteQuery = false;
+ handler.init(getHeartbeatConfiguration(true));
HeartbeatResponse response = handler.handle(getSchemaContext(), Collections.emptyList());
Assert.assertNotNull(response);
Assert.assertNotNull(response.getHeartbeatResultMap());
@@ -125,13 +125,13 @@ public final class HeartbeatHandlerTest {
HeartbeatResult heartbeatResult = response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().next();
assertNotNull(heartbeatResult);
assertThat(heartbeatResult.getDataSourceName(), is(DATA_SOURCE_0));
- assertFalse(heartbeatResult.getEnable());
+ assertFalse(heartbeatResult.isEnable());
}
@Test
public void assertMultipleDataSource() {
- multipleDataSource = Boolean.TRUE;
- handler.init(getHeartbeatConfiguration(Boolean.FALSE));
+ multipleDataSource = true;
+ handler.init(getHeartbeatConfiguration(false));
HeartbeatResponse response = handler.handle(getSchemaContext(), Collections.emptyList());
Assert.assertNotNull(response);
Assert.assertNotNull(response.getHeartbeatResultMap());
@@ -139,10 +139,10 @@ public final class HeartbeatHandlerTest {
assertThat(response.getHeartbeatResultMap().get(SCHEMA_NAME).size(), is(2));
assertTrue(response.getHeartbeatResultMap().get(SCHEMA_NAME).stream().map(HeartbeatResult::getDataSourceName)
.collect(Collectors.toList()).containsAll(Arrays.asList(DATA_SOURCE_0, DATA_SOURCE_1)));
- response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().forEachRemaining(each -> assertTrue(each.getEnable()));
+ response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().forEachRemaining(each -> assertTrue(each.isEnable()));
}
- private HeartbeatConfiguration getHeartbeatConfiguration(final Boolean retry) {
+ private HeartbeatConfiguration getHeartbeatConfiguration(final boolean retry) {
HeartbeatConfiguration configuration = new HeartbeatConfiguration();
configuration.setSql(DETECT_SQL);
configuration.setThreadCount(50);
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponseTest.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponseTest.java
index e2933e3..4990942 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponseTest.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/response/HeartbeatResponseTest.java
@@ -34,7 +34,7 @@ public final class HeartbeatResponseTest {
@Test
public void getHeartbeatResultMap() {
Map<String, Collection<HeartbeatResult>> heartbeatResultMap = new HashMap<>();
- heartbeatResultMap.put("sharding_db", Collections.singleton(new HeartbeatResult("ds_1", true, 123L, Boolean.FALSE)));
+ heartbeatResultMap.put("sharding_db", Collections.singleton(new HeartbeatResult("ds_1", true, 123L, false)));
HeartbeatResponse heartbeatResponse = new HeartbeatResponse(heartbeatResultMap);
assertThat(heartbeatResponse.getHeartbeatResultMap(), is(heartbeatResultMap));
assertTrue(heartbeatResponse.getHeartbeatResultMap().keySet().contains("sharding_db"));
@@ -42,7 +42,7 @@ public final class HeartbeatResponseTest {
HeartbeatResult heartbeatResult = heartbeatResultMap.values().iterator().next().stream().findFirst().get();
assertNotNull(heartbeatResult);
assertThat(heartbeatResult.getDataSourceName(), is("ds_1"));
- assertTrue(heartbeatResult.getEnable());
+ assertTrue(heartbeatResult.isEnable());
assertThat(heartbeatResult.getDetectTimeStamp(), is(123L));
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/ClusterStateInstance.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/ClusterStateInstance.java
index 5f6f089..9afa071 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/ClusterStateInstance.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/ClusterStateInstance.java
@@ -67,18 +67,6 @@ public final class ClusterStateInstance {
}
/**
- * Load instance state by instance id.
- *
- * @param instanceId instance id
- * @return instance state
- */
- private InstanceState loadInstanceState(final String instanceId) {
- String instanceData = ShardingOrchestrationFacade.getInstance().getRegistryCenter().loadInstanceData(instanceId);
- Preconditions.checkState(!Strings.isNullOrEmpty(instanceData), "Can not load instance state of '%s' from registry center", instanceId);
- return YamlEngine.unmarshal(instanceData, InstanceState.class);
- }
-
- /**
* Disabled data source after state changed.
*
* @param event disabled state changed event