Commit 4c62c5b1 authored by haocao's avatar haocao
Browse files

Refactor sharding jdbc yaml configuration.

parent a5998eb1

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/masterslave/YamlMasterSlaveConfig.java

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import lombok.Getter; 
import lombok.Setter;



import javax.sql.DataSource;

import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.Map;
@@ -42,7 +43,7 @@ public class YamlMasterSlaveConfig { 
    

    private String masterDataSourceName;

    

    private Collection<String> slaveDataSourceNames;

    private Collection<String> slaveDataSourceNames = new ArrayList<>();

    

    private MasterSlaveLoadBalanceAlgorithmType loadBalanceAlgorithmType;

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/yaml/AbstractYamlDataSourceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public abstract class AbstractYamlDataSourceTest { 
    

    private static List<String> getSchemaFiles() {

        return Arrays.asList("yaml/schema/sharding/db0.sql", "yaml/schema/sharding/db1.sql",

                "yaml/schema/ms/db_master.sql", "yaml/schema/ms/db_slave.sql",

                "yaml/schema/ms/db_master.sql", "yaml/schema/ms/db_slave_0.sql", "yaml/schema/ms/db_slave_1.sql",

                "yaml/schema/sharding_ms/db0_master.sql", "yaml/schema/sharding_ms/db1_master.sql",

                "yaml/schema/sharding_ms/db0_slave.sql", "yaml/schema/sharding_ms/db1_slave.sql");

    }

sharding-jdbc-core/src/test/java/io/shardingjdbc/core/yaml/masterslave/YamlMasterSlaveIntegrateTest.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class YamlMasterSlaveIntegrateTest extends AbstractYamlDataSourceTest { 
        if (hasDataSource) {

            dataSource = new YamlMasterSlaveDataSource(yamlFile);

        } else {

            dataSource = new YamlMasterSlaveDataSource(Maps.asMap(Sets.newHashSet("db_master", "db_slave"), new Function<String, DataSource>() {

            dataSource = new YamlMasterSlaveDataSource(Maps.asMap(Sets.newHashSet("db_master", "db_slave_0", "db_slave_1"), new Function<String, DataSource>() {

                @Override

                public DataSource apply(final String key) {

                    return createDataSource(key);

sharding-jdbc-core/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml

+11 −8
Original line number Diff line number Diff line
@@ -5,18 +5,21 @@ dataSources: 
    username: sa

    password: 

    maxActive: 100

  db_slave: !!org.apache.commons.dbcp.BasicDataSource

  db_slave_0: !!org.apache.commons.dbcp.BasicDataSource

    driverClassName: org.h2.Driver

    url: jdbc:h2:mem:db_slave;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL

    url: jdbc:h2:mem:db_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL

    username: sa

    password: 

    maxActive: 100

  db_slave_1: !!org.apache.commons.dbcp.BasicDataSource

      driverClassName: org.h2.Driver

      url: jdbc:h2:mem:db_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL

      username: sa

      password: 

      maxActive: 100



name: 

  db_ms

name: db_ms



masterDataSourceName:

  db_master

masterDataSourceName: db_master



slaveDataSourceNames:

  - db_slave
 
slaveDataSourceNames: [db_slave_0, db_slave_1]

sharding-jdbc-core/src/test/resources/yaml/schema/ms/db_slave.sql→sharding-jdbc-core/src/test/resources/yaml/schema/ms/db_slave_0.sql

+2 −2
Original line number Diff line number Diff line 
DROP SCHEMA IF EXISTS `db_slave`;

CREATE SCHEMA `db_slave`;

DROP SCHEMA IF EXISTS `db_slave_0`;

CREATE SCHEMA `db_slave_0`;

DROP TABLE IF EXISTS `t_order`;

DROP TABLE IF EXISTS `t_order_item`;

DROP TABLE IF EXISTS `t_config`;