Commit 17790a3a authored by tristaZero's avatar tristaZero
Browse files

delete ShardingAndMasterSlaveTogether.java

parent ef15f7ea

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/zookeeper/ShardingAndMasterSlaveTogether.java

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,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 {
@@ -78,7 +78,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/zookeeper/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.zookeeper.ZookeeperConfiguration;

import io.shardingsphere.shardingjdbc.orchestration.api.OrchestrationShardingDataSourceFactory;
@@ -57,7 +56,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 {
@@ -66,7 +65,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);

    }