Refactor ReadWriteSplitting dependency (#82)
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReplicaDataSourceDTO.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReadDataSourceDTO.java
similarity index 87%
rename from shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReplicaDataSourceDTO.java
rename to shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReadDataSourceDTO.java
index ebe4dfa..1d54157 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReplicaDataSourceDTO.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/common/dto/ReadDataSourceDTO.java
@@ -23,19 +23,19 @@
import lombok.Setter;
/**
- * Replica data source DTO.
+ * Read data source DTO.
*/
@Setter
@Getter
@NoArgsConstructor
@AllArgsConstructor
-public final class ReplicaDataSourceDTO {
+public final class ReadDataSourceDTO {
private String schema;
- private String primaryDataSourceName;
+ private String writeDataSourceName;
- private String replicaDataSourceName;
+ private String readDataSourceName;
private boolean enabled;
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/GovernanceService.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/GovernanceService.java
index 2152781..cd8d166 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/GovernanceService.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/GovernanceService.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.ui.servcie;
import org.apache.shardingsphere.ui.common.dto.InstanceDTO;
-import org.apache.shardingsphere.ui.common.dto.ReplicaDataSourceDTO;
+import org.apache.shardingsphere.ui.common.dto.ReadDataSourceDTO;
import java.util.Collection;
@@ -43,18 +43,18 @@
void updateInstanceStatus(String instanceId, boolean enabled);
/**
- * Get all replica data source.
+ * Get all read data source.
*
- * @return all replica data source dto
+ * @return all read data source dto
*/
- Collection<ReplicaDataSourceDTO> getAllReplicaDataSource();
+ Collection<ReadDataSourceDTO> getAllReadDataSource();
/**
- * update replica data source status.
+ * update read data source status.
*
* @param schemaNames schema name
- * @param replicaDataSourceName replica data source name
+ * @param readDataSourceName read data source name
* @param enabled enabled
*/
- void updateReplicaDataSourceStatus(String schemaNames, String replicaDataSourceName, boolean enabled);
+ void updateReadDataSourceStatus(String schemaNames, String readDataSourceName, boolean enabled);
}
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
index fd5119d..8284ca9 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/servcie/impl/GovernanceServiceImpl.java
@@ -25,7 +25,7 @@
import org.apache.shardingsphere.readwrite.splitting.api.ReadWriteSplittingRuleConfiguration;
import org.apache.shardingsphere.readwrite.splitting.api.rule.ReadWriteSplittingDataSourceRuleConfiguration;
import org.apache.shardingsphere.ui.common.dto.InstanceDTO;
-import org.apache.shardingsphere.ui.common.dto.ReplicaDataSourceDTO;
+import org.apache.shardingsphere.ui.common.dto.ReadDataSourceDTO;
import org.apache.shardingsphere.ui.servcie.GovernanceService;
import org.apache.shardingsphere.ui.servcie.RegistryCenterService;
import org.apache.shardingsphere.ui.servcie.ShardingSchemaService;
@@ -70,8 +70,8 @@
}
@Override
- public Collection<ReplicaDataSourceDTO> getAllReplicaDataSource() {
- Collection<ReplicaDataSourceDTO> result = new ArrayList<>();
+ public Collection<ReadDataSourceDTO> getAllReadDataSource() {
+ Collection<ReadDataSourceDTO> result = new ArrayList<>();
for (String schemaName : shardingSchemaService.getAllSchemaNames()) {
String configData = shardingSchemaService.getRuleConfiguration(schemaName);
if (StringUtils.isEmpty(configData)) {
@@ -87,9 +87,9 @@
}
@Override
- public void updateReplicaDataSourceStatus(final String schemaNames, final String replicaDataSourceName, final boolean enabled) {
+ public void updateReadDataSourceStatus(final String schemaNames, final String readDataSourceName, final boolean enabled) {
String value = enabled ? "" : RegistryCenterNodeStatus.DISABLED.toString();
- registryCenterService.getActivatedRegistryCenter().persist(registryCenterService.getActivatedStateNode().getDataSourcePath(schemaNames, replicaDataSourceName), value);
+ registryCenterService.getActivatedRegistryCenter().persist(registryCenterService.getActivatedStateNode().getDataSourcePath(schemaNames, readDataSourceName), value);
}
private String getInstancesNodeFullRootPath() {
@@ -97,21 +97,21 @@
return result.substring(0, result.length() - 1);
}
- private void handleShardingRuleConfiguration(final Collection<ReplicaDataSourceDTO> replicaDataSourceDTOS, final String configData, final String schemaName) {
+ private void handleShardingRuleConfiguration(final Collection<ReadDataSourceDTO> readDataSourceDTOS, final String configData, final String schemaName) {
Collection<RuleConfiguration> configurations = YamlConfigurationConverter.convertRuleConfigurations(configData);
Collection<ReadWriteSplittingRuleConfiguration> readWriteSplittingRuleConfigurations = configurations.stream().filter(
config -> config instanceof ReadWriteSplittingRuleConfiguration).map(config -> (ReadWriteSplittingRuleConfiguration) config).collect(Collectors.toList());
for (ReadWriteSplittingRuleConfiguration readWriteSplittingRuleConfiguration : readWriteSplittingRuleConfigurations) {
- addSlaveDataSource(replicaDataSourceDTOS, readWriteSplittingRuleConfiguration, schemaName);
+ addSlaveDataSource(readDataSourceDTOS, readWriteSplittingRuleConfiguration, schemaName);
}
}
- private void handleMasterSlaveRuleConfiguration(final Collection<ReplicaDataSourceDTO> replicaDataSourceDTOS, final String configData, final String schemaName) {
- ReadWriteSplittingRuleConfiguration readWriteSplittingRuleConfiguration = loadPrimaryReplicaRuleConfiguration(configData);
- addSlaveDataSource(replicaDataSourceDTOS, readWriteSplittingRuleConfiguration, schemaName);
+ private void handleMasterSlaveRuleConfiguration(final Collection<ReadDataSourceDTO> readDataSourceDTOS, final String configData, final String schemaName) {
+ ReadWriteSplittingRuleConfiguration readWriteSplittingRuleConfiguration = loadPrimaryReadRuleConfiguration(configData);
+ addSlaveDataSource(readDataSourceDTOS, readWriteSplittingRuleConfiguration, schemaName);
}
- private ReadWriteSplittingRuleConfiguration loadPrimaryReplicaRuleConfiguration(final String configData) {
+ private ReadWriteSplittingRuleConfiguration loadPrimaryReadRuleConfiguration(final String configData) {
Collection<RuleConfiguration> ruleConfigurations = YamlConfigurationConverter.convertRuleConfigurations(configData);
Optional<ReadWriteSplittingRuleConfiguration> result = ruleConfigurations.stream().filter(
each -> each instanceof ReadWriteSplittingRuleConfiguration).map(ruleConfiguration -> (ReadWriteSplittingRuleConfiguration) ruleConfiguration).findFirst();
@@ -119,17 +119,17 @@
return result.get();
}
- private void addSlaveDataSource(final Collection<ReplicaDataSourceDTO> replicaDataSourceDTOS, final ReadWriteSplittingRuleConfiguration readWriteSplittingRuleConfiguration, final String schemaName) {
+ private void addSlaveDataSource(final Collection<ReadDataSourceDTO> readDataSourceDTOS, final ReadWriteSplittingRuleConfiguration readWriteSplittingRuleConfiguration, final String schemaName) {
Collection<String> disabledSchemaDataSourceNames = getDisabledSchemaDataSourceNames();
for (ReadWriteSplittingDataSourceRuleConfiguration each : readWriteSplittingRuleConfiguration.getDataSources()) {
- replicaDataSourceDTOS.addAll(getReplicaDataSourceDTOS(schemaName, disabledSchemaDataSourceNames, each));
+ readDataSourceDTOS.addAll(getReadDataSourceDTOS(schemaName, disabledSchemaDataSourceNames, each));
}
}
- private Collection<ReplicaDataSourceDTO> getReplicaDataSourceDTOS(final String schemaName, final Collection<String> disabledSchemaDataSourceNames, final ReadWriteSplittingDataSourceRuleConfiguration group) {
- Collection<ReplicaDataSourceDTO> result = new LinkedList<>();
+ private Collection<ReadDataSourceDTO> getReadDataSourceDTOS(final String schemaName, final Collection<String> disabledSchemaDataSourceNames, final ReadWriteSplittingDataSourceRuleConfiguration group) {
+ Collection<ReadDataSourceDTO> result = new LinkedList<>();
for (String each : group.getReadDataSourceNames()) {
- result.add(new ReplicaDataSourceDTO(schemaName, group.getWriteDataSourceName(), each, !disabledSchemaDataSourceNames.contains(schemaName + "." + each)));
+ result.add(new ReadDataSourceDTO(schemaName, group.getWriteDataSourceName(), each, !disabledSchemaDataSourceNames.contains(schemaName + "." + each)));
}
return result;
}
diff --git a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/GovernanceController.java b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/GovernanceController.java
index 334a0a2..1a85a1d 100644
--- a/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/GovernanceController.java
+++ b/shardingsphere-ui-backend/src/main/java/org/apache/shardingsphere/ui/web/controller/GovernanceController.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.ui.web.controller;
import org.apache.shardingsphere.ui.common.dto.InstanceDTO;
-import org.apache.shardingsphere.ui.common.dto.ReplicaDataSourceDTO;
+import org.apache.shardingsphere.ui.common.dto.ReadDataSourceDTO;
import org.apache.shardingsphere.ui.servcie.GovernanceService;
import org.apache.shardingsphere.ui.web.response.ResponseResult;
import org.apache.shardingsphere.ui.web.response.ResponseResultUtil;
@@ -63,24 +63,24 @@
}
/**
- * Load all replica data sources.
+ * Load all read data sources.
*
* @return response result
*/
@RequestMapping(value = "/datasource", method = RequestMethod.GET)
- public ResponseResult<Collection<ReplicaDataSourceDTO>> loadAllReplicaDataSources() {
- return ResponseResultUtil.build(governanceService.getAllReplicaDataSource());
+ public ResponseResult<Collection<ReadDataSourceDTO>> loadAllReadDataSources() {
+ return ResponseResultUtil.build(governanceService.getAllReadDataSource());
}
/**
- * Update replica data source status.
+ * Update read data source status.
*
- * @param replicaDataSourceDTO replica data source DTO
+ * @param readDataSourceDTO read data source DTO
* @return response result
*/
@RequestMapping(value = "/datasource", method = RequestMethod.PUT)
- public ResponseResult updateReplicaDataSourceStatus(@RequestBody final ReplicaDataSourceDTO replicaDataSourceDTO) {
- governanceService.updateReplicaDataSourceStatus(replicaDataSourceDTO.getSchema(), replicaDataSourceDTO.getReplicaDataSourceName(), replicaDataSourceDTO.isEnabled());
+ public ResponseResult updateReadDataSourceStatus(@RequestBody final ReadDataSourceDTO readDataSourceDTO) {
+ governanceService.updateReadDataSourceStatus(readDataSourceDTO.getSchema(), readDataSourceDTO.getReadDataSourceName(), readDataSourceDTO.isEnabled());
return ResponseResultUtil.success();
}
diff --git a/shardingsphere-ui-frontend/src/views/data-scaling/module/index.vue b/shardingsphere-ui-frontend/src/views/data-scaling/module/index.vue
index 4afdc45..c21d9df 100644
--- a/shardingsphere-ui-frontend/src/views/data-scaling/module/index.vue
+++ b/shardingsphere-ui-frontend/src/views/data-scaling/module/index.vue
@@ -413,7 +413,7 @@
}
)
const masterSlaveYamlType = new yaml.Type(
- '!PRIMARY_REPLICA_REPLICATION',
+ '!READ_WRITE_SPLITTING',
{
kind: 'mapping',
construct(data) {
diff --git a/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue b/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
index e4110e5..6f56d2a 100644
--- a/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
+++ b/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
@@ -208,7 +208,7 @@
}
)
const masterSlaveYamlType = new yaml.Type(
- '!PRIMARY_REPLICA_REPLICATION',
+ '!READ_WRITE_SPLITTING',
{
kind: 'mapping',
construct(data) {
diff --git a/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue b/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
index d637f3c..6569259 100644
--- a/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
+++ b/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
@@ -57,11 +57,11 @@
},
{
label: this.$t('runtimeStatus').dataSource.writeDataSourceName,
- prop: 'primaryDataSourceName'
+ prop: 'writeDataSourceName'
},
{
label: this.$t('runtimeStatus').dataSource.readDataSourceName,
- prop: 'replicaDataSourceName'
+ prop: 'readDataSourceName'
}
],
tableData: [],
