You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2022/10/10 03:55:03 UTC
[shardingsphere] branch master updated: Remove MigrationJobPublicAPI.list() (#21436)
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 859689bc0d3 Remove MigrationJobPublicAPI.list() (#21436)
859689bc0d3 is described below
commit 859689bc0d32661cea5382d96368a35a9177a6f5
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Oct 10 11:54:55 2022 +0800
Remove MigrationJobPublicAPI.list() (#21436)
* Remove MigrationJobPublicAPI.list()
* Fix test case
* Fix test case
---
.../data/pipeline/api/MigrationJobPublicAPI.java | 10 ---------
.../scenario/migration/MigrationJobAPIImpl.java | 6 ------
.../core/api/impl/MigrationJobAPIImplTest.java | 25 ++++++++--------------
3 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
index fb8fe96405e..866c0948c8a 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
@@ -18,13 +18,11 @@
package org.apache.shardingsphere.data.pipeline.api;
import org.apache.shardingsphere.data.pipeline.api.pojo.CreateMigrationJobParameter;
-import org.apache.shardingsphere.data.pipeline.api.pojo.MigrationJobInfo;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.util.spi.type.required.RequiredSPI;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
/**
@@ -33,14 +31,6 @@ import java.util.Map;
@SingletonSPI
public interface MigrationJobPublicAPI extends InventoryIncrementalJobPublicAPI, RequiredSPI {
- /**
- * List all jobs.
- *
- * @return job infos
- */
- @Override
- List<MigrationJobInfo> list();
-
/**
* Add migration source resources.
*
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
index 89b312097d7..cca42cb6f9a 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
@@ -122,12 +122,6 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
return DigestUtils.md5Hex(text.getBytes(StandardCharsets.UTF_8));
}
- @SuppressWarnings("unchecked")
- @Override
- public List<MigrationJobInfo> list() {
- return (List<MigrationJobInfo>) super.list();
- }
-
@Override
protected MigrationJobInfo getJobInfo(final String jobId) {
MigrationJobInfo result = new MigrationJobInfo(jobId);
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
index 0f240d13966..f1bae44e529 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.data.pipeline.core.api.impl;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCheckResult;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyContentCheckResult;
import org.apache.shardingsphere.data.pipeline.api.check.consistency.DataConsistencyCountCheckResult;
@@ -31,6 +30,7 @@ import org.apache.shardingsphere.data.pipeline.api.job.progress.InventoryIncreme
import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData;
import org.apache.shardingsphere.data.pipeline.api.pojo.CreateMigrationJobParameter;
import org.apache.shardingsphere.data.pipeline.api.pojo.MigrationJobInfo;
+import org.apache.shardingsphere.data.pipeline.api.pojo.PipelineJobInfo;
import org.apache.shardingsphere.data.pipeline.core.datasource.creator.PipelineDataSourceCreatorFactory;
import org.apache.shardingsphere.data.pipeline.core.util.JobConfigurationBuilder;
import org.apache.shardingsphere.data.pipeline.core.util.PipelineContextUtil;
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobAP
import org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobItemContext;
import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
-import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -67,7 +66,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-@Slf4j
@RunWith(MockitoJUnitRunner.class)
public final class MigrationJobAPIImplTest {
@@ -95,18 +93,18 @@ public final class MigrationJobAPIImplTest {
public void assertStartAndList() {
Optional<String> jobId = jobAPI.start(JobConfigurationBuilder.createJobConfiguration());
assertTrue(jobId.isPresent());
- MigrationJobInfo jobInfo = getNonNullJobInfo(jobId.get());
+ PipelineJobInfo jobInfo = getNonNullJobInfo(jobId.get());
assertTrue(jobInfo.isActive());
- assertThat(jobInfo.getTable(), is("t_order"));
+ assertThat(((MigrationJobInfo) jobInfo).getTable(), is("t_order"));
assertThat(jobInfo.getShardingTotalCount(), is(1));
}
- private Optional<MigrationJobInfo> getJobInfo(final String jobId) {
+ private Optional<? extends PipelineJobInfo> getJobInfo(final String jobId) {
return jobAPI.list().stream().filter(each -> Objects.equals(each.getJobId(), jobId)).reduce((a, b) -> a);
}
- private MigrationJobInfo getNonNullJobInfo(final String jobId) {
- Optional<MigrationJobInfo> result = getJobInfo(jobId);
+ private PipelineJobInfo getNonNullJobInfo(final String jobId) {
+ Optional<? extends PipelineJobInfo> result = getJobInfo(jobId);
assertTrue(result.isPresent());
return result.get();
}
@@ -133,7 +131,7 @@ public final class MigrationJobAPIImplTest {
}
@Test
- public void assertCommit() throws SQLException {
+ public void assertCommit() {
Optional<String> jobId = jobAPI.start(JobConfigurationBuilder.createJobConfiguration());
assertTrue(jobId.isPresent());
MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId.get());
@@ -156,11 +154,7 @@ public final class MigrationJobAPIImplTest {
ReflectionUtil.setFieldValue(jobConfiguration, "uniqueKeyColumn", new PipelineColumnMetaData(1, "order_id", 4, "", false, true, true));
Optional<String> jobId = jobAPI.start(jobConfiguration);
assertTrue(jobId.isPresent());
- MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId.get());
- if (null == jobConfig.getSource()) {
- log.error("source is null, jobConfig={}", YamlEngine.marshal(jobConfig));
- }
- initTableData(jobConfig);
+ initTableData(jobAPI.getJobConfiguration(jobId.get()));
Map<String, DataConsistencyCheckResult> checkResultMap = jobAPI.dataConsistencyCheck(jobId.get());
assertThat(checkResultMap.size(), is(1));
}
@@ -169,8 +163,7 @@ public final class MigrationJobAPIImplTest {
public void assertDataConsistencyCheckWithAlgorithm() {
Optional<String> jobId = jobAPI.start(JobConfigurationBuilder.createJobConfiguration());
assertTrue(jobId.isPresent());
- MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId.get());
- initTableData(jobConfig);
+ initTableData(jobAPI.getJobConfiguration(jobId.get()));
Map<String, DataConsistencyCheckResult> checkResultMap = jobAPI.dataConsistencyCheck(jobId.get(), "FIXTURE", null);
assertThat(checkResultMap.size(), is(1));
assertTrue(checkResultMap.get("t_order").getCountCheckResult().isMatched());