You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/04/08 13:55:08 UTC
[shardingsphere] branch master updated: Remove useless DataConsistencyCheckAlgorithm.provider (#16673)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 859d2f0ebc3 Remove useless DataConsistencyCheckAlgorithm.provider (#16673)
859d2f0ebc3 is described below
commit 859d2f0ebc3d3fff0af799b6f150005bc47dc953
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Apr 8 21:54:55 2022 +0800
Remove useless DataConsistencyCheckAlgorithm.provider (#16673)
---
.../handler/query/ShowScalingCheckAlgorithmsQueryResultSet.java | 1 -
.../query/ShowScalingCheckAlgorithmsQueryResultSetTest.java | 2 +-
.../data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java | 1 -
.../check/consistency/AbstractDataConsistencyCheckAlgorithm.java | 5 -----
.../pipeline/api/pojo/DataConsistencyCheckAlgorithmInfo.java | 2 --
.../spi/check/consistency/DataConsistencyCheckAlgorithm.java | 9 +--------
.../apache/shardingsphere/spi/type/typed/TypedSPIRegistry.java | 1 -
.../data/pipeline/api/impl/RuleAlteredJobAPIImplTest.java | 1 -
.../core/fixture/FixtureDataConsistencyCheckAlgorithm.java | 5 -----
.../consistency/CRC32MatchDataConsistencyCheckAlgorithmTest.java | 1 -
10 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSet.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSet.java
index df311a9a668..68336ab6404 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSet.java
@@ -48,7 +48,6 @@ public final class ShowScalingCheckAlgorithmsQueryResultSet implements DistSQLRe
result.add(each.getType());
result.add(each.getDescription());
result.add(Joiner.on(",").join(each.getSupportedDatabaseTypes()));
- result.add(each.getProvider());
return result;
}).collect(Collectors.toList()).iterator();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSetTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSetTest.java
index 3011d24d044..495936d5132 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSetTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingCheckAlgorithmsQueryResultSetTest.java
@@ -56,7 +56,7 @@ public final class ShowScalingCheckAlgorithmsQueryResultSetTest {
Set<Object> algorithmTypes = new LinkedHashSet<>();
while (resultSet.next()) {
Collection<Object> actual = resultSet.getRowData();
- assertThat(actual.size(), is(4));
+ assertThat(actual.size(), is(3));
Iterator<Object> rowData = actual.iterator();
algorithmTypes.add(rowData.next());
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
index 9af3bc86893..c286bd2b177 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/api/impl/RuleAlteredJobAPIImpl.java
@@ -249,7 +249,6 @@ public final class RuleAlteredJobAPIImpl extends AbstractPipelineJobAPIImpl impl
result.setType(each.getType());
result.setDescription(each.getDescription());
result.setSupportedDatabaseTypes(each.getSupportedDatabaseTypes());
- result.setProvider(each.getProvider());
return result;
}).collect(Collectors.toList());
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractDataConsistencyCheckAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractDataConsistencyCheckAlgorithm.java
index d716821f50b..7a01c367d49 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractDataConsistencyCheckAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/AbstractDataConsistencyCheckAlgorithm.java
@@ -38,11 +38,6 @@ public abstract class AbstractDataConsistencyCheckAlgorithm implements DataConsi
public void init() {
}
- @Override
- public String getProvider() {
- return "ShardingSphere";
- }
-
@Override
public final SingleTableDataCalculator getSingleTableDataCalculator(final String supportedDatabaseType) {
SingleTableDataCalculator result = SingleTableDataCalculatorRegistry.newServiceInstance(getType(), supportedDatabaseType);
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/DataConsistencyCheckAlgorithmInfo.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/DataConsistencyCheckAlgorithmInfo.java
index 1ec790f9d18..aaea9a4739f 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/DataConsistencyCheckAlgorithmInfo.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/pojo/DataConsistencyCheckAlgorithmInfo.java
@@ -36,6 +36,4 @@ public final class DataConsistencyCheckAlgorithmInfo {
private String description;
private Collection<String> supportedDatabaseTypes;
-
- private String provider;
}
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCheckAlgorithm.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCheckAlgorithm.java
index aef8c89e0dd..4bd49b926e0 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCheckAlgorithm.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCheckAlgorithm.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.spi.type.singleton.SingletonSPI;
import java.util.Collection;
/**
- * Data consistency check algorithm, SPI.
+ * Data consistency check algorithm.
*/
public interface DataConsistencyCheckAlgorithm extends ShardingSphereAlgorithm, ShardingSphereAlgorithmPostProcessor, SingletonSPI {
@@ -42,13 +42,6 @@ public interface DataConsistencyCheckAlgorithm extends ShardingSphereAlgorithm,
*/
Collection<String> getSupportedDatabaseTypes();
- /**
- * Get algorithm provider.
- *
- * @return algorithm provider
- */
- String getProvider();
-
/**
* Get single table data calculator.
*
diff --git a/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/type/typed/TypedSPIRegistry.java b/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/type/typed/TypedSPIRegistry.java
index c83aeee8593..997e0645d69 100644
--- a/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/type/typed/TypedSPIRegistry.java
+++ b/shardingsphere-spi/src/main/java/org/apache/shardingsphere/spi/type/typed/TypedSPIRegistry.java
@@ -127,4 +127,3 @@ public final class TypedSPIRegistry {
return ShardingSphereServiceLoader.getSingletonServiceInstances(spiClass).stream().collect(Collectors.toMap(TypedSPI::getType, Function.identity()));
}
}
-
\ No newline at end of file
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/RuleAlteredJobAPIImplTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/RuleAlteredJobAPIImplTest.java
index a1335a8a85d..cb52cbafede 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/RuleAlteredJobAPIImplTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/api/impl/RuleAlteredJobAPIImplTest.java
@@ -121,7 +121,6 @@ public final class RuleAlteredJobAPIImplTest {
FixtureDataConsistencyCheckAlgorithm fixtureAlgorithm = new FixtureDataConsistencyCheckAlgorithm();
assertThat(algorithmInfo.getDescription(), is(fixtureAlgorithm.getDescription()));
assertThat(algorithmInfo.getSupportedDatabaseTypes(), is(fixtureAlgorithm.getSupportedDatabaseTypes()));
- assertThat(algorithmInfo.getProvider(), is(fixtureAlgorithm.getProvider()));
}
@Test
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataConsistencyCheckAlgorithm.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataConsistencyCheckAlgorithm.java
index b7fb65b8ee2..6d98b276f78 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataConsistencyCheckAlgorithm.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataConsistencyCheckAlgorithm.java
@@ -49,11 +49,6 @@ public final class FixtureDataConsistencyCheckAlgorithm implements DataConsisten
return null != supportedDatabaseTypes ? supportedDatabaseTypes : SUPPORTED_DATABASE_TYPES;
}
- @Override
- public String getProvider() {
- return "ShardingSphere";
- }
-
@Override
public SingleTableDataCalculator getSingleTableDataCalculator(final String supportedDatabaseType) {
return SingleTableDataCalculatorRegistry.newServiceInstance(TYPE, supportedDatabaseType);
diff --git a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/CRC32MatchDataConsistencyCheckAlgorithmTest.java b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/CRC32MatchDataConsistencyCheckAlgorithmTest.java
index 68b61295b86..caa937e3825 100644
--- a/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/CRC32MatchDataConsistencyCheckAlgorithmTest.java
+++ b/shardingsphere-test/shardingsphere-pipeline-test/src/test/java/org/apache/shardingsphere/data/pipeline/core/spi/check/consistency/CRC32MatchDataConsistencyCheckAlgorithmTest.java
@@ -33,7 +33,6 @@ public final class CRC32MatchDataConsistencyCheckAlgorithmTest {
checkAlgorithm.init();
assertThat(checkAlgorithm.getType(), is(CRC32MatchDataConsistencyCheckAlgorithm.TYPE));
assertNotNull(checkAlgorithm.getDescription());
- assertThat(checkAlgorithm.getProvider(), is("ShardingSphere"));
assertThat(checkAlgorithm.getSupportedDatabaseTypes(), is(Collections.singletonList("MySQL")));
}