From 597b89b92865bf39106e3b76fa5c27dc3ec69e44 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Tue, 18 Aug 2020 18:42:11 +0800 Subject: [PATCH] Refactor SpringNamespaceTest --- .../spring/SpringNamespaceTest.java | 262 +++--------------- .../META-INF/spring/application-context.xml | 189 +++---------- .../META-INF/spring/datasource/dataSource.xml | 31 --- .../datasource/masterSlaveDataSource.xml | 36 --- .../test/resources/conf/rdb/conf.properties | 13 +- .../conf/rdb/master_slave_conf.properties | 47 ---- 6 files changed, 78 insertions(+), 500 deletions(-) delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/dataSource.xml delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/masterSlaveDataSource.xml delete mode 100644 shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/master_slave_conf.properties diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java index d5ee1607cc..52f5346581 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/SpringNamespaceTest.java @@ -19,34 +19,20 @@ package org.apache.shardingsphere.spring; import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; import org.apache.shardingsphere.encrypt.rule.EncryptRule; -import org.apache.shardingsphere.infra.config.properties.ConfigurationPropertyKey; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.rule.ShardingSphereRule; -import org.apache.shardingsphere.kernel.context.SchemaContexts; -import org.apache.shardingsphere.sharding.api.config.strategy.sharding.ComplexShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.api.config.strategy.sharding.HintShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.api.config.strategy.sharding.NoneShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.api.config.strategy.sharding.StandardShardingStrategyConfiguration; -import org.apache.shardingsphere.sharding.rule.BindingTableRule; +import org.apache.shardingsphere.masterslave.rule.MasterSlaveRule; import org.apache.shardingsphere.sharding.rule.ShardingRule; -import org.apache.shardingsphere.sharding.rule.TableRule; -import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm; -import org.apache.shardingsphere.sharding.strategy.none.NoneShardingStrategy; -import org.apache.shardingsphere.spring.fixture.IncrementKeyGenerateAlgorithm; import org.apache.shardingsphere.spring.transaction.ShardingTransactionTypeScanner; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; -import javax.sql.DataSource; +import javax.annotation.Resource; +import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -54,221 +40,61 @@ import static org.junit.Assert.assertTrue; @ContextConfiguration(locations = "classpath:META-INF/spring/application-context.xml") public final class SpringNamespaceTest extends AbstractJUnit4SpringContextTests { - @Test - public void assertKeyGenerateAlgorithm() { - assertThat(applicationContext.getBean("incrementAlgorithm"), instanceOf(KeyGenerateAlgorithm.class)); - KeyGenerateAlgorithm incrementKeyGenerateAlgorithm = (KeyGenerateAlgorithm) applicationContext.getBean("incrementAlgorithm"); - KeyGenerateAlgorithm directIncrementKeyGenerateAlgorithm = new IncrementKeyGenerateAlgorithm(); - assertThat(directIncrementKeyGenerateAlgorithm.generateKey(), is(incrementKeyGenerateAlgorithm.generateKey())); - } - - @Test - public void assertStandardStrategy() { - StandardShardingStrategyConfiguration standardStrategy = applicationContext.getBean("standardStrategy", StandardShardingStrategyConfiguration.class); - assertThat(standardStrategy.getShardingColumn(), is("user_id")); - assertThat(standardStrategy.getShardingAlgorithmName(), is("standardModuloDatabaseShardingAlgorithm")); - } - - @Test - public void assertRangeStandardStrategy() { - StandardShardingStrategyConfiguration rangeStandardStrategy = applicationContext.getBean("rangeStandardStrategy", StandardShardingStrategyConfiguration.class); - assertThat(rangeStandardStrategy.getShardingColumn(), is("order_id")); - assertThat(rangeStandardStrategy.getShardingAlgorithmName(), is("standardModuloTableShardingAlgorithm")); - } - - @Test - public void assertComplexStrategy() { - ComplexShardingStrategyConfiguration complexStrategy = applicationContext.getBean("complexStrategy", ComplexShardingStrategyConfiguration.class); - assertThat(complexStrategy.getShardingColumns(), is("order_id,user_id")); - assertThat(complexStrategy.getShardingAlgorithmName(), is("defaultComplexKeysShardingAlgorithm")); - } - - @Test - public void assertInlineStrategy() { - StandardShardingStrategyConfiguration inlineStrategy = applicationContext.getBean("inlineStrategy", StandardShardingStrategyConfiguration.class); - assertThat(inlineStrategy.getShardingColumn(), is("order_id")); - assertThat(inlineStrategy.getShardingAlgorithmName(), is("inlineStrategyShardingAlgorithm")); - } + @Resource + private ShardingSphereDataSource dataSource; @Test - public void assertHintStrategy() { - HintShardingStrategyConfiguration hintStrategy = applicationContext.getBean("hintStrategy", HintShardingStrategyConfiguration.class); - assertThat(hintStrategy.getShardingAlgorithmName(), is("defaultHintShardingAlgorithm")); + public void assertShardingSphereDataSource() { + assertDataSourceMap(); + Collection rules = dataSource.getSchemaContexts().getDefaultSchemaContext().getSchema().getRules(); + assertThat(rules.size(), is(3)); + for (ShardingSphereRule each : rules) { + if (each instanceof ShardingRule) { + assertShardingRule((ShardingRule) each); + } else if (each instanceof MasterSlaveRule) { + assertMasterSlaveRule((MasterSlaveRule) each); + } else if (each instanceof EncryptRule) { + assertEncryptRule((EncryptRule) each); + } + } } - @Test - public void assertNoneStrategy() { - applicationContext.getBean("noneStrategy", NoneShardingStrategyConfiguration.class); + private void assertDataSourceMap() { + assertThat(dataSource.getDataSourceMap().size(), is(6)); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_master")); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_slave_0")); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_0_slave_1")); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_master")); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_slave_0")); + assertTrue(dataSource.getDataSourceMap().containsKey("ds_1_slave_1")); } - @Test - public void assertSimpleShardingSphereDataSource() { - Map dataSourceMap = getDataSourceMap("simpleShardingDataSource"); - assertNotNull(dataSourceMap.get("dbtbl_0")); - Iterator rules = getRules("simpleShardingDataSource").iterator(); - ShardingRule shardingRule = (ShardingRule) rules.next(); - assertThat(shardingRule.getTableRules().size(), is(1)); - assertThat(shardingRule.getTableRules().iterator().next().getLogicTable(), is("t_order")); - EncryptRule encryptRule = (EncryptRule) rules.next(); - assertThat(encryptRule.getEncryptTableNames().size(), is(1)); - assertTrue(encryptRule.getEncryptTableNames().contains("t_order")); - assertFalse(rules.hasNext()); + private void assertShardingRule(final ShardingRule rule) { + assertThat(rule.getTableRules().size(), is(1)); + assertThat(rule.getTableRule("t_order").getActualDataNodes(), is(Arrays.asList( + new DataNode("ds_0.t_order_0"), new DataNode("ds_0.t_order_1"), new DataNode("ds_0.t_order_2"), new DataNode("ds_0.t_order_3"), + new DataNode("ds_1.t_order_0"), new DataNode("ds_1.t_order_1"), new DataNode("ds_1.t_order_2"), new DataNode("ds_1.t_order_3")))); + assertThat(rule.getTableRule("t_order").getDatabaseShardingStrategy().getShardingAlgorithm().getProps().getProperty("algorithm.expression"), is("ds_$->{user_id % 2}")); + assertThat(rule.getTableRule("t_order").getTableShardingStrategy().getShardingAlgorithm().getProps().getProperty("algorithm.expression"), is("t_order_$->{order_id % 4}")); } - @Test - public void assertShardingRuleWithAttributesDataSource() { - Map dataSourceMap = getDataSourceMap("shardingRuleWithAttributesDataSource"); - assertNotNull(dataSourceMap.get("dbtbl_0")); - assertNotNull(dataSourceMap.get("dbtbl_1")); - ShardingRule shardingRule = getShardingRule("shardingRuleWithAttributesDataSource"); - assertThat(shardingRule.getDefaultDatabaseShardingStrategy().getShardingColumns().toArray(new String[]{}), - is(new String[]{applicationContext.getBean("standardStrategy", StandardShardingStrategyConfiguration.class).getShardingColumn()})); - assertThat(shardingRule.getDefaultTableShardingStrategy().getShardingColumns().toArray(new String[]{}), - is(new String[]{applicationContext.getBean("inlineStrategy", StandardShardingStrategyConfiguration.class).getShardingColumn()})); - assertThat(shardingRule.getDefaultKeyGenerateAlgorithm(), instanceOf(IncrementKeyGenerateAlgorithm.class)); + private void assertMasterSlaveRule(final MasterSlaveRule rule) { + assertTrue(rule.findDataSourceRule("ds_0").isPresent()); + assertThat(rule.findDataSourceRule("ds_0").get().getMasterDataSourceName(), is("ds_0_master")); + assertThat(rule.findDataSourceRule("ds_0").get().getSlaveDataSourceNames(), is(Arrays.asList("ds_0_slave_0", "ds_0_slave_1"))); + assertTrue(rule.findDataSourceRule("ds_1").isPresent()); + assertThat(rule.findDataSourceRule("ds_1").get().getMasterDataSourceName(), is("ds_1_master")); + assertThat(rule.findDataSourceRule("ds_1").get().getSlaveDataSourceNames(), is(Arrays.asList("ds_1_slave_0", "ds_1_slave_1"))); } - @Test - public void assertAutoShardingDataSource() { - Map dataSourceMap = getDataSourceMap("autoShardingDataSource"); - assertNotNull(dataSourceMap.get("dbtbl_0")); - assertNotNull(dataSourceMap.get("dbtbl_1")); - ShardingRule shardingRule = getShardingRule("autoShardingDataSource"); - assertThat(shardingRule.getTableRules().size(), is(1)); - TableRule tableRule = shardingRule.getTableRules().iterator().next(); - assertThat(tableRule.getLogicTable(), is("t_order")); - assertThat(tableRule.getActualDataNodes().size(), is(4)); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_0"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_1"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_2"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_3"))); - assertThat(tableRule.getDatabaseShardingStrategy(), instanceOf(NoneShardingStrategy.class)); - assertThat(tableRule.getTableShardingStrategy().getShardingColumns().toArray(new String[]{}), - is(new String[]{applicationContext.getBean("inlineStrategy", StandardShardingStrategyConfiguration.class).getShardingColumn()})); - assertTrue(tableRule.getGenerateKeyColumn().isPresent()); - assertThat(tableRule.getGenerateKeyColumn().get(), is("order_id")); - assertThat(tableRule.getKeyGeneratorName(), is("incrementAlgorithm")); - } - - @Test - public void assertTableRuleWithAttributesDataSource() { - ShardingRule shardingRule = getShardingRule("tableRuleWithAttributesDataSource"); - assertThat(shardingRule.getTableRules().size(), is(1)); - TableRule tableRule = shardingRule.getTableRules().iterator().next(); - assertThat(tableRule.getLogicTable(), is("t_order")); - assertThat(tableRule.getActualDataNodes().size(), is(8)); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_0"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_1"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_2"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_3"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_0"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_1"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_2"))); - assertTrue(tableRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_3"))); - assertThat(tableRule.getDatabaseShardingStrategy().getShardingColumns().toArray(new String[]{}), - is(new String[]{applicationContext.getBean("standardStrategy", StandardShardingStrategyConfiguration.class).getShardingColumn()})); - assertThat(tableRule.getTableShardingStrategy().getShardingColumns().toArray(new String[]{}), - is(new String[]{applicationContext.getBean("inlineStrategy", StandardShardingStrategyConfiguration.class).getShardingColumn()})); - assertTrue(tableRule.getGenerateKeyColumn().isPresent()); - assertThat(tableRule.getGenerateKeyColumn().get(), is("order_id")); - assertThat(tableRule.getKeyGeneratorName(), is("incrementAlgorithm")); - } - - @Test - public void assertMultiTableRulesDataSource() { - ShardingRule shardingRule = getShardingRule("multiTableRulesDataSource"); - assertThat(shardingRule.getTableRules().size(), is(2)); - Iterator tableRules = shardingRule.getTableRules().iterator(); - assertThat(tableRules.next().getLogicTable(), is("t_order")); - assertThat(tableRules.next().getLogicTable(), is("t_order_item")); - } - - @Test - public void assertBindingTableRuleDatasource() { - ShardingRule shardingRule = getShardingRule("bindingTableRuleDatasource"); - assertThat(shardingRule.getBindingTableRules().size(), is(1)); - BindingTableRule bindingTableRule = shardingRule.getBindingTableRules().iterator().next(); - assertThat(bindingTableRule.getBindingActualTable("dbtbl_0", "t_order", "t_order_item"), is("t_order")); - assertThat(bindingTableRule.getBindingActualTable("dbtbl_1", "t_order", "t_order_item"), is("t_order")); - } - - @Test - public void assertMultiBindingTableRulesDatasource() { - ShardingRule shardingRule = getShardingRule("multiBindingTableRulesDatasource"); - assertThat(shardingRule.getBindingTableRules().size(), is(2)); - Iterator bindingTableRules = shardingRule.getBindingTableRules().iterator(); - BindingTableRule orderRule = bindingTableRules.next(); - assertThat(orderRule.getBindingActualTable("dbtbl_0", "t_order", "t_order_item"), is("t_order")); - assertThat(orderRule.getBindingActualTable("dbtbl_1", "t_order", "t_order_item"), is("t_order")); - BindingTableRule userRule = bindingTableRules.next(); - assertThat(userRule.getBindingActualTable("dbtbl_0", "t_user", "t_user_detail"), is("t_user")); - assertThat(userRule.getBindingActualTable("dbtbl_1", "t_user", "t_user_detail"), is("t_user")); - } - - @Test - public void assertBroadcastTableRuleDatasource() { - ShardingRule shardingRule = getShardingRule("broadcastTableRuleDatasource"); - assertThat(shardingRule.getBroadcastTables().size(), is(1)); - assertThat(shardingRule.getBroadcastTables().iterator().next(), is("t_config")); - } - - @Test - public void assertMultiBroadcastTableRulesDatasource() { - ShardingRule shardingRule = getShardingRule("multiBroadcastTableRulesDatasource"); - assertThat(shardingRule.getBroadcastTables().size(), is(2)); - assertThat(((LinkedList) shardingRule.getBroadcastTables()).get(0), is("t_config1")); - assertThat(((LinkedList) shardingRule.getBroadcastTables()).get(1), is("t_config2")); - } - - @Test - public void assertPropsDataSource() { - ShardingSphereDataSource shardingSphereDataSource = applicationContext.getBean("propsDataSource", ShardingSphereDataSource.class); - SchemaContexts schemaContexts = shardingSphereDataSource.getSchemaContexts(); - assertTrue(schemaContexts.getProps().getValue(ConfigurationPropertyKey.SQL_SHOW)); - boolean showSql = schemaContexts.getProps().getValue(ConfigurationPropertyKey.SQL_SHOW); - assertTrue(showSql); - int executorSize = schemaContexts.getProps().getValue(ConfigurationPropertyKey.EXECUTOR_SIZE); - assertThat(executorSize, is(10)); - } - - @Test - public void assertShardingSphereDataSourceType() { - assertNotNull(applicationContext.getBean("simpleShardingDataSource", ShardingSphereDataSource.class)); - } - - @Test - public void assertDefaultActualDataNodes() { - ShardingSphereDataSource shardingSphereDataSource = applicationContext.getBean("multiTableRulesDataSource", ShardingSphereDataSource.class); - SchemaContexts schemaContexts = shardingSphereDataSource.getSchemaContexts(); - ShardingRule shardingRule = (ShardingRule) schemaContexts.getDefaultSchemaContext().getSchema().getRules().iterator().next(); - assertThat(shardingRule.getTableRules().size(), is(2)); - Iterator tableRules = shardingRule.getTableRules().iterator(); - TableRule orderRule = tableRules.next(); - assertThat(orderRule.getActualDataNodes().size(), is(2)); - assertTrue(orderRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order"))); - assertTrue(orderRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order"))); - TableRule orderItemRule = tableRules.next(); - assertThat(orderItemRule.getActualDataNodes().size(), is(2)); - assertTrue(orderItemRule.getActualDataNodes().contains(new DataNode("dbtbl_0", "t_order_item"))); - assertTrue(orderItemRule.getActualDataNodes().contains(new DataNode("dbtbl_1", "t_order_item"))); + private void assertEncryptRule(final EncryptRule rule) { + assertThat(rule.getCipherColumn("t_order", "pwd"), is("pwd_cipher")); + assertTrue(rule.findEncryptor("t_order", "pwd").isPresent()); + assertThat(rule.findEncryptor("t_order", "pwd").get().getProps().getProperty("aes.key.value"), is("123456")); } @Test public void assertShardingTransactionTypeScanner() { assertNotNull(applicationContext.getBean(ShardingTransactionTypeScanner.class)); } - - private Map getDataSourceMap(final String dataSourceName) { - ShardingSphereDataSource shardingSphereDataSource = applicationContext.getBean(dataSourceName, ShardingSphereDataSource.class); - return shardingSphereDataSource.getDataSourceMap(); - } - - private ShardingRule getShardingRule(final String dataSourceName) { - ShardingSphereDataSource shardingSphereDataSource = applicationContext.getBean(dataSourceName, ShardingSphereDataSource.class); - return (ShardingRule) shardingSphereDataSource.getSchemaContexts().getDefaultSchemaContext().getSchema().getRules().iterator().next(); - } - - private Collection getRules(final String dataSourceName) { - return applicationContext.getBean(dataSourceName, ShardingSphereDataSource.class).getSchemaContexts().getDefaultSchemaContext().getSchema().getRules(); - } } diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml index 02aee30a21..e0d9cc0d45 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/application-context.xml @@ -18,12 +18,15 @@ - - + - - - - - + + + + + + + + - t_order_${order_id % 4} + ds_$->{user_id % 2} - + - 4 + t_order_$->{order_id % 4} - - - - - - - - - + + - - - - - - - - - - - - - - - - - + - 123456 + ${aes.key.value} - - - - - - - - - - - - - + - + - - - - - + + + + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - ${sql_show} - 10 - bar + false + ${executor.size} diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/dataSource.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/dataSource.xml deleted file mode 100644 index 4abc6c0563..0000000000 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/dataSource.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/masterSlaveDataSource.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/masterSlaveDataSource.xml deleted file mode 100644 index f134c9ab6c..0000000000 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/META-INF/spring/datasource/masterSlaveDataSource.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/conf.properties b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/conf.properties index ac6c71d69d..e1515fa240 100644 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/conf.properties +++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/conf.properties @@ -15,14 +15,5 @@ # limitations under the License. # -dbtbl_0.driver=org.h2.Driver -dbtbl_0.url=jdbc:h2:mem:dbtbl_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_0.username=sa -dbtbl_0.password= - -dbtbl_1.driver=org.h2.Driver -dbtbl_1.url=jdbc:h2:mem:dbtbl_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_1.username=sa -dbtbl_1.password= - -sql_show=true +aes.key.value=123456 +executor.size=10 diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/master_slave_conf.properties b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/master_slave_conf.properties deleted file mode 100644 index 5ea379a5db..0000000000 --- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/resources/conf/rdb/master_slave_conf.properties +++ /dev/null @@ -1,47 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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. -# - -dbtbl_0_master.driver=org.h2.Driver -dbtbl_0_master.url=jdbc:h2:mem:dbtbl_0_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_0_master.username=sa -dbtbl_0_master.password= - -dbtbl_0_slave_0.driver=org.h2.Driver -dbtbl_0_slave_0.url=jdbc:h2:mem:dbtbl_0_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_0_slave_0.username=sa -dbtbl_0_slave_0.password= - -dbtbl_0_slave_1.driver=org.h2.Driver -dbtbl_0_slave_1.url=jdbc:h2:mem:dbtbl_0_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_0_slave_1.username=sa -dbtbl_0_slave_1.password= - - -dbtbl_1_master.driver=org.h2.Driver -dbtbl_1_master.url=jdbc:h2:mem:dbtbl_1_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_1_master.username=sa -dbtbl_1_master.password= - -dbtbl_1_slave_0.driver=org.h2.Driver -dbtbl_1_slave_0.url=jdbc:h2:mem:dbtbl_1_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_1_slave_0.username=sa -dbtbl_1_slave_0.password= - -dbtbl_1_slave_1.driver=org.h2.Driver -dbtbl_1_slave_1.url=jdbc:h2:mem:dbtbl_1_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL -dbtbl_1_slave_1.username=sa -dbtbl_1_slave_1.password= -- GitLab