This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 ae688c4da62 Refactor ShardingTokenGenerateBuilder (#32413)
ae688c4da62 is described below
commit ae688c4da6250137ca5b1aef2c0358aaba2cc3b4
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 5 23:10:19 2024 +0800
Refactor ShardingTokenGenerateBuilder (#32413)
---
.../token/ShardingTokenGenerateBuilder.java | 40 +++++++++++-----------
...ShardingAggregationDistinctTokenGenerator.java} | 4 +--
....java => ShardingConstraintTokenGenerator.java} | 4 +--
...ator.java => ShardingCursorTokenGenerator.java} | 4 +--
...ingDistinctProjectionPrefixTokenGenerator.java} | 4 +--
...a => ShardingFetchDirectionTokenGenerator.java} | 4 +--
...rator.java => ShardingIndexTokenGenerator.java} | 4 +--
...ator.java => ShardingOffsetTokenGenerator.java} | 4 +--
...tor.java => ShardingOrderByTokenGenerator.java} | 4 +--
...java => ShardingProjectionsTokenGenerator.java} | 4 +--
...or.java => ShardingRowCountTokenGenerator.java} | 4 +--
.../token/ShardingTokenGenerateBuilderTest.java | 8 ++---
...dingAggregationDistinctTokenGeneratorTest.java} | 8 ++---
...a => ShardingConstraintTokenGeneratorTest.java} | 8 ++---
....java => ShardingCursorTokenGeneratorTest.java} | 8 ++---
...istinctProjectionPrefixTokenGeneratorTest.java} | 8 ++---
...t.java => ShardingIndexTokenGeneratorTest.java} | 8 ++---
....java => ShardingOffsetTokenGeneratorTest.java} | 18 +++++-----
...java => ShardingOrderByTokenGeneratorTest.java} | 8 ++---
... => ShardingProjectionsTokenGeneratorTest.java} | 10 +++---
...ava => ShardingRowCountTokenGeneratorTest.java} | 18 +++++-----
21 files changed, 91 insertions(+), 91 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
index 3733a48e365..7143637cb8f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilder.java
@@ -24,16 +24,16 @@ import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.aware.
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.builder.SQLTokenGeneratorBuilder;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import
org.apache.shardingsphere.sharding.rewrite.token.generator.IgnoreForSingleRoute;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.AggregationDistinctTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ConstraintTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.CursorTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.DistinctProjectionPrefixTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.FetchDirectionTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.IndexTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.OffsetTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.OrderByTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ProjectionsTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.RowCountTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingAggregationDistinctTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingConstraintTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingCursorTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingDistinctProjectionPrefixTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingFetchDirectionTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingIndexTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingOffsetTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingOrderByTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingProjectionsTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingRowCountTokenGenerator;
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.ShardingTableTokenGenerator;
@@ -63,22 +63,22 @@ public final class ShardingTokenGenerateBuilder implements
SQLTokenGeneratorBuil
public Collection<SQLTokenGenerator> getSQLTokenGenerators() {
Collection<SQLTokenGenerator> result = new LinkedList<>();
addSQLTokenGenerator(result, new ShardingTableTokenGenerator());
- addSQLTokenGenerator(result, new
DistinctProjectionPrefixTokenGenerator());
- addSQLTokenGenerator(result, new ProjectionsTokenGenerator());
- addSQLTokenGenerator(result, new OrderByTokenGenerator());
- addSQLTokenGenerator(result, new AggregationDistinctTokenGenerator());
- addSQLTokenGenerator(result, new IndexTokenGenerator());
- addSQLTokenGenerator(result, new ConstraintTokenGenerator());
- addSQLTokenGenerator(result, new OffsetTokenGenerator());
- addSQLTokenGenerator(result, new RowCountTokenGenerator());
+ addSQLTokenGenerator(result, new
ShardingDistinctProjectionPrefixTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingProjectionsTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingOrderByTokenGenerator());
+ addSQLTokenGenerator(result, new
ShardingAggregationDistinctTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingIndexTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingConstraintTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingOffsetTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingRowCountTokenGenerator());
addSQLTokenGenerator(result, new
GeneratedKeyInsertColumnTokenGenerator());
addSQLTokenGenerator(result, new
GeneratedKeyForUseDefaultInsertColumnsTokenGenerator());
addSQLTokenGenerator(result, new
GeneratedKeyAssignmentTokenGenerator());
addSQLTokenGenerator(result, new ShardingInsertValuesTokenGenerator());
addSQLTokenGenerator(result, new
GeneratedKeyInsertValuesTokenGenerator());
addSQLTokenGenerator(result, new ShardingRemoveTokenGenerator());
- addSQLTokenGenerator(result, new CursorTokenGenerator());
- addSQLTokenGenerator(result, new FetchDirectionTokenGenerator());
+ addSQLTokenGenerator(result, new ShardingCursorTokenGenerator());
+ addSQLTokenGenerator(result, new
ShardingFetchDirectionTokenGenerator());
return result;
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/AggregationDistinctTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingAggregationDistinctTokenGenerator.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/AggregationDistinctTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingAggregationDistinctTokenGenerator.java
index d493f1a7c89..3cafe2c3f1b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/AggregationDistinctTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingAggregationDistinctTokenGenerator.java
@@ -31,9 +31,9 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Aggregation distinct token generator.
+ * Sharding aggregation distinct token generator.
*/
-public final class AggregationDistinctTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, IgnoreForSingleRoute {
+public final class ShardingAggregationDistinctTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, IgnoreForSingleRoute {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ConstraintTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingConstraintTokenGenerator.java
similarity index 94%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ConstraintTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingConstraintTokenGenerator.java
index 049b43d337d..cb252bdbdb7 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ConstraintTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingConstraintTokenGenerator.java
@@ -32,10 +32,10 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Constraint token generator.
+ * Sharding constraint token generator.
*/
@Setter
-public final class ConstraintTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware {
+public final class ShardingConstraintTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware {
private ShardingRule shardingRule;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/CursorTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingCursorTokenGenerator.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/CursorTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingCursorTokenGenerator.java
index 2e85760dc00..2c9f637577f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/CursorTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingCursorTokenGenerator.java
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.sharding.rule.aware.ShardingRuleAware;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.cursor.CursorNameSegment;
/**
- * Cursor token generator.
+ * Sharding cursor token generator.
*/
@Setter
-public final class CursorTokenGenerator implements
OptionalSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware {
+public final class ShardingCursorTokenGenerator implements
OptionalSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware {
private ShardingRule shardingRule;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/DistinctProjectionPrefixTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingDistinctProjectionPrefixTokenGenerator.java
similarity index 90%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/DistinctProjectionPrefixTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingDistinctProjectionPrefixTokenGenerator.java
index ea76cdcfae0..7c3ed07d70e 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/DistinctProjectionPrefixTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingDistinctProjectionPrefixTokenGenerator.java
@@ -24,9 +24,9 @@ import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.Option
import
org.apache.shardingsphere.sharding.rewrite.token.pojo.DistinctProjectionPrefixToken;
/**
- * Distinct projection prefix token generator.
+ * Sharding distinct projection prefix token generator.
*/
-public final class DistinctProjectionPrefixTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
+public final class ShardingDistinctProjectionPrefixTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/FetchDirectionTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingFetchDirectionTokenGenerator.java
similarity index 94%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/FetchDirectionTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingFetchDirectionTokenGenerator.java
index 2ca6fa7f583..4c6b4228147 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/FetchDirectionTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingFetchDirectionTokenGenerator.java
@@ -31,10 +31,10 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.cursor.Di
import
org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.FetchStatement;
/**
- * Fetch direction token generator.
+ * Sharding fetch direction token generator.
*/
@Setter
-public final class FetchDirectionTokenGenerator implements
OptionalSQLTokenGenerator<SQLStatementContext>, ConnectionContextAware {
+public final class ShardingFetchDirectionTokenGenerator implements
OptionalSQLTokenGenerator<SQLStatementContext>, ConnectionContextAware {
private ConnectionContext connectionContext;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingIndexTokenGenerator.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingIndexTokenGenerator.java
index 70a5c20579b..eea53496126 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/IndexTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingIndexTokenGenerator.java
@@ -38,10 +38,10 @@ import java.util.LinkedList;
import java.util.Map;
/**
- * Index token generator.
+ * Sharding index token generator.
*/
@Setter
-public final class IndexTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware,
SchemaMetaDataAware {
+public final class ShardingIndexTokenGenerator implements
CollectionSQLTokenGenerator<SQLStatementContext>, ShardingRuleAware,
SchemaMetaDataAware {
private ShardingRule shardingRule;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OffsetTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOffsetTokenGenerator.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OffsetTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOffsetTokenGenerator.java
index 75ed787ba1d..e9d7dcb56a9 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OffsetTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOffsetTokenGenerator.java
@@ -27,9 +27,9 @@ import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.Option
import org.apache.shardingsphere.sharding.rewrite.token.pojo.OffsetToken;
/**
- * Offset token generator.
+ * Sharding offset token generator.
*/
-public final class OffsetTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
+public final class ShardingOffsetTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOrderByTokenGenerator.java
similarity index 95%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOrderByTokenGenerator.java
index a877be05f0b..a9c392e5770 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/OrderByTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingOrderByTokenGenerator.java
@@ -29,9 +29,9 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table
import
org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
/**
- * Order by token generator.
+ * Sharding order by token generator.
*/
-public final class OrderByTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
+public final class ShardingOrderByTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingProjectionsTokenGenerator.java
similarity index 97%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingProjectionsTokenGenerator.java
index 1d1bbb9204f..b7701b523ed 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ProjectionsTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingProjectionsTokenGenerator.java
@@ -51,10 +51,10 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Projections token generator.
+ * Sharding projections token generator.
*/
@Setter
-public final class ProjectionsTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute,
RouteContextAware {
+public final class ShardingProjectionsTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute,
RouteContextAware {
private RouteContext routeContext;
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/RowCountTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRowCountTokenGenerator.java
similarity index 93%
rename from
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/RowCountTokenGenerator.java
rename to
features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRowCountTokenGenerator.java
index 9522b3aeb81..2e4da13f054 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/RowCountTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingRowCountTokenGenerator.java
@@ -27,9 +27,9 @@ import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.Option
import org.apache.shardingsphere.sharding.rewrite.token.pojo.RowCountToken;
/**
- * Row count token generator.
+ * Sharding row count token generator.
*/
-public final class RowCountTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
+public final class ShardingRowCountTokenGenerator implements
OptionalSQLTokenGenerator<SelectStatementContext>, IgnoreForSingleRoute {
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
index 209cc517a88..66f77a2b835 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ShardingTokenGenerateBuilderTest.java
@@ -21,8 +21,8 @@ import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatem
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.SQLTokenGenerator;
import
org.apache.shardingsphere.infra.rewrite.sql.token.common.generator.aware.RouteContextAware;
import org.apache.shardingsphere.infra.route.context.RouteContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.AggregationDistinctTokenGenerator;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.DistinctProjectionPrefixTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingAggregationDistinctTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingDistinctProjectionPrefixTokenGenerator;
import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingRemoveTokenGenerator;
import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingTableTokenGenerator;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -66,10 +66,10 @@ class ShardingTokenGenerateBuilderTest {
assertThat(tableTokenGenerator,
instanceOf(ShardingTableTokenGenerator.class));
assertSqlTokenGenerator(tableTokenGenerator);
SQLTokenGenerator distinctProjectionPrefixTokenGenerator =
iterator.next();
- assertThat(distinctProjectionPrefixTokenGenerator,
instanceOf(DistinctProjectionPrefixTokenGenerator.class));
+ assertThat(distinctProjectionPrefixTokenGenerator,
instanceOf(ShardingDistinctProjectionPrefixTokenGenerator.class));
assertSqlTokenGenerator(distinctProjectionPrefixTokenGenerator);
SQLTokenGenerator aggregationDistinctTokenGenerator = iterator.next();
- assertThat(aggregationDistinctTokenGenerator,
instanceOf(AggregationDistinctTokenGenerator.class));
+ assertThat(aggregationDistinctTokenGenerator,
instanceOf(ShardingAggregationDistinctTokenGenerator.class));
assertSqlTokenGenerator(aggregationDistinctTokenGenerator);
SQLTokenGenerator shardingRemoveTokenGenerator = iterator.next();
assertThat(shardingRemoveTokenGenerator,
instanceOf(ShardingRemoveTokenGenerator.class));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingAggregationDistinctTokenGeneratorTest.java
similarity index 92%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingAggregationDistinctTokenGeneratorTest.java
index b5a646ff84d..3d6225b0864 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/AggregationDistinctTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingAggregationDistinctTokenGeneratorTest.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.
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.sql.token.common.pojo.SQLToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.AggregationDistinctTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingAggregationDistinctTokenGenerator;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
import org.junit.jupiter.api.Test;
@@ -38,11 +38,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class AggregationDistinctTokenGeneratorTest {
+class ShardingAggregationDistinctTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
- AggregationDistinctTokenGenerator aggregationDistinctTokenGenerator =
new AggregationDistinctTokenGenerator();
+ ShardingAggregationDistinctTokenGenerator
aggregationDistinctTokenGenerator = new
ShardingAggregationDistinctTokenGenerator();
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getProjectionsContext().getAggregationDistinctProjections()).thenReturn(Collections.emptyList());
assertFalse(aggregationDistinctTokenGenerator.isGenerateSQLToken(selectStatementContext));
@@ -64,7 +64,7 @@ class AggregationDistinctTokenGeneratorTest {
when(aggregationDistinctProjection.getDistinctInnerExpression()).thenReturn(testDistinctInnerExpression);
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getProjectionsContext().getAggregationDistinctProjections()).thenReturn(Collections.singletonList(aggregationDistinctProjection));
- AggregationDistinctTokenGenerator aggregationDistinctTokenGenerator =
new AggregationDistinctTokenGenerator();
+ ShardingAggregationDistinctTokenGenerator
aggregationDistinctTokenGenerator = new
ShardingAggregationDistinctTokenGenerator();
List<SQLToken> generateSQLTokensResult = new
ArrayList<>(aggregationDistinctTokenGenerator.generateSQLTokens(selectStatementContext));
assertThat(generateSQLTokensResult.get(0).toString(),
is(testDistinctInnerExpression + " AS " + testAlias));
when(aggregationDistinctProjection.getAlias()).thenReturn(Optional.of(new
IdentifierValue("TEST_ERROR_ALIAS")));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingConstraintTokenGeneratorTest.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingConstraintTokenGeneratorTest.java
index 735629b4d4e..57fe54c9949 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ConstraintTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingConstraintTokenGeneratorTest.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.sharding.rewrite.token.generator;
import
org.apache.shardingsphere.infra.binder.context.statement.UnknownSQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ConstraintTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingConstraintTokenGenerator;
import org.apache.shardingsphere.sharding.rewrite.token.pojo.ConstraintToken;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.constraint.ConstraintSegment;
@@ -38,11 +38,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class ConstraintTokenGeneratorTest {
+class ShardingConstraintTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
- ConstraintTokenGenerator generator = new ConstraintTokenGenerator();
+ ShardingConstraintTokenGenerator generator = new
ShardingConstraintTokenGenerator();
assertFalse(generator.isGenerateSQLToken(mock(UnknownSQLStatementContext.class)));
AlterTableStatementContext alterTableStatementContext =
mock(AlterTableStatementContext.class);
Collection<ConstraintSegment> constraintSegments = new LinkedList<>();
@@ -61,7 +61,7 @@ class ConstraintTokenGeneratorTest {
when(constraintSegment.getIdentifier()).thenReturn(constraintIdentifier);
AlterTableStatementContext alterTableStatementContext =
mock(AlterTableStatementContext.class);
when(alterTableStatementContext.getConstraints()).thenReturn(Collections.singleton(constraintSegment));
- ConstraintTokenGenerator generator = new ConstraintTokenGenerator();
+ ShardingConstraintTokenGenerator generator = new
ShardingConstraintTokenGenerator();
generator.setShardingRule(mock(ShardingRule.class));
Collection<SQLToken> actual =
generator.generateSQLTokens(alterTableStatementContext);
assertThat(actual.size(), is(1));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingCursorTokenGeneratorTest.java
similarity index 93%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingCursorTokenGeneratorTest.java
index fe0da79a9af..79dfbfbfb6d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/CursorTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingCursorTokenGeneratorTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.binder.context.statement.ddl.FetchStateme
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.MoveStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.CursorTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingCursorTokenGenerator;
import org.apache.shardingsphere.sharding.rewrite.token.pojo.CursorToken;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.cursor.CursorNameSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -38,11 +38,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class CursorTokenGeneratorTest {
+class ShardingCursorTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
- CursorTokenGenerator generator = new CursorTokenGenerator();
+ ShardingCursorTokenGenerator generator = new
ShardingCursorTokenGenerator();
assertFalse(generator.isGenerateSQLToken(mock(SelectStatementContext.class)));
Optional<CursorNameSegment> cursorName = Optional.of(new
CursorNameSegment(0, 0, new IdentifierValue("t_order_cursor")));
CursorStatementContext cursorStatementContext =
mock(CursorStatementContext.class);
@@ -61,7 +61,7 @@ class CursorTokenGeneratorTest {
@Test
void assertGenerateSQLToken() {
- CursorTokenGenerator generator = new CursorTokenGenerator();
+ ShardingCursorTokenGenerator generator = new
ShardingCursorTokenGenerator();
CursorStatementContext statementContext =
mock(CursorStatementContext.class);
when(statementContext.getCursorName()).thenReturn(Optional.of(new
CursorNameSegment(0, 0, new IdentifierValue("t_order_cursor"))));
SQLToken actual = generator.generateSQLToken(statementContext);
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingDistinctProjectionPrefixTokenGeneratorTest.java
similarity index 88%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingDistinctProjectionPrefixTokenGeneratorTest.java
index 2a380cce82e..d71d8c6a488 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/DistinctProjectionPrefixTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingDistinctProjectionPrefixTokenGeneratorTest.java
@@ -20,7 +20,7 @@ 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.UnknownSQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.DistinctProjectionPrefixTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingDistinctProjectionPrefixTokenGenerator;
import org.junit.jupiter.api.Test;
import java.util.LinkedList;
@@ -34,11 +34,11 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class DistinctProjectionPrefixTokenGeneratorTest {
+class ShardingDistinctProjectionPrefixTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
- DistinctProjectionPrefixTokenGenerator generator = new
DistinctProjectionPrefixTokenGenerator();
+ ShardingDistinctProjectionPrefixTokenGenerator generator = new
ShardingDistinctProjectionPrefixTokenGenerator();
assertFalse(generator.isGenerateSQLToken(mock(UnknownSQLStatementContext.class)));
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
List<AggregationDistinctProjection> aggregationDistinctProjections =
new LinkedList<>();
@@ -53,7 +53,7 @@ class DistinctProjectionPrefixTokenGeneratorTest {
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
final int testStartIndex = 1;
when(selectStatementContext.getProjectionsContext().getStartIndex()).thenReturn(testStartIndex);
- DistinctProjectionPrefixTokenGenerator generator = new
DistinctProjectionPrefixTokenGenerator();
+ ShardingDistinctProjectionPrefixTokenGenerator generator = new
ShardingDistinctProjectionPrefixTokenGenerator();
assertThat(generator.generateSQLToken(selectStatementContext).toString(),
is("DISTINCT "));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingIndexTokenGeneratorTest.java
similarity index 94%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingIndexTokenGeneratorTest.java
index 71e44acac20..fd082c2a7da 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/IndexTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingIndexTokenGeneratorTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.rewrite.sql.token.common.pojo.SQLToken;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.IndexTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingIndexTokenGenerator;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.IndexNameSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.IndexSegment;
@@ -43,12 +43,12 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class IndexTokenGeneratorTest {
+class ShardingIndexTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
UnknownSQLStatementContext sqlStatementContext =
mock(UnknownSQLStatementContext.class);
- IndexTokenGenerator generator = new IndexTokenGenerator();
+ ShardingIndexTokenGenerator generator = new
ShardingIndexTokenGenerator();
assertFalse(generator.isGenerateSQLToken(sqlStatementContext));
AlterIndexStatementContext alterIndexStatementContext =
mock(AlterIndexStatementContext.class);
Collection<IndexSegment> indexSegments = new LinkedList<>();
@@ -69,7 +69,7 @@ class IndexTokenGeneratorTest {
when(alterIndexStatementContext.getIndexes()).thenReturn(Collections.singleton(indexSegment));
when(alterIndexStatementContext.getDatabaseType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"FIXTURE"));
when(alterIndexStatementContext.getTablesContext().getSchemaName()).thenReturn(Optional.empty());
- IndexTokenGenerator generator = new IndexTokenGenerator();
+ ShardingIndexTokenGenerator generator = new
ShardingIndexTokenGenerator();
generator.setShardingRule(mock(ShardingRule.class));
generator.setSchemas(Collections.singletonMap("test",
mock(ShardingSphereSchema.class)));
Collection<SQLToken> actual =
generator.generateSQLTokens(alterIndexStatementContext);
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOffsetTokenGeneratorTest.java
similarity index 82%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOffsetTokenGeneratorTest.java
index 353ca24a4e6..7a97e642257 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OffsetTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOffsetTokenGeneratorTest.java
@@ -20,7 +20,7 @@ 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;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.OffsetTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingOffsetTokenGenerator;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.NumberLiteralPaginationValueSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.PaginationValueSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.ParameterMarkerPaginationValueSegment;
@@ -36,23 +36,23 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class OffsetTokenGeneratorTest {
+class ShardingOffsetTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
InsertStatementContext insertStatementContext =
mock(InsertStatementContext.class);
- OffsetTokenGenerator offsetTokenGenerator = new OffsetTokenGenerator();
-
assertFalse(offsetTokenGenerator.isGenerateSQLToken(insertStatementContext));
+ ShardingOffsetTokenGenerator shardingOffsetTokenGenerator = new
ShardingOffsetTokenGenerator();
+
assertFalse(shardingOffsetTokenGenerator.isGenerateSQLToken(insertStatementContext));
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getPaginationContext().getOffsetSegment().isPresent()).thenReturn(Boolean.FALSE);
-
assertFalse(offsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
+
assertFalse(shardingOffsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
when(selectStatementContext.getPaginationContext().getOffsetSegment().isPresent()).thenReturn(Boolean.TRUE);
ParameterMarkerPaginationValueSegment
parameterMarkerPaginationValueSegment =
mock(ParameterMarkerPaginationValueSegment.class);
when(selectStatementContext.getPaginationContext().getOffsetSegment().get()).thenReturn(parameterMarkerPaginationValueSegment);
-
assertFalse(offsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
+
assertFalse(shardingOffsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
NumberLiteralPaginationValueSegment
numberLiteralPaginationValueSegment =
mock(NumberLiteralPaginationValueSegment.class);
when(selectStatementContext.getPaginationContext().getOffsetSegment().get()).thenReturn(numberLiteralPaginationValueSegment);
-
assertTrue(offsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
+
assertTrue(shardingOffsetTokenGenerator.isGenerateSQLToken(selectStatementContext));
}
@Test
@@ -68,7 +68,7 @@ class OffsetTokenGeneratorTest {
when(paginationContext.getRevisedOffset()).thenReturn(testRevisedOffset);
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class);
when(selectStatementContext.getPaginationContext()).thenReturn(paginationContext);
- OffsetTokenGenerator offsetTokenGenerator = new OffsetTokenGenerator();
-
assertThat(offsetTokenGenerator.generateSQLToken(selectStatementContext).toString(),
is(String.valueOf(testRevisedOffset)));
+ ShardingOffsetTokenGenerator shardingOffsetTokenGenerator = new
ShardingOffsetTokenGenerator();
+
assertThat(shardingOffsetTokenGenerator.generateSQLToken(selectStatementContext).toString(),
is(String.valueOf(testRevisedOffset)));
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOrderByTokenGeneratorTest.java
similarity index 96%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOrderByTokenGeneratorTest.java
index 08ac2e648cb..cd6d031129f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/OrderByTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingOrderByTokenGeneratorTest.java
@@ -20,7 +20,7 @@ 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;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.OrderByTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingOrderByTokenGenerator;
import org.apache.shardingsphere.sharding.rewrite.token.pojo.OrderByToken;
import
org.apache.shardingsphere.sql.parser.statement.core.enums.OrderDirection;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.ColumnOrderByItemSegment;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class OrderByTokenGeneratorTest {
+class ShardingOrderByTokenGeneratorTest {
private static final String TEST_COLUMN_ORDER_BY_ITEM_SEGMENT_COLUMN_LABEL
= "TEST_COLUMN_ORDER_BY_ITEM_SEGMENT_COLUMN_LABEL";
@@ -59,7 +59,7 @@ class OrderByTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
- OrderByTokenGenerator generator = new OrderByTokenGenerator();
+ ShardingOrderByTokenGenerator generator = new
ShardingOrderByTokenGenerator();
assertFalse(generator.isGenerateSQLToken(mock(InsertStatementContext.class)));
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getOrderByContext().isGenerated()).thenReturn(Boolean.FALSE);
@@ -78,7 +78,7 @@ class OrderByTokenGeneratorTest {
when(selectStatementContext.getSqlStatement()).thenReturn(selectStatement);
Collection<OrderByItem> orderByItems = getOrderByItems();
when(selectStatementContext.getOrderByContext().getItems()).thenReturn(orderByItems);
- OrderByTokenGenerator generator = new OrderByTokenGenerator();
+ ShardingOrderByTokenGenerator generator = new
ShardingOrderByTokenGenerator();
OrderByToken actual =
generator.generateSQLToken(selectStatementContext);
assertThat(actual.getColumnLabels().get(0),
is(TEST_COLUMN_ORDER_BY_ITEM_SEGMENT_COLUMN_LABEL));
assertThat(actual.getColumnLabels().get(1),
is(TEST_EXPRESSION_ORDER_BY_ITEM_SEGMENT_COLUMN_LABEL));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingProjectionsTokenGeneratorTest.java
similarity index 96%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingProjectionsTokenGeneratorTest.java
index cb31211c002..b57bb676adb 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ProjectionsTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingProjectionsTokenGeneratorTest.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ProjectionsTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingProjectionsTokenGenerator;
import org.apache.shardingsphere.sharding.rewrite.token.pojo.ProjectionsToken;
import
org.apache.shardingsphere.sql.parser.statement.core.enums.OrderDirection;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.order.item.ColumnOrderByItemSegment;
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
-class ProjectionsTokenGeneratorTest {
+class ShardingProjectionsTokenGeneratorTest {
private static final String
TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION =
"TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION";
@@ -112,17 +112,17 @@ class ProjectionsTokenGeneratorTest {
when(selectStatementContext.getProjectionsContext().getProjections()).thenReturn(projections);
when(selectStatementContext.getProjectionsContext().getStopIndex()).thenReturn(2);
when(selectStatementContext.getSqlStatement()).thenReturn(new
MySQLSelectStatement());
- ProjectionsTokenGenerator generator = getProjectionsTokenGenerator();
+ ShardingProjectionsTokenGenerator generator =
getProjectionsTokenGenerator();
ProjectionsToken actual =
generator.generateSQLToken(selectStatementContext);
assertThat(actual.toString(routeUnit), is(", " +
TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION + " AS " +
TEST_AGGREGATION_DISTINCT_PROJECTION_ALIAS + " "
+ ", " + TEST_ACTUAL_TABLE_NAME_WRAPPED + ".null" + " AS " +
TEST_DERIVED_PROJECTION_ALIAS + " "
+ ", " + TEST_OTHER_DERIVED_PROJECTION_EXPRESSION + " AS " +
TEST_OTHER_DERIVED_PROJECTION_ALIAS + " "));
}
- private ProjectionsTokenGenerator getProjectionsTokenGenerator() {
+ private ShardingProjectionsTokenGenerator getProjectionsTokenGenerator() {
RouteContext routeContext = mock(RouteContext.class);
when(routeContext.getRouteUnits()).thenReturn(Collections.singleton(routeUnit));
- ProjectionsTokenGenerator result = new ProjectionsTokenGenerator();
+ ShardingProjectionsTokenGenerator result = new
ShardingProjectionsTokenGenerator();
result.setRouteContext(routeContext);
return result;
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRowCountTokenGeneratorTest.java
similarity index 82%
rename from
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
rename to
features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRowCountTokenGeneratorTest.java
index 85f96489742..e6d029398b5 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/RowCountTokenGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/generator/ShardingRowCountTokenGeneratorTest.java
@@ -20,7 +20,7 @@ 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;
import
org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
-import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.RowCountTokenGenerator;
+import
org.apache.shardingsphere.sharding.rewrite.token.generator.impl.ShardingRowCountTokenGenerator;
import org.apache.shardingsphere.sharding.rewrite.token.pojo.RowCountToken;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.NumberLiteralPaginationValueSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.pagination.limit.NumberLiteralLimitValueSegment;
@@ -36,19 +36,19 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class RowCountTokenGeneratorTest {
+class ShardingRowCountTokenGeneratorTest {
@Test
void assertIsGenerateSQLToken() {
InsertStatementContext insertStatementContext =
mock(InsertStatementContext.class);
- RowCountTokenGenerator rowCountTokenGenerator = new
RowCountTokenGenerator();
-
assertFalse(rowCountTokenGenerator.isGenerateSQLToken(insertStatementContext));
+ ShardingRowCountTokenGenerator shardingRowCountTokenGenerator = new
ShardingRowCountTokenGenerator();
+
assertFalse(shardingRowCountTokenGenerator.isGenerateSQLToken(insertStatementContext));
SelectStatementContext selectStatementContext =
mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getPaginationContext().getRowCountSegment().isPresent()).thenReturn(Boolean.FALSE);
NumberLiteralPaginationValueSegment
numberLiteralPaginationValueSegment =
mock(NumberLiteralPaginationValueSegment.class);
-
assertFalse(rowCountTokenGenerator.isGenerateSQLToken(selectStatementContext));
+
assertFalse(shardingRowCountTokenGenerator.isGenerateSQLToken(selectStatementContext));
when(selectStatementContext.getPaginationContext().getRowCountSegment()).thenReturn(Optional.of(numberLiteralPaginationValueSegment));
-
assertTrue(rowCountTokenGenerator.isGenerateSQLToken(selectStatementContext));
+
assertTrue(shardingRowCountTokenGenerator.isGenerateSQLToken(selectStatementContext));
}
@Test
@@ -62,11 +62,11 @@ class RowCountTokenGeneratorTest {
when(selectStatementContext.getPaginationContext()).thenReturn(paginationContext);
when(selectStatementContext.getGroupByContext().getItems().isEmpty()).thenReturn(Boolean.FALSE);
when(selectStatementContext.isSameGroupByAndOrderByItems()).thenReturn(Boolean.FALSE);
- RowCountTokenGenerator rowCountTokenGenerator = new
RowCountTokenGenerator();
- RowCountToken rowCountToken =
rowCountTokenGenerator.generateSQLToken(selectStatementContext);
+ ShardingRowCountTokenGenerator shardingRowCountTokenGenerator = new
ShardingRowCountTokenGenerator();
+ RowCountToken rowCountToken =
shardingRowCountTokenGenerator.generateSQLToken(selectStatementContext);
assertThat(rowCountToken.toString(),
is(String.valueOf(Integer.MAX_VALUE)));
when(selectStatementContext.isSameGroupByAndOrderByItems()).thenReturn(Boolean.TRUE);
- rowCountToken =
rowCountTokenGenerator.generateSQLToken(selectStatementContext);
+ rowCountToken =
shardingRowCountTokenGenerator.generateSQLToken(selectStatementContext);
assertThat(rowCountToken.toString(),
is(String.valueOf(testOffsetSegmentValue + testRowCountSegmentValue)));
}
}
