Skip to content

Commit

Permalink
Move key generate rewrite logic to infra module for reuse (#29041)
Browse files Browse the repository at this point in the history 
* Move key generate rewrite logic to infra module for reuse

* Add sharding table check for ShardingSQLRewriteContextDecorator
  • Loading branch information
@strongduanmu
strongduanmu authored Nov 15, 2023
1 parent 8f552ad commit 1cc5b41
Show file tree
Hide file tree
Showing 33 changed files with 62 additions and 54 deletions.
15 changes: 14 additions & 1 deletion ...rg/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
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;
import org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
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;
Expand All @@ -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();
Expand All @@ -46,6 +50,15 @@ public void decorate(final ShardingRule shardingRule, final ConfigurationPropert
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());
Expand Down
4 changes: 2 additions & 2 deletions ...rg/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
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;
Expand All @@ -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;
}
Expand Down
10 changes: 5 additions & 5 deletions ...en/pojo/ShardingTokenGenerateBuilder.java → ...e/token/ShardingTokenGenerateBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -37,10 +37,10 @@
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;

Expand Down
2 changes: 1 addition & 1 deletion ...ojo/ShardingTokenGenerateBuilderTest.java → ...ken/ShardingTokenGenerateBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ggregationDistinctTokenGeneratorTest.java → ...ggregationDistinctTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...e/token/ConstraintTokenGeneratorTest.java → ...nerator/ConstraintTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...write/token/CursorTokenGeneratorTest.java → ...n/generator/CursorTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ctProjectionPrefixTokenGeneratorTest.java → ...ctProjectionPrefixTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ewrite/token/IndexTokenGeneratorTest.java → ...en/generator/IndexTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...write/token/OffsetTokenGeneratorTest.java → ...n/generator/OffsetTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rite/token/OrderByTokenGeneratorTest.java → .../generator/OrderByTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../token/ProjectionsTokenGeneratorTest.java → ...erator/ProjectionsTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ite/token/RowCountTokenGeneratorTest.java → ...generator/RowCountTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ardingInsertValuesTokenGeneratorTest.java → ...ardingInsertValuesTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ken/ShardingRemoveTokenGeneratorTest.java → ...tor/ShardingRemoveTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ewrite/token/TableTokenGeneratorTest.java → ...en/generator/TableTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ratedKeyInsertValueParameterRewriter.java → ...ratedKeyInsertValueParameterRewriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -30,10 +30,10 @@
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) {
Expand Down
2 changes: 1 addition & 1 deletion ...eygen/BaseGeneratedKeyTokenGenerator.java → ...eygen/BaseGeneratedKeyTokenGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...GeneratedKeyAssignmentTokenGenerator.java → ...GeneratedKeyAssignmentTokenGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...seDefaultInsertColumnsTokenGenerator.java → ...seDefaultInsertColumnsTokenGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...neratedKeyInsertColumnTokenGenerator.java → ...neratedKeyInsertColumnTokenGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...neratedKeyInsertValuesTokenGenerator.java → ...neratedKeyInsertValuesTokenGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ken/pojo/GeneratedKeyAssignmentToken.java → ...o/keygen/GeneratedKeyAssignmentToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...n/pojo/GeneratedKeyInsertColumnToken.java → ...keygen/GeneratedKeyInsertColumnToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...o/LiteralGeneratedKeyAssignmentToken.java → ...n/LiteralGeneratedKeyAssignmentToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...terMarkerGeneratedKeyAssignmentToken.java → ...terMarkerGeneratedKeyAssignmentToken.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 4 additions & 5 deletions ...dKeyInsertValueParameterRewriterTest.java → ...dKeyInsertValueParameterRewriterTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -42,15 +41,15 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

class ShardingGeneratedKeyInsertValueParameterRewriterTest {
class GeneratedKeyInsertValueParameterRewriterTest {

private static final int TEST_PARAMETER_COUNT = 3;

private static final String TEST_GENERATED_VALUE = "testGeneratedValue";

@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);
Expand All @@ -68,7 +67,7 @@ void assertIsNeedRewrite() {
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));
}
Expand Down
7 changes: 3 additions & 4 deletions ...ratedKeyAssignmentTokenGeneratorTest.java → ...ratedKeyAssignmentTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions ...faultInsertColumnsTokenGeneratorTest.java → ...faultInsertColumnsTokenGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit 1cc5b41

Please sign in to comment.