> loadProxyDataSources() {
*/
public ShardingRuleConfiguration loadShardingRuleConfiguration() {
try {
- ShardingRuleConfiguration result = ShardingConfigurationConverter.shardingRuleConfigFromYaml(regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.SHARDING_RULE_NODE_PATH)));
- Preconditions.checkState(null != result && !result.getTableRuleConfigs().isEmpty(), "No available sharding rule configuration to load.");
- return result;
+ return ShardingConfigurationConverter.shardingRuleConfigFromYaml(regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.SHARDING_RULE_NODE_PATH)));
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- throw new ShardingConfigurationException("No available sharding rule configuration to load.");
+ return new ShardingRuleConfiguration();
}
}
@@ -297,14 +295,12 @@ public Properties loadShardingProperties() {
*/
public MasterSlaveRuleConfiguration loadMasterSlaveRuleConfiguration() {
try {
- MasterSlaveRuleConfiguration result = MasterSlaveConfigurationConverter.masterSlaveRuleConfigFromYaml(
+ return MasterSlaveConfigurationConverter.masterSlaveRuleConfigFromYaml(
regCenter.getDirectly(configNode.getFullPath(ConfigurationNode.MASTER_SLAVE_RULE_NODE_PATH)));
- Preconditions.checkState(null != result && !Strings.isNullOrEmpty(result.getMasterDataSourceName()), "No available master slave rule configuration to load.");
- return result;
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- throw new ShardingConfigurationException("No available master slave rule configuration to load.");
+ return new MasterSlaveRuleConfiguration();
}
}
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationMasterSlaveRule.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationMasterSlaveRule.java
new file mode 100644
index 0000000000000..52e5062b2e836
--- /dev/null
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationMasterSlaveRule.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016-2018 shardingsphere.io.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.shardingsphere.orchestration.internal.rule;
+
+import com.google.common.eventbus.Subscribe;
+import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
+import io.shardingsphere.core.rule.MasterSlaveRule;
+import io.shardingsphere.orchestration.internal.event.state.DisabledStateEventBusEvent;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * Orchestration master slave rule.
+ *
+ * @author panjuan
+ */
+public final class OrchestrationMasterSlaveRule extends MasterSlaveRule {
+
+ private final Collection disabledDataSourceNames = new LinkedList<>();
+
+ public OrchestrationMasterSlaveRule(final MasterSlaveRuleConfiguration config) {
+ super(config);
+ }
+
+ /**
+ * Get slave data source names.
+ *
+ * @return available slave data source name
+ */
+ @Override
+ public Collection getSlaveDataSourceNames() {
+ Collection result = new LinkedList<>(super.getSlaveDataSourceNames());
+ for (String each : disabledDataSourceNames) {
+ result.remove(each);
+ }
+ return result;
+ }
+
+ /**
+ * Renew disable dataSource names.
+ *
+ * @param disabledStateEventBusEvent jdbc disabled event bus event
+ */
+ @Subscribe
+ public void renew(final DisabledStateEventBusEvent disabledStateEventBusEvent) {
+ disabledDataSourceNames.clear();
+ disabledDataSourceNames.addAll(disabledStateEventBusEvent.getDisabledDataSourceNames());
+ }
+}
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationShardingRule.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationShardingRule.java
new file mode 100644
index 0000000000000..48e4fb3f98b0b
--- /dev/null
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/rule/OrchestrationShardingRule.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016-2018 shardingsphere.io.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package io.shardingsphere.orchestration.internal.rule;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
+import io.shardingsphere.api.config.ShardingRuleConfiguration;
+import io.shardingsphere.core.rule.MasterSlaveRule;
+import io.shardingsphere.core.rule.ShardingRule;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * Orchestration sharding rule.
+ *
+ * @author panjuan
+ */
+public final class OrchestrationShardingRule extends ShardingRule {
+
+ private final Collection masterSlaveRules = new LinkedList<>();
+
+ public OrchestrationShardingRule(final ShardingRuleConfiguration shardingRuleConfig, final Collection dataSourceNames) {
+ super(shardingRuleConfig, dataSourceNames);
+ initMasterSlaveRules(shardingRuleConfig);
+ }
+
+ private void initMasterSlaveRules(final ShardingRuleConfiguration shardingRuleConfig) {
+ for (MasterSlaveRuleConfiguration each : shardingRuleConfig.getMasterSlaveRuleConfigs()) {
+ masterSlaveRules.add(new OrchestrationMasterSlaveRule(each));
+ }
+ }
+
+ @Override
+ public Collection getMasterSlaveRules() {
+ return Collections2.transform(masterSlaveRules, new Function() {
+
+ @Override
+ public MasterSlaveRule apply(final OrchestrationMasterSlaveRule input) {
+ return input;
+ }
+ });
+ }
+}
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
index 1086967c680e9..97ffdb92572a9 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java
@@ -17,6 +17,8 @@
package io.shardingsphere.orchestration.internal.state.datasource;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
import io.shardingsphere.api.config.MasterSlaveRuleConfiguration;
import io.shardingsphere.api.config.ShardingRuleConfiguration;
import io.shardingsphere.core.rule.DataSourceParameter;
@@ -100,6 +102,7 @@ public Map> getProxyAvailableDataSource
*/
public ShardingRuleConfiguration getAvailableShardingRuleConfiguration() {
ShardingRuleConfiguration result = configService.loadShardingRuleConfiguration();
+ Preconditions.checkState(null != result && !result.getTableRuleConfigs().isEmpty(), "Missing the sharding rule configuration on register center");
Collection disabledDataSourceNames = getDisabledDataSourceNames();
for (String each : disabledDataSourceNames) {
for (MasterSlaveRuleConfiguration masterSlaveRuleConfig : result.getMasterSlaveRuleConfigs()) {
@@ -116,6 +119,7 @@ public ShardingRuleConfiguration getAvailableShardingRuleConfiguration() {
*/
public MasterSlaveRuleConfiguration getAvailableMasterSlaveRuleConfiguration() {
MasterSlaveRuleConfiguration result = configService.loadMasterSlaveRuleConfiguration();
+ Preconditions.checkState(null != result && !Strings.isNullOrEmpty(result.getMasterDataSourceName()), "No available master slave rule configuration to load.");
Collection disabledDataSourceNames = getDisabledDataSourceNames();
for (String each : disabledDataSourceNames) {
result.getSlaveDataSourceNames().remove(each);
diff --git a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
index 692c824866e07..670ad603e1c12 100644
--- a/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
+++ b/sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java
@@ -19,7 +19,6 @@
import com.google.common.base.Preconditions;
import io.shardingsphere.orchestration.config.OrchestrationConfiguration;
-import io.shardingsphere.orchestration.config.OrchestrationType;
import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;
import io.shardingsphere.orchestration.reg.zookeeper.ZookeeperConfiguration;
import lombok.Getter;
@@ -29,6 +28,7 @@
* Orchestration configuration for yaml.
*
* @author caohao
+ * @author panjuan
*/
@Getter
@Setter
@@ -42,8 +42,6 @@ public class YamlOrchestrationConfiguration {
private boolean overwrite;
- private OrchestrationType type;
-
/**
* Get orchestration master-slave rule configuration from yaml.
*
@@ -51,6 +49,6 @@ public class YamlOrchestrationConfiguration {
*/
public OrchestrationConfiguration getOrchestrationConfiguration() {
Preconditions.checkState(null == etcd || null == zookeeper, "Can't config both zookeeper and etcd as registry center!");
- return new OrchestrationConfiguration(getName(), null != etcd ? etcd : zookeeper, overwrite, type);
+ return new OrchestrationConfiguration(getName(), null != etcd ? etcd : zookeeper, overwrite);
}
}
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
index 462d9bb61ec5a..935e5577efb46 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/Bootstrap.java
@@ -92,7 +92,7 @@ private static void startWithRegistryCenter(
orchestrationFacade.init(getYamlServerConfiguration(serverConfig), getSchemaDataSourceMap(ruleConfigs), getRuleConfiguration(ruleConfigs));
}
GlobalRegistry.getInstance().init(orchestrationFacade.getConfigService().loadYamlServerConfiguration(),
- orchestrationFacade.getConfigService().loadProxyDataSources(), orchestrationFacade.getConfigService().loadProxyConfiguration());
+ orchestrationFacade.getConfigService().loadProxyDataSources(), orchestrationFacade.getConfigService().loadProxyConfiguration(), true);
initOpenTracing();
new ShardingProxy().start(port);
}
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/datasource/JDBCBackendDataSource.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/datasource/JDBCBackendDataSource.java
index 80e695873816e..6edc5d87add27 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/datasource/JDBCBackendDataSource.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/jdbc/datasource/JDBCBackendDataSource.java
@@ -22,13 +22,13 @@
import io.shardingsphere.core.rule.DataSourceParameter;
import io.shardingsphere.shardingproxy.backend.BackendDataSource;
import io.shardingsphere.shardingproxy.runtime.GlobalRegistry;
-import io.shardingsphere.shardingproxy.runtime.ShardingSchema;
import javax.sql.DataSource;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
@@ -44,22 +44,22 @@
*/
public final class JDBCBackendDataSource implements BackendDataSource, AutoCloseable {
- private final ShardingSchema shardingSchema;
+ private final Map dataSources;
- private final Map dataSourceMap;
+ private final Map availableDataSources;
- public JDBCBackendDataSource(final ShardingSchema shardingSchema) {
- this.shardingSchema = shardingSchema;
- dataSourceMap = createDataSourceMap();
+ public JDBCBackendDataSource(final Map dataSourceParameters) {
+ dataSources = createDataSourceMap(dataSourceParameters);
+ availableDataSources = new LinkedHashMap<>(dataSources);
}
- private Map createDataSourceMap() {
+ private Map createDataSourceMap(final Map dataSourceParameters) {
// TODO getCircuitDataSourceMap if getCircuitBreakerDataSourceNames() is not empty
- return getNormalDataSourceMap(shardingSchema.getDataSources());
+ return getNormalDataSourceMap(dataSourceParameters);
}
private Map getNormalDataSourceMap(final Map dataSourceParameters) {
- Map result = new LinkedHashMap<>(dataSourceParameters.size());
+ Map result = new LinkedHashMap<>(dataSourceParameters.size(), 1);
for (Entry entry : dataSourceParameters.entrySet()) {
try {
result.put(entry.getKey(), getBackendDataSourceFactory().build(entry.getKey(), entry.getValue()));
@@ -81,6 +81,22 @@ private JDBCBackendDataSourceFactory getBackendDataSourceFactory() {
}
}
+ /**
+ * Set available data sources.
+ *
+ * @param disabledDataSourceNames disabled data source names
+ */
+ public void setAvailableDataSources(final Collection disabledDataSourceNames) {
+ synchronized (availableDataSources) {
+ availableDataSources.clear();
+ for (Entry entry : dataSources.entrySet()) {
+ if (!disabledDataSourceNames.contains(entry.getKey())) {
+ availableDataSources.put(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+ }
+
/**
* Get connection.
*
@@ -103,7 +119,7 @@ public Connection getConnection(final String dataSourceName) throws SQLException
*/
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
public List getConnections(final ConnectionMode connectionMode, final String dataSourceName, final int connectionSize) throws SQLException {
- DataSource dataSource = getDataSourceMap().get(dataSourceName);
+ DataSource dataSource = availableDataSources.get(dataSourceName);
if (1 == connectionSize) {
return Collections.singletonList(dataSource.getConnection());
}
@@ -115,18 +131,6 @@ public List getConnections(final ConnectionMode connectionMode, fina
}
}
- private Map getDataSourceMap() {
- return shardingSchema.getDisabledDataSourceNames().isEmpty() ? dataSourceMap : getAvailableDataSourceMap();
- }
-
- private Map getAvailableDataSourceMap() {
- Map result = new LinkedHashMap<>(dataSourceMap);
- for (String each : shardingSchema.getDisabledDataSourceNames()) {
- result.remove(each);
- }
- return result;
- }
-
private List createConnections(final DataSource dataSource, final int connectionSize) throws SQLException {
List result = new ArrayList<>(connectionSize);
for (int i = 0; i < connectionSize; i++) {
@@ -141,7 +145,7 @@ public void close() {
}
private void closeOriginalDataSources() {
- for (DataSource each : dataSourceMap.values()) {
+ for (DataSource each : dataSources.values()) {
try {
Method method = each.getClass().getDeclaredMethod("close");
method.invoke(each);
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
index df49504b29dc4..a104c077b42d1 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java
@@ -26,16 +26,21 @@
import io.shardingsphere.core.executor.ShardingExecuteEngine;
import io.shardingsphere.core.rule.Authentication;
import io.shardingsphere.core.rule.DataSourceParameter;
+import io.shardingsphere.core.rule.MasterSlaveRule;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
import io.shardingsphere.core.yaml.other.YamlServerConfiguration;
import io.shardingsphere.orchestration.internal.event.config.ProxyConfigurationEventBusEvent;
import io.shardingsphere.orchestration.internal.event.state.CircuitStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.event.state.DisabledStateEventBusEvent;
import io.shardingsphere.orchestration.internal.event.state.ProxyDisabledStateEventBusEvent;
+import io.shardingsphere.orchestration.internal.rule.OrchestrationMasterSlaveRule;
+import io.shardingsphere.orchestration.internal.rule.OrchestrationShardingRule;
import io.shardingsphere.shardingproxy.runtime.nio.BackendNIOConfiguration;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
+import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -102,11 +107,23 @@ public void register() {
* @param schemaRules schema rule map
*/
public void init(final YamlServerConfiguration serverConfig, final Map> schemaDataSources, final Map schemaRules) {
+ init(serverConfig, schemaDataSources, schemaRules, false);
+ }
+
+ /**
+ * Initialize proxy context.
+ *
+ * @param serverConfig server configuration
+ * @param schemaDataSources data source map
+ * @param schemaRules schema rule map
+ * @param isUsingRegistry is using registry or not
+ */
+ public void init(final YamlServerConfiguration serverConfig, final Map> schemaDataSources, final Map schemaRules, final boolean isUsingRegistry) {
initServerConfiguration(serverConfig);
for (Entry entry : schemaRules.entrySet()) {
String schemaName = entry.getKey();
schemaNames.add(schemaName);
- shardingSchemas.put(schemaName, new ShardingSchema(schemaName, schemaDataSources.get(schemaName), entry.getValue()));
+ shardingSchemas.put(schemaName, new ShardingSchema(schemaName, schemaDataSources.get(schemaName), entry.getValue(), isUsingRegistry));
}
}
@@ -174,7 +191,7 @@ public void renew(final ProxyConfigurationEventBusEvent proxyConfigurationEventB
shardingSchemas.clear();
for (Entry> entry : proxyConfigurationEventBusEvent.getSchemaDataSourceMap().entrySet()) {
String schemaName = entry.getKey();
- shardingSchemas.put(schemaName, new ShardingSchema(schemaName, entry.getValue(), proxyConfigurationEventBusEvent.getSchemaRuleMap().get(schemaName)));
+ shardingSchemas.put(schemaName, new ShardingSchema(schemaName, entry.getValue(), proxyConfigurationEventBusEvent.getSchemaRuleMap().get(schemaName), true));
}
}
@@ -196,7 +213,30 @@ public void renewCircuitBreakerDataSourceNames(final CircuitStateEventBusEvent c
@Subscribe
public void renewDisabledDataSourceNames(final ProxyDisabledStateEventBusEvent disabledStateEventBusEvent) {
for (Entry entry : shardingSchemas.entrySet()) {
- entry.getValue().setDisabledDataSourceNames(disabledStateEventBusEvent.getDisabledSchemaDataSourceMap().get(entry.getKey()));
+ DisabledStateEventBusEvent disabledEvent = new DisabledStateEventBusEvent(getDisabledDataSourceNames(entry.getKey(), disabledStateEventBusEvent.getDisabledSchemaDataSourceMap()));
+ if (entry.getValue().isMasterSlaveOnly()) {
+ renewShardingSchemaWithMasterSlaveRule(entry.getValue(), disabledEvent);
+ } else {
+ renewShardingSchemaWithShardingRule(entry.getValue(), disabledEvent);
+ }
}
}
+
+ private Collection getDisabledDataSourceNames(final String shardingSchemaName, final Map> disabledSchemaDataSourceMap) {
+ Collection result = new LinkedList<>();
+ if (disabledSchemaDataSourceMap.containsKey(shardingSchemaName)) {
+ result.addAll(disabledSchemaDataSourceMap.get(shardingSchemaName));
+ }
+ return result;
+ }
+
+ private void renewShardingSchemaWithShardingRule(final ShardingSchema shardingSchema, final DisabledStateEventBusEvent disabledEvent) {
+ for (MasterSlaveRule each : ((OrchestrationShardingRule) shardingSchema.getShardingRule()).getMasterSlaveRules()) {
+ ((OrchestrationMasterSlaveRule) each).renew(disabledEvent);
+ }
+ }
+
+ private void renewShardingSchemaWithMasterSlaveRule(final ShardingSchema shardingSchema, final DisabledStateEventBusEvent disabledEvent) {
+ ((OrchestrationMasterSlaveRule) shardingSchema.getMasterSlaveRule()).renew(disabledEvent);
+ }
}
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/ShardingSchema.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/ShardingSchema.java
index bbfe3f1fa2ffb..cddc029eee782 100644
--- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/ShardingSchema.java
+++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/ShardingSchema.java
@@ -25,14 +25,13 @@
import io.shardingsphere.core.rule.MasterSlaveRule;
import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.core.yaml.YamlRuleConfiguration;
+import io.shardingsphere.orchestration.internal.rule.OrchestrationMasterSlaveRule;
+import io.shardingsphere.orchestration.internal.rule.OrchestrationShardingRule;
import io.shardingsphere.shardingproxy.backend.jdbc.datasource.JDBCBackendDataSource;
import io.shardingsphere.shardingproxy.runtime.metadata.ProxyTableMetaDataConnectionManager;
import lombok.Getter;
-import lombok.Setter;
-import java.util.Collection;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.Map;
import java.util.Map.Entry;
@@ -60,16 +59,25 @@ public final class ShardingSchema {
private ShardingMetaData metaData;
- @Setter
- private Collection disabledDataSourceNames = new LinkedList<>();
-
- public ShardingSchema(final String name, final Map dataSources, final YamlRuleConfiguration rule) {
+ public ShardingSchema(final String name, final Map dataSources, final YamlRuleConfiguration rule, final boolean isUsingRegistry) {
this.name = name;
// TODO :jiaqi only use JDBC need connect db via JDBC, netty style should use SQL packet to get metadata
this.dataSources = dataSources;
- shardingRule = new ShardingRule(null == rule.getShardingRule() ? new ShardingRuleConfiguration() : rule.getShardingRule().getShardingRuleConfiguration(), dataSources.keySet());
- masterSlaveRule = null == rule.getMasterSlaveRule() ? null : new MasterSlaveRule(rule.getMasterSlaveRule().getMasterSlaveRuleConfiguration());
- backendDataSource = new JDBCBackendDataSource(this);
+ shardingRule = getShardingRule(rule, isUsingRegistry);
+ masterSlaveRule = getMasterSlaveRule(rule, isUsingRegistry);
+ backendDataSource = new JDBCBackendDataSource(dataSources);
+ }
+
+ private ShardingRule getShardingRule(final YamlRuleConfiguration rule, final boolean isUsingRegistry) {
+ return isUsingRegistry ? new OrchestrationShardingRule(null == rule.getShardingRule() ? new ShardingRuleConfiguration() : rule.getShardingRule().getShardingRuleConfiguration(), dataSources.keySet())
+ : new ShardingRule(null == rule.getShardingRule() ? new ShardingRuleConfiguration() : rule.getShardingRule().getShardingRuleConfiguration(), dataSources.keySet());
+ }
+
+ private MasterSlaveRule getMasterSlaveRule(final YamlRuleConfiguration rule, final boolean isUsingRegistry) {
+ if (null == rule.getMasterSlaveRule()) {
+ return null;
+ }
+ return isUsingRegistry ? new OrchestrationMasterSlaveRule(rule.getMasterSlaveRule().getMasterSlaveRuleConfiguration()) : new MasterSlaveRule(rule.getMasterSlaveRule().getMasterSlaveRuleConfiguration());
}
/**
@@ -98,24 +106,4 @@ private Map getDataSourceURLs(final Map getDataSources() {
- if (!getDisabledDataSourceNames().isEmpty()) {
- return getAvailableDataSourceConfigurationMap();
- }
- return dataSources;
- }
-
- private Map getAvailableDataSourceConfigurationMap() {
- Map result = new LinkedHashMap<>(dataSources);
- for (String each : disabledDataSourceNames) {
- result.remove(each);
- }
- return result;
- }
}