Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add test case and release note for broadcast table #1489

Merged
merged 3 commits into from
Nov 16, 2018
Merged

add test case and release note for broadcast table #1489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0047eb
add spring boot start orchestration test case for broadcast table
maxiaoguang64 Nov 16, 2018
89d6ae0
add release note for broadcast table
maxiaoguang64 Nov 16, 2018
f1e24b8
Merge branch 'dev' of https://github.com/sharding-sphere/sharding-sph…
maxiaoguang64 Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion RELEASE-NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

#### Core

1. [ISSUE #1422](https://github.com/sharding-sphere/sharding-sphere/issues/1422) Exception occur when using defaultDataSourceName and defaultDatabaseStrategy at same time
1. [ISSUE #1412](https://github.com/sharding-sphere/sharding-sphere/issues/1412) Support broadcast table
2. [ISSUE #1422](https://github.com/sharding-sphere/sharding-sphere/issues/1422) Exception occur when using defaultDataSourceName and defaultDatabaseStrategy at same time

#### Sharding-Proxy

Expand Down
3 changes: 2 additions & 1 deletion RELEASE-NOTES_ZH.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

#### Core

1. [ISSUE #1422](https://github.com/sharding-sphere/sharding-sphere/issues/1422) 同时使用`defaultDataSourceName`和`defaultDatabaseStrategy`时异常
1. [ISSUE #1412](https://github.com/sharding-sphere/sharding-sphere/issues/1412) 支持广播表
2. [ISSUE #1422](https://github.com/sharding-sphere/sharding-sphere/issues/1422) 同时使用`defaultDataSourceName`和`defaultDatabaseStrategy`时异常

#### Sharding-Proxy

Expand Down
82 changes: 82 additions & 0 deletions .../io/shardingsphere/shardingjdbc/spring/boot/type/OrchestrationSpringBootShardingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import io.shardingsphere.api.ConfigMapContext;
import io.shardingsphere.core.constant.properties.ShardingProperties;
import io.shardingsphere.core.constant.properties.ShardingPropertiesConstant;
import io.shardingsphere.core.routing.strategy.inline.InlineShardingStrategy;
import io.shardingsphere.core.rule.DataNode;
import io.shardingsphere.core.rule.ShardingRule;
import io.shardingsphere.core.rule.TableRule;
import io.shardingsphere.shardingjdbc.jdbc.core.ShardingContext;
import io.shardingsphere.shardingjdbc.jdbc.core.datasource.ShardingDataSource;
import io.shardingsphere.shardingjdbc.orchestration.internal.datasource.OrchestrationShardingDataSource;
Expand All @@ -37,9 +41,11 @@
import javax.annotation.Resource;
import javax.sql.DataSource;
import java.lang.reflect.Field;
import java.util.LinkedList;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -76,6 +82,82 @@ public void assertWithShardingDataSource() {
assertThat((Integer) shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_SIZE), is(100));
}

@Test
public void assertWithShardingDataSourceNames() {
ShardingDataSource shardingDataSource = getFieldValue("dataSource", OrchestrationShardingDataSource.class, dataSource);
ShardingContext shardingContext = getFieldValue("shardingContext", ShardingDataSource.class, shardingDataSource);
ShardingRule shardingRule = shardingContext.getShardingRule();
assertThat(shardingRule.getShardingDataSourceNames().getDataSourceNames().size(), is(3));
assertTrue(shardingRule.getShardingDataSourceNames().getDataSourceNames().contains("ds"));
assertTrue(shardingRule.getShardingDataSourceNames().getDataSourceNames().contains("ds_0"));
assertTrue(shardingRule.getShardingDataSourceNames().getDataSourceNames().contains("ds_1"));
}

@Test
public void assertWithTableRules() {
ShardingDataSource shardingDataSource = getFieldValue("dataSource", OrchestrationShardingDataSource.class, dataSource);
ShardingContext shardingContext = getFieldValue("shardingContext", ShardingDataSource.class, shardingDataSource);
ShardingRule shardingRule = shardingContext.getShardingRule();
assertThat(shardingRule.getTableRules().size(), is(2));
TableRule tableRule1 = ((LinkedList<TableRule>) shardingRule.getTableRules()).get(0);
assertThat(tableRule1.getLogicTable(), is("t_order_item"));
assertThat(tableRule1.getActualDataNodes().size(), is(4));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_0", "t_order_item_0")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_0", "t_order_item_1")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_1", "t_order_item_0")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_1", "t_order_item_1")));
assertThat(tableRule1.getTableShardingStrategy(), instanceOf(InlineShardingStrategy.class));
assertThat(tableRule1.getTableShardingStrategy().getShardingColumns().iterator().next(), is("order_id"));
assertThat(tableRule1.getGenerateKeyColumn(), is("order_item_id"));
TableRule tableRule2 = ((LinkedList<TableRule>) shardingRule.getTableRules()).get(1);
assertThat(tableRule2.getLogicTable(), is("t_order"));
assertThat(tableRule2.getActualDataNodes().size(), is(4));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_0", "t_order_0")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_0", "t_order_1")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_1", "t_order_0")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_1", "t_order_1")));
assertThat(tableRule1.getTableShardingStrategy(), instanceOf(InlineShardingStrategy.class));
assertThat(tableRule1.getTableShardingStrategy().getShardingColumns().iterator().next(), is("order_id"));
assertThat(tableRule2.getGenerateKeyColumn(), is("order_id"));
}

@Test
public void assertWithBindingTableRules() {
ShardingDataSource shardingDataSource = getFieldValue("dataSource", OrchestrationShardingDataSource.class, dataSource);
ShardingContext shardingContext = getFieldValue("shardingContext", ShardingDataSource.class, shardingDataSource);
ShardingRule shardingRule = shardingContext.getShardingRule();
assertThat(shardingRule.getBindingTableRules().size(), is(2));
TableRule tableRule1 = ((LinkedList<TableRule>) shardingRule.getTableRules()).get(0);
assertThat(tableRule1.getLogicTable(), is("t_order_item"));
assertThat(tableRule1.getActualDataNodes().size(), is(4));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_0", "t_order_item_0")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_0", "t_order_item_1")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_1", "t_order_item_0")));
assertTrue(tableRule1.getActualDataNodes().contains(new DataNode("ds_1", "t_order_item_1")));
assertThat(tableRule1.getTableShardingStrategy(), instanceOf(InlineShardingStrategy.class));
assertThat(tableRule1.getTableShardingStrategy().getShardingColumns().iterator().next(), is("order_id"));
assertThat(tableRule1.getGenerateKeyColumn(), is("order_item_id"));
TableRule tableRule2 = ((LinkedList<TableRule>) shardingRule.getTableRules()).get(1);
assertThat(tableRule2.getLogicTable(), is("t_order"));
assertThat(tableRule2.getActualDataNodes().size(), is(4));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_0", "t_order_0")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_0", "t_order_1")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_1", "t_order_0")));
assertTrue(tableRule2.getActualDataNodes().contains(new DataNode("ds_1", "t_order_1")));
assertThat(tableRule1.getTableShardingStrategy(), instanceOf(InlineShardingStrategy.class));
assertThat(tableRule1.getTableShardingStrategy().getShardingColumns().iterator().next(), is("order_id"));
assertThat(tableRule2.getGenerateKeyColumn(), is("order_id"));
}

@Test
public void assertWithBroadcastTables() {
ShardingDataSource shardingDataSource = getFieldValue("dataSource", OrchestrationShardingDataSource.class, dataSource);
ShardingContext shardingContext = getFieldValue("shardingContext", ShardingDataSource.class, shardingDataSource);
ShardingRule shardingRule = shardingContext.getShardingRule();
assertThat(shardingRule.getBroadcastTables().size(), is(1));
assertThat(shardingRule.getBroadcastTables().iterator().next(), is("t_config"));
}

@SuppressWarnings("unchecked")
@SneakyThrows
private <T> T getFieldValue(final String fieldName, final Class<?> fieldClass, final Object target) {
Expand Down
2 changes: 2 additions & 0 deletions ...jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ sharding.jdbc.config.sharding.tables.t_order_item.actual-data-nodes=ds_${0..1}.t
sharding.jdbc.config.sharding.tables.t_order_item.table-strategy.inline.sharding-column=order_id
sharding.jdbc.config.sharding.tables.t_order_item.table-strategy.inline.algorithm-expression=t_order_item_${order_id % 2}
sharding.jdbc.config.sharding.tables.t_order_item.key-generator-column-name=order_item_id
sharding.jdbc.config.sharding.binding-tables=t_order,t_order_item
sharding.jdbc.config.sharding.broadcast-tables=t_config

sharding.jdbc.config.config-map.key1=value1

Expand Down
16 changes: 16 additions & 0 deletions .../shardingsphere/shardingjdbc/orchestration/spring/OrchestrationShardingNamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;

import static org.hamcrest.CoreMatchers.is;
Expand Down Expand Up @@ -135,6 +136,21 @@ public void assertMultiBindingTableRulesDatasource() {
assertThat(userRule.getBindingActualTable("dbtbl_1", "t_user", "t_user_detail"), is("t_user"));
}

@Test
public void assertBroadcastTableRuleDatasource() {
ShardingRule shardingRule = getShardingRule("broadcastTableRuleDatasourceOrchestration");
assertThat(shardingRule.getBroadcastTables().size(), is(1));
assertThat(shardingRule.getBroadcastTables().iterator().next(), is("t_config"));
}

@Test
public void assertMultiBroadcastTableRulesDatasource() {
ShardingRule shardingRule = getShardingRule("multiBroadcastTableRulesDatasourceOrchestration");
assertThat(shardingRule.getBroadcastTables().size(), is(2));
assertThat(((LinkedList<String>) shardingRule.getBroadcastTables()).get(0), is("t_config1"));
assertThat(((LinkedList<String>) shardingRule.getBroadcastTables()).get(1), is("t_config2"));
}

@Test
public void assertPropsDataSource() {
OrchestrationSpringShardingDataSource shardingDataSource = applicationContext.getBean("propsDataSourceOrchestration", OrchestrationSpringShardingDataSource.class);
Expand Down
31 changes: 31 additions & 0 deletions ...pring-namespace/src/test/resources/META-INF/rdb/namespace/shardingDataSourceNamespace.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,37 @@
</sharding:sharding-rule>
</sharding:data-source>

<sharding:data-source id="broadcastTableRuleDatasource">
<sharding:sharding-rule data-source-names="dbtbl_0,dbtbl_1" >
<sharding:table-rules>
<sharding:table-rule logic-table="t_order" />
<sharding:table-rule logic-table="t_order_item" />
</sharding:table-rules>
<sharding:binding-table-rules>
<sharding:binding-table-rule logic-tables="t_order, t_order_item" />
</sharding:binding-table-rules>
<sharding:broadcast-table-rules>
<sharding:broadcast-table-rule tables="t_config" />
</sharding:broadcast-table-rules>
</sharding:sharding-rule>
</sharding:data-source>

<sharding:data-source id="multiBroadcastTableRulesDatasource">
<sharding:sharding-rule data-source-names="dbtbl_0,dbtbl_1" >
<sharding:table-rules>
<sharding:table-rule logic-table="t_order" />
<sharding:table-rule logic-table="t_order_item" />
</sharding:table-rules>
<sharding:binding-table-rules>
<sharding:binding-table-rule logic-tables="t_order, t_order_item" />
</sharding:binding-table-rules>
<sharding:broadcast-table-rules>
<sharding:broadcast-table-rule tables="t_config1" />
<sharding:broadcast-table-rule tables="t_config2" />
</sharding:broadcast-table-rules>
</sharding:sharding-rule>
</sharding:data-source>

<sharding:data-source id="propsDataSource">
<sharding:sharding-rule data-source-names="dbtbl_0,dbtbl_1">
<sharding:table-rules>
Expand Down
2 changes: 2 additions & 0 deletions ...-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@
<orchestraion:sharding-data-source id="tableRuleWithAttributesDataSourceOrchestration" data-source-ref="tableRuleWithAttributesDataSource" registry-center-ref="regCenter" />
<orchestraion:sharding-data-source id="bindingTableRuleDatasourceOrchestration" data-source-ref="bindingTableRuleDatasource" registry-center-ref="regCenter" />
<orchestraion:sharding-data-source id="multiBindingTableRulesDatasourceOrchestration" data-source-ref="multiBindingTableRulesDatasource" registry-center-ref="regCenter" />
<orchestraion:sharding-data-source id="broadcastTableRuleDatasourceOrchestration" data-source-ref="broadcastTableRuleDatasource" registry-center-ref="regCenter" />
<orchestraion:sharding-data-source id="multiBroadcastTableRulesDatasourceOrchestration" data-source-ref="multiBroadcastTableRulesDatasource" registry-center-ref="regCenter" />
</beans>