提交 656cc34f 编写于 作者: T terrymanu

fix test case for jdbc

上级 83b6cde5
......@@ -86,11 +86,11 @@ public final class Main {
ShardingRuleConfiguration result = new ShardingRuleConfiguration();
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order_${[0, 1]}");
orderTableRuleConfig.setActualDataNodes("ds_jdbc_${0..1}.t_order_${0..1}");
result.getTableRuleConfigs().add(orderTableRuleConfig);
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}");
orderItemTableRuleConfig.setActualDataNodes("ds_jdbc_${0..1}.t_order_item_${0..1}");
result.getTableRuleConfigs().add(orderItemTableRuleConfig);
result.getBindingTableGroups().add("t_order, t_order_item");
result.setDefaultDatabaseShardingStrategyConfig(new InlineShardingStrategyConfiguration("user_id", "ds_jdbc_${user_id % 2}"));
......
......@@ -57,7 +57,7 @@ public final class RawJdbcJavaShardingAndMasterSlaveMain {
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order_${[0, 1]}");
orderTableRuleConfig.setActualDataNodes("ds_${0..1}.t_order_${[0, 1]}");
orderTableRuleConfig.setKeyGeneratorColumnName("order_id");
return orderTableRuleConfig;
}
......@@ -65,7 +65,7 @@ public final class RawJdbcJavaShardingAndMasterSlaveMain {
private static TableRuleConfiguration getOrderItemTableRuleConfiguration() {
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}");
orderItemTableRuleConfig.setActualDataNodes("ds_${0..1}.t_order_item_${[0, 1]}");
return orderItemTableRuleConfig;
}
......
......@@ -52,7 +52,7 @@ public final class RawJdbcJavaShardingDatabaseAndTableMain {
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order_${[0, 1]}");
orderTableRuleConfig.setActualDataNodes("ds_jdbc_${0..1}.t_order_${[0, 1]}");
orderTableRuleConfig.setKeyGeneratorColumnName("order_id");
return orderTableRuleConfig;
}
......@@ -60,7 +60,7 @@ public final class RawJdbcJavaShardingDatabaseAndTableMain {
private static TableRuleConfiguration getOrderItemTableRuleConfiguration() {
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}");
orderItemTableRuleConfig.setActualDataNodes("ds_jdbc_${0..1}.t_order_item_${[0, 1]}");
return orderItemTableRuleConfig;
}
......
......@@ -48,7 +48,6 @@ public final class RawJdbcJavaShardingDatabaseOnlyMain {
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order");
orderTableRuleConfig.setKeyGeneratorColumnName("order_id");
return orderTableRuleConfig;
}
......@@ -56,7 +55,6 @@ public final class RawJdbcJavaShardingDatabaseOnlyMain {
private static TableRuleConfiguration getOrderItemTableRuleConfiguration() {
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item");
return orderItemTableRuleConfig;
}
......
......@@ -47,7 +47,7 @@ public final class RawJdbcJavaShardingTableOnlyMain {
private static TableRuleConfiguration getOrderTableRuleConfiguration() {
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order_${[0, 1]}");
orderTableRuleConfig.setActualDataNodes("ds_jdbc.t_order_${[0, 1]}");
orderTableRuleConfig.setKeyGeneratorColumnName("order_id");
return orderTableRuleConfig;
}
......@@ -55,7 +55,7 @@ public final class RawJdbcJavaShardingTableOnlyMain {
private static TableRuleConfiguration getOrderItemTableRuleConfiguration() {
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item_${[0, 1]}");
orderItemTableRuleConfig.setActualDataNodes("ds_jdbc.t_order_item_${[0, 1]}");
return orderItemTableRuleConfig;
}
......
......@@ -19,17 +19,17 @@ defaultKeyGeneratorClass: io.shardingjdbc.core.keygen.DefaultKeyGenerator
tables:
t_config:
actualTables: ds_config.t_config
actualDataNodes: ds_config.t_config
t_order:
actualTables: ds_${0..1}.t_order_${0..1}
actualDataNodes: ds_${0..1}.t_order_${0..1}
tableStrategy:
inline:
shardingColumn: order_id
algorithmInlineExpression: t_order_${order_id % 2}
keyGeneratorColumnName: order_id
t_order_item:
actualTables: ds_${0..1}.t_order_item_${0..1}
actualDataNodes: ds_${0..1}.t_order_item_${0..1}
#绑定表中其余的表的策略与第一张表的策略相同
tableStrategy:
inline:
......
......@@ -12,14 +12,14 @@ dataSources:
tables:
t_order:
actualTables: t_order_${0..1}
actualDataNodes: ds_${0..1}.t_order_${0..1}
tableStrategy:
inline:
shardingColumn: order_id
algorithmInlineExpression: t_order_${order_id % 2}
t_order_item:
actualTables: t_order_item_${0..1}
actualDataNodes: ds_${0..1}.t_order_item_${0..1}
#绑定表中其余的表的策略与第一张表的策略相同
tableStrategy:
inline:
......
......@@ -78,12 +78,12 @@ public final class Main {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
TableRuleConfiguration orderTableRuleConfig = new TableRuleConfiguration();
orderTableRuleConfig.setLogicTable("t_order");
orderTableRuleConfig.setActualTables("t_order_0, t_order_1");
orderTableRuleConfig.setActualDataNodes("ds_trans_${0..1}.t_order_${0..1}");
shardingRuleConfig.getTableRuleConfigs().add(orderTableRuleConfig);
TableRuleConfiguration orderItemTableRuleConfig = new TableRuleConfiguration();
orderItemTableRuleConfig.setLogicTable("t_order_item");
orderItemTableRuleConfig.setActualTables("t_order_item_0, t_order_item_1");
orderItemTableRuleConfig.setActualDataNodes("ds_trans_${0..1}.t_order_item_${0..1}");
shardingRuleConfig.getTableRuleConfigs().add(orderItemTableRuleConfig);
shardingRuleConfig.getBindingTableGroups().add("t_order, t_order_item");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册