Unverified Commit a5fdc3b9 authored by 张亮's avatar 张亮 Committed by GitHub
Browse files

Merge pull request #64 from tristaZero/dev 

Simply the orchestration configuration
parents 62647cbc 9c3912ff

sharding-jdbc-example/raw-jdbc-orche-example/src/main/java/io/shardingsphere/example/jdbc/main/orche/java/etcd/MasterSlaveOnly.java

+2 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import io.shardingsphere.example.repository.jdbc.repository.RawOrderItemReposito 
import io.shardingsphere.example.repository.jdbc.repository.RawOrderRepository;

import io.shardingsphere.example.repository.jdbc.service.RawDemoService;

import io.shardingsphere.orchestration.config.OrchestrationConfiguration;

import io.shardingsphere.orchestration.config.OrchestrationType;

import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;

import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationMasterSlaveDataSourceFactory;
@@ -57,13 +56,13 @@ public class MasterSlaveOnly { 
    

    private static DataSource getDataSourceFromRegCenter() throws SQLException {

        return OrchestrationMasterSlaveDataSourceFactory.createDataSource(

                new OrchestrationConfiguration("orchestration-master-slave-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.MASTER_SLAVE));

                new OrchestrationConfiguration("orchestration-master-slave-data-source", getRegistryCenterConfiguration(), false));

    }

    

    private static DataSource getDataSourceFromLocalConfiguration() throws SQLException {

        MasterSlaveRuleConfiguration masterSlaveRuleConfig = new MasterSlaveRuleConfiguration("demo_ds_master_slave", "demo_ds_master", Arrays.asList("demo_ds_slave_0", "demo_ds_slave_1"));

        OrchestrationConfiguration orchestrationConfig = new OrchestrationConfiguration(

                "orchestration-master-slave-data-source", getRegistryCenterConfiguration(), true, OrchestrationType.MASTER_SLAVE);

                "orchestration-master-slave-data-source", getRegistryCenterConfiguration(), true);

        return OrchestrationMasterSlaveDataSourceFactory.createDataSource(createDataSourceMap(), masterSlaveRuleConfig, new HashMap<String, Object>(), new Properties(), orchestrationConfig);

    }

sharding-jdbc-example/raw-jdbc-orche-example/src/main/java/io/shardingsphere/example/jdbc/main/orche/java/etcd/ShardingAndMasterSlaveTogether.java

+2 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import io.shardingsphere.example.repository.jdbc.repository.RawOrderItemReposito 
import io.shardingsphere.example.repository.jdbc.repository.RawOrderRepository;

import io.shardingsphere.example.repository.jdbc.service.RawDemoService;

import io.shardingsphere.orchestration.config.OrchestrationConfiguration;

import io.shardingsphere.orchestration.config.OrchestrationType;

import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;

import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
@@ -61,7 +60,7 @@ public class ShardingAndMasterSlaveTogether { 
    

    private static DataSource getDataSourceFromRegCenter() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                new OrchestrationConfiguration("orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING));

                new OrchestrationConfiguration("orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), false));

    }

    

    private static DataSource getDataSourceFromLocalConfiguration() throws SQLException {
@@ -73,7 +72,7 @@ public class ShardingAndMasterSlaveTogether { 
        shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new ModuloShardingTableAlgorithm()));

        shardingRuleConfig.setMasterSlaveRuleConfigs(getMasterSlaveRuleConfigurations());

        OrchestrationConfiguration orchestrationConfig = new OrchestrationConfiguration(

                "orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), true, OrchestrationType.SHARDING);

                "orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), true);

        return OrchestrationShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), new Properties(), orchestrationConfig);

    }

sharding-jdbc-example/raw-jdbc-orche-example/src/main/java/io/shardingsphere/example/jdbc/main/orche/java/etcd/ShardingOnlyWithDatabases.java

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import io.shardingsphere.example.repository.jdbc.repository.RawOrderItemReposito 
import io.shardingsphere.example.repository.jdbc.repository.RawOrderRepository;

import io.shardingsphere.example.repository.jdbc.service.RawDemoService;

import io.shardingsphere.orchestration.config.OrchestrationConfiguration;

import io.shardingsphere.orchestration.config.OrchestrationType;

import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;

import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
@@ -55,7 +54,7 @@ public class ShardingOnlyWithDatabases { 
    

    private static DataSource getDataSourceFromRegCenter() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                new OrchestrationConfiguration("orchestration-sharding-db-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING));

                new OrchestrationConfiguration("orchestration-sharding-db-data-source", getRegistryCenterConfiguration(), false));

    }

    

    private static DataSource getDataSourceFromLocalConfiguration() throws SQLException {
@@ -64,7 +63,7 @@ public class ShardingOnlyWithDatabases { 
        shardingRuleConfig.getTableRuleConfigs().add(getOrderItemTableRuleConfiguration());

        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "demo_ds_${user_id % 2}"));

        OrchestrationConfiguration orchestrationConfig = new OrchestrationConfiguration(

                "orchestration-sharding-db-data-source", getRegistryCenterConfiguration(), true, OrchestrationType.SHARDING);

                "orchestration-sharding-db-data-source", getRegistryCenterConfiguration(), true);

        return OrchestrationShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), new Properties(), orchestrationConfig);

    }

sharding-jdbc-example/raw-jdbc-orche-example/src/main/java/io/shardingsphere/example/jdbc/main/orche/java/etcd/ShardingOnlyWithDatabasesAndTables.java

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import io.shardingsphere.example.repository.jdbc.repository.RawOrderItemReposito 
import io.shardingsphere.example.repository.jdbc.repository.RawOrderRepository;

import io.shardingsphere.example.repository.jdbc.service.RawDemoService;

import io.shardingsphere.orchestration.config.OrchestrationConfiguration;

import io.shardingsphere.orchestration.config.OrchestrationType;

import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;

import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
@@ -57,7 +56,7 @@ public class ShardingOnlyWithDatabasesAndTables { 
    

    private static DataSource getDataSourceFromRegCenter() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                new OrchestrationConfiguration("orchestration-sharding-dbtbl-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING));

                new OrchestrationConfiguration("orchestration-sharding-dbtbl-data-source", getRegistryCenterConfiguration(), false));

    }

    

    private static DataSource getDataSourceFromLocalConfiguration() throws SQLException {
@@ -68,7 +67,7 @@ public class ShardingOnlyWithDatabasesAndTables { 
        shardingRuleConfig.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "demo_ds_${user_id % 2}"));

        shardingRuleConfig.setDefaultTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("order_id", new ModuloShardingTableAlgorithm()));

        OrchestrationConfiguration orchestrationConfig = new OrchestrationConfiguration(

                "orchestration-sharding-dbtbl-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING);

                "orchestration-sharding-dbtbl-data-source", getRegistryCenterConfiguration(), false);

        return OrchestrationShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), new Properties(), orchestrationConfig);

    }

sharding-jdbc-example/raw-jdbc-orche-example/src/main/java/io/shardingsphere/example/jdbc/main/orche/java/etcd/ShardingOnlyWithTables.java

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import io.shardingsphere.example.repository.jdbc.repository.RawOrderItemReposito 
import io.shardingsphere.example.repository.jdbc.repository.RawOrderRepository;

import io.shardingsphere.example.repository.jdbc.service.RawDemoService;

import io.shardingsphere.orchestration.config.OrchestrationConfiguration;

import io.shardingsphere.orchestration.config.OrchestrationType;

import io.shardingsphere.orchestration.reg.api.RegistryCenterConfiguration;

import io.shardingsphere.orchestration.reg.etcd.EtcdConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
@@ -54,7 +53,7 @@ public class ShardingOnlyWithTables { 
    

    private static DataSource getDataSourceFromRegCenter() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                new OrchestrationConfiguration("orchestration-sharding-tbl-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING));

                new OrchestrationConfiguration("orchestration-sharding-tbl-data-source", getRegistryCenterConfiguration(), false));

    }

    

    private static DataSource getDataSourceFromLocalConfiguration() throws SQLException {
@@ -63,7 +62,7 @@ public class ShardingOnlyWithTables { 
        shardingRuleConfig.getTableRuleConfigs().add(getOrderItemTableRuleConfiguration());

        shardingRuleConfig.getBindingTableGroups().add("t_order, t_order_item");

        OrchestrationConfiguration orchestrationConfig = new OrchestrationConfiguration(

                "orchestration-sharding-tbl-data-source", getRegistryCenterConfiguration(), false, OrchestrationType.SHARDING);

                "orchestration-sharding-tbl-data-source", getRegistryCenterConfiguration(), false);

        return OrchestrationShardingDataSourceFactory.createDataSource(createDataSourceMap(), shardingRuleConfig, new HashMap<String, Object>(), new Properties(), orchestrationConfig);

    }