From 1aae276a33fcbd17309f988aa1f84fd790b867f2 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Fri, 22 Sep 2017 19:15:29 +0800 Subject: [PATCH] refactor api: actual tables -> actual data nodes 3rd version --- README_ZH.md | 4 ++-- .../api/config/TableRuleConfiguration.java | 6 +++--- .../io/shardingjdbc/core/rule/TableRule.java | 14 +++++++------- .../sharding/YamlTableRuleConfiguration.java | 6 ++---- .../api/ShardingDataSourceFactoryTest.java | 2 +- .../api/fixture/ShardingRuleMockBuilder.java | 4 ++-- ...stractShardingJDBCDatabaseAndTableTest.java | 4 ++-- .../sharding/ShardingDatabaseAndTableTest.java | 4 ++-- .../type/sharding/ShardingMasterSlaveTest.java | 4 ++-- .../type/sharding/ShardingTableOnlyTest.java | 4 ++-- .../datasource/ShardingDataSourceTest.java | 2 +- .../core/parsing/SQLParsingEngineTest.java | 4 ++-- .../sql/AbstractStatementParserTest.java | 2 +- .../parser/sql/InsertStatementParserTest.java | 2 +- .../core/rule/BindingTableRuleTest.java | 4 ++-- .../core/rule/ShardingRuleTest.java | 12 ++++++------ .../shardingjdbc/core/rule/TableRuleTest.java | 18 +++++++++--------- .../test/resources/yaml/config/config-all.yaml | 6 +++--- .../yaml/config/config-bindingError.yaml | 4 ++-- .../yaml/config/config-classNotFound.yaml | 2 +- .../test/resources/yaml/config/config-min.yaml | 2 +- .../configWithDataSourceWithProps.yaml | 6 +++--- .../configWithDataSourceWithoutProps.yaml | 6 +++--- .../configWithoutDataSourceWithProps.yaml | 6 +++--- .../configWithoutDataSourceWithoutProps.yaml | 6 +++--- .../configWithDataSourceWithProps.yaml | 6 +++--- .../configWithDataSourceWithoutProps.yaml | 6 +++--- .../configWithoutDataSourceWithProps.yaml | 6 +++--- .../configWithoutDataSourceWithoutProps.yaml | 6 +++--- ...ShardingRuleConfigurationConverterTest.java | 12 ++++++------ ...gJdbcDataSourceBeanDefinitionParserTag.java | 2 +- ...dingJdbcDataSourceBeanDefinitionParser.java | 6 +++--- .../resources/META-INF/namespace/sharding.xsd | 2 +- .../rdb/withNamespaceAlgorithmClass.xml | 4 ++-- .../withNamespaceAlgorithmClassAndProps.xml | 4 ++-- .../rdb/withNamespaceAlgorithmExpression.xml | 4 ++-- .../rdb/withNamespaceBindingTables.xml | 4 ++-- .../rdb/withNamespaceDefaultStrategy.xml | 4 ++-- .../rdb/withNamespaceDifferentTables.xml | 4 ++-- ...espaceForMasterSlaveWithDefaultStrategy.xml | 4 ++-- ...hNamespaceForMasterSlaveWithStrategyRef.xml | 4 ++-- ...NamespaceForMasterSlaveWithStrategyType.xml | 4 ++-- .../rdb/withNamespaceGenerateKeyColumns.xml | 4 ++-- 43 files changed, 109 insertions(+), 111 deletions(-) diff --git a/README_ZH.md b/README_ZH.md index f153b35045..d64a7fdbcc 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -135,8 +135,8 @@ try ( - - + + diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/TableRuleConfiguration.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/TableRuleConfiguration.java index 1549686308..d1935a13b6 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/TableRuleConfiguration.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/config/TableRuleConfiguration.java @@ -43,7 +43,7 @@ public class TableRuleConfiguration { private String logicTable; - private String actualTables; + private String actualDataNodes; private ShardingStrategyConfiguration databaseShardingStrategyConfig; @@ -61,10 +61,10 @@ public class TableRuleConfiguration { */ public TableRule build(final Map dataSourceMap) { Preconditions.checkNotNull(logicTable, "Logic table cannot be null."); - List actualTables = new InlineExpressionParser(this.actualTables).evaluate(); + List actualDataNodes = new InlineExpressionParser(this.actualDataNodes).evaluate(); ShardingStrategy databaseShardingStrategy = null == databaseShardingStrategyConfig ? null : databaseShardingStrategyConfig.build(); ShardingStrategy tableShardingStrategy = null == tableShardingStrategyConfig ? null : tableShardingStrategyConfig.build(); KeyGenerator keyGenerator = !Strings.isNullOrEmpty(keyGeneratorColumnName) && !Strings.isNullOrEmpty(keyGeneratorClass) ? KeyGeneratorFactory.newInstance(keyGeneratorClass) : null; - return new TableRule(logicTable, actualTables, dataSourceMap, databaseShardingStrategy, tableShardingStrategy, keyGeneratorColumnName, keyGenerator); + return new TableRule(logicTable, actualDataNodes, dataSourceMap, databaseShardingStrategy, tableShardingStrategy, keyGeneratorColumnName, keyGenerator); } } diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rule/TableRule.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rule/TableRule.java index 5c60f8f8b7..428bee5e42 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rule/TableRule.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rule/TableRule.java @@ -51,10 +51,10 @@ public final class TableRule { private final KeyGenerator keyGenerator; - public TableRule(final String logicTable, final List actualTables, final Map dataSourceMap, + public TableRule(final String logicTable, final List actualDataNodes, final Map dataSourceMap, final ShardingStrategy databaseShardingStrategy, final ShardingStrategy tableShardingStrategy, final String generateKeyColumn, final KeyGenerator keyGenerator) { this.logicTable = logicTable; - this.actualDataNodes = null == actualTables || actualTables.isEmpty() ? generateDataNodes(logicTable, dataSourceMap) : generateDataNodes(actualTables, dataSourceMap); + this.actualDataNodes = null == actualDataNodes || actualDataNodes.isEmpty() ? generateDataNodes(logicTable, dataSourceMap) : generateDataNodes(actualDataNodes, dataSourceMap); this.databaseShardingStrategy = databaseShardingStrategy; this.tableShardingStrategy = tableShardingStrategy; this.generateKeyColumn = generateKeyColumn; @@ -69,13 +69,13 @@ public final class TableRule { return result; } - private List generateDataNodes(final List actualTables, final Map dataSourceMap) { + private List generateDataNodes(final List actualDataNodes, final Map dataSourceMap) { List result = new LinkedList<>(); - for (String actualTable : actualTables) { - Preconditions.checkArgument(DataNode.isValidDataNode(actualTable), String.format("Invalid format for actual data nodes: '%s'", actualTable)); - DataNode dataNode = new DataNode(actualTable); + for (String each : actualDataNodes) { + Preconditions.checkArgument(DataNode.isValidDataNode(each), String.format("Invalid format for actual data nodes: '%s'", each)); + DataNode dataNode = new DataNode(each); Preconditions.checkArgument(dataSourceMap.containsKey(dataNode.getDataSourceName()), - String.format("Cannot find data source name in sharding rule, invalid actual data node is: '%s'", actualTable)); + String.format("Cannot find data source name in sharding rule, invalid actual data node is: '%s'", each)); result.add(dataNode); } return result; diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlTableRuleConfiguration.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlTableRuleConfiguration.java index 21707c6e14..e78f2c969e 100644 --- a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlTableRuleConfiguration.java +++ b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlTableRuleConfiguration.java @@ -16,9 +16,7 @@ public class YamlTableRuleConfiguration { private String logicTable; - private String actualTables; - - private String dataSourceNames; + private String actualDataNodes; private YamlShardingStrategyConfiguration databaseStrategy; @@ -37,7 +35,7 @@ public class YamlTableRuleConfiguration { Preconditions.checkNotNull(logicTable, "Logic table cannot be null."); TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable(logicTable); - tableRuleConfig.setActualTables(actualTables); + tableRuleConfig.setActualDataNodes(actualDataNodes); tableRuleConfig.setLogicTable(logicTable); if (null != databaseStrategy) { tableRuleConfig.setDatabaseShardingStrategyConfig(databaseStrategy.build()); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/ShardingDataSourceFactoryTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/ShardingDataSourceFactoryTest.java index 79c9952ebb..ebe2e2debf 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/ShardingDataSourceFactoryTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/ShardingDataSourceFactoryTest.java @@ -71,7 +71,7 @@ public final class ShardingDataSourceFactoryTest { ShardingRuleConfiguration result = new ShardingRuleConfiguration(); TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds.table_${0..2}"); result.getTableRuleConfigs().add(tableRuleConfig); return result; } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/fixture/ShardingRuleMockBuilder.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/fixture/ShardingRuleMockBuilder.java index fbeb783355..6e9bafb2b4 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/fixture/ShardingRuleMockBuilder.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/api/fixture/ShardingRuleMockBuilder.java @@ -77,7 +77,7 @@ public class ShardingRuleMockBuilder { public TableRuleConfiguration apply(final String input) { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable(input); - result.setActualTables("db0." + input + ",db1." + input); + result.setActualDataNodes("db0." + input + ",db1." + input); result.setKeyGeneratorColumnName(generateKeyColumnsMap.get(input)); return result; } @@ -86,7 +86,7 @@ public class ShardingRuleMockBuilder { if (tableRuleConfigs.isEmpty()) { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("mock"); - tableRuleConfig.setActualTables("mock"); + tableRuleConfig.setActualDataNodes("mock"); tableRuleConfigs.add(tableRuleConfig); } ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java index 6b7863966d..8b5087abb5 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/common/base/AbstractShardingJDBCDatabaseAndTableTest.java @@ -63,7 +63,7 @@ public abstract class AbstractShardingJDBCDatabaseAndTableTest extends AbstractS for (String dataSourceName : entry.getValue().keySet()) { orderActualDataNodes.add(dataSourceName + ".t_order_${0..1}"); } - orderTableRuleConfig.setActualTables(Joiner.on(",").join(orderActualDataNodes)); + orderTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); @@ -71,7 +71,7 @@ public abstract class AbstractShardingJDBCDatabaseAndTableTest extends AbstractS for (String dataSourceName : entry.getValue().keySet()) { orderItemActualDataNodes.add(dataSourceName + ".t_order_item_${0..1}"); } - orderItemTableRuleConfig.setActualTables(Joiner.on(",").join(orderItemActualDataNodes)); + orderItemTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderItemActualDataNodes)); orderItemTableRuleConfig.setKeyGeneratorColumnName("item_id"); orderItemTableRuleConfig.setKeyGeneratorClass(IncrementKeyGenerator.class.getName()); shardingRuleConfig.getTableRuleConfigs().add(orderItemTableRuleConfig); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingDatabaseAndTableTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingDatabaseAndTableTest.java index 6b3f53a0b2..a4aa7fc3c1 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingDatabaseAndTableTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingDatabaseAndTableTest.java @@ -86,7 +86,7 @@ public class ShardingDatabaseAndTableTest extends AbstractSQLAssertTest { for (String dataSourceName : entry.getValue().keySet()) { orderActualDataNodes.add(dataSourceName + ".t_order_${0..9}"); } - orderTableRuleConfig.setActualTables(Joiner.on(",").join(orderActualDataNodes)); + orderTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); @@ -94,7 +94,7 @@ public class ShardingDatabaseAndTableTest extends AbstractSQLAssertTest { for (String dataSourceName : entry.getValue().keySet()) { orderItemActualDataNodes.add(dataSourceName + ".t_order_item_${0..9}"); } - orderItemTableRuleConfig.setActualTables(Joiner.on(",").join(orderItemActualDataNodes)); + orderItemTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderItemActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderItemTableRuleConfig); TableRuleConfiguration configTableRuleConfig = new TableRuleConfiguration(); configTableRuleConfig.setLogicTable("t_config"); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingMasterSlaveTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingMasterSlaveTest.java index 946b482b00..21856f0362 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingMasterSlaveTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingMasterSlaveTest.java @@ -99,7 +99,7 @@ public class ShardingMasterSlaveTest extends AbstractSQLAssertTest { for (String dataSourceName : masterSlaveDataSourceMap.keySet()) { orderActualDataNodes.add(dataSourceName + ".t_order_${0..9}"); } - orderTableRuleConfig.setActualTables(Joiner.on(",").join(orderActualDataNodes)); + orderTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); @@ -107,7 +107,7 @@ public class ShardingMasterSlaveTest extends AbstractSQLAssertTest { for (String dataSourceName : masterSlaveDataSourceMap.keySet()) { itemOrderActualDataNodes.add(dataSourceName + ".t_order_item_${0..9}"); } - orderItemTableRuleConfig.setActualTables(Joiner.on(",").join(itemOrderActualDataNodes)); + orderItemTableRuleConfig.setActualDataNodes(Joiner.on(",").join(itemOrderActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderItemTableRuleConfig); TableRuleConfiguration configTableRuleConfig = new TableRuleConfiguration(); configTableRuleConfig.setLogicTable("t_config"); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingTableOnlyTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingTableOnlyTest.java index 2663b7d36f..e53a338564 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingTableOnlyTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/integrate/type/sharding/ShardingTableOnlyTest.java @@ -75,7 +75,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest { for (String dataSourceName : entry.getValue().keySet()) { orderActualDataNodes.add(dataSourceName + ".t_order_${0..9}"); } - orderTableRuleConfig.setActualTables(Joiner.on(",").join(orderActualDataNodes)); + orderTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderActualDataNodes)); shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); @@ -83,7 +83,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest { for (String dataSourceName : entry.getValue().keySet()) { orderItemActualDataNodes.add(dataSourceName + ".t_order_item_${0..9}"); } - orderItemTableRuleConfig.setActualTables(Joiner.on(",").join(orderItemActualDataNodes)); + orderItemTableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderItemActualDataNodes)); orderItemTableRuleConfig.setKeyGeneratorClass("item_id"); shardingRuleConfig.getTableRuleConfigs().add(orderItemTableRuleConfig); shardingRuleConfig.getBindingTableGroups().add("t_order, t_order_item"); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSourceTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSourceTest.java index 5150f2073b..42261657c9 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSourceTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSourceTest.java @@ -194,7 +194,7 @@ public final class ShardingDataSourceTest { for (String each : dataSourceMap.keySet()) { orderActualDataNodes.add(each + ".table_${0..2}"); } - tableRuleConfig.setActualTables(Joiner.on(",").join(orderActualDataNodes)); + tableRuleConfig.setActualDataNodes(Joiner.on(",").join(orderActualDataNodes)); result.getTableRuleConfigs().add(tableRuleConfig); return result; } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/SQLParsingEngineTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/SQLParsingEngineTest.java index 123c180df6..5c38651bdd 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/SQLParsingEngineTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/SQLParsingEngineTest.java @@ -68,11 +68,11 @@ public final class SQLParsingEngineTest extends AbstractBaseParseSQLTest { private ShardingRule buildShardingRule() throws SQLException { TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration(); orderTableRuleConfig.setLogicTable("t_order"); - orderTableRuleConfig.setActualTables("db0.t_order,db1.t_order"); + orderTableRuleConfig.setActualDataNodes("db0.t_order,db1.t_order"); orderTableRuleConfig.setTableShardingStrategyConfig(new ComplexShardingStrategyConfiguration("user_id, order_id", TestComplexKeysShardingAlgorithm.class.getName())); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); - orderItemTableRuleConfig.setActualTables("db0.t_order_item,db1.t_order_item"); + orderItemTableRuleConfig.setActualDataNodes("db0.t_order_item,db1.t_order_item"); orderItemTableRuleConfig.setTableShardingStrategyConfig(new ComplexShardingStrategyConfiguration("user_id, order_id, item_id", TestComplexKeysShardingAlgorithm.class.getName())); return new ShardingRuleMockBuilder().addTableRuleConfig(orderTableRuleConfig).addTableRuleConfig(orderItemTableRuleConfig) .addShardingColumns("user_id").addShardingColumns("order_id").addShardingColumns("item_id").addGenerateKeyColumn("t_order_item", "item_id").build(); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/AbstractStatementParserTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/AbstractStatementParserTest.java index dacffad03f..17acccb16f 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/AbstractStatementParserTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/AbstractStatementParserTest.java @@ -48,7 +48,7 @@ public abstract class AbstractStatementParserTest { } TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("TABLE_XXX"); - tableRuleConfig.setActualTables("ds.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds.table_${0..2}"); tableRuleConfig.setTableShardingStrategyConfig( new ComplexShardingStrategyConfiguration("field1, field2, field3, field4, field5, field6, field7", TestComplexKeysShardingAlgorithm.class.getName())); ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/InsertStatementParserTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/InsertStatementParserTest.java index 4ea53d4475..5f040f4fb1 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/InsertStatementParserTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/parsing/parser/sql/InsertStatementParserTest.java @@ -110,7 +110,7 @@ public final class InsertStatementParserTest extends AbstractStatementParserTest final ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration(); TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("TABLE_XXX"); - tableRuleConfig.setActualTables("ds.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds.table_${0..2}"); tableRuleConfig.setTableShardingStrategyConfig(new ComplexShardingStrategyConfiguration("field1", TestComplexKeysShardingAlgorithm.class.getName())); tableRuleConfig.setKeyGeneratorColumnName("field2"); shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfig); diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/BindingTableRuleTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/BindingTableRuleTest.java index 420e05fb48..b8065a1ab7 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/BindingTableRuleTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/BindingTableRuleTest.java @@ -74,14 +74,14 @@ public final class BindingTableRuleTest { private TableRule createTableRule() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds1.table_0, ds1.table_1, ds2.table_0, ds2.table_1"); + tableRuleConfig.setActualDataNodes("ds1.table_0, ds1.table_1, ds2.table_0, ds2.table_1"); return tableRuleConfig.build(createDataSourceMap()); } private TableRule createSubTableRule() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("subLogicTable"); - tableRuleConfig.setActualTables("ds1.sub_table_0, ds1.sub_table_1, ds2.sub_table_0, ds2.sub_table_1"); + tableRuleConfig.setActualDataNodes("ds1.sub_table_0, ds1.sub_table_1, ds2.sub_table_0, ds2.sub_table_1"); return tableRuleConfig.build(createDataSourceMap()); } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/ShardingRuleTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/ShardingRuleTest.java index 2c215f854a..05532e35a2 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/ShardingRuleTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/ShardingRuleTest.java @@ -284,14 +284,14 @@ public final class ShardingRuleTest { private TableRuleConfiguration createTableRuleConfig() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("logicTable"); - result.setActualTables("ds${0..1}.table_${0..2}"); + result.setActualDataNodes("ds${0..1}.table_${0..2}"); return result; } private TableRuleConfiguration createTableRuleConfigWithDatabaseShardingStrategy(final ShardingStrategyConfiguration strategyConfig) { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("logicTable"); - result.setActualTables("ds${0..1}.table_${0..2}"); + result.setActualDataNodes("ds${0..1}.table_${0..2}"); result.setDatabaseShardingStrategyConfig(strategyConfig); return result; } @@ -299,7 +299,7 @@ public final class ShardingRuleTest { private TableRuleConfiguration createTableRuleConfigWithTableShardingStrategy(final ShardingStrategyConfiguration strategyConfig) { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("logicTable"); - result.setActualTables("ds${0..1}.table_${0..2}"); + result.setActualDataNodes("ds${0..1}.table_${0..2}"); result.setTableShardingStrategyConfig(strategyConfig); return result; } @@ -307,14 +307,14 @@ public final class ShardingRuleTest { private TableRuleConfiguration createSubTableRuleConfig() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("subLogicTable"); - result.setActualTables("ds${0..1}.sub_table_${0..2}"); + result.setActualDataNodes("ds${0..1}.sub_table_${0..2}"); return result; } private TableRuleConfiguration createTableRuleConfigWithAllStrategies() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("logicTable"); - result.setActualTables("ds${0..1}.table_${0..2}"); + result.setActualDataNodes("ds${0..1}.table_${0..2}"); result.setDatabaseShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", TestPreciseShardingAlgorithm.class.getName())); result.setTableShardingStrategyConfig(new NoneShardingStrategyConfiguration()); return result; @@ -323,7 +323,7 @@ public final class ShardingRuleTest { private TableRuleConfiguration createTableRuleConfigWithTableStrategies() { TableRuleConfiguration result = new TableRuleConfiguration(); result.setLogicTable("logicTable"); - result.setActualTables("ds${0..1}.table_${0..2}"); + result.setActualDataNodes("ds${0..1}.table_${0..2}"); result.setTableShardingStrategyConfig(new StandardShardingStrategyConfiguration("column", TestPreciseShardingAlgorithm.class.getName())); return result; } diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/TableRuleTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/TableRuleTest.java index 79302e06b1..07aa6726a2 100644 --- a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/TableRuleTest.java +++ b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/rule/TableRuleTest.java @@ -42,7 +42,7 @@ public final class TableRuleTest { public void assertTableRuleWithoutDataNode() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertActualTable(actual); assertNull(actual.getDatabaseShardingStrategy()); @@ -53,7 +53,7 @@ public final class TableRuleTest { public void assertTableRuleWithDatabaseShardingStrategyWithoutDataNode() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); tableRuleConfig.setDatabaseShardingStrategyConfig(new NoneShardingStrategyConfiguration()); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertActualTable(actual); @@ -65,7 +65,7 @@ public final class TableRuleTest { public void assertTableRuleWithTableShardingStrategyWithoutDataNode() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); tableRuleConfig.setTableShardingStrategyConfig(new NoneShardingStrategyConfiguration()); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertActualTable(actual); @@ -77,7 +77,7 @@ public final class TableRuleTest { public void assertTableRuleWithDataNodeString() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertActualTable(actual); assertNull(actual.getDatabaseShardingStrategy()); @@ -88,7 +88,7 @@ public final class TableRuleTest { public void assertTableRuleWithDataSourceNames() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertActualTable(actual); assertNull(actual.getDatabaseShardingStrategy()); @@ -109,7 +109,7 @@ public final class TableRuleTest { public void assertGetActualDatasourceNames() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertThat(actual.getActualDatasourceNames(), is((Collection) Sets.newLinkedHashSet(Arrays.asList("ds0", "ds1")))); } @@ -118,7 +118,7 @@ public final class TableRuleTest { public void assertGetActualTableNames() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertThat(actual.getActualTableNames("ds1"), is((Collection) Sets.newLinkedHashSet(Arrays.asList("table_0", "table_1", "table_2")))); } @@ -127,7 +127,7 @@ public final class TableRuleTest { public void assertFindActualTableIndex() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertThat(actual.findActualTableIndex("ds1", "table_1"), is(4)); } @@ -136,7 +136,7 @@ public final class TableRuleTest { public void assertFindActualTableIndexForNotFound() { TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration(); tableRuleConfig.setLogicTable("logicTable"); - tableRuleConfig.setActualTables("ds${0..1}.table_${0..2}"); + tableRuleConfig.setActualDataNodes("ds${0..1}.table_${0..2}"); TableRule actual = tableRuleConfig.build(createDataSourceMap()); assertThat(actual.findActualTableIndex("ds2", "table_2"), is(-1)); } diff --git a/sharding-jdbc-core/src/test/resources/yaml/config/config-all.yaml b/sharding-jdbc-core/src/test/resources/yaml/config/config-all.yaml index b16b2267f5..89ca82753e 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/config/config-all.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/config/config-all.yaml @@ -18,10 +18,10 @@ defaultKeyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerato tables: config: - actualTables: db${0..1}.config_${0..1} + actualDataNodes: db${0..1}.config_${0..1} t_order: - actualTables: db${0..1}.t_order_${0..1} + actualDataNodes: db${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: order_id @@ -31,7 +31,7 @@ tables: shardingColumn: id algorithmInlineExpression: t_order_${id % 2} t_order_item: - actualTables: db${0..1}.t_order_item_${0..1} + actualDataNodes: db${0..1}.t_order_item_${0..1} keyGeneratorColumnName: order_item_id keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.DecrementKeyGenerator #绑定表中其余的表的策略与第一张表的策略相同 diff --git a/sharding-jdbc-core/src/test/resources/yaml/config/config-bindingError.yaml b/sharding-jdbc-core/src/test/resources/yaml/config/config-bindingError.yaml index 9e117591e7..2f4e14c57f 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/config/config-bindingError.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/config/config-bindingError.yaml @@ -1,6 +1,6 @@ tables: t_order: - actualTables: ds.t_order_${0..1} + actualDataNodes: ds.t_order_${0..1} databaseStrategy: standard: shardingColumn: order_id @@ -10,7 +10,7 @@ tables: shardingColumn: id algorithmInlineExpression: t_order_${id % 2} t_order_item: - actualTables: ds.t_order_item_${0..1} + actualDataNodes: ds.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/config/config-classNotFound.yaml b/sharding-jdbc-core/src/test/resources/yaml/config/config-classNotFound.yaml index 12f51ae3c9..bc7bdba125 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/config/config-classNotFound.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/config/config-classNotFound.yaml @@ -13,7 +13,7 @@ dataSources: maxActive: 100 tables: t_order: - actualTables: t_order_${0..1} + actualDataNodes: t_order_${0..1} tableStrategy: standard: shardingColumn: order_id diff --git a/sharding-jdbc-core/src/test/resources/yaml/config/config-min.yaml b/sharding-jdbc-core/src/test/resources/yaml/config/config-min.yaml index 811274f8eb..a608fc41fe 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/config/config-min.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/config/config-min.yaml @@ -1,3 +1,3 @@ tables: config: - actualTables: ds.config_${0..1} + actualDataNodes: ds.config_${0..1} diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml index c52e358e0a..db18ae35cf 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml @@ -14,10 +14,10 @@ dataSources: tables: config: - actualTables: db${0..1}.t_config + actualDataNodes: db${0..1}.t_config t_order: - actualTables: db${0..1}.t_order_${0..1} + actualDataNodes: db${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -30,7 +30,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db${0..1}.t_order_item_${0..1} + actualDataNodes: db${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml index 1b9999a11a..fa848028be 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml @@ -14,10 +14,10 @@ dataSources: tables: config: - actualTables: db${0..1}.t_config + actualDataNodes: db${0..1}.t_config t_order: - actualTables: db${0..1}.t_order_${0..1} + actualDataNodes: db${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -30,7 +30,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db${0..1}.t_order_item_${0..1} + actualDataNodes: db${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml index 69f7063e00..31ebe2a88d 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml @@ -1,9 +1,9 @@ tables: config: - actualTables: db${0..1}.t_config + actualDataNodes: db${0..1}.t_config t_order: - actualTables: db${0..1}.t_order_${0..1} + actualDataNodes: db${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -16,7 +16,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db${0..1}.t_order_item_${0..1} + actualDataNodes: db${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml index d1af668b55..62db41351f 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml @@ -1,8 +1,8 @@ tables: config: - actualTables: db${0..1}.t_config + actualDataNodes: db${0..1}.t_config t_order: - actualTables: db${0..1}.t_order_${0..1} + actualDataNodes: db${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -15,7 +15,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db${0..1}.t_order_item_${0..1} + actualDataNodes: db${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml index 6e083132d4..3255ece8ce 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml @@ -26,10 +26,10 @@ dataSources: tables: config: - actualTables: db_ms_${0..1}.t_config + actualDataNodes: db_ms_${0..1}.t_config t_order: - actualTables: db_ms_${0..1}.t_order_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -42,7 +42,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db_ms_${0..1}.t_order_item_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml index 4354fb6f78..13f7b38b9c 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml @@ -26,10 +26,10 @@ dataSources: tables: config: - actualTables: db_ms_${0..1}.t_config + actualDataNodes: db_ms_${0..1}.t_config t_order: - actualTables: db_ms_${0..1}.t_order_${0..2} + actualDataNodes: db_ms_${0..1}.t_order_${0..2} databaseStrategy: standard: shardingColumn: user_id @@ -42,7 +42,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db_ms_${0..1}.t_order_item_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml index 55c1fcff87..1e271aab55 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml @@ -1,9 +1,9 @@ tables: config: - actualTables: db_ms_${0..1}.t_config + actualDataNodes: db_ms_${0..1}.t_config t_order: - actualTables: db_ms_${0..1}.t_order_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -16,7 +16,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db_ms_${0..1}.t_order_item_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml index 0fd613ce04..e5a21190ce 100644 --- a/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml +++ b/sharding-jdbc-core/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml @@ -1,9 +1,9 @@ tables: config: - actualTables: db_ms_${0..1}.t_config + actualDataNodes: db_ms_${0..1}.t_config t_order: - actualTables: db_ms_${0..1}.t_order_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_${0..1} databaseStrategy: standard: shardingColumn: user_id @@ -16,7 +16,7 @@ tables: keyGeneratorClass: io.shardingjdbc.core.yaml.fixture.IncrementKeyGenerator t_order_item: - actualTables: db_ms_${0..1}.t_order_item_${0..1} + actualDataNodes: db_ms_${0..1}.t_order_item_${0..1} #绑定表中其余的表的策略与第一张表的策略相同 databaseStrategy: standard: diff --git a/sharding-jdbc-orchestration/src/test/java/io/shardingjdbc/orchestration/json/ShardingRuleConfigurationConverterTest.java b/sharding-jdbc-orchestration/src/test/java/io/shardingjdbc/orchestration/json/ShardingRuleConfigurationConverterTest.java index d4d0dc5044..78185de762 100644 --- a/sharding-jdbc-orchestration/src/test/java/io/shardingjdbc/orchestration/json/ShardingRuleConfigurationConverterTest.java +++ b/sharding-jdbc-orchestration/src/test/java/io/shardingjdbc/orchestration/json/ShardingRuleConfigurationConverterTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.assertThat; public final class ShardingRuleConfigurationConverterTest { - private final String commonShardingRuleConfigJson = "{\"tableRuleConfigs\":[{\"logicTable\":\"t_order\",\"actualTables\":\"t_order_${[0, 1]}\"," + private final String commonShardingRuleConfigJson = "{\"tableRuleConfigs\":[{\"logicTable\":\"t_order\",\"actualDataNodes\":\"t_order_${[0, 1]}\"," + "\"databaseShardingStrategyConfig\":{},\"tableShardingStrategyConfig\":{}}," - + "{\"logicTable\":\"t_order_item\",\"actualTables\":\"t_order_item_${[0, 1]}\"," + + "{\"logicTable\":\"t_order_item\",\"actualDataNodes\":\"t_order_item_${[0, 1]}\"," + "\"databaseShardingStrategyConfig\":{},\"tableShardingStrategyConfig\":{}}" + "],\"bindingTableGroups\":[\"t_order, t_order_item\"],\"defaultDatabaseShardingStrategyConfig\":{},"; @@ -61,11 +61,11 @@ public final class ShardingRuleConfigurationConverterTest { ShardingRuleConfiguration actual = new ShardingRuleConfiguration(); TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration(); orderTableRuleConfig.setLogicTable("t_order"); - orderTableRuleConfig.setActualTables("t_order_${[0, 1]}"); + orderTableRuleConfig.setActualDataNodes("t_order_${[0, 1]}"); actual.getTableRuleConfigs().add(orderTableRuleConfig); TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration(); orderItemTableRuleConfig.setLogicTable("t_order_item"); - orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}"); + orderItemTableRuleConfig.setActualDataNodes("t_order_item_${[0, 1]}"); actual.getTableRuleConfigs().add(orderItemTableRuleConfig); actual.getBindingTableGroups().add("t_order, t_order_item"); actual.setDefaultTableShardingStrategyConfig(strategyConfig); @@ -153,10 +153,10 @@ public final class ShardingRuleConfigurationConverterTest { Iterator actualTableRuleConfigs = actual.getTableRuleConfigs().iterator(); TableRuleConfiguration orderTableRuleConfig = actualTableRuleConfigs.next(); assertThat(orderTableRuleConfig.getLogicTable(), is("t_order")); - assertThat(orderTableRuleConfig.getActualTables(), is("t_order_${[0, 1]}")); + assertThat(orderTableRuleConfig.getActualDataNodes(), is("t_order_${[0, 1]}")); TableRuleConfiguration orderItemTableRuleConfig = actualTableRuleConfigs.next(); assertThat(orderItemTableRuleConfig.getLogicTable(), is("t_order_item")); - assertThat(orderItemTableRuleConfig.getActualTables(), is("t_order_item_${[0, 1]}")); + assertThat(orderItemTableRuleConfig.getActualDataNodes(), is("t_order_item_${[0, 1]}")); assertThat(actual.getBindingTableGroups().size(), is(1)); assertThat(actual.getBindingTableGroups().iterator().next(), is("t_order, t_order_item")); } diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java index 719a3069df..174dc25b91 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/constants/ShardingJdbcDataSourceBeanDefinitionParserTag.java @@ -50,7 +50,7 @@ public final class ShardingJdbcDataSourceBeanDefinitionParserTag { public static final String LOGIC_TABLES_ATTRIBUTE = "logic-tables"; - public static final String ACTUAL_TABLES_ATTRIBUTE = "actual-tables"; + public static final String ACTUAL_DATA_NODES_ATTRIBUTE = "actual-data-nodes"; public static final String DATABASE_STRATEGY_REF_ATTRIBUTE = "database-strategy-ref"; diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java index d2ccbed6c0..14fd92e5f2 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/java/io/shardingjdbc/spring/namespace/parser/ShardingJdbcDataSourceBeanDefinitionParser.java @@ -121,9 +121,9 @@ public class ShardingJdbcDataSourceBeanDefinitionParser extends AbstractBeanDefi private BeanDefinition parseTableRuleConfig(final Element tableElement) { BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(TableRuleConfiguration.class); factory.addPropertyValue("logicTable", tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.LOGIC_TABLE_ATTRIBUTE)); - String actualTables = tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.ACTUAL_TABLES_ATTRIBUTE); - if (!Strings.isNullOrEmpty(actualTables)) { - factory.addPropertyValue("actualTables", actualTables); + String actualDataNodes = tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.ACTUAL_DATA_NODES_ATTRIBUTE); + if (!Strings.isNullOrEmpty(actualDataNodes)) { + factory.addPropertyValue("actualDataNodes", actualDataNodes); } String databaseStrategy = tableElement.getAttribute(ShardingJdbcDataSourceBeanDefinitionParserTag.DATABASE_STRATEGY_REF_ATTRIBUTE); if (!Strings.isNullOrEmpty(databaseStrategy)) { diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd index 53645f2e41..7ee3efa892 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/main/resources/META-INF/namespace/sharding.xsd @@ -38,7 +38,7 @@ - + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml index 34d8b886bb..1070be60fc 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClass.xml @@ -15,8 +15,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml index 8bbab9697f..07bcb7b79f 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmClassAndProps.xml @@ -15,8 +15,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmExpression.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmExpression.xml index 2e9c2ce3af..3ae2a09a24 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmExpression.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceAlgorithmExpression.xml @@ -16,8 +16,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml index e070aa49cb..5d83eaeeb5 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceBindingTables.xml @@ -15,8 +15,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml index 1cdfbe79b8..de252b52af 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDefaultStrategy.xml @@ -15,8 +15,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDifferentTables.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDifferentTables.xml index 0253644f19..557502e1b2 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDifferentTables.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceDifferentTables.xml @@ -16,8 +16,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithDefaultStrategy.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithDefaultStrategy.xml index e47c70c8b5..5e9543e1fe 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithDefaultStrategy.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithDefaultStrategy.xml @@ -22,8 +22,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyRef.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyRef.xml index aefff2a3b0..b95121b5e1 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyRef.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyRef.xml @@ -24,8 +24,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyType.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyType.xml index 0cb48778c1..32e657aa17 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyType.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceForMasterSlaveWithStrategyType.xml @@ -22,8 +22,8 @@ - - + + diff --git a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml index 6a86605370..84a82b1b80 100644 --- a/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml +++ b/sharding-jdbc-spring/sharding-jdbc-spring-namespace/src/test/resources/META-INF/rdb/withNamespaceGenerateKeyColumns.xml @@ -15,8 +15,8 @@ - - + + -- GitLab