This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 1cc5b41c965 Move key generate rewrite logic to infra module for reuse
(#29041)
1cc5b41c965 is described below
commit 1cc5b41c965b12bbddde1a22b59d6eddd318dd07
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Wed Nov 15 17:35:48 2023 +0800
Move key generate rewrite logic to infra module for reuse (#29041)
* Move key generate rewrite logic to infra module for reuse
* Add sharding table check for ShardingSQLRewriteContextDecorator
---
.../context/ShardingSQLRewriteContextDecorator.java | 15 ++++++++++++++-
.../parameter/ShardingParameterRewriterBuilder.java | 4 ++--
.../token/{pojo => }/ShardingTokenGenerateBuilder.java | 10 +++++-----
.../{pojo => }/ShardingTokenGenerateBuilderTest.java | 2 +-
.../AggregationDistinctTokenGeneratorTest.java | 2 +-
.../{ => generator}/ConstraintTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/CursorTokenGeneratorTest.java | 2 +-
.../DistinctProjectionPrefixTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/IndexTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/OffsetTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/OrderByTokenGeneratorTest.java | 2 +-
.../{ => generator}/ProjectionsTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/RowCountTokenGeneratorTest.java | 2 +-
.../ShardingInsertValuesTokenGeneratorTest.java | 2 +-
.../{ => generator}/ShardingRemoveTokenGeneratorTest.java | 2 +-
.../token/{ => generator}/TableTokenGeneratorTest.java | 2 +-
.../keygen/GeneratedKeyInsertValueParameterRewriter.java | 6 +++---
.../generator}/keygen/BaseGeneratedKeyTokenGenerator.java | 2 +-
.../keygen/GeneratedKeyAssignmentTokenGenerator.java | 8 ++++----
...eratedKeyForUseDefaultInsertColumnsTokenGenerator.java | 2 +-
.../keygen/GeneratedKeyInsertColumnTokenGenerator.java | 4 ++--
.../keygen/GeneratedKeyInsertValuesTokenGenerator.java | 2 +-
.../token/pojo/keygen}/GeneratedKeyAssignmentToken.java | 2 +-
.../token/pojo/keygen}/GeneratedKeyInsertColumnToken.java | 2 +-
.../pojo/keygen}/LiteralGeneratedKeyAssignmentToken.java | 2 +-
.../ParameterMarkerGeneratedKeyAssignmentToken.java | 2 +-
.../GeneratedKeyInsertValueParameterRewriterTest.java | 9 ++++-----
.../keygen}/GeneratedKeyAssignmentTokenGeneratorTest.java | 7 +++----
...edKeyForUseDefaultInsertColumnsTokenGeneratorTest.java | 3 +--
.../GeneratedKeyInsertColumnTokenGeneratorTest.java | 3 +--
.../GeneratedKeyInsertValuesTokenGeneratorTest.java | 3 +--
.../pojo/keygen}/GeneratedKeyAssignmentTokenTest.java | 2 +-
.../pojo/keygen}/GeneratedKeyInsertColumnTokenTest.java | 2 +-
33 files changed, 62 insertions(+), 54 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
index ff116672c93..14ecbe37376 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.sharding.rewrite.context;
import lombok.Setter;
+import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import
org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContextDecorator;
@@ -25,7 +26,7 @@ import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewri
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.constant.ShardingOrder;
import
org.apache.shardingsphere.sharding.rewrite.parameter.ShardingParameterRewriterBuilder;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.ShardingTokenGenerateBuilder;
+import
org.apache.shardingsphere.sharding.rewrite.token.ShardingTokenGenerateBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import java.util.Collection;
@@ -38,6 +39,9 @@ public final class ShardingSQLRewriteContextDecorator
implements SQLRewriteConte
@Override
public void decorate(final ShardingRule shardingRule, final
ConfigurationProperties props, final SQLRewriteContext sqlRewriteContext, final
RouteContext routeContext) {
+ if (!containsShardingTable(shardingRule,
sqlRewriteContext.getSqlStatementContext())) {
+ return;
+ }
if (!sqlRewriteContext.getParameters().isEmpty()) {
Collection<ParameterRewriter> parameterRewriters =
new ShardingParameterRewriterBuilder(shardingRule,
routeContext, sqlRewriteContext.getDatabase().getSchemas(),
sqlRewriteContext.getSqlStatementContext()).getParameterRewriters();
@@ -46,6 +50,15 @@ public final class ShardingSQLRewriteContextDecorator
implements SQLRewriteConte
sqlRewriteContext.addSQLTokenGenerators(new
ShardingTokenGenerateBuilder(shardingRule, routeContext,
sqlRewriteContext.getSqlStatementContext()).getSQLTokenGenerators());
}
+ private boolean containsShardingTable(final ShardingRule shardingRule,
final SQLStatementContext sqlStatementContext) {
+ for (String each :
sqlStatementContext.getTablesContext().getTableNames()) {
+ if (shardingRule.findTableRule(each).isPresent()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private void rewriteParameters(final SQLRewriteContext sqlRewriteContext,
final Collection<ParameterRewriter> parameterRewriters) {
for (ParameterRewriter each : parameterRewriters) {
each.rewrite(sqlRewriteContext.getParameterBuilder(),
sqlRewriteContext.getSqlStatementContext(), sqlRewriteContext.getParameters());
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
index 421ad8d319f..95b875c893f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewri
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.RouteContextAware;
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.SchemaMetaDataAware;
import org.apache.shardingsphere.infra.route.context.RouteContext;
-import
org.apache.shardingsphere.sharding.rewrite.parameter.impl.ShardingGeneratedKeyInsertValueParameterRewriter;
+import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen.GeneratedKeyInsertValueParameterRewriter;
import
org.apache.shardingsphere.sharding.rewrite.parameter.impl.ShardingPaginationParameterRewriter;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.aware.ShardingRuleAware;
@@ -51,7 +51,7 @@ public final class ShardingParameterRewriterBuilder
implements ParameterRewriter
@Override
public Collection<ParameterRewriter> getParameterRewriters() {
Collection<ParameterRewriter> result = new LinkedList<>();
- addParameterRewriter(result, new
ShardingGeneratedKeyInsertValueParameterRewriter());
+ addParameterRewriter(result, new
GeneratedKeyInsertValueParameterRewriter());
addParameterRewriter(result, new
ShardingPaginationParameterRewriter());
return result;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
similarity index 90%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilder.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
index 3a59f8957fd..dbf83686c42 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.sharding.rewrite.token;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
@@ -37,10 +37,10 @@ import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.RowCountT
import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingInsertValuesTokenGenerator;
import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingRemoveTokenGenerator;
import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.TableTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyAssignmentTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyForUseDefaultInsertColumnsTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyInsertColumnTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyInsertValuesTokenGenerator;
+import
org.apache.shardingsphere.infra.rewrite.token.generator.keygen.GeneratedKeyAssignmentTokenGenerator;
+import
org.apache.shardingsphere.infra.rewrite.token.generator.keygen.GeneratedKeyForUseDefaultInsertColumnsTokenGenerator;
+import
org.apache.shardingsphere.infra.rewrite.token.generator.keygen.GeneratedKeyInsertColumnTokenGenerator;
+import
org.apache.shardingsphere.infra.rewrite.token.generator.keygen.GeneratedKeyInsertValuesTokenGenerator;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.aware.ShardingRuleAware;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilderTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
index 1158a104cd2..92e8dce06cf 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ShardingTokenGenerateBuilderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.sharding.rewrite.token;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.SQLTokenGenerator;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/AggregationDistinctTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/AggregationDistinctTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
index 6b54c6e3117..5bea224a268 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/AggregationDistinctTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ConstraintTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ConstraintTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
index 77fc4c2f07b..9fdaf0cd768 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ConstraintTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/CursorTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/CursorTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
index 006cee52cc5..67f2b12f7c5 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/CursorTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CloseStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/DistinctProjectionPrefixTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
similarity index 97%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/DistinctProjectionPrefixTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
index 27f884b07f1..0eb51b961e3 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/DistinctProjectionPrefixTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
index a5aae6972a9..b2838690d0d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/IndexTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterIndexStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OffsetTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OffsetTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
index 930d7f415ce..4dc0181cbaf 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OffsetTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.pagination.PaginationContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OrderByTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OrderByTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
index 3adc32877bf..a7a719402fb 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/OrderByTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
similarity index 99%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
index 0517a45577b..4520b5ed01f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/RowCountTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/RowCountTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
index ef367dd01ca..c70cb0f536b 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/RowCountTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.select.pagination.PaginationContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingInsertValuesTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingInsertValuesTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingInsertValuesTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingInsertValuesTokenGeneratorTest.java
index 679669e97e0..ef7cb247b09 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingInsertValuesTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingInsertValuesTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.values.InsertValueContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingRemoveTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRemoveTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingRemoveTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRemoveTokenGeneratorTest.java
index cf41333736b..4ed6b0c70a8 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingRemoveTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRemoveTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/TableTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
similarity index 98%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/TableTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
index bf4fa5759f1..43ab5247a34 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/TableTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/TableTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java
index e12aa3b790f..b9f2f3e8ec3 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameter.impl;
+package org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen;
import lombok.Setter;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
@@ -30,10 +30,10 @@ import java.util.Iterator;
import java.util.List;
/**
- * Sharding generated key insert value parameter rewriter.
+ * Generated key insert value parameter rewriter.
*/
@Setter
-public final class ShardingGeneratedKeyInsertValueParameterRewriter implements
ParameterRewriter {
+public final class GeneratedKeyInsertValueParameterRewriter implements
ParameterRewriter {
@Override
public boolean isNeedRewrite(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/BaseGeneratedKeyTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/BaseGeneratedKeyTokenGenerator.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/BaseGeneratedKeyTokenGenerator.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/BaseGeneratedKeyTokenGenerator.java
index feea15ebcaa..9d1e1b2fe94 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/BaseGeneratedKeyTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/BaseGeneratedKeyTokenGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.OptionalSQLTokenGenerator;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyAssignmentTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGenerator.java
similarity index 87%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyAssignmentTokenGenerator.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGenerator.java
index 04bbfb441be..33097470362 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyAssignmentTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGenerator.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import com.google.common.base.Preconditions;
import lombok.Setter;
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.aware.ParametersAware;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.GeneratedKeyAssignmentToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.LiteralGeneratedKeyAssignmentToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.ParameterMarkerGeneratedKeyAssignmentToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.GeneratedKeyAssignmentToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.LiteralGeneratedKeyAssignmentToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.ParameterMarkerGeneratedKeyAssignmentToken;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.InsertStatement;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
similarity index 97%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
index 06b2104580f..766e5a52f7f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import com.google.common.base.Preconditions;
import
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.UseDefaultInsertColumnsToken;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGenerator.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGenerator.java
index 8ea1ddd1122..8de6ffdc2a4 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertColumnTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGenerator.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.GeneratedKeyInsertColumnToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.GeneratedKeyInsertColumnToken;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.InsertColumnsSegment;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGenerator.java
similarity index 98%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGenerator.java
index 39c924025b8..671edf0082b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGenerator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import com.google.common.base.Preconditions;
import lombok.Setter;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentToken.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentToken.java
index a60b86c30ec..d5887e00c32 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Attachable;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnToken.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnToken.java
index b1a046b1f1f..8a69720bb00 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Attachable;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/LiteralGeneratedKeyAssignmentToken.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/LiteralGeneratedKeyAssignmentToken.java
index 094afa157c0..200dee67e07 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/LiteralGeneratedKeyAssignmentToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/LiteralGeneratedKeyAssignmentToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
/**
* Generated key assignment token for literal.
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/ParameterMarkerGeneratedKeyAssignmentToken.java
similarity index 94%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java
rename to
infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/ParameterMarkerGeneratedKeyAssignmentToken.java
index dcb4a077e77..80fa7bfdcca 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/ParameterMarkerGeneratedKeyAssignmentToken.java
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/ParameterMarkerGeneratedKeyAssignmentToken.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
/**
* Generated key assignment token for parameter marker.
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java
similarity index 91%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java
index 260299f283a..19e99c6b20d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/keygen/GeneratedKeyInsertValueParameterRewriterTest.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.parameter;
+package org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
import
org.apache.shardingsphere.infra.rewrite.parameter.builder.ParameterBuilder;
import
org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.GroupedParameterBuilder;
import
org.apache.shardingsphere.infra.rewrite.parameter.builder.impl.StandardParameterBuilder;
-import
org.apache.shardingsphere.sharding.rewrite.parameter.impl.ShardingGeneratedKeyInsertValueParameterRewriter;
import org.junit.jupiter.api.Test;
import org.mockito.stubbing.Answer;
@@ -42,7 +41,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ShardingGeneratedKeyInsertValueParameterRewriterTest {
+class GeneratedKeyInsertValueParameterRewriterTest {
private static final int TEST_PARAMETER_COUNT = 3;
@@ -50,7 +49,7 @@ class ShardingGeneratedKeyInsertValueParameterRewriterTest {
@Test
void assertIsNeedRewrite() {
- ShardingGeneratedKeyInsertValueParameterRewriter paramRewriter = new
ShardingGeneratedKeyInsertValueParameterRewriter();
+ GeneratedKeyInsertValueParameterRewriter paramRewriter = new
GeneratedKeyInsertValueParameterRewriter();
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class);
assertFalse(paramRewriter.isNeedRewrite(selectStatementContext));
InsertStatementContext insertStatementContext =
mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
@@ -68,7 +67,7 @@ class ShardingGeneratedKeyInsertValueParameterRewriterTest {
void assertRewrite() {
InsertStatementContext insertStatementContext =
getInsertStatementContext();
ParameterBuilder groupedParamBuilder = getParameterBuilder();
- ShardingGeneratedKeyInsertValueParameterRewriter paramRewriter = new
ShardingGeneratedKeyInsertValueParameterRewriter();
+ GeneratedKeyInsertValueParameterRewriter paramRewriter = new
GeneratedKeyInsertValueParameterRewriter();
paramRewriter.rewrite(groupedParamBuilder, insertStatementContext,
null);
assertThat(((GroupedParameterBuilder)
groupedParamBuilder).getParameterBuilders().get(0).getAddedIndexAndParameters().get(TEST_PARAMETER_COUNT),
hasItem(TEST_GENERATED_VALUE));
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGeneratorTest.java
similarity index 89%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGeneratorTest.java
index 9b33c404ca9..4a972c429f1 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyAssignmentTokenGeneratorTest.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyAssignmentTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.LiteralGeneratedKeyAssignmentToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.pojo.ParameterMarkerGeneratedKeyAssignmentToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.LiteralGeneratedKeyAssignmentToken;
+import
org.apache.shardingsphere.infra.rewrite.token.pojo.keygen.ParameterMarkerGeneratedKeyAssignmentToken;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.assignment.SetAssignmentSegment;
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLInsertStatement;
import org.junit.jupiter.api.Test;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
index 25931113b66..cead9b74ae1 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyForUseDefaultInsertColumnsTokenGeneratorTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyForUseDefaultInsertColumnsTokenGenerator;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.InsertColumnsSegment;
import org.junit.jupiter.api.Test;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertColumnTokenGeneratorTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGeneratorTest.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertColumnTokenGeneratorTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGeneratorTest.java
index 43ccff0bae1..e6ad5c7bcf4 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertColumnTokenGeneratorTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertColumnTokenGeneratorTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyInsertColumnTokenGenerator;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.InsertColumnsSegment;
import org.junit.jupiter.api.Test;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertValuesTokenGeneratorTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGeneratorTest.java
similarity index 95%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertValuesTokenGeneratorTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGeneratorTest.java
index c1c0b6af12b..7125953e382 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyInsertValuesTokenGeneratorTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/generator/keygen/GeneratedKeyInsertValuesTokenGeneratorTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.infra.rewrite.token.generator.keygen;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.values.InsertValueContext;
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatem
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.InsertValue;
import
org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.InsertValuesToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.keygen.GeneratedKeyInsertValuesTokenGenerator;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentTokenTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentTokenTest.java
similarity index 97%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentTokenTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentTokenTest.java
index 4e91217f7b7..eaaf8347205 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyAssignmentTokenTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyAssignmentTokenTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
import org.junit.jupiter.api.Test;
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnTokenTest.java
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnTokenTest.java
similarity index 95%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnTokenTest.java
rename to
infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnTokenTest.java
index 591da3d321e..42b6b520f9f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/GeneratedKeyInsertColumnTokenTest.java
+++
b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/token/pojo/keygen/GeneratedKeyInsertColumnTokenTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.infra.rewrite.token.pojo.keygen;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
