Skip to content

Commit

Permalink
for #98
Browse files Browse the repository at this point in the history
  • Loading branch information
terrymanu committed Sep 1, 2017
1 parent baf78e6 commit 8af20e0
Show file tree
Hide file tree
Showing 10 changed files with 193 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package com.dangdang.ddframe.rdb.sharding.api;

import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.MasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.MasterSlaveLoadBalanceStrategyType;
import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.MasterSlaveDataSource;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -54,7 +56,7 @@ public static DataSource createDataSource(final String name, final DataSource ma
for (DataSource each : otherSlaveDataSources) {
slaveDataSourceMap.put(each.toString(), each);
}
return new MasterSlaveDataSource(name, masterDataSource.toString(), masterDataSource, slaveDataSourceMap);
return new MasterSlaveDataSource(name, masterDataSource.toString(), masterDataSource, slaveDataSourceMap, MasterSlaveLoadBalanceStrategyType.getDefaultStrategy());
}

/**
Expand All @@ -69,8 +71,45 @@ public static DataSource createDataSource(final String name, final DataSource ma
* @return master-slave data source
* @throws SQLException SQL exception
*/
public static DataSource createDataSource(final String name,
final String masterDataSourceName, final DataSource masterDataSource, final Map<String, DataSource> slaveDataSourceMap) throws SQLException {
return new MasterSlaveDataSource(name, masterDataSourceName, masterDataSource, slaveDataSourceMap);
public static DataSource createDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSourceMap) throws SQLException {
return new MasterSlaveDataSource(name, masterDataSourceName, masterDataSource, slaveDataSourceMap, MasterSlaveLoadBalanceStrategyType.getDefaultStrategy());
}

/**
* Create master-slave data source.
*
* <p>One master data source can configure multiple slave data source.</p>
*
* @param name data source name
* @param masterDataSourceName name of data source for master
* @param masterDataSource data source for master
* @param slaveDataSourceMap map of data source name and data source for slave
* @param strategyType master-slave database load-balance strategy type
* @return master-slave data source
* @throws SQLException SQL exception
*/
public static DataSource createDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSourceMap, final MasterSlaveLoadBalanceStrategyType strategyType) throws SQLException {
return new MasterSlaveDataSource(name, masterDataSourceName, masterDataSource, slaveDataSourceMap, strategyType);
}


/**
* Create master-slave data source.
*
* <p>One master data source can configure multiple slave data source.</p>
*
* @param name data source name
* @param masterDataSourceName name of data source for master
* @param masterDataSource data source for master
* @param slaveDataSourceMap map of data source name and data source for slave
* @param strategy master-slave database load-balance strategy
* @return master-slave data source
* @throws SQLException SQL exception
*/
public static DataSource createDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSourceMap, final MasterSlaveLoadBalanceStrategy strategy) throws SQLException {
return new MasterSlaveDataSource(name, masterDataSourceName, masterDataSource, slaveDataSourceMap, strategy);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* 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.
* </p>
*/

package com.dangdang.ddframe.rdb.sharding.api.strategy.slave;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

/**
* Master-slave database load-balance strategy type.
*
* @author zhangliang
*/
@RequiredArgsConstructor
@Getter
public enum MasterSlaveLoadBalanceStrategyType {

RoundRobin(new RoundRobinMasterSlaveLoadBalanceStrategy()),
Random(new RandomMasterSlaveLoadBalanceStrategy());

private final MasterSlaveLoadBalanceStrategy strategy;

/**
* Get default master-slave database load-balance strategy.
*
* @return default master-slave database load-balance strategy
*/
public static MasterSlaveLoadBalanceStrategy getDefaultStrategy() {
return RoundRobin.strategy;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 1999-2015 dangdang.com.
* <p>
* 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.
* </p>
*/

package com.dangdang.ddframe.rdb.sharding.api.strategy.slave;

import java.util.List;
import java.util.Random;

/**
* Random slave database load-balance strategy.
*
* @author zhangliang
*/
public final class RandomMasterSlaveLoadBalanceStrategy implements MasterSlaveLoadBalanceStrategy {

@Override
public String getDataSource(final String name, final String masterDataSourceName, final List<String> slaveDataSourceNames) {
return slaveDataSourceNames.get(new Random().nextInt(slaveDataSourceNames.size()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

package com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource;

import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RoundRobinMasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.MasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.MasterSlaveLoadBalanceStrategyType;
import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
import com.dangdang.ddframe.rdb.sharding.hint.HintManagerHolder;
import com.dangdang.ddframe.rdb.sharding.jdbc.adapter.AbstractDataSourceAdapter;
Expand Down Expand Up @@ -60,14 +60,27 @@ protected Boolean initialValue() {
@Getter
private final Map<String, DataSource> slaveDataSources;

private final MasterSlaveLoadBalanceStrategy masterSlaveLoadBalanceStrategy = new RoundRobinMasterSlaveLoadBalanceStrategy();
private final MasterSlaveLoadBalanceStrategy masterSlaveLoadBalanceStrategy;

public MasterSlaveDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource, final Map<String, DataSource> slaveDataSources) throws SQLException {
@Deprecated // TODO for spring namespace only
public MasterSlaveDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSources) throws SQLException {
this(name, masterDataSourceName, masterDataSource, slaveDataSources, MasterSlaveLoadBalanceStrategyType.getDefaultStrategy());
}

public MasterSlaveDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSources, final MasterSlaveLoadBalanceStrategyType strategyType) throws SQLException {
this(name, masterDataSourceName, masterDataSource, slaveDataSources, strategyType.getStrategy());
}

public MasterSlaveDataSource(final String name, final String masterDataSourceName, final DataSource masterDataSource,
final Map<String, DataSource> slaveDataSources, final MasterSlaveLoadBalanceStrategy masterSlaveLoadBalanceStrategy) throws SQLException {
super(getAllDataSources(masterDataSource, slaveDataSources.values()));
this.name = name;
this.masterDataSourceName = masterDataSourceName;
this.masterDataSource = masterDataSource;
this.slaveDataSources = slaveDataSources;
this.masterSlaveLoadBalanceStrategy = masterSlaveLoadBalanceStrategy;
}

private static Collection<DataSource> getAllDataSources(final DataSource masterDataSource, final Collection<DataSource> slaveDataSources) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.dangdang.ddframe.rdb.sharding.api.rule.ShardingRule;
import com.dangdang.ddframe.rdb.sharding.api.rule.TableRule;
import com.dangdang.ddframe.rdb.sharding.api.strategy.database.DatabaseShardingStrategy;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RoundRobinMasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.api.strategy.table.TableShardingStrategy;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
import com.dangdang.ddframe.rdb.sharding.hint.HintManagerHolder;
Expand Down Expand Up @@ -151,7 +152,7 @@ private MasterSlaveDataSource getMasterSlaveDataSource(final Map<String, DataSou
final String name, final String masterDataSourceName, final String slaveDataSourceName) throws SQLException {
Map<String, DataSource> slaveDs0 = new HashMap<>(1, 1);
slaveDs0.put(slaveDataSourceName, masterSlaveDataSourceMap.get(slaveDataSourceName));
return new MasterSlaveDataSource(name, masterDataSourceName, masterSlaveDataSourceMap.get(masterDataSourceName), slaveDs0);
return new MasterSlaveDataSource(name, masterDataSourceName, masterSlaveDataSourceMap.get(masterDataSourceName), slaveDs0, new RoundRobinMasterSlaveLoadBalanceStrategy());
}

@After
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.dangdang.ddframe.rdb.sharding.api.strategy.common.ShardingStrategyTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.database.DatabaseShardingStrategyTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.database.NoneDatabaseShardingAlgorithmTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RandomMasterSlaveLoadBalanceStrategyTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RoundRobinMasterSlaveLoadBalanceStrategyTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.table.NoneTableShardingAlgorithmTest;
import com.dangdang.ddframe.rdb.sharding.api.strategy.table.TableShardingStrategyTest;
Expand All @@ -36,24 +37,25 @@

@RunWith(Suite.class)
@Suite.SuiteClasses({
ShardingDataSourceFactoryTest.class,
ShardingPropertiesTest.class,
ShardingPropertiesConstantTest.class,
ShardingValueTest.class,
DataSourceRuleTest.class,
ShardingRuleTest.class,
TableRuleTest.class,
DataNodeTest.class,
DynamicDataNodeTest.class,
BindingTableRuleTest.class,
ShardingStrategyTest.class,
DatabaseShardingStrategyTest.class,
NoneDatabaseShardingAlgorithmTest.class,
TableShardingStrategyTest.class,
NoneTableShardingAlgorithmTest.class,
HintManagerTest.class,
MasterSlaveDataSourceFactoryTest.class,
RoundRobinMasterSlaveLoadBalanceStrategyTest.class
ShardingDataSourceFactoryTest.class,
ShardingPropertiesTest.class,
ShardingPropertiesConstantTest.class,
ShardingValueTest.class,
DataSourceRuleTest.class,
ShardingRuleTest.class,
TableRuleTest.class,
DataNodeTest.class,
DynamicDataNodeTest.class,
BindingTableRuleTest.class,
ShardingStrategyTest.class,
DatabaseShardingStrategyTest.class,
NoneDatabaseShardingAlgorithmTest.class,
TableShardingStrategyTest.class,
NoneTableShardingAlgorithmTest.class,
HintManagerTest.class,
MasterSlaveDataSourceFactoryTest.class,
RoundRobinMasterSlaveLoadBalanceStrategyTest.class,
RandomMasterSlaveLoadBalanceStrategyTest.class
})
public class AllApiTests {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.dangdang.ddframe.rdb.sharding.api.strategy.slave;

import org.junit.Test;

import java.util.Arrays;
import java.util.List;

import static org.junit.Assert.assertTrue;

public final class RandomMasterSlaveLoadBalanceStrategyTest {

private final RandomMasterSlaveLoadBalanceStrategy randomMasterSlaveLoadBalanceStrategy = new RandomMasterSlaveLoadBalanceStrategy();

@Test
public void assertGetDataSource() {
String masterDataSourceName = "test_ds_master";
String slaveDataSourceName1 = "test_ds_slave_1";
String slaveDataSourceName2 = "test_ds_slave_2";
List<String> slaveDataSourceNames = Arrays.asList(slaveDataSourceName1, slaveDataSourceName2);
assertTrue(slaveDataSourceNames.contains(randomMasterSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames)));
assertTrue(slaveDataSourceNames.contains(randomMasterSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames)));
assertTrue(slaveDataSourceNames.contains(randomMasterSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames)));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.junit.Test;

import java.util.Arrays;
import java.util.List;

import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
Expand All @@ -33,8 +34,9 @@ public void assertGetDataSource() {
String masterDataSourceName = "test_ds_master";
String slaveDataSourceName1 = "test_ds_slave_1";
String slaveDataSourceName2 = "test_ds_slave_2";
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, Arrays.asList(slaveDataSourceName1, slaveDataSourceName2)), is(slaveDataSourceName1));
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, Arrays.asList(slaveDataSourceName1, slaveDataSourceName2)), is(slaveDataSourceName2));
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, Arrays.asList(slaveDataSourceName1, slaveDataSourceName2)), is(slaveDataSourceName1));
List<String> slaveDataSourceNames = Arrays.asList(slaveDataSourceName1, slaveDataSourceName2);
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames), is(slaveDataSourceName1));
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames), is(slaveDataSourceName2));
assertThat(roundRobinSlaveLoadBalanceStrategy.getDataSource("ds", masterDataSourceName, slaveDataSourceNames), is(slaveDataSourceName1));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.dangdang.ddframe.rdb.sharding.api.rule.DataSourceRule;
import com.dangdang.ddframe.rdb.sharding.api.rule.ShardingRule;
import com.dangdang.ddframe.rdb.sharding.api.rule.TableRule;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RoundRobinMasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
import com.dangdang.ddframe.rdb.sharding.fixture.TestDataSource;
import com.dangdang.ddframe.rdb.sharding.jdbc.core.ShardingContext;
Expand Down Expand Up @@ -53,7 +54,7 @@ public static void init() throws SQLException {
DataSource slaveDataSource = new TestDataSource("test_ds_slave");
Map<String, DataSource> slaveDataSourceMap = new HashMap<>(1, 1);
slaveDataSourceMap.put("test_ds_slave", slaveDataSource);
masterSlaveDataSource = new MasterSlaveDataSource("test_ds", "test_ds_master", masterDataSource, slaveDataSourceMap);
masterSlaveDataSource = new MasterSlaveDataSource("test_ds", "test_ds_master", masterDataSource, slaveDataSourceMap, new RoundRobinMasterSlaveLoadBalanceStrategy());
((TestDataSource) slaveDataSource).setThrowExceptionWhenClosing(true);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import com.dangdang.ddframe.rdb.sharding.api.HintManager;
import com.dangdang.ddframe.rdb.sharding.api.MasterSlaveDataSourceFactory;
import com.dangdang.ddframe.rdb.sharding.api.strategy.slave.RoundRobinMasterSlaveLoadBalanceStrategy;
import com.dangdang.ddframe.rdb.sharding.constant.DatabaseType;
import com.dangdang.ddframe.rdb.sharding.constant.SQLType;
import com.dangdang.ddframe.rdb.sharding.fixture.TestDataSource;
Expand Down Expand Up @@ -55,7 +56,7 @@ public MasterSlaveDataSourceTest() throws SQLException {
slaveDataSource = new TestDataSource("test_ds_slave");
Map<String, DataSource> slaveDataSourceMap = new HashMap<>(1, 1);
slaveDataSourceMap.put("test_ds_slave", slaveDataSource);
masterSlaveDataSource = new MasterSlaveDataSource("test_ds", "test_ds_master", masterDataSource, slaveDataSourceMap);
masterSlaveDataSource = new MasterSlaveDataSource("test_ds", "test_ds_master", masterDataSource, slaveDataSourceMap, new RoundRobinMasterSlaveLoadBalanceStrategy());
}

@Before
Expand Down

0 comments on commit 8af20e0

Please sign in to comment.