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 27f04a8435c Rename PipelineJobObjective to PipelineJobTarget (#37120)
27f04a8435c is described below
commit 27f04a8435cb806cce34f02027947ba9cc237ebd
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Nov 15 23:20:00 2025 +0800
Rename PipelineJobObjective to PipelineJobTarget (#37120)
---
.../data/pipeline/core/job/service/PipelineJobManager.java | 2 +-
.../data/pipeline/core/job/service/TransmissionJobManager.java | 8 ++++----
.../data/pipeline/core/job/type/PipelineJobType.java | 8 ++++----
.../shardingsphere/data/pipeline/core/pojo/PipelineJobInfo.java | 4 ++--
.../pojo/{PipelineJobObjective.java => PipelineJobTarget.java} | 4 ++--
.../org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java | 6 +++---
.../apache/shardingsphere/data/pipeline/cdc/CDCJobTypeTest.java | 6 +++---
.../cdc/distsql/handler/query/ShowStreamingListExecutor.java | 6 +++---
.../scenario/consistencycheck/ConsistencyCheckJobType.java | 4 ++--
.../scenario/consistencycheck/ConsistencyCheckJobTypeTest.java | 4 ++--
.../data/pipeline/scenario/migration/MigrationJobType.java | 6 +++---
.../data/pipeline/scenario/migration/MigrationJobTypeTest.java | 6 +++---
.../distsql/handler/query/ShowMigrationListExecutor.java | 8 ++++----
13 files changed, 36 insertions(+), 36 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManager.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManager.java
index cc368f856ee..0979392bcf0 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManager.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/PipelineJobManager.java
@@ -179,7 +179,7 @@ public final class PipelineJobManager {
try {
return
PipelineAPIFactory.getJobStatisticsAPI(contextKey).getAllJobsBriefInfo().stream().filter(this::isValidJob)
.map(each -> new PipelineJobInfo(new
PipelineJobMetaData(PipelineJobIdUtils.getElasticJobConfigurationPOJO(each.getJobName())),
- jobType.getJobObjective(new
PipelineJobConfigurationManager(jobType.getOption()).getJobConfiguration(each.getJobName()))))
+ jobType.getJobTarget(new
PipelineJobConfigurationManager(jobType.getOption()).getJobConfiguration(each.getJobName()))))
.collect(Collectors.toList());
} catch (final UnsupportedOperationException ex) {
return Collections.emptyList();
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/TransmissionJobManager.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/TransmissionJobManager.java
index 086b2e86fa6..d4f0ed6faec 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/TransmissionJobManager.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/service/TransmissionJobManager.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.data.pipeline.core.job.config.PipelineJobConfig
import org.apache.shardingsphere.data.pipeline.core.job.id.PipelineJobIdUtils;
import
org.apache.shardingsphere.data.pipeline.core.job.progress.TransmissionJobItemProgress;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import
org.apache.shardingsphere.data.pipeline.core.pojo.TransmissionJobItemInfo;
import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
@@ -58,17 +58,17 @@ public final class TransmissionJobManager {
long startTimeMillis =
Long.parseLong(Optional.ofNullable(PipelineJobIdUtils.getElasticJobConfigurationPOJO(jobId).getProps().getProperty("start_time_millis")).orElse("0"));
Map<Integer, TransmissionJobItemProgress> jobProgress =
getJobProgress(jobConfig);
List<TransmissionJobItemInfo> result = new LinkedList<>();
- PipelineJobObjective jobObjective = jobType.getJobObjective(jobConfig);
+ PipelineJobTarget jobTarget = jobType.getJobTarget(jobConfig);
for (Entry<Integer, TransmissionJobItemProgress> entry :
jobProgress.entrySet()) {
int shardingItem = entry.getKey();
TransmissionJobItemProgress jobItemProgress = entry.getValue();
String errorMessage =
PipelineAPIFactory.getPipelineGovernanceFacade(PipelineJobIdUtils.parseContextKey(jobId)).getJobItemFacade().getErrorMessage().load(jobId,
shardingItem);
if (null == jobItemProgress) {
- result.add(new TransmissionJobItemInfo(shardingItem,
jobObjective.getTableName(), null, startTimeMillis, 0, errorMessage));
+ result.add(new TransmissionJobItemInfo(shardingItem,
jobTarget.getTableName(), null, startTimeMillis, 0, errorMessage));
continue;
}
int inventoryFinishedPercentage =
getInventoryFinishedPercentage(jobItemProgress);
- result.add(new TransmissionJobItemInfo(shardingItem,
jobObjective.getTableName(), jobItemProgress, startTimeMillis,
inventoryFinishedPercentage, errorMessage));
+ result.add(new TransmissionJobItemInfo(shardingItem,
jobTarget.getTableName(), jobItemProgress, startTimeMillis,
inventoryFinishedPercentage, errorMessage));
}
return result;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobType.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobType.java
index e57c0ddff66..cb9cc562a5f 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobType.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/type/PipelineJobType.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.Consistency
import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.PipelineDataConsistencyChecker;
import
org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext;
import
org.apache.shardingsphere.data.pipeline.core.job.config.PipelineJobConfiguration;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
@@ -46,12 +46,12 @@ public interface PipelineJobType<T extends
PipelineJobConfiguration> extends Typ
PipelineJobOption getOption();
/**
- * Get pipeline job objective.
+ * Get pipeline job target.
*
* @param jobConfig pipeline job configuration
- * @return pipeline pipeline job objective
+ * @return pipeline job target
*/
- PipelineJobObjective getJobObjective(T jobConfig);
+ PipelineJobTarget getJobTarget(T jobConfig);
/**
* Build pipeline data consistency checker.
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobInfo.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobInfo.java
index 7ed3c5d1fc3..e0bacd2b300 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobInfo.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobInfo.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
@Getter
public final class PipelineJobInfo {
- private final PipelineJobMetaData jobMetaData;
+ private final PipelineJobMetaData metaData;
- private final PipelineJobObjective jobObjective;
+ private final PipelineJobTarget target;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobObjective.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobTarget.java
similarity index 93%
rename from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobObjective.java
rename to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobTarget.java
index 5d1cdd83ee4..30fd5d02ae8 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobObjective.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/pojo/PipelineJobTarget.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Pipeline job objective.
+ * Pipeline job target.
*/
@RequiredArgsConstructor
@Getter
-public final class PipelineJobObjective {
+public final class PipelineJobTarget {
private final String databaseName;
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
index 7f0555c9707..1d5d317901d 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobType.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.data.pipeline.cdc.config.CDCJobConfiguration;
import
org.apache.shardingsphere.data.pipeline.cdc.config.yaml.swapper.YamlCDCJobConfigurationSwapper;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobOption;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
/**
* CDC job type.
@@ -34,8 +34,8 @@ public final class CDCJobType implements
PipelineJobType<CDCJobConfiguration> {
}
@Override
- public PipelineJobObjective getJobObjective(final CDCJobConfiguration
jobConfig) {
- return new PipelineJobObjective(jobConfig.getDatabaseName(),
String.join(", ", jobConfig.getSchemaTableNames()));
+ public PipelineJobTarget getJobTarget(final CDCJobConfiguration jobConfig)
{
+ return new PipelineJobTarget(jobConfig.getDatabaseName(),
String.join(", ", jobConfig.getSchemaTableNames()));
}
@Override
diff --git
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTypeTest.java
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTypeTest.java
index 02d254b5680..a06af3311aa 100644
---
a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTypeTest.java
+++
b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/CDCJobTypeTest.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.data.pipeline.cdc.config.yaml.swapper.YamlCDCJo
import
org.apache.shardingsphere.data.pipeline.core.job.progress.yaml.swapper.YamlTransmissionJobItemProgressSwapper;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobOption;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.junit.jupiter.api.Test;
@@ -58,11 +58,11 @@ class CDCJobTypeTest {
@SuppressWarnings("unchecked")
@Test
- void assertGetJobObjective() {
+ void assertGetJobTarget() {
CDCJobConfiguration jobConfig = mock(CDCJobConfiguration.class);
when(jobConfig.getDatabaseName()).thenReturn("foo_db");
when(jobConfig.getSchemaTableNames()).thenReturn(Arrays.asList("foo_schema.foo_tbl",
"bar_schema.bar_tbl"));
- PipelineJobObjective actual = jobType.getJobObjective(jobConfig);
+ PipelineJobTarget actual = jobType.getJobTarget(jobConfig);
assertThat(actual.getDatabaseName(), is("foo_db"));
assertThat(actual.getTableName(), is("foo_schema.foo_tbl,
bar_schema.bar_tbl"));
}
diff --git
a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
index b23bf5de7da..93142dcb9a3 100644
---
a/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
+++
b/kernel/data-pipeline/scenario/cdc/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
@@ -44,9 +44,9 @@ public final class ShowStreamingListExecutor implements
DistSQLQueryExecutor<Sho
@Override
public Collection<LocalDataQueryResultRow> getRows(final
ShowStreamingListStatement sqlStatement, final ContextManager contextManager) {
- return pipelineJobManager.getJobInfos(new
PipelineContextKey(InstanceType.PROXY)).stream().map(each -> new
LocalDataQueryResultRow(each.getJobMetaData().getJobId(),
- each.getJobObjective().getDatabaseName(),
each.getJobObjective().getTableName(), each.getJobMetaData().getJobItemCount(),
each.getJobMetaData().isActive(),
- each.getJobMetaData().getCreateTime(),
each.getJobMetaData().getStopTime())).collect(Collectors.toList());
+ return pipelineJobManager.getJobInfos(new
PipelineContextKey(InstanceType.PROXY)).stream().map(each -> new
LocalDataQueryResultRow(each.getMetaData().getJobId(),
+ each.getTarget().getDatabaseName(),
each.getTarget().getTableName(), each.getMetaData().getJobItemCount(),
each.getMetaData().isActive(),
+ each.getMetaData().getCreateTime(),
each.getMetaData().getStopTime())).collect(Collectors.toList());
}
@Override
diff --git
a/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
b/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
index 2811e463546..5d70c101335 100644
---
a/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
+++
b/kernel/data-pipeline/scenario/consistency-check/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobType.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.data.pipeline.scenario.consistencycheck;
import
org.apache.shardingsphere.data.pipeline.core.job.config.PipelineJobConfiguration;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobOption;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import
org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.config.yaml.swapper.YamlConsistencyCheckJobConfigurationSwapper;
/**
@@ -34,7 +34,7 @@ public final class ConsistencyCheckJobType implements
PipelineJobType<PipelineJo
}
@Override
- public PipelineJobObjective getJobObjective(final PipelineJobConfiguration
jobConfig) {
+ public PipelineJobTarget getJobTarget(final PipelineJobConfiguration
jobConfig) {
return null;
}
diff --git
a/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTypeTest.java
b/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTypeTest.java
index 4398821bfef..471e23fb7fe 100644
---
a/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTypeTest.java
+++
b/kernel/data-pipeline/scenario/consistency-check/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTypeTest.java
@@ -54,7 +54,7 @@ class ConsistencyCheckJobTypeTest {
@SuppressWarnings("unchecked")
@Test
- void assertGetJobObjective() {
-
assertNull(jobType.getJobObjective(mock(PipelineJobConfiguration.class)));
+ void assertGetJobTarget() {
+ assertNull(jobType.getJobTarget(mock(PipelineJobConfiguration.class)));
}
}
diff --git
a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
index c409b95f2b7..dede99e5221 100644
---
a/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
+++
b/kernel/data-pipeline/scenario/migration/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobType.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.PipelineDat
import
org.apache.shardingsphere.data.pipeline.core.context.TransmissionProcessContext;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobOption;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.check.consistency.MigrationDataConsistencyChecker;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.yaml.swapper.YamlMigrationJobConfigurationSwapper;
@@ -41,10 +41,10 @@ public final class MigrationJobType implements
PipelineJobType<MigrationJobConfi
}
@Override
- public PipelineJobObjective getJobObjective(final
MigrationJobConfiguration jobConfig) {
+ public PipelineJobTarget getJobTarget(final MigrationJobConfiguration
jobConfig) {
Collection<String> sourceTables = new LinkedList<>();
jobConfig.getJobShardingDataNodes().forEach(each ->
each.getEntries().forEach(entry -> entry.getDataNodes().forEach(dataNode ->
sourceTables.add(dataNode.format()))));
- return new PipelineJobObjective(null, String.join(",", sourceTables));
+ return new PipelineJobTarget(null, String.join(",", sourceTables));
}
@Override
diff --git
a/kernel/data-pipeline/scenario/migration/core/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobTypeTest.java
b/kernel/data-pipeline/scenario/migration/core/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobTypeTest.java
index 15ed9f4ee21..a76e11a9019 100644
---
a/kernel/data-pipeline/scenario/migration/core/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobTypeTest.java
+++
b/kernel/data-pipeline/scenario/migration/core/src/test/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobTypeTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.data.pipeline.core.datanode.JobDataNodeLine;
import
org.apache.shardingsphere.data.pipeline.core.job.progress.yaml.swapper.YamlTransmissionJobItemProgressSwapper;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobOption;
import org.apache.shardingsphere.data.pipeline.core.job.type.PipelineJobType;
-import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobObjective;
+import org.apache.shardingsphere.data.pipeline.core.pojo.PipelineJobTarget;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.yaml.swapper.YamlMigrationJobConfigurationSwapper;
import org.apache.shardingsphere.infra.datanode.DataNode;
@@ -63,12 +63,12 @@ class MigrationJobTypeTest {
@SuppressWarnings("unchecked")
@Test
- void assertGetJobObjective() {
+ void assertGetJobTarget() {
JobDataNodeEntry dataNodeEntry1 = new JobDataNodeEntry("foo_tbl",
Arrays.asList(new DataNode("db.foo_tbl_0"), new DataNode("db.foo_tbl_1")));
JobDataNodeEntry dataNodeEntry2 = new JobDataNodeEntry("bar_tbl",
Arrays.asList(new DataNode("db.bar_tbl_0"), new DataNode("db.bar_tbl_1")));
MigrationJobConfiguration jobConfig =
mock(MigrationJobConfiguration.class);
when(jobConfig.getJobShardingDataNodes()).thenReturn(Collections.singletonList(new
JobDataNodeLine(Arrays.asList(dataNodeEntry1, dataNodeEntry2))));
- PipelineJobObjective actual = jobType.getJobObjective(jobConfig);
+ PipelineJobTarget actual = jobType.getJobTarget(jobConfig);
assertNull(actual.getDatabaseName());
assertThat(actual.getTableName(),
is("db.foo_tbl_0,db.foo_tbl_1,db.bar_tbl_0,db.bar_tbl_1"));
}
diff --git
a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
index d75b42abd7a..099556556ef 100644
---
a/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
+++
b/kernel/data-pipeline/scenario/migration/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/distsql/handler/query/ShowMigrationListExecutor.java
@@ -51,10 +51,10 @@ public final class ShowMigrationListExecutor implements
DistSQLQueryExecutor<Sho
}
private LocalDataQueryResultRow getRow(final PipelineContextKey
contextKey, final PipelineJobInfo jobInfo) {
- boolean active = jobInfo.getJobMetaData().isActive();
- String jobShardingNodes = active ? getJobShardingNodes(contextKey,
jobInfo.getJobMetaData().getJobId()) : "";
- return new
LocalDataQueryResultRow(jobInfo.getJobMetaData().getJobId(),
jobInfo.getJobObjective().getTableName(), active,
jobInfo.getJobMetaData().getCreateTime(),
- jobInfo.getJobMetaData().getStopTime(),
jobInfo.getJobMetaData().getJobItemCount(), jobShardingNodes);
+ boolean active = jobInfo.getMetaData().isActive();
+ String jobShardingNodes = active ? getJobShardingNodes(contextKey,
jobInfo.getMetaData().getJobId()) : "";
+ return new LocalDataQueryResultRow(jobInfo.getMetaData().getJobId(),
jobInfo.getTarget().getTableName(), active,
jobInfo.getMetaData().getCreateTime(),
+ jobInfo.getMetaData().getStopTime(),
jobInfo.getMetaData().getJobItemCount(), jobShardingNodes);
}
private String getJobShardingNodes(final PipelineContextKey contextKey,
final String jobId) {
