You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/05/03 14:53:19 UTC
[shardingsphere] branch master updated: Remove useless ShardingSphereAlgorithmPropertiesAware (#17304)
This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 18453dd520a Remove useless ShardingSphereAlgorithmPropertiesAware (#17304)
18453dd520a is described below
commit 18453dd520af41dd3c143cb153a801da8012bd56
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue May 3 22:53:03 2022 +0800
Remove useless ShardingSphereAlgorithmPropertiesAware (#17304)
---
.../api/sharding/ShardingAutoTableAlgorithm.java | 4 +--
.../datetime/AutoIntervalShardingAlgorithm.java | 6 ----
.../sharding/mod/HashModShardingAlgorithm.java | 6 ----
.../sharding/mod/ModShardingAlgorithm.java | 6 ----
.../range/BoundaryBasedRangeShardingAlgorithm.java | 7 -----
.../range/VolumeBasedRangeShardingAlgorithm.java | 7 -----
.../BoundaryRangeShardingAlgorithmFixture.java | 5 ----
.../fixture/ModShardingAlgorithmFixture.java | 5 ----
.../ShardingSphereAlgorithmPropertiesAware.java | 33 ----------------------
9 files changed, 1 insertion(+), 78 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/ShardingAutoTableAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/ShardingAutoTableAlgorithm.java
index 99df5406e70..5201f1d3311 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/ShardingAutoTableAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-api/src/main/java/org/apache/shardingsphere/sharding/api/sharding/ShardingAutoTableAlgorithm.java
@@ -17,12 +17,10 @@
package org.apache.shardingsphere.sharding.api.sharding;
-import org.apache.shardingsphere.infra.config.algorithm.ShardingSphereAlgorithmPropertiesAware;
-
/**
* Sharding auto table algorithm.
*/
-public interface ShardingAutoTableAlgorithm extends ShardingSphereAlgorithmPropertiesAware {
+public interface ShardingAutoTableAlgorithm {
/**
* Get auto tables amount.
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
index 874826e9836..afd6995ad85 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/datetime/AutoIntervalShardingAlgorithm.java
@@ -33,7 +33,6 @@ import java.time.Duration;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.util.Arrays;
import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Properties;
@@ -123,9 +122,4 @@ public final class AutoIntervalShardingAlgorithm implements StandardShardingAlgo
public String getType() {
return "AUTO_INTERVAL";
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return Arrays.asList(DATE_TIME_LOWER_KEY, DATE_TIME_UPPER_KEY, SHARDING_SECONDS_KEY);
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
index ad5e34be706..4687f66c136 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/HashModShardingAlgorithm.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingVal
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
-import java.util.Collections;
import java.util.Properties;
/**
@@ -76,9 +75,4 @@ public final class HashModShardingAlgorithm implements StandardShardingAlgorithm
public String getType() {
return "HASH_MOD";
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return Collections.singletonList(SHARDING_COUNT_KEY);
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
index ab63efec0b5..69164e6a244 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/mod/ModShardingAlgorithm.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingVal
import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Properties;
@@ -91,9 +90,4 @@ public final class ModShardingAlgorithm implements StandardShardingAlgorithm<Com
public String getType() {
return "MOD";
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return Collections.singletonList(SHARDING_COUNT_KEY);
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
index 98a0bb03c84..8dbe7356c20 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
@@ -22,8 +22,6 @@ import com.google.common.base.Splitter;
import com.google.common.collect.Range;
import com.google.common.primitives.Longs;
-import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -64,9 +62,4 @@ public final class BoundaryBasedRangeShardingAlgorithm extends AbstractRangeShar
public String getType() {
return "BOUNDARY_RANGE";
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return Collections.singletonList(SHARDING_RANGES_KEY);
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/VolumeBasedRangeShardingAlgorithm.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/VolumeBasedRangeShardingAlgorithm.java
index 9f5c9c1efee..e163745ebca 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/VolumeBasedRangeShardingAlgorithm.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/VolumeBasedRangeShardingAlgorithm.java
@@ -22,8 +22,6 @@ import com.google.common.collect.Range;
import com.google.common.math.LongMath;
import java.math.RoundingMode;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -62,9 +60,4 @@ public final class VolumeBasedRangeShardingAlgorithm extends AbstractRangeShardi
public String getType() {
return "VOLUME_RANGE";
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return Arrays.asList(RANGE_LOWER_KEY, RANGE_UPPER_KEY, SHARDING_VOLUME_KEY);
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/BoundaryRangeShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/BoundaryRangeShardingAlgorithmFixture.java
index daf2773fb1b..62c0d529110 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/BoundaryRangeShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/BoundaryRangeShardingAlgorithmFixture.java
@@ -50,9 +50,4 @@ public final class BoundaryRangeShardingAlgorithmFixture implements StandardShar
public int getAutoTablesAmount() {
return 4;
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return null;
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/ModShardingAlgorithmFixture.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/ModShardingAlgorithmFixture.java
index d83adef9904..679eac17472 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/ModShardingAlgorithmFixture.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/ModShardingAlgorithmFixture.java
@@ -50,9 +50,4 @@ public final class ModShardingAlgorithmFixture implements StandardShardingAlgori
public int getAutoTablesAmount() {
return 2;
}
-
- @Override
- public Collection<String> getAllPropertyKeys() {
- return null;
- }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmPropertiesAware.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmPropertiesAware.java
deleted file mode 100644
index 3e66f3a30b3..00000000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/algorithm/ShardingSphereAlgorithmPropertiesAware.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.infra.config.algorithm;
-
-import java.util.Collection;
-
-/**
- * ShardingSphere algorithm properties aware.
- */
-public interface ShardingSphereAlgorithmPropertiesAware {
-
- /**
- * Get all property keys.
- *
- * @return all property keys
- */
- Collection<String> getAllPropertyKeys();
-}