This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 96f54fa12f3 Add @AllArgsConstructor for DataNode (#36946)
96f54fa12f3 is described below
commit 96f54fa12f3b099d318f89459d9bf2404692a30f
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Oct 27 14:32:49 2025 +0800
Add @AllArgsConstructor for DataNode (#36946)
---
.../shardingsphere/infra/datanode/DataNode.java | 8 ++--
.../infra/datanode/DataNodeTest.java | 49 +++++++---------------
.../schema/util/SchemaMetaDataUtilsTest.java | 6 +--
.../data/pipeline/core/datanode/DataNodeUtils.java | 6 +--
.../handler/update/MigrateTableExecutor.java | 9 +---
.../single/datanode/SingleTableDataNodeLoader.java | 4 +-
.../SingleMutableDataNodeRuleAttribute.java | 4 +-
.../single/route/SingleSQLRouterTest.java | 10 +----
.../route/engine/engine/SingleRouteEngineTest.java | 10 +----
.../single/util/SingleTableLoadUtilsTest.java | 6 +--
.../update/MigrateTableStatementAssert.java | 3 +-
11 files changed, 34 insertions(+), 81 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
index 8637e16535f..f67aaf8c337 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/datanode/DataNode.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.infra.datanode;
import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
import com.google.common.base.Objects;
import com.google.common.base.Splitter;
+import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
@@ -35,6 +36,7 @@ import java.util.List;
/**
* Data node.
*/
+@AllArgsConstructor
@RequiredArgsConstructor
@Getter
@Setter
@@ -47,11 +49,11 @@ public final class DataNode {
private final String dataSourceName;
- private final String tableName;
-
// TODO add final for schemaName
private String schemaName;
+ private final String tableName;
+
/**
* Constructs a data node with well-formatted string.
*
@@ -60,7 +62,7 @@ public final class DataNode {
public DataNode(final String dataNode) {
validateDataNodeFormat(dataNode);
List<String> segments = Splitter.on(DELIMITER).splitToList(dataNode);
- boolean isIncludeInstance = segments.size() == 3;
+ boolean isIncludeInstance = 3 == segments.size();
dataSourceName = isIncludeInstance ? segments.get(0) + DELIMITER +
segments.get(1) : segments.get(0);
tableName = segments.get(isIncludeInstance ? 2 : 1);
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
index 1f6f73fd717..ba691e0664e 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
@@ -54,9 +54,7 @@ class DataNodeTest {
@Test
void assertFormatWithSchema() {
- DataNode dataNode = new DataNode("foo_ds", "foo_tbl");
- dataNode.setSchemaName("foo_schema");
- assertThat(dataNode.format(), is("foo_ds.foo_schema.foo_tbl"));
+ assertThat(new DataNode("foo_ds", "foo_schema", "foo_tbl").format(),
is("foo_ds.foo_schema.foo_tbl"));
}
@Test
@@ -82,7 +80,7 @@ class DataNodeTest {
@Test
void assertToString() {
- assertThat(new DataNode("ds_0.tbl_0").toString(),
is("DataNode(dataSourceName=ds_0, tableName=tbl_0, schemaName=null)"));
+ assertThat(new DataNode("ds_0.tbl_0").toString(),
is("DataNode(dataSourceName=ds_0, schemaName=null, tableName=tbl_0)"));
}
@Test
@@ -109,7 +107,7 @@ class DataNodeTest {
@Test
void assertToStringIncludeInstance() {
- assertThat(new DataNode("ds_0.db_0.tbl_0").toString(),
is("DataNode(dataSourceName=ds_0.db_0, tableName=tbl_0, schemaName=null)"));
+ assertThat(new DataNode("ds_0.db_0.tbl_0").toString(),
is("DataNode(dataSourceName=ds_0.db_0, schemaName=null, tableName=tbl_0)"));
}
@Test
@@ -215,9 +213,7 @@ class DataNodeTest {
@Test
void assertFormatWithDatabaseType() {
- DataNode dataNode = new DataNode("ds", "tbl");
- dataNode.setSchemaName("schema");
-
assertThat(dataNode.format(TypedSPILoader.getService(DatabaseType.class,
"PostgreSQL")), is("ds.schema.tbl"));
+ assertThat(new DataNode("ds", "schema",
"tbl").format(TypedSPILoader.getService(DatabaseType.class, "PostgreSQL")),
is("ds.schema.tbl"));
}
@Test
@@ -228,27 +224,22 @@ class DataNodeTest {
@Test
void assertEqualsCaseInsensitive() {
- DataNode dataNode1 = new DataNode("DS", "TBL");
- DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName("schema");
- dataNode2.setSchemaName("SCHEMA");
+ DataNode dataNode1 = new DataNode("DS", "SCHEMA", "TBL");
+ DataNode dataNode2 = new DataNode("ds", "schema", "tbl");
assertThat(dataNode1, is(dataNode2));
}
@Test
void assertEqualsWithDifferentSchema() {
- DataNode dataNode1 = new DataNode("ds", "tbl");
- DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName("schema1");
- dataNode2.setSchemaName("schema2");
+ DataNode dataNode1 = new DataNode("ds", "schema1", "tbl");
+ DataNode dataNode2 = new DataNode("ds", "schema2", "tbl");
assertThat(dataNode1, not(dataNode2));
}
@Test
void assertEqualsWithOneNullSchema() {
- DataNode dataNode1 = new DataNode("ds", "tbl");
+ DataNode dataNode1 = new DataNode("ds", "schema", "tbl");
DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName("schema");
assertThat(dataNode1, not(dataNode2));
}
@@ -277,10 +268,8 @@ class DataNodeTest {
@Test
void assertHashCodeWithSchema() {
- DataNode dataNode1 = new DataNode("ds", "tbl");
- DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName("SCHEMA");
- dataNode2.setSchemaName("schema");
+ DataNode dataNode1 = new DataNode("DS", "SCHEMA", "TBL");
+ DataNode dataNode2 = new DataNode("ds", "schema", "tbl");
assertThat(dataNode1.hashCode(), is(dataNode2.hashCode()));
}
@@ -288,8 +277,6 @@ class DataNodeTest {
void assertHashCodeWithNullSchema() {
DataNode dataNode1 = new DataNode("ds", "tbl");
DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName(null);
- dataNode2.setSchemaName(null);
assertThat(dataNode1.hashCode(), is(dataNode2.hashCode()));
}
@@ -297,8 +284,6 @@ class DataNodeTest {
void assertEqualsWithNullSchemas() {
DataNode dataNode1 = new DataNode("ds", "tbl");
DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName(null);
- dataNode2.setSchemaName(null);
assertThat(dataNode1, is(dataNode2));
}
@@ -306,7 +291,6 @@ class DataNodeTest {
void assertFormatWithDatabaseTypeAndNullSchema() {
DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
DataNode dataNode = new DataNode("ds", "tbl");
- dataNode.setSchemaName(null);
assertThat(dataNode.format(databaseType), is("ds.tbl"));
}
@@ -325,18 +309,15 @@ class DataNodeTest {
@Test
void assertHashCodeConsistency() {
- DataNode dataNode1 = new DataNode("DS", "TBL");
- DataNode dataNode2 = new DataNode("ds", "tbl");
- dataNode1.setSchemaName("SCHEMA");
- dataNode2.setSchemaName("schema");
+ DataNode dataNode1 = new DataNode("DS", "SCHEMA", "TBL");
+ DataNode dataNode2 = new DataNode("ds", "schema", "tbl");
assertThat(dataNode1.hashCode(), is(dataNode2.hashCode()));
}
@Test
void assertToStringWithSchema() {
- DataNode dataNode = new DataNode("ds", "tbl");
- dataNode.setSchemaName("schema");
- assertThat(dataNode.toString(), is("DataNode(dataSourceName=ds,
tableName=tbl, schemaName=schema)"));
+ DataNode dataNode = new DataNode("ds", "schema", "tbl");
+ assertThat(dataNode.toString(), is("DataNode(dataSourceName=ds,
schemaName=schema, tableName=tbl)"));
}
@Test
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
index d24969363b9..85a51056867 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/SchemaMetaDataUtilsTest.java
@@ -114,10 +114,8 @@ class SchemaMetaDataUtilsTest {
}
private List<DataNode> mockSingleTableDataNodes() {
- DataNode firstDataNode = new DataNode("ds_0.t_single");
- firstDataNode.setSchemaName("public");
- DataNode secondDataNode = new DataNode("ds_0.t_single");
- secondDataNode.setSchemaName("test");
+ DataNode firstDataNode = new DataNode("ds_0", "public", "t_single");
+ DataNode secondDataNode = new DataNode("ds_0", "test", "t_single");
return Arrays.asList(firstDataNode, secondDataNode);
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datanode/DataNodeUtils.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datanode/DataNodeUtils.java
index 9fc8ebeafcb..8bb575967b5 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datanode/DataNodeUtils.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datanode/DataNodeUtils.java
@@ -42,10 +42,6 @@ public final class DataNodeUtils {
public static DataNode parseWithSchema(final String text) {
List<String> segments = Splitter.on(".").splitToList(text);
ShardingSpherePreconditions.checkState(2 == segments.size() || 3 ==
segments.size(), () -> new InvalidDataNodeFormatException(text));
- DataNode result = new DataNode(segments.get(0),
segments.get(segments.size() - 1));
- if (3 == segments.size()) {
- result.setSchemaName(segments.get(1));
- }
- return result;
+ return 3 == segments.size() ? new DataNode(segments.get(0),
segments.get(1), segments.get(2)) : new DataNode(segments.get(0),
segments.get(segments.size() - 1));
}
}
diff --git
a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
index 5420c2affa7..1800b3f528a 100644
---
a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
+++
b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/update/MigrateTableExecutor.java
@@ -68,13 +68,8 @@ public final class MigrateTableExecutor implements
DistSQLUpdateExecutor<Migrate
private Collection<MigrationSourceTargetEntry>
getMigrationSourceTargetEntries(final PipelineContextKey contextKey, final
MigrateTableStatement sqlStatement) {
Collection<MigrationSourceTargetEntry> result = new LinkedList<>();
for (MigrationSourceTargetSegment each :
sqlStatement.getSourceTargetEntries()) {
- DataNode dataNode = new DataNode(each.getSourceDatabaseName(),
each.getSourceTableName());
- if (null == each.getSourceSchemaName()) {
- getDefaultSchemaName(contextKey,
each.getSourceDatabaseName()).ifPresent(dataNode::setSchemaName);
- } else {
- dataNode.setSchemaName(each.getSourceSchemaName());
- }
- result.add(new MigrationSourceTargetEntry(dataNode,
each.getTargetTableName()));
+ String schemaName = null == each.getSourceSchemaName() ?
getDefaultSchemaName(contextKey, each.getSourceDatabaseName()).orElse(null) :
each.getSourceSchemaName();
+ result.add(new MigrationSourceTargetEntry(new
DataNode(each.getSourceDatabaseName(), schemaName, each.getSourceTableName()),
each.getTargetTableName()));
}
return result;
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
index 888a1098d2b..b5f172095d5 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/datanode/SingleTableDataNodeLoader.java
@@ -101,9 +101,7 @@ public final class SingleTableDataNodeLoader {
for (Entry<String, Collection<String>> entry :
schemaTableNames.entrySet()) {
for (String each : entry.getValue()) {
Collection<DataNode> dataNodes = result.getOrDefault(each, new
LinkedList<>());
- DataNode dataNode = new DataNode(dataSourceName, each);
- dataNode.setSchemaName(entry.getKey());
- dataNodes.add(dataNode);
+ dataNodes.add(new DataNode(dataSourceName, entry.getKey(),
each));
result.putIfAbsent(each, dataNodes);
}
}
diff --git
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleMutableDataNodeRuleAttribute.java
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleMutableDataNodeRuleAttribute.java
index 5c5527b28bf..d0b03eca632 100644
---
a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleMutableDataNodeRuleAttribute.java
+++
b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleMutableDataNodeRuleAttribute.java
@@ -56,9 +56,7 @@ public final class SingleMutableDataNodeRuleAttribute
implements MutableDataNode
public void put(final String dataSourceName, final String schemaName,
final String tableName) {
if (dataSourceNames.contains(dataSourceName)) {
Collection<DataNode> dataNodes =
singleTableDataNodes.computeIfAbsent(tableName.toLowerCase(), key -> new
LinkedHashSet<>());
- DataNode dataNode = new DataNode(dataSourceName, tableName);
- dataNode.setSchemaName(schemaName);
- dataNodes.add(dataNode);
+ dataNodes.add(new DataNode(dataSourceName, schemaName, tableName));
tableMapperRuleAttribute.getLogicTableNames().add(tableName);
addTableConfiguration(dataSourceName, schemaName, tableName);
}
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/SingleSQLRouterTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/SingleSQLRouterTest.java
index a219f2aee6a..03e1763ca9a 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/SingleSQLRouterTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/SingleSQLRouterTest.java
@@ -80,7 +80,7 @@ class SingleSQLRouterTest {
@Test
void assertCreateRouteContextWithSingleDataSource() throws SQLException {
SingleRule rule = new SingleRule(new SingleRuleConfiguration(),
"foo_db", databaseType, Collections.singletonMap("foo_ds", new
MockedDataSource(mockConnection())), Collections.emptyList());
-
rule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singleton(createDataNode("foo_ds")));
+
rule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singleton(new DataNode("foo_ds", "foo_db", "t_order")));
ShardingSphereDatabase database = mockSingleDatabase();
RouteContext actual = new SingleSQLRouter().createRouteContext(
createQueryContext(), mock(RuleMetaData.class), database,
rule, Collections.singletonList("t_order"), new ConfigurationProperties(new
Properties()));
@@ -101,7 +101,7 @@ class SingleSQLRouterTest {
void assertCreateRouteContextWithReadwriteSplittingDataSource() throws
SQLException {
SingleRule rule = new SingleRule(new SingleRuleConfiguration(),
"foo_db", databaseType,
Collections.singletonMap("readwrite_ds", new
MockedDataSource(mockConnection())), Collections.emptyList());
-
rule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singletonList(createDataNode("write_ds")));
+
rule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singletonList(new DataNode("write_ds", "foo_db", "t_order")));
ShardingSphereDatabase database = mockReadwriteSplittingDatabase();
RouteContext actual = new SingleSQLRouter().createRouteContext(
createQueryContext(), mock(RuleMetaData.class), database,
rule, Collections.singletonList("t_order"), new ConfigurationProperties(new
Properties()));
@@ -148,12 +148,6 @@ class SingleSQLRouterTest {
return result;
}
- private DataNode createDataNode(final String dataSourceName) {
- DataNode result = new DataNode(dataSourceName, "t_order");
- result.setSchemaName("foo_db");
- return result;
- }
-
private ShardingSphereDatabase mockDatabaseWithMultipleResources() {
Map<String, StorageUnit> storageUnits = new HashMap<>(2, 1F);
DataSourcePoolProperties dataSourcePoolProps0 =
mock(DataSourcePoolProperties.class, RETURNS_DEEP_STUBS);
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/engine/engine/SingleRouteEngineTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/engine/engine/SingleRouteEngineTest.java
index 774cde39211..ea3d6234923 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/engine/engine/SingleRouteEngineTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/route/engine/engine/SingleRouteEngineTest.java
@@ -69,8 +69,8 @@ class SingleRouteEngineTest {
void assertRouteInSameDataSource() throws SQLException {
SingleRouteEngine engine = new
SingleRouteEngine(mockQualifiedTables(), null, mock());
SingleRule singleRule = new SingleRule(new SingleRuleConfiguration(),
"foo_db", mock(), createDataSourceMap(), Collections.emptyList());
-
singleRule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singleton(mockDataNode("t_order")));
-
singleRule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order_item",
Collections.singleton(mockDataNode("t_order_item")));
+
singleRule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order",
Collections.singleton(new DataNode("ds_0", "foo_db", "t_order")));
+
singleRule.getAttributes().getAttribute(DataNodeRuleAttribute.class).getAllDataNodes().put("t_order_item",
Collections.singleton(new DataNode("ds_0", "foo_db", "t_order_item")));
RouteContext routeContext = new RouteContext();
engine.route(routeContext, singleRule);
List<RouteUnit> routeUnits = new
ArrayList<>(routeContext.getRouteUnits());
@@ -86,12 +86,6 @@ class SingleRouteEngineTest {
assertThat(tableMapper1.getLogicName(), is("t_order_item"));
}
- private DataNode mockDataNode(final String tableName) {
- DataNode result = new DataNode("ds_0", tableName);
- result.setSchemaName("foo_db");
- return result;
- }
-
private Collection<QualifiedTable> mockQualifiedTables() {
return Arrays.asList(new QualifiedTable("foo_db", "t_order"), new
QualifiedTable("foo_db", "t_order_item"));
}
diff --git
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/util/SingleTableLoadUtilsTest.java
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/util/SingleTableLoadUtilsTest.java
index 4e944606ef4..61a659d1c17 100644
---
a/kernel/single/core/src/test/java/org/apache/shardingsphere/single/util/SingleTableLoadUtilsTest.java
+++
b/kernel/single/core/src/test/java/org/apache/shardingsphere/single/util/SingleTableLoadUtilsTest.java
@@ -96,10 +96,8 @@ class SingleTableLoadUtilsTest {
@Test
void assertConvertToDataNodes() {
- DataNode expectedDataNode1 = new DataNode("foo_ds.foo_tbl");
- expectedDataNode1.setSchemaName("foo_db");
- DataNode expectedDataNode2 = new DataNode("bar_ds.bar_tbl");
- expectedDataNode2.setSchemaName("foo_db");
+ DataNode expectedDataNode1 = new DataNode("foo_ds", "foo_db",
"foo_tbl");
+ DataNode expectedDataNode2 = new DataNode("bar_ds", "foo_db",
"bar_tbl");
assertThat(SingleTableLoadUtils.convertToDataNodes("foo_db",
databaseType, Arrays.asList("foo_ds.foo_tbl", "bar_ds.bar_tbl")),
is(new LinkedHashSet<>(Arrays.asList(expectedDataNode1,
expectedDataNode2))));
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/pipeline/migration/update/MigrateTableStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/pipeline/migration/update/MigrateTableStatementAssert.java
index 30ab0295f95..37ba5e9ab6a 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/pipeline/migration/update/MigrateTableStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/type/pipeline/migration/update/MigrateTableStatementAssert.java
@@ -45,8 +45,7 @@ public final class MigrateTableStatementAssert {
assertThat(assertContext.getText("target database name does not
match"), actual.getTargetDatabaseName(), is(expected.getTargetDatabaseName()));
assertThat(actual.getSourceTargetEntries().size(), is(1));
for (MigrationSourceTargetSegment each :
actual.getSourceTargetEntries()) {
- DataNode dataNode = new DataNode(each.getSourceDatabaseName(),
each.getSourceTableName());
- dataNode.setSchemaName(each.getSourceSchemaName());
+ DataNode dataNode = new DataNode(each.getSourceDatabaseName(),
each.getSourceSchemaName(), each.getSourceTableName());
assertThat(assertContext.getText("source database name does not
match"), dataNode.getDataSourceName(), is(expected.getSourceResourceName()));
assertThat(assertContext.getText("source schema name does not
match"), dataNode.getSchemaName(), is(expected.getSourceSchemaName()));
assertThat(assertContext.getText("source table name does not
match"), dataNode.getTableName(), is(expected.getSourceTableName()));
