未验证 提交 e785816d 编写于 作者: L Liang Zhang 提交者: GitHub

Add addressingDataSources in reg center (#8123)

上级 dccf7c66
......@@ -21,6 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.infra.yaml.config.YamlConfiguration;
import java.util.Collection;
import java.util.Map;
/**
......@@ -33,4 +34,6 @@ public final class YamlTableMetaData implements YamlConfiguration {
private Map<String, YamlColumnMetaData> columns;
private Map<String, YamlIndexMetaData> indexes;
private Collection<String> addressingDataSources;
}
......@@ -60,7 +60,9 @@ public final class SchemaYamlSwapper implements YamlSwapper<YamlSchema, Sharding
}
private TableMetaData convertTable(final YamlTableMetaData table) {
return new TableMetaData(convertColumns(table.getColumns()), convertIndexes(table.getIndexes()));
TableMetaData result = new TableMetaData(convertColumns(table.getColumns()), convertIndexes(table.getIndexes()));
result.getAddressingDataSources().addAll(table.getAddressingDataSources());
return result;
}
private Collection<IndexMetaData> convertIndexes(final Map<String, YamlIndexMetaData> indexes) {
......@@ -83,6 +85,7 @@ public final class SchemaYamlSwapper implements YamlSwapper<YamlSchema, Sharding
YamlTableMetaData result = new YamlTableMetaData();
result.setColumns(convertYamlColumns(table.getColumns()));
result.setIndexes(convertYamlIndexes(table.getIndexes()));
result.setAddressingDataSources(table.getAddressingDataSources());
return result;
}
......
......@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public final class SchemaYamlSwapperTest {
......@@ -46,6 +47,9 @@ public final class SchemaYamlSwapperTest {
assertThat(yamlSchema.getTables().keySet(), is(Collections.singleton("t_order")));
assertThat(yamlSchema.getTables().get("t_order").getIndexes().keySet(), is(Collections.singleton("primary")));
assertThat(yamlSchema.getTables().get("t_order").getColumns().keySet(), is(Collections.singleton("id")));
assertThat(yamlSchema.getTables().get("t_order").getAddressingDataSources().size(), is(2));
assertTrue(yamlSchema.getTables().get("t_order").getAddressingDataSources().contains("ds_0"));
assertTrue(yamlSchema.getTables().get("t_order").getAddressingDataSources().contains("ds_1"));
}
@Test
......@@ -56,6 +60,9 @@ public final class SchemaYamlSwapperTest {
assertThat(schema.get("t_order").getIndexes().keySet(), is(Collections.singleton("primary")));
assertThat(schema.getAllColumnNames("t_order").size(), is(1));
assertThat(schema.get("t_order").getColumns().keySet(), is(Collections.singleton("id")));
assertThat(schema.get("t_order").getAddressingDataSources().size(), is(2));
assertTrue(schema.get("t_order").getAddressingDataSources().contains("ds_0"));
assertTrue(schema.get("t_order").getAddressingDataSources().contains("ds_1"));
}
@SneakyThrows({URISyntaxException.class, IOException.class})
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册