This is an automated email from the ASF dual-hosted git repository.

jianglongtao 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 c0a9d7a1375 Rename package of key-generator module (#30188)
c0a9d7a1375 is described below

commit c0a9d7a13751afd4f6b291821f1d07a0bdba882e
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Feb 19 00:43:06 2024 +0800

    Rename package of key-generator module (#30188)
    
    * Rename package of algorithm-core module
    
    * Rename package of key-generator module
    
    * Rename package of key-generator module
---
 .../apache/shardingsphere/sharding/rule/ShardingRule.java  |  4 ++--
 .../fixture/AutoIncrementKeyGenerateAlgorithmFixture.java  |  2 +-
 .../shardingsphere/sharding/rule/ShardingRuleTest.java     |  6 +++---
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 .../handler/checker/ShardingTableRuleStatementChecker.java |  2 +-
 .../fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java |  2 +-
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 .../keygen/core}/KeyGenerateAlgorithm.java                 |  2 +-
 .../exception/GenerateKeyStrategyNotFoundException.java    |  2 +-
 .../KeyGenerateAlgorithmInitializationException.java       |  2 +-
 .../keygen/core/exception/KeyGenerateSQLException.java     |  2 +-
 .../keygen/snowflake}/SnowflakeKeyGenerateAlgorithm.java   |  8 ++++----
 .../keygen/snowflake}/TimeService.java                     |  2 +-
 .../exception/SnowflakeClockMoveBackException.java         |  4 ++--
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  2 +-
 .../snowflake}/SnowflakeKeyGenerateAlgorithmTest.java      | 14 +++++++-------
 .../keygen/snowflake/fixture/FixedTimeService.java         |  6 +++---
 .../keygen/snowflake/fixture/WorkerIdGeneratorFixture.java |  2 +-
 .../keygen/uuid}/UUIDKeyGenerateAlgorithm.java             |  4 ++--
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  2 +-
 .../keygen/uuid}/UUIDKeyGenerateAlgorithmTest.java         |  2 +-
 .../type/KeyGenerateAlgorithmTypeAndClassMapper.java       |  2 +-
 .../checker/ShardingRuleConfigurationImportChecker.java    |  2 +-
 .../DistSQLKeyGenerateAlgorithmImplementationsFixture.java |  2 +-
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 .../keygen/IncrementKeyGenerateAlgorithmFixture.java       |  2 +-
 .../keygen/ResetIncrementKeyGenerateAlgorithmFixture.java  |  2 +-
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 .../ITAutoIncrementKeyGenerateAlgorithmFixture.java        |  2 +-
 .../test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java    |  2 +-
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 .../test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java         |  2 +-
 .../migration/general/MySQLMigrationGeneralE2EIT.java      |  2 +-
 .../migration/general/PostgreSQLMigrationGeneralE2EIT.java |  2 +-
 .../cases/migration/general/RulesMigrationE2EIT.java       |  2 +-
 .../cases/migration/primarykey/IndexesMigrationE2EIT.java  |  4 ++--
 .../cases/migration/primarykey/MariaDBMigrationE2EIT.java  |  4 ++--
 .../migration/primarykey/TextPrimaryKeyMigrationE2EIT.java |  2 +-
 .../e2e/data/pipeline/cases/task/E2EIncrementalTask.java   |  2 +-
 .../data/pipeline/framework/helper/PipelineCaseHelper.java |  2 +-
 .../pipeline/util/AutoIncrementKeyGenerateAlgorithm.java   |  2 +-
 .../fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java |  2 +-
 ...phere.infra.algorithm.keygen.core.KeyGenerateAlgorithm} |  0
 43 files changed, 55 insertions(+), 55 deletions(-)

diff --git 
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
 
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index fdee05ba69d..6a729c728bd 100644
--- 
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ 
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -36,9 +36,9 @@ import 
org.apache.shardingsphere.infra.rule.identifier.type.DataNodeContainedRul
 import org.apache.shardingsphere.infra.rule.identifier.type.TableContainedRule;
 import org.apache.shardingsphere.infra.rule.identifier.type.TableNamesMapper;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.core.exception.GenerateKeyStrategyNotFoundException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.exception.GenerateKeyStrategyNotFoundException;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
diff --git 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
index 033aabaa1ac..726f6ef7dd2 100644
--- 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
+++ 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/algorithm/keygen/fixture/AutoIncrementKeyGenerateAlgorithmFixture.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.sharding.algorithm.keygen.fixture;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
index d2ee4625fb1..9f2d2c2fc6e 100644
--- 
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
+++ 
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rule/ShardingRuleTest.java
@@ -31,9 +31,9 @@ import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.core.exception.GenerateKeyStrategyNotFoundException;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm;
-import 
org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.exception.GenerateKeyStrategyNotFoundException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.sharding.algorithm.audit.DMLShardingConditionsShardingAuditAlgorithm;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
diff --git 
a/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
features/sharding/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
diff --git 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
index cac58cfaeb7..c47292b56c7 100644
--- 
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
+++ 
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/checker/ShardingTableRuleStatementChecker.java
@@ -33,7 +33,7 @@ import 
org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableReferenceRuleConfiguration;
diff --git 
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
 
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
index 7c426ae2cf8..893fe72a768 100644
--- 
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
+++ 
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/fixture/keygen/DistSQLKeyGenerateAlgorithmFixture.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.sharding.distsql.fixture.keygen;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/features/sharding/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/features/sharding/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
features/sharding/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
features/sharding/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
diff --git 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/algorithm/KeyGenerateAlgorithm.java
 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/KeyGenerateAlgorithm.java
similarity index 96%
rename from 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/algorithm/KeyGenerateAlgorithm.java
rename to 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/KeyGenerateAlgorithm.java
index 704b14330cf..150ac977254 100644
--- 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/algorithm/KeyGenerateAlgorithm.java
+++ 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/KeyGenerateAlgorithm.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.core.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.core;
 
 import org.apache.shardingsphere.infra.algorithm.core.ShardingSphereAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
diff --git 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
similarity index 94%
rename from 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
rename to 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
index fb58ba183c7..7b2f4dbf203 100644
--- 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
+++ 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/GenerateKeyStrategyNotFoundException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.core.exception;
+package org.apache.shardingsphere.infra.algorithm.keygen.core.exception;
 
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
 
diff --git 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
similarity index 95%
rename from 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
rename to 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
index c1014621d36..c848db034a0 100644
--- 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
+++ 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateAlgorithmInitializationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.core.exception;
+package org.apache.shardingsphere.infra.algorithm.keygen.core.exception;
 
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
 
diff --git 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateSQLException.java
 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateSQLException.java
similarity index 95%
rename from 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateSQLException.java
rename to 
infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateSQLException.java
index 0cd428bc31a..2df48116d47 100644
--- 
a/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/keygen/core/exception/KeyGenerateSQLException.java
+++ 
b/infra/algorithm/key-generator/core/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/core/exception/KeyGenerateSQLException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.core.exception;
+package org.apache.shardingsphere.infra.algorithm.keygen.core.exception;
 
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.SQLState;
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.type.feature.FeatureSQLException;
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithm.java
 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithm.java
similarity index 95%
rename from 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithm.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithm.java
index c7bf5302066..cb09f5a40b4 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithm.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithm.java
@@ -15,17 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake;
 
 import lombok.Setter;
 import lombok.SneakyThrows;
 import 
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
 import org.apache.shardingsphere.infra.instance.InstanceContext;
 import org.apache.shardingsphere.infra.instance.InstanceContextAware;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.core.exception.KeyGenerateAlgorithmInitializationException;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.exception.SnowflakeClockMoveBackException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.exception.KeyGenerateAlgorithmInitializationException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.exception.SnowflakeClockMoveBackException;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/TimeService.java
 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/TimeService.java
similarity index 93%
rename from 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/TimeService.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/TimeService.java
index 11ef525b540..85e6dee5714 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/TimeService.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/TimeService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake;
 
 /**
  * Time service.
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
similarity index 88%
rename from 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
index f20db073a47..03f831640a8 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/exception/SnowflakeClockMoveBackException.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.exception;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake.exception;
 
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
-import 
org.apache.shardingsphere.infra.keygen.core.exception.KeyGenerateSQLException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.exception.KeyGenerateSQLException;
 
 /**
  * Snowflake clock move back exception.
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 92%
rename from 
infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
index 15fad58e79f..e64e101ad3d 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm
+org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithmTest.java
 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithmTest.java
similarity index 96%
rename from 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithmTest.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithmTest.java
index 8c15c32fcd9..0ec1070dacb 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/algorithm/SnowflakeKeyGenerateAlgorithmTest.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/SnowflakeKeyGenerateAlgorithmTest.java
@@ -15,9 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake;
 
 import lombok.SneakyThrows;
+import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.exception.KeyGenerateAlgorithmInitializationException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.exception.SnowflakeClockMoveBackException;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.fixture.FixedTimeService;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.fixture.WorkerIdGeneratorFixture;
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.instance.ComputeNodeInstance;
 import org.apache.shardingsphere.infra.instance.InstanceContext;
@@ -27,12 +33,6 @@ import 
org.apache.shardingsphere.infra.instance.mode.ModeContextManager;
 import org.apache.shardingsphere.infra.lock.LockContext;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
-import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.core.exception.KeyGenerateAlgorithmInitializationException;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.exception.SnowflakeClockMoveBackException;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.fixture.FixedTimeService;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.fixture.WorkerIdGeneratorFixture;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
 import org.awaitility.Awaitility;
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/FixedTimeService.java
 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/FixedTimeService.java
similarity index 84%
rename from 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/FixedTimeService.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/FixedTimeService.java
index d65deeb4dcd..7ff40eafeff 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/FixedTimeService.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/FixedTimeService.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.fixture;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake.fixture;
 
 import lombok.RequiredArgsConstructor;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm;
-import org.apache.shardingsphere.infra.keygen.snowflake.algorithm.TimeService;
+import org.apache.shardingsphere.infra.algorithm.keygen.snowflake.TimeService;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
similarity index 94%
rename from 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
rename to 
infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
index 5015dea9863..718b654803b 100644
--- 
a/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
+++ 
b/infra/algorithm/key-generator/type/snowflake/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/snowflake/fixture/WorkerIdGeneratorFixture.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.snowflake.fixture;
+package org.apache.shardingsphere.infra.algorithm.keygen.snowflake.fixture;
 
 import com.google.common.base.Preconditions;
 import lombok.RequiredArgsConstructor;
diff --git 
a/infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithm.java
 
b/infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithm.java
similarity index 93%
rename from 
infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithm.java
rename to 
infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithm.java
index 3516b579d63..64764acc371 100644
--- 
a/infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithm.java
+++ 
b/infra/algorithm/key-generator/type/uuid/src/main/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithm.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.uuid.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.uuid;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 92%
rename from 
infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
index 8e0fcae129e..9b2bea3d221 100644
--- 
a/infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
+++ 
b/infra/algorithm/key-generator/type/uuid/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 
-org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm
+org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm
diff --git 
a/infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithmTest.java
 
b/infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithmTest.java
similarity index 95%
rename from 
infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithmTest.java
rename to 
infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithmTest.java
index 5fcd7bcc501..1a17e795247 100644
--- 
a/infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/keygen/uuid/algorithm/UUIDKeyGenerateAlgorithmTest.java
+++ 
b/infra/algorithm/key-generator/type/uuid/src/test/java/org/apache/shardingsphere/infra/algorithm/keygen/uuid/UUIDKeyGenerateAlgorithmTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.keygen.uuid.algorithm;
+package org.apache.shardingsphere.infra.algorithm.keygen.uuid;
 
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 import org.junit.jupiter.api.Test;
diff --git 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java
 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java
index 49c352fde9e..0fdfab6e550 100644
--- 
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java
+++ 
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/type/KeyGenerateAlgorithmTypeAndClassMapper.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.distsql.handler.executor.ral.plugin.type;
 
 import 
org.apache.shardingsphere.distsql.handler.executor.ral.plugin.PluginTypeAndClassMapper;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 
 /**
  * Key generate algorithm type and class mapper.
diff --git 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
index 57713055a79..b4040f1c8fc 100644
--- 
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
+++ 
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/common/checker/ShardingRuleConfigurationImportChecker.java
@@ -26,7 +26,7 @@ import 
org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
 import 
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
 import 
org.apache.shardingsphere.infra.rule.identifier.type.DataSourceContainedRule;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleConfiguration;
 import 
org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
diff --git 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/DistSQLKeyGenerateAlgorithmImplementationsFixture.java
 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/DistSQLKeyGenerateAlgorithmImplementationsFixture.java
index 71736e9dda6..c70a477f4f1 100644
--- 
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/DistSQLKeyGenerateAlgorithmImplementationsFixture.java
+++ 
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/fixture/DistSQLKeyGenerateAlgorithmImplementationsFixture.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.proxy.backend.handler.distsql.fixture;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
proxy/backend/core/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
diff --git 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
index 1dff5cccc2f..3acd26556d1 100644
--- 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
+++ 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/IncrementKeyGenerateAlgorithmFixture.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.test.e2e.driver.fixture.keygen;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
index 4d53523ed2a..c90ddedbe57 100644
--- 
a/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
+++ 
b/test/e2e/driver/src/test/java/org/apache/shardingsphere/test/e2e/driver/fixture/keygen/ResetIncrementKeyGenerateAlgorithmFixture.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.test.e2e.driver.fixture.keygen;
 
 import lombok.Getter;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/e2e/driver/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/test/e2e/driver/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
test/e2e/driver/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
test/e2e/driver/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
diff --git 
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
 
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
index 5adcd2a758b..ef3afdb859c 100644
--- 
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
+++ 
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITAutoIncrementKeyGenerateAlgorithmFixture.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.test.e2e.fixture;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
 
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
index 4f7d9682863..735100c12bb 100644
--- 
a/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
+++ 
b/test/e2e/fixture/src/test/java/org/apache/shardingsphere/test/e2e/fixture/ITKeyGenerateAlgorithmFixture.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.e2e.fixture;
 
 import org.apache.shardingsphere.infra.instance.InstanceContext;
 import org.apache.shardingsphere.infra.instance.InstanceContextAware;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
test/e2e/fixture/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
index f2055e7c1b1..cbeb077ffa2 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
@@ -40,7 +40,7 @@ import 
org.apache.shardingsphere.infra.database.core.metadata.database.DialectDa
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.task.E2EIncrementalTask;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
index c583ddb06a1..80acb0ee519 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import 
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.task.E2EIncrementalTask;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
index 326b9cf9a55..0878a10877d 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
@@ -23,7 +23,7 @@ import 
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobTy
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.snowflake.algorithm.SnowflakeKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.snowflake.SnowflakeKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.task.E2EIncrementalTask;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
index b7d113241ad..8d0d0527083 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/RulesMigrationE2EIT.java
@@ -20,7 +20,7 @@ package 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.general
 import 
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
index 45fb3cbce29..fa9bc36df4b 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/IndexesMigrationE2EIT.java
@@ -25,9 +25,9 @@ import 
org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
 import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
 import 
org.apache.shardingsphere.infra.exception.core.external.sql.type.wrapper.SQLWrapperException;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
-import 
org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
index d360825a427..fd63cff7be7 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/MariaDBMigrationE2EIT.java
@@ -20,8 +20,8 @@ package 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.primary
 import 
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
-import 
org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
index 407fd2e5e40..dfd183ac151 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
@@ -21,7 +21,7 @@ import 
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobTy
 import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import 
org.apache.shardingsphere.infra.keygen.uuid.algorithm.UUIDKeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.uuid.UUIDKeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerComposer;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.cases.migration.AbstractMigrationE2EIT;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
index 750d67bf2b4..a5d33253036 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
@@ -24,7 +24,7 @@ import 
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
 import 
org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType;
 import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
 import org.apache.shardingsphere.test.e2e.data.pipeline.util.SQLBuilderUtils;
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
index 8c38b3b939f..fe9ba1420ea 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/helper/PipelineCaseHelper.java
@@ -28,7 +28,7 @@ import 
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
 import 
org.apache.shardingsphere.infra.database.opengauss.type.OpenGaussDatabaseType;
 import 
org.apache.shardingsphere.infra.database.postgresql.type.PostgreSQLDatabaseType;
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 import 
org.apache.shardingsphere.test.e2e.data.pipeline.util.AutoIncrementKeyGenerateAlgorithm;
 
diff --git 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
index c72c525281e..9b7533c2df4 100644
--- 
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
+++ 
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/AutoIncrementKeyGenerateAlgorithm.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.test.e2e.data.pipeline.util;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
 
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
index 0207b6c619c..7ddb524ca20 100644
--- 
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
+++ 
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/fixture/keygen/RewriteKeyGenerateAlgorithmFixture.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.test.it.rewrite.fixture.keygen;
 
-import 
org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm;
+import 
org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm;
 import 
org.apache.shardingsphere.infra.algorithm.core.context.AlgorithmSQLContext;
 
 import java.util.Collection;
diff --git 
a/test/it/rewriter/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
 
b/test/it/rewriter/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm
similarity index 100%
rename from 
test/it/rewriter/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.keygen.core.algorithm.KeyGenerateAlgorithm
rename to 
test/it/rewriter/src/test/resources/META-INF/services/org.apache.shardingsphere.infra.algorithm.keygen.core.KeyGenerateAlgorithm

Reply via email to