You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2024/11/01 17:21:55 UTC
(shardingsphere) branch master updated: Rename routingEngine to routeEngine (#33503)
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 5a905122377 Rename routingEngine to routeEngine (#33503)
5a905122377 is described below
commit 5a9051223776a354f7620f5bad7c3a9885742fb9
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 2 01:21:47 2024 +0800
Rename routingEngine to routeEngine (#33503)
---
.../route/engine/BroadcastRouteEngineFactory.java | 46 ++++++------
... => BroadcastDatabaseBroadcastRouteEngine.java} | 4 +-
... => BroadcastInstanceBroadcastRouteEngine.java} | 4 +-
...ava => BroadcastTableBroadcastRouteEngine.java} | 4 +-
...Engine.java => BroadcastIgnoreRouteEngine.java} | 4 +-
...ngine.java => BroadcastUnicastRouteEngine.java} | 4 +-
.../engine/BroadcastRouteEngineFactoryTest.java | 42 +++++------
...BroadcastDatabaseBroadcastRouteEngineTest.java} | 4 +-
...BroadcastInstanceBroadcastRouteEngineTest.java} | 4 +-
...=> BroadcastTableBroadcastRouteEngineTest.java} | 6 +-
...st.java => BroadcastIgnoreRouteEngineTest.java} | 4 +-
...t.java => BroadcastUnicastRouteEngineTest.java} | 6 +-
.../route/engine/ShadowRouteEngineFactory.java | 40 +++++------
....java => ShadowDeleteStatementRouteEngine.java} | 6 +-
....java => ShadowInsertStatementRouteEngine.java} | 6 +-
....java => ShadowSelectStatementRouteEngine.java} | 6 +-
....java => ShadowUpdateStatementRouteEngine.java} | 6 +-
....java => ShadowNonDMLStatementRouteEngine.java} | 4 +-
.../route/engine/ShadowRouteEngineFactoryTest.java | 16 ++---
...a => ShadowNonDMLStatementRouteEngineTest.java} | 6 +-
.../engine/type/ShardingRouteEngineFactory.java | 84 +++++++++++-----------
...ardingDataSourceGroupBroadcastRouteEngine.java} | 4 +-
...a => ShardingDatabaseBroadcastRouteEngine.java} | 4 +-
...a => ShardingInstanceBroadcastRouteEngine.java} | 4 +-
...java => ShardingTableBroadcastRouteEngine.java} | 8 +--
...gine.java => ShardingCartesianRouteEngine.java} | 4 +-
...Engine.java => ShardingComplexRouteEngine.java} | 10 +--
...gEngine.java => ShardingIgnoreRouteEngine.java} | 4 +-
...ngine.java => ShardingStandardRouteEngine.java} | 8 +--
...Engine.java => ShardingUnicastRouteEngine.java} | 4 +-
.../dml/impl/ShardingInsertStatementValidator.java | 4 +-
.../dml/impl/ShardingUpdateStatementValidator.java | 4 +-
...java => ShardingRouteEngineFixtureBuilder.java} | 4 +-
.../type/ShardingRouteEngineFactoryTest.java | 64 ++++++++---------
...ngDataSourceGroupBroadcastRouteEngineTest.java} | 6 +-
... ShardingDatabaseBroadcastRouteEngineTest.java} | 6 +-
... ShardingInstanceBroadcastRouteEngineTest.java} | 8 +--
... => ShardingTableBroadcastRouteEngineTest.java} | 22 +++---
...st.java => ShardingComplexRouteEngineTest.java} | 20 +++---
...est.java => ShardingIgnoreRouteEngineTest.java} | 6 +-
...t.java => ShardingStandardRouteEngineTest.java} | 54 +++++++-------
.../standard/assertion/ShardingRouteAssert.java | 8 +--
...st.java => ShardingUnicastRouteEngineTest.java} | 24 +++----
43 files changed, 293 insertions(+), 293 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
index 1b9a5ce0baa..321e115fddc 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactory.java
@@ -20,10 +20,10 @@ package org.apache.shardingsphere.broadcast.route.engine;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.broadcast.route.engine.type.BroadcastRouteEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastDatabaseBroadcastRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastTableBroadcastRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.ignore.BroadcastIgnoreRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.unicast.BroadcastUnicastRoutingEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastDatabaseBroadcastRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastTableBroadcastRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.ignore.BroadcastIgnoreRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.unicast.BroadcastUnicastRouteEngine;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import org.apache.shardingsphere.infra.binder.context.extractor.SQLStatementContextExtractor;
@@ -65,61 +65,61 @@ public final class BroadcastRouteEngineFactory {
SQLStatementContext sqlStatementContext = queryContext.getSqlStatementContext();
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof TCLStatement) {
- return new BroadcastDatabaseBroadcastRoutingEngine();
+ return new BroadcastDatabaseBroadcastRouteEngine();
}
if (sqlStatement instanceof DDLStatement) {
return sqlStatementContext instanceof CursorAvailable
? getCursorRouteEngine(rule, sqlStatementContext, queryContext.getConnectionContext())
- : getDDLRoutingEngine(rule, database, sqlStatementContext);
+ : getDDLRouteEngine(rule, database, sqlStatementContext);
}
if (sqlStatement instanceof DALStatement) {
- return getDALRoutingEngine(rule, sqlStatementContext);
+ return getDALRouteEngine(rule, sqlStatementContext);
}
if (sqlStatement instanceof DCLStatement) {
- return getDCLRoutingEngine(rule, sqlStatementContext);
+ return getDCLRouteEngine(rule, sqlStatementContext);
}
- return getDMLRoutingEngine(rule, sqlStatementContext, queryContext.getConnectionContext());
+ return getDMLRouteEngine(rule, sqlStatementContext, queryContext.getConnectionContext());
}
private static BroadcastRouteEngine getCursorRouteEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext, final ConnectionContext connectionContext) {
if (sqlStatementContext instanceof CloseStatementContext && ((CloseStatementContext) sqlStatementContext).getSqlStatement().isCloseAll()) {
- return new BroadcastDatabaseBroadcastRoutingEngine();
+ return new BroadcastDatabaseBroadcastRouteEngine();
}
if (sqlStatementContext instanceof TableAvailable) {
Collection<String> tableNames = ((TableAvailable) sqlStatementContext)
.getTablesContext().getSimpleTables().stream().map(each -> each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet());
- return rule.isAllBroadcastTables(tableNames) ? new BroadcastUnicastRoutingEngine(sqlStatementContext, tableNames, connectionContext) : new BroadcastIgnoreRoutingEngine();
+ return rule.isAllBroadcastTables(tableNames) ? new BroadcastUnicastRouteEngine(sqlStatementContext, tableNames, connectionContext) : new BroadcastIgnoreRouteEngine();
}
- return new BroadcastIgnoreRoutingEngine();
+ return new BroadcastIgnoreRouteEngine();
}
- private static BroadcastRouteEngine getDDLRoutingEngine(final BroadcastRule rule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
+ private static BroadcastRouteEngine getDDLRouteEngine(final BroadcastRule rule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
Collection<String> tableNames = SQLStatementContextExtractor.getTableNames(database, sqlStatementContext);
- return rule.isAllBroadcastTables(tableNames) ? new BroadcastTableBroadcastRoutingEngine(tableNames) : new BroadcastIgnoreRoutingEngine();
+ return rule.isAllBroadcastTables(tableNames) ? new BroadcastTableBroadcastRouteEngine(tableNames) : new BroadcastIgnoreRouteEngine();
}
- private static BroadcastRouteEngine getDALRoutingEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext) {
+ private static BroadcastRouteEngine getDALRouteEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof MySQLUseStatement) {
- return new BroadcastIgnoreRoutingEngine();
+ return new BroadcastIgnoreRouteEngine();
}
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
- return tableNames.isEmpty() ? new BroadcastIgnoreRoutingEngine() : new BroadcastTableBroadcastRoutingEngine(rule.filterBroadcastTableNames(tableNames));
+ return tableNames.isEmpty() ? new BroadcastIgnoreRouteEngine() : new BroadcastTableBroadcastRouteEngine(rule.filterBroadcastTableNames(tableNames));
}
- private static BroadcastRouteEngine getDCLRoutingEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext) {
+ private static BroadcastRouteEngine getDCLRouteEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
Collection<String> broadcastTableNames = rule.filterBroadcastTableNames(tableNames);
- return broadcastTableNames.isEmpty() ? new BroadcastIgnoreRoutingEngine() : new BroadcastTableBroadcastRoutingEngine(broadcastTableNames);
+ return broadcastTableNames.isEmpty() ? new BroadcastIgnoreRouteEngine() : new BroadcastTableBroadcastRouteEngine(broadcastTableNames);
}
- private static BroadcastRouteEngine getDMLRoutingEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext, final ConnectionContext connectionContext) {
+ private static BroadcastRouteEngine getDMLRouteEngine(final BroadcastRule rule, final SQLStatementContext sqlStatementContext, final ConnectionContext connectionContext) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
if (rule.isAllBroadcastTables(tableNames)) {
return sqlStatementContext.getSqlStatement() instanceof SelectStatement
- ? new BroadcastUnicastRoutingEngine(sqlStatementContext, tableNames, connectionContext)
- : new BroadcastDatabaseBroadcastRoutingEngine();
+ ? new BroadcastUnicastRouteEngine(sqlStatementContext, tableNames, connectionContext)
+ : new BroadcastDatabaseBroadcastRouteEngine();
}
- return new BroadcastIgnoreRoutingEngine();
+ return new BroadcastIgnoreRouteEngine();
}
}
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngine.java
similarity index 92%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngine.java
index f42545d6114..8fe9a82bd5f 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngine.java
@@ -27,10 +27,10 @@ import org.apache.shardingsphere.infra.route.context.RouteUnit;
import java.util.Collections;
/**
- * Broadcast routing engine for database.
+ * Broadcast route engine for database.
*/
@HighFrequencyInvocation
-public final class BroadcastDatabaseBroadcastRoutingEngine implements BroadcastRouteEngine {
+public final class BroadcastDatabaseBroadcastRouteEngine implements BroadcastRouteEngine {
@Override
public RouteContext route(final RouteContext routeContext, final BroadcastRule broadcastRule) {
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngine.java
similarity index 93%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngine.java
index 84c19433813..3587545e58a 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngine.java
@@ -29,11 +29,11 @@ import org.apache.shardingsphere.infra.route.context.RouteUnit;
import java.util.Collections;
/**
- * Broadcast routing engine for database instance.
+ * Broadcast route engine for database instance.
*/
@HighFrequencyInvocation
@RequiredArgsConstructor
-public final class BroadcastInstanceBroadcastRoutingEngine implements BroadcastRouteEngine {
+public final class BroadcastInstanceBroadcastRouteEngine implements BroadcastRouteEngine {
private final ResourceMetaData resourceMetaData;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngine.java
similarity index 96%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngine.java
index e0be543465d..98d59ee2068 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngine.java
@@ -30,11 +30,11 @@ import java.util.Collections;
import java.util.LinkedList;
/**
- * Broadcast routing engine for table.
+ * Broadcast route engine for table.
*/
@HighFrequencyInvocation
@RequiredArgsConstructor
-public final class BroadcastTableBroadcastRoutingEngine implements BroadcastRouteEngine {
+public final class BroadcastTableBroadcastRouteEngine implements BroadcastRouteEngine {
private final Collection<String> broadcastTableNames;
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngine.java
similarity index 91%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngine.java
index 7f1ea33458e..66bd7365b32 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngine.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
import org.apache.shardingsphere.infra.route.context.RouteContext;
/**
- * Broadcast ignore routing engine.
+ * Broadcast ignore route engine.
*/
-public final class BroadcastIgnoreRoutingEngine implements BroadcastRouteEngine {
+public final class BroadcastIgnoreRouteEngine implements BroadcastRouteEngine {
@Override
public RouteContext route(final RouteContext routeContext, final BroadcastRule broadcastRule) {
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngine.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngine.java
similarity index 97%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngine.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngine.java
index c5c0427b62c..8bffcfe41e9 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngine.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngine.java
@@ -37,10 +37,10 @@ import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Broadcast unicast routing engine.
+ * Broadcast unicast route engine.
*/
@RequiredArgsConstructor
-public final class BroadcastUnicastRoutingEngine implements BroadcastRouteEngine {
+public final class BroadcastUnicastRouteEngine implements BroadcastRouteEngine {
private final SQLStatementContext sqlStatementContext;
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactoryTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactoryTest.java
index d4e886bb1c5..c6f2df29b0b 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactoryTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/BroadcastRouteEngineFactoryTest.java
@@ -17,10 +17,10 @@
package org.apache.shardingsphere.broadcast.route.engine;
-import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastDatabaseBroadcastRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastTableBroadcastRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.ignore.BroadcastIgnoreRoutingEngine;
-import org.apache.shardingsphere.broadcast.route.engine.type.unicast.BroadcastUnicastRoutingEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastDatabaseBroadcastRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.broadcast.BroadcastTableBroadcastRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.ignore.BroadcastIgnoreRouteEngine;
+import org.apache.shardingsphere.broadcast.route.engine.type.unicast.BroadcastUnicastRouteEngine;
import org.apache.shardingsphere.broadcast.rule.BroadcastRule;
import org.apache.shardingsphere.infra.binder.context.extractor.SQLStatementContextExtractor;
import org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
@@ -86,7 +86,7 @@ class BroadcastRouteEngineFactoryTest {
@Test
void assertNewInstanceWithTCLStatement() {
when(queryContext.getSqlStatementContext().getSqlStatement()).thenReturn(mock(TCLStatement.class));
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRouteEngine.class));
}
@Test
@@ -94,14 +94,14 @@ class BroadcastRouteEngineFactoryTest {
CloseStatementContext sqlStatementContext = mock(CloseStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getSqlStatement().isCloseAll()).thenReturn(true);
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRouteEngine.class));
}
@Test
void assertNewInstanceWithCursorAvailableAndIsNotAllBroadcastTables() {
CloseStatementContext sqlStatementContext = mock(CloseStatementContext.class, RETURNS_DEEP_STUBS);
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -109,7 +109,7 @@ class BroadcastRouteEngineFactoryTest {
CloseStatementContext sqlStatementContext = mock(CloseStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getSimpleTables()).thenReturn(Collections.singletonList(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("foo_tbl")))));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastUnicastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastUnicastRouteEngine.class));
}
@Test
@@ -117,7 +117,7 @@ class BroadcastRouteEngineFactoryTest {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(CursorAvailable.class));
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DDLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -126,7 +126,7 @@ class BroadcastRouteEngineFactoryTest {
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DDLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
when(SQLStatementContextExtractor.getTableNames(database, sqlStatementContext)).thenReturn(Collections.singleton("foo_tbl"));
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRouteEngine.class));
}
@Test
@@ -134,13 +134,13 @@ class BroadcastRouteEngineFactoryTest {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DDLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
void assertNewInstanceWithDALStatementAndNotTableAvailable() {
when(queryContext.getSqlStatementContext().getSqlStatement()).thenReturn(mock(DALStatement.class));
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -149,7 +149,7 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(new TablesContext(Collections.emptyList(), databaseType, null));
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DALStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -159,13 +159,13 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(tablesContext);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DALStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRouteEngine.class));
}
@Test
void assertNewInstanceWithDCLStatementAndNotTableAvailable() {
when(queryContext.getSqlStatementContext().getSqlStatement()).thenReturn(mock(DCLStatement.class));
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -174,7 +174,7 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(new TablesContext(Collections.emptyList(), databaseType, null));
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DCLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -184,13 +184,13 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(tablesContext);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DCLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastTableBroadcastRouteEngine.class));
}
@Test
void assertNewInstanceWithDMLStatementAndNotTableAvailable() {
when(queryContext.getSqlStatementContext().getSqlStatement()).thenReturn(mock(DMLStatement.class));
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -200,7 +200,7 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(tablesContext);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DMLStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastIgnoreRouteEngine.class));
}
@Test
@@ -210,7 +210,7 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(tablesContext);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(SelectStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastUnicastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastUnicastRouteEngine.class));
}
@Test
@@ -220,6 +220,6 @@ class BroadcastRouteEngineFactoryTest {
when(((TableAvailable) sqlStatementContext).getTablesContext()).thenReturn(tablesContext);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(UpdateStatement.class));
when(queryContext.getSqlStatementContext()).thenReturn(sqlStatementContext);
- assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRoutingEngine.class));
+ assertThat(BroadcastRouteEngineFactory.newInstance(rule, database, queryContext), instanceOf(BroadcastDatabaseBroadcastRouteEngine.class));
}
}
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngineTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngineTest.java
similarity index 93%
rename from features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngineTest.java
rename to features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngineTest.java
index 12f13b20a92..23572825334 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRoutingEngineTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastDatabaseBroadcastRouteEngineTest.java
@@ -30,13 +30,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class BroadcastDatabaseBroadcastRoutingEngineTest {
+class BroadcastDatabaseBroadcastRouteEngineTest {
@Test
void assertRoute() {
BroadcastRule rule = mock(BroadcastRule.class);
when(rule.getDataSourceNames()).thenReturn(Arrays.asList("ds_0", "ds_1"));
- BroadcastDatabaseBroadcastRoutingEngine engine = new BroadcastDatabaseBroadcastRoutingEngine();
+ BroadcastDatabaseBroadcastRouteEngine engine = new BroadcastDatabaseBroadcastRouteEngine();
RouteContext routeContext = engine.route(new RouteContext(), rule);
assertThat(routeContext.getRouteUnits().size(), is(2));
Iterator<RouteUnit> iterator = routeContext.getRouteUnits().iterator();
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngineTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngineTest.java
similarity index 93%
rename from features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngineTest.java
rename to features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngineTest.java
index 318383016d6..1b6e5ca87d4 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRoutingEngineTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastInstanceBroadcastRouteEngineTest.java
@@ -31,13 +31,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class BroadcastInstanceBroadcastRoutingEngineTest {
+class BroadcastInstanceBroadcastRouteEngineTest {
@Test
void assertRoute() {
ResourceMetaData resourceMetaData = mock(ResourceMetaData.class);
when(resourceMetaData.getAllInstanceDataSourceNames()).thenReturn(Collections.singleton("ds_0"));
- BroadcastInstanceBroadcastRoutingEngine engine = new BroadcastInstanceBroadcastRoutingEngine(resourceMetaData);
+ BroadcastInstanceBroadcastRouteEngine engine = new BroadcastInstanceBroadcastRouteEngine(resourceMetaData);
BroadcastRule rule = mock(BroadcastRule.class);
when(rule.getDataSourceNames()).thenReturn(Arrays.asList("ds_0", "ds_1"));
RouteContext routeContext = engine.route(new RouteContext(), rule);
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngineTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngineTest.java
similarity index 92%
rename from features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngineTest.java
rename to features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngineTest.java
index 02fa3ddb612..f3a11136f1f 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRoutingEngineTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/broadcast/BroadcastTableBroadcastRouteEngineTest.java
@@ -34,12 +34,12 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-class BroadcastTableBroadcastRoutingEngineTest {
+class BroadcastTableBroadcastRouteEngineTest {
@Test
void assertRouteWithBroadcastRuleTable() {
Collection<String> broadcastRuleTableNames = Collections.singleton("t_address");
- BroadcastTableBroadcastRoutingEngine engine = new BroadcastTableBroadcastRoutingEngine(broadcastRuleTableNames);
+ BroadcastTableBroadcastRouteEngine engine = new BroadcastTableBroadcastRouteEngine(broadcastRuleTableNames);
BroadcastRule rule = mock(BroadcastRule.class);
when(rule.getDataSourceNames()).thenReturn(Arrays.asList("ds_0", "ds_1"));
when(rule.filterBroadcastTableNames(any())).thenReturn(Collections.singleton("t_address"));
@@ -53,7 +53,7 @@ class BroadcastTableBroadcastRoutingEngineTest {
@Test
void assertRouteWithoutBroadcastRuleTable() {
Collection<String> broadcastRuleTableNames = Collections.singleton("t_address");
- BroadcastTableBroadcastRoutingEngine engine = new BroadcastTableBroadcastRoutingEngine(broadcastRuleTableNames);
+ BroadcastTableBroadcastRouteEngine engine = new BroadcastTableBroadcastRouteEngine(broadcastRuleTableNames);
BroadcastRule rule = mock(BroadcastRule.class);
when(rule.getDataSourceNames()).thenReturn(Arrays.asList("ds_0", "ds_1"));
when(rule.filterBroadcastTableNames(any())).thenReturn(Collections.emptyList());
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngineTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngineTest.java
similarity index 91%
rename from features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngineTest.java
rename to features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngineTest.java
index 3c899198c02..6bb667aa832 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRoutingEngineTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/ignore/BroadcastIgnoreRouteEngineTest.java
@@ -24,11 +24,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-class BroadcastIgnoreRoutingEngineTest {
+class BroadcastIgnoreRouteEngineTest {
@Test
void assertRoute() {
- BroadcastIgnoreRoutingEngine engine = new BroadcastIgnoreRoutingEngine();
+ BroadcastIgnoreRouteEngine engine = new BroadcastIgnoreRouteEngine();
RouteContext routeContext = engine.route(new RouteContext(), mock(BroadcastRule.class));
assertTrue(routeContext.getRouteUnits().isEmpty());
}
diff --git a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngineTest.java b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngineTest.java
similarity index 93%
rename from features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngineTest.java
rename to features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngineTest.java
index 144d505f019..18a815a0c1e 100644
--- a/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRoutingEngineTest.java
+++ b/features/broadcast/core/src/test/java/org/apache/shardingsphere/broadcast/route/engine/type/unicast/BroadcastUnicastRouteEngineTest.java
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
@ExtendWith(MockitoExtension.class)
-class BroadcastUnicastRoutingEngineTest {
+class BroadcastUnicastRouteEngineTest {
@Mock
private BroadcastRule rule;
@@ -92,7 +92,7 @@ class BroadcastUnicastRoutingEngineTest {
@SafeVarargs
private final void assertRoute(final SQLStatementContext sqlStatementContext, final Matcher<String>... matchers) {
- BroadcastUnicastRoutingEngine engine = new BroadcastUnicastRoutingEngine(sqlStatementContext, Collections.singleton("foo_tbl"), connectionContext);
+ BroadcastUnicastRouteEngine engine = new BroadcastUnicastRouteEngine(sqlStatementContext, Collections.singleton("foo_tbl"), connectionContext);
RouteContext actual = engine.route(new RouteContext(), rule);
assertThat(actual.getRouteUnits().size(), is(1));
RouteMapper actualDataSourceRouteMapper = actual.getRouteUnits().iterator().next().getDataSourceMapper();
@@ -110,7 +110,7 @@ class BroadcastUnicastRoutingEngineTest {
@Test
void assertRouteWithEmptyTables() {
- BroadcastUnicastRoutingEngine engine = new BroadcastUnicastRoutingEngine(mock(SQLStatementContext.class), Collections.emptyList(), connectionContext);
+ BroadcastUnicastRouteEngine engine = new BroadcastUnicastRouteEngine(mock(SQLStatementContext.class), Collections.emptyList(), connectionContext);
RouteContext actual = engine.route(new RouteContext(), rule);
assertThat(actual.getRouteUnits().size(), is(1));
Collection<RouteMapper> actualTableRouteMappers = actual.getRouteUnits().iterator().next().getTableMappers();
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactory.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactory.java
index 09180afb00f..47322fee541 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactory.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactory.java
@@ -24,11 +24,11 @@ import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatem
import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
import org.apache.shardingsphere.infra.binder.context.statement.dml.UpdateStatementContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowDeleteStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowInsertStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowSelectStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowUpdateStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.impl.ShadowNonDMLStatementRoutingEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowDeleteStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowInsertStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowSelectStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowUpdateStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.impl.ShadowNonDMLStatementRouteEngine;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.DeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
@@ -50,37 +50,37 @@ public final class ShadowRouteEngineFactory {
public static ShadowRouteEngine newInstance(final QueryContext queryContext) {
SQLStatement sqlStatement = queryContext.getSqlStatementContext().getSqlStatement();
if (sqlStatement instanceof InsertStatement) {
- return createShadowInsertStatementRoutingEngine(queryContext);
+ return createShadowInsertStatementRouteEngine(queryContext);
}
if (sqlStatement instanceof DeleteStatement) {
- return createShadowDeleteStatementRoutingEngine(queryContext);
+ return createShadowDeleteStatementRouteEngine(queryContext);
}
if (sqlStatement instanceof UpdateStatement) {
- return createShadowUpdateStatementRoutingEngine(queryContext);
+ return createShadowUpdateStatementRouteEngine(queryContext);
}
if (sqlStatement instanceof SelectStatement) {
- return createShadowSelectStatementRoutingEngine(queryContext);
+ return createShadowSelectStatementRouteEngine(queryContext);
}
- return createShadowNonMDLStatementRoutingEngine(queryContext);
+ return createShadowNonMDLStatementRouteEngine(queryContext);
}
- private static ShadowRouteEngine createShadowNonMDLStatementRoutingEngine(final QueryContext queryContext) {
- return new ShadowNonDMLStatementRoutingEngine(queryContext.getHintValueContext());
+ private static ShadowRouteEngine createShadowNonMDLStatementRouteEngine(final QueryContext queryContext) {
+ return new ShadowNonDMLStatementRouteEngine(queryContext.getHintValueContext());
}
- private static ShadowRouteEngine createShadowSelectStatementRoutingEngine(final QueryContext queryContext) {
- return new ShadowSelectStatementRoutingEngine((SelectStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
+ private static ShadowRouteEngine createShadowSelectStatementRouteEngine(final QueryContext queryContext) {
+ return new ShadowSelectStatementRouteEngine((SelectStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
}
- private static ShadowRouteEngine createShadowUpdateStatementRoutingEngine(final QueryContext queryContext) {
- return new ShadowUpdateStatementRoutingEngine((UpdateStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
+ private static ShadowRouteEngine createShadowUpdateStatementRouteEngine(final QueryContext queryContext) {
+ return new ShadowUpdateStatementRouteEngine((UpdateStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
}
- private static ShadowRouteEngine createShadowDeleteStatementRoutingEngine(final QueryContext queryContext) {
- return new ShadowDeleteStatementRoutingEngine((DeleteStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
+ private static ShadowRouteEngine createShadowDeleteStatementRouteEngine(final QueryContext queryContext) {
+ return new ShadowDeleteStatementRouteEngine((DeleteStatementContext) queryContext.getSqlStatementContext(), queryContext.getParameters(), queryContext.getHintValueContext());
}
- private static ShadowRouteEngine createShadowInsertStatementRoutingEngine(final QueryContext queryContext) {
- return new ShadowInsertStatementRoutingEngine((InsertStatementContext) queryContext.getSqlStatementContext(), queryContext.getHintValueContext());
+ private static ShadowRouteEngine createShadowInsertStatementRouteEngine(final QueryContext queryContext) {
+ return new ShadowInsertStatementRouteEngine((InsertStatementContext) queryContext.getSqlStatementContext(), queryContext.getHintValueContext());
}
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRoutingEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRouteEngine.java
similarity index 90%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRoutingEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRouteEngine.java
index 38ec38bcca7..a7cc1015ea2 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRoutingEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowDeleteStatementRouteEngine.java
@@ -32,15 +32,15 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Shadow delete statement routing engine.
+ * Shadow delete statement route engine.
*/
-public final class ShadowDeleteStatementRoutingEngine extends AbstractShadowDMLStatementRouteEngine {
+public final class ShadowDeleteStatementRouteEngine extends AbstractShadowDMLStatementRouteEngine {
private final DeleteStatementContext sqlStatementContext;
private final List<Object> parameters;
- public ShadowDeleteStatementRoutingEngine(final DeleteStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
+ public ShadowDeleteStatementRouteEngine(final DeleteStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
super(sqlStatementContext, hintValueContext, ShadowOperationType.DELETE);
this.sqlStatementContext = sqlStatementContext;
this.parameters = parameters;
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRoutingEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRouteEngine.java
similarity index 91%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRoutingEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRouteEngine.java
index cbeee8431f4..ba0de55e147 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRoutingEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowInsertStatementRouteEngine.java
@@ -30,13 +30,13 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Shadow insert statement routing engine.
+ * Shadow insert statement route engine.
*/
-public final class ShadowInsertStatementRoutingEngine extends AbstractShadowDMLStatementRouteEngine {
+public final class ShadowInsertStatementRouteEngine extends AbstractShadowDMLStatementRouteEngine {
private final InsertStatementContext sqlStatementContext;
- public ShadowInsertStatementRoutingEngine(final InsertStatementContext sqlStatementContext, final HintValueContext hintValueContext) {
+ public ShadowInsertStatementRouteEngine(final InsertStatementContext sqlStatementContext, final HintValueContext hintValueContext) {
super(sqlStatementContext, hintValueContext, ShadowOperationType.INSERT);
this.sqlStatementContext = sqlStatementContext;
}
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRoutingEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRouteEngine.java
similarity index 92%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRoutingEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRouteEngine.java
index 6c14b09348a..49ef8e7cfbf 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRoutingEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowSelectStatementRouteEngine.java
@@ -36,15 +36,15 @@ import java.util.List;
import java.util.Optional;
/**
- * Shadow select statement routing engine.
+ * Shadow select statement route engine.
*/
-public final class ShadowSelectStatementRoutingEngine extends AbstractShadowDMLStatementRouteEngine {
+public final class ShadowSelectStatementRouteEngine extends AbstractShadowDMLStatementRouteEngine {
private final SelectStatementContext sqlStatementContext;
private final List<Object> parameters;
- public ShadowSelectStatementRoutingEngine(final SelectStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
+ public ShadowSelectStatementRouteEngine(final SelectStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
super(sqlStatementContext, hintValueContext, ShadowOperationType.SELECT);
this.sqlStatementContext = sqlStatementContext;
this.parameters = parameters;
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRoutingEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRouteEngine.java
similarity index 91%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRoutingEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRouteEngine.java
index a33eb227537..4e65f0a8c16 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRoutingEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/dml/ShadowUpdateStatementRouteEngine.java
@@ -34,15 +34,15 @@ import java.util.LinkedList;
import java.util.List;
/**
- * Shadow update statement routing engine.
+ * Shadow update statement route engine.
*/
-public final class ShadowUpdateStatementRoutingEngine extends AbstractShadowDMLStatementRouteEngine {
+public final class ShadowUpdateStatementRouteEngine extends AbstractShadowDMLStatementRouteEngine {
private final UpdateStatementContext sqlStatementContext;
private final List<Object> parameters;
- public ShadowUpdateStatementRoutingEngine(final UpdateStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
+ public ShadowUpdateStatementRouteEngine(final UpdateStatementContext sqlStatementContext, final List<Object> parameters, final HintValueContext hintValueContext) {
super(sqlStatementContext, hintValueContext, ShadowOperationType.UPDATE);
this.sqlStatementContext = sqlStatementContext;
this.parameters = parameters;
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngine.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngine.java
similarity index 95%
rename from features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngine.java
rename to features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngine.java
index 3dfab903311..dfaa4700c40 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngine.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngine.java
@@ -31,10 +31,10 @@ import java.util.Collections;
import java.util.Map;
/**
- * Shadow non-DML statement routing engine.
+ * Shadow non-DML statement route engine.
*/
@RequiredArgsConstructor
-public final class ShadowNonDMLStatementRoutingEngine implements ShadowRouteEngine {
+public final class ShadowNonDMLStatementRouteEngine implements ShadowRouteEngine {
private final HintValueContext hintValueContext;
diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactoryTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactoryTest.java
index 1a4f21ff2b9..4dc785892ba 100644
--- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactoryTest.java
+++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/ShadowRouteEngineFactoryTest.java
@@ -27,10 +27,10 @@ import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowDeleteStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowInsertStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowSelectStatementRoutingEngine;
-import org.apache.shardingsphere.shadow.route.engine.dml.ShadowUpdateStatementRoutingEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowDeleteStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowInsertStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowSelectStatementRouteEngine;
+import org.apache.shardingsphere.shadow.route.engine.dml.ShadowUpdateStatementRouteEngine;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.DeleteStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.InsertStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.SelectStatement;
@@ -52,16 +52,16 @@ class ShadowRouteEngineFactoryTest {
void assertNewInstance() {
ShadowRouteEngine shadowInsertRouteEngine = ShadowRouteEngineFactory.newInstance(
new QueryContext(createInsertSqlStatementContext(), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class)));
- assertThat(shadowInsertRouteEngine, instanceOf(ShadowInsertStatementRoutingEngine.class));
+ assertThat(shadowInsertRouteEngine, instanceOf(ShadowInsertStatementRouteEngine.class));
ShadowRouteEngine shadowUpdateRouteEngine = ShadowRouteEngineFactory.newInstance(
new QueryContext(createUpdateSqlStatementContext(), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class)));
- assertThat(shadowUpdateRouteEngine, instanceOf(ShadowUpdateStatementRoutingEngine.class));
+ assertThat(shadowUpdateRouteEngine, instanceOf(ShadowUpdateStatementRouteEngine.class));
ShadowRouteEngine shadowDeleteRouteEngine = ShadowRouteEngineFactory.newInstance(
new QueryContext(createDeleteSqlStatementContext(), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class)));
- assertThat(shadowDeleteRouteEngine, instanceOf(ShadowDeleteStatementRoutingEngine.class));
+ assertThat(shadowDeleteRouteEngine, instanceOf(ShadowDeleteStatementRouteEngine.class));
ShadowRouteEngine shadowSelectRouteEngine = ShadowRouteEngineFactory.newInstance(
new QueryContext(createSelectSqlStatementContext(), "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class)));
- assertThat(shadowSelectRouteEngine, instanceOf(ShadowSelectStatementRoutingEngine.class));
+ assertThat(shadowSelectRouteEngine, instanceOf(ShadowSelectStatementRouteEngine.class));
}
private ConnectionContext mockConnectionContext() {
diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngineTest.java
similarity index 94%
rename from features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java
rename to features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngineTest.java
index e0a650a387b..6418b62eafe 100644
--- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRoutingEngineTest.java
+++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/impl/ShadowNonDMLStatementRouteEngineTest.java
@@ -38,13 +38,13 @@ import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-class ShadowNonDMLStatementRoutingEngineTest {
+class ShadowNonDMLStatementRouteEngineTest {
- private ShadowNonDMLStatementRoutingEngine shadowRouteEngine;
+ private ShadowNonDMLStatementRouteEngine shadowRouteEngine;
@BeforeEach
void init() {
- shadowRouteEngine = new ShadowNonDMLStatementRoutingEngine(createHintValueContext());
+ shadowRouteEngine = new ShadowNonDMLStatementRouteEngine(createHintValueContext());
}
private HintValueContext createHintValueContext() {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
index 5afdc67648f..a9475ea962b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactory.java
@@ -30,14 +30,14 @@ import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDataSourceGroupBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDatabaseBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingInstanceBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingTableBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingComplexRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.ignore.ShardingIgnoreRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.unicast.ShardingUnicastRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDataSourceGroupBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDatabaseBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingInstanceBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingTableBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingComplexRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.ignore.ShardingIgnoreRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.unicast.ShardingUnicastRouteEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dal.AnalyzeTableStatement;
@@ -89,85 +89,85 @@ public final class ShardingRouteEngineFactory {
SQLStatementContext sqlStatementContext = queryContext.getSqlStatementContext();
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof TCLStatement) {
- return new ShardingDatabaseBroadcastRoutingEngine();
+ return new ShardingDatabaseBroadcastRouteEngine();
}
if (sqlStatement instanceof DDLStatement) {
if (sqlStatementContext instanceof CursorAvailable) {
return getCursorRouteEngine(shardingRule, database, sqlStatementContext, queryContext.getHintValueContext(), shardingConditions, props);
}
- return getDDLRoutingEngine(shardingRule, database, sqlStatementContext);
+ return getDDLRouteEngine(shardingRule, database, sqlStatementContext);
}
if (sqlStatement instanceof DALStatement) {
- return getDALRoutingEngine(shardingRule, database, sqlStatementContext, queryContext.getConnectionContext());
+ return getDALRouteEngine(shardingRule, database, sqlStatementContext, queryContext.getConnectionContext());
}
if (sqlStatement instanceof DCLStatement) {
- return getDCLRoutingEngine(shardingRule, database, sqlStatementContext);
+ return getDCLRouteEngine(shardingRule, database, sqlStatementContext);
}
- return getDQLRoutingEngine(shardingRule, database, sqlStatementContext, queryContext.getHintValueContext(), shardingConditions, props, queryContext.getConnectionContext());
+ return getDQLRouteEngine(shardingRule, database, sqlStatementContext, queryContext.getHintValueContext(), shardingConditions, props, queryContext.getConnectionContext());
}
- private static ShardingRouteEngine getDDLRoutingEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
+ private static ShardingRouteEngine getDDLRouteEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
boolean functionStatement = sqlStatement instanceof CreateFunctionStatement || sqlStatement instanceof AlterFunctionStatement || sqlStatement instanceof DropFunctionStatement;
boolean procedureStatement = sqlStatement instanceof CreateProcedureStatement || sqlStatement instanceof AlterProcedureStatement || sqlStatement instanceof DropProcedureStatement;
if (functionStatement || procedureStatement) {
- return new ShardingDatabaseBroadcastRoutingEngine();
+ return new ShardingDatabaseBroadcastRouteEngine();
}
if (sqlStatement instanceof CreateTablespaceStatement || sqlStatement instanceof AlterTablespaceStatement || sqlStatement instanceof DropTablespaceStatement) {
- return new ShardingInstanceBroadcastRoutingEngine(database.getResourceMetaData());
+ return new ShardingInstanceBroadcastRouteEngine(database.getResourceMetaData());
}
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable
? ((TableAvailable) sqlStatementContext).getTablesContext().getSimpleTables().stream().map(each -> each.getTableName().getIdentifier().getValue()).collect(Collectors.toSet())
: Collections.emptyList();
Collection<String> shardingRuleTableNames = shardingRule.getShardingRuleTableNames(tableNames);
if (!tableNames.isEmpty() && shardingRuleTableNames.isEmpty()) {
- return new ShardingIgnoreRoutingEngine();
+ return new ShardingIgnoreRouteEngine();
}
- return new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, shardingRuleTableNames);
+ return new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, shardingRuleTableNames);
}
private static ShardingRouteEngine getCursorRouteEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext,
final HintValueContext hintValueContext, final ShardingConditions shardingConditions, final ConfigurationProperties props) {
if (sqlStatementContext instanceof CloseStatementContext && ((CloseStatementContext) sqlStatementContext).getSqlStatement().isCloseAll()) {
- return new ShardingDatabaseBroadcastRoutingEngine();
+ return new ShardingDatabaseBroadcastRouteEngine();
}
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
Collection<String> logicTableNames = shardingRule.getShardingLogicTableNames(tableNames);
boolean allBindingTables = logicTableNames.size() > 1 && shardingRule.isAllBindingTables(database, sqlStatementContext, logicTableNames);
if (isShardingStandardQuery(shardingRule, logicTableNames, allBindingTables)) {
- return new ShardingStandardRoutingEngine(getLogicTableName(shardingConditions, logicTableNames), shardingConditions, sqlStatementContext, hintValueContext, props);
+ return new ShardingStandardRouteEngine(getLogicTableName(shardingConditions, logicTableNames), shardingConditions, sqlStatementContext, hintValueContext, props);
}
- return new ShardingIgnoreRoutingEngine();
+ return new ShardingIgnoreRouteEngine();
}
- private static ShardingRouteEngine getDALRoutingEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext,
- final ConnectionContext connectionContext) {
+ private static ShardingRouteEngine getDALRouteEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext,
+ final ConnectionContext connectionContext) {
SQLStatement sqlStatement = sqlStatementContext.getSqlStatement();
if (sqlStatement instanceof MySQLUseStatement) {
- return new ShardingIgnoreRoutingEngine();
+ return new ShardingIgnoreRouteEngine();
}
if (sqlStatement instanceof SetStatement || sqlStatement instanceof ResetParameterStatement || sqlStatement instanceof MySQLShowDatabasesStatement || sqlStatement instanceof LoadStatement) {
- return new ShardingDatabaseBroadcastRoutingEngine();
+ return new ShardingDatabaseBroadcastRouteEngine();
}
if (isResourceGroupStatement(sqlStatement)) {
- return new ShardingInstanceBroadcastRoutingEngine(database.getResourceMetaData());
+ return new ShardingInstanceBroadcastRouteEngine(database.getResourceMetaData());
}
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
Collection<String> shardingRuleTableNames = shardingRule.getShardingRuleTableNames(tableNames);
if (!tableNames.isEmpty() && shardingRuleTableNames.isEmpty()) {
- return new ShardingIgnoreRoutingEngine();
+ return new ShardingIgnoreRouteEngine();
}
if (sqlStatement instanceof MySQLOptimizeTableStatement) {
- return new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, shardingRuleTableNames);
+ return new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, shardingRuleTableNames);
}
if (sqlStatement instanceof AnalyzeTableStatement) {
- return shardingRuleTableNames.isEmpty() ? new ShardingDatabaseBroadcastRoutingEngine()
- : new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, shardingRuleTableNames);
+ return shardingRuleTableNames.isEmpty() ? new ShardingDatabaseBroadcastRouteEngine()
+ : new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, shardingRuleTableNames);
}
if (!shardingRuleTableNames.isEmpty()) {
- return new ShardingUnicastRoutingEngine(sqlStatementContext, shardingRuleTableNames, connectionContext);
+ return new ShardingUnicastRouteEngine(sqlStatementContext, shardingRuleTableNames, connectionContext);
}
- return new ShardingDataSourceGroupBroadcastRoutingEngine();
+ return new ShardingDataSourceGroupBroadcastRouteEngine();
}
private static boolean isResourceGroupStatement(final SQLStatement sqlStatement) {
@@ -175,13 +175,13 @@ public final class ShardingRouteEngineFactory {
return sqlStatement instanceof MySQLCreateResourceGroupStatement || sqlStatement instanceof MySQLSetResourceGroupStatement;
}
- private static ShardingRouteEngine getDCLRoutingEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
+ private static ShardingRouteEngine getDCLRouteEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext) {
if (isDCLForSingleTable(sqlStatementContext)) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
Collection<String> shardingRuleTableNames = shardingRule.getShardingRuleTableNames(tableNames);
- return shardingRuleTableNames.isEmpty() ? new ShardingIgnoreRoutingEngine() : new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, shardingRuleTableNames);
+ return shardingRuleTableNames.isEmpty() ? new ShardingIgnoreRouteEngine() : new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, shardingRuleTableNames);
}
- return new ShardingInstanceBroadcastRoutingEngine(database.getResourceMetaData());
+ return new ShardingInstanceBroadcastRouteEngine(database.getResourceMetaData());
}
private static boolean isDCLForSingleTable(final SQLStatementContext sqlStatementContext) {
@@ -193,16 +193,16 @@ public final class ShardingRouteEngineFactory {
return false;
}
- private static ShardingRouteEngine getDQLRoutingEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext,
- final HintValueContext hintValueContext, final ShardingConditions shardingConditions, final ConfigurationProperties props,
- final ConnectionContext connectionContext) {
+ private static ShardingRouteEngine getDQLRouteEngine(final ShardingRule shardingRule, final ShardingSphereDatabase database, final SQLStatementContext sqlStatementContext,
+ final HintValueContext hintValueContext, final ShardingConditions shardingConditions, final ConfigurationProperties props,
+ final ConnectionContext connectionContext) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable ? ((TableAvailable) sqlStatementContext).getTablesContext().getTableNames() : Collections.emptyList();
if (sqlStatementContext.getSqlStatement() instanceof DMLStatement && shardingConditions.isAlwaysFalse() || tableNames.isEmpty()) {
- return new ShardingUnicastRoutingEngine(sqlStatementContext, tableNames, connectionContext);
+ return new ShardingUnicastRouteEngine(sqlStatementContext, tableNames, connectionContext);
}
Collection<String> shardingLogicTableNames = shardingRule.getShardingLogicTableNames(tableNames);
if (shardingLogicTableNames.isEmpty()) {
- return new ShardingIgnoreRoutingEngine();
+ return new ShardingIgnoreRouteEngine();
}
return getDQLRouteEngineForShardingTable(shardingRule, database, sqlStatementContext, hintValueContext, shardingConditions, props, shardingLogicTableNames);
}
@@ -212,10 +212,10 @@ public final class ShardingRouteEngineFactory {
final ShardingConditions shardingConditions, final ConfigurationProperties props, final Collection<String> tableNames) {
boolean allBindingTables = tableNames.size() > 1 && shardingRule.isAllBindingTables(database, sqlStatementContext, tableNames);
if (isShardingStandardQuery(shardingRule, tableNames, allBindingTables)) {
- return new ShardingStandardRoutingEngine(getLogicTableName(shardingConditions, tableNames), shardingConditions, sqlStatementContext, hintValueContext, props);
+ return new ShardingStandardRouteEngine(getLogicTableName(shardingConditions, tableNames), shardingConditions, sqlStatementContext, hintValueContext, props);
}
// TODO config for cartesian set
- return new ShardingComplexRoutingEngine(shardingConditions, sqlStatementContext, hintValueContext, props, tableNames);
+ return new ShardingComplexRouteEngine(shardingConditions, sqlStatementContext, hintValueContext, props, tableNames);
}
private static String getLogicTableName(final ShardingConditions shardingConditions, final Collection<String> tableNames) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngine.java
similarity index 96%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngine.java
index 9948c2cbc01..00456c021c8 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngine.java
@@ -33,9 +33,9 @@ import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
/**
- * Sharding data source group broadcast routing engine.
+ * Sharding data source group broadcast route engine.
*/
-public final class ShardingDataSourceGroupBroadcastRoutingEngine implements ShardingRouteEngine {
+public final class ShardingDataSourceGroupBroadcastRouteEngine implements ShardingRouteEngine {
@Override
public RouteContext route(final ShardingRule shardingRule) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngine.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngine.java
index 12368c59958..f164ea5e835 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngine.java
@@ -26,9 +26,9 @@ import org.apache.shardingsphere.sharding.rule.ShardingRule;
import java.util.Collections;
/**
- * Sharding broadcast routing engine for databases.
+ * Sharding broadcast route engine for databases.
*/
-public final class ShardingDatabaseBroadcastRoutingEngine implements ShardingRouteEngine {
+public final class ShardingDatabaseBroadcastRouteEngine implements ShardingRouteEngine {
@Override
public RouteContext route(final ShardingRule shardingRule) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngine.java
similarity index 92%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngine.java
index b6a45a7db37..ee85dc41b37 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngine.java
@@ -28,10 +28,10 @@ import org.apache.shardingsphere.sharding.rule.ShardingRule;
import java.util.Collections;
/**
- * Sharding broadcast routing engine for database instance.
+ * Sharding broadcast route engine for database instance.
*/
@RequiredArgsConstructor
-public final class ShardingInstanceBroadcastRoutingEngine implements ShardingRouteEngine {
+public final class ShardingInstanceBroadcastRouteEngine implements ShardingRouteEngine {
private final ResourceMetaData resourceMetaData;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngine.java
similarity index 96%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngine.java
index d9c5cf119a3..7b45827866d 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngine.java
@@ -29,7 +29,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.sharding.route.engine.type.ShardingRouteEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingCartesianRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingCartesianRouteEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.ShardingTable;
import org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.IndexSegment;
@@ -40,10 +40,10 @@ import java.util.LinkedList;
import java.util.stream.Collectors;
/**
- * Sharding broadcast routing engine for tables.
+ * Sharding broadcast route engine for tables.
*/
@RequiredArgsConstructor
-public final class ShardingTableBroadcastRoutingEngine implements ShardingRouteEngine {
+public final class ShardingTableBroadcastRouteEngine implements ShardingRouteEngine {
private final ShardingSphereDatabase database;
@@ -63,7 +63,7 @@ public final class ShardingTableBroadcastRoutingEngine implements ShardingRouteE
result.getRouteUnits().addAll(getBindingTableRouteUnits(shardingRule, logicTableNames));
} else {
Collection<RouteContext> routeContexts = getRouteContexts(shardingRule, logicTableNames);
- RouteContext routeContext = new ShardingCartesianRoutingEngine(routeContexts).route(shardingRule);
+ RouteContext routeContext = new ShardingCartesianRouteEngine(routeContexts).route(shardingRule);
result.getOriginalDataNodes().addAll(routeContext.getOriginalDataNodes());
result.getRouteUnits().addAll(routeContext.getRouteUnits());
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRouteEngine.java
similarity index 97%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRouteEngine.java
index 1445ffe2ef2..ffeb8065d8c 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingCartesianRouteEngine.java
@@ -40,10 +40,10 @@ import java.util.Set;
import java.util.stream.Collectors;
/**
- * Sharding cartesian routing engine.
+ * Sharding cartesian route engine.
*/
@RequiredArgsConstructor
-public final class ShardingCartesianRoutingEngine implements ShardingRouteEngine {
+public final class ShardingCartesianRouteEngine implements ShardingRouteEngine {
private final Collection<RouteContext> routeContexts;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngine.java
similarity index 89%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngine.java
index c68032853a5..98e2ff506eb 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngine.java
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.exception.metadata.ShardingTableRuleNotFoundException;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
import org.apache.shardingsphere.sharding.route.engine.type.ShardingRouteEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRouteEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sharding.rule.ShardingTable;
@@ -35,10 +35,10 @@ import java.util.Optional;
import java.util.TreeSet;
/**
- * Sharding complex routing engine.
+ * Sharding complex route engine.
*/
@RequiredArgsConstructor
-public final class ShardingComplexRoutingEngine implements ShardingRouteEngine {
+public final class ShardingComplexRouteEngine implements ShardingRouteEngine {
private final ShardingConditions shardingConditions;
@@ -58,7 +58,7 @@ public final class ShardingComplexRoutingEngine implements ShardingRouteEngine {
Optional<ShardingTable> shardingTable = shardingRule.findShardingTable(each);
if (shardingTable.isPresent()) {
if (!bindingTableNames.contains(each)) {
- routeContexts.add(new ShardingStandardRoutingEngine(shardingTable.get().getLogicTable(), shardingConditions, sqlStatementContext, hintValueContext, props).route(shardingRule));
+ routeContexts.add(new ShardingStandardRouteEngine(shardingTable.get().getLogicTable(), shardingConditions, sqlStatementContext, hintValueContext, props).route(shardingRule));
}
shardingRule.findBindingTableRule(each).ifPresent(optional -> bindingTableNames.addAll(optional.getShardingTables().keySet()));
}
@@ -72,7 +72,7 @@ public final class ShardingComplexRoutingEngine implements ShardingRouteEngine {
result.getOriginalDataNodes().addAll(newRouteContext.getOriginalDataNodes());
result.getRouteUnits().addAll(newRouteContext.getRouteUnits());
} else {
- RouteContext routeContext = new ShardingCartesianRoutingEngine(routeContexts).route(shardingRule);
+ RouteContext routeContext = new ShardingCartesianRouteEngine(routeContexts).route(shardingRule);
result.getOriginalDataNodes().addAll(routeContext.getOriginalDataNodes());
result.getRouteUnits().addAll(routeContext.getRouteUnits());
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngine.java
similarity index 91%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngine.java
index 5665b2b5a9d..e6bc088b140 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngine.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.sharding.route.engine.type.ShardingRouteEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
/**
- * Sharding ignore routing engine.
+ * Sharding ignore route engine.
*/
-public final class ShardingIgnoreRoutingEngine implements ShardingRouteEngine {
+public final class ShardingIgnoreRouteEngine implements ShardingRouteEngine {
@Override
public RouteContext route(final ShardingRule shardingRule) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
similarity index 97%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
index 8f7dfc55d02..75e566e50b3 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngine.java
@@ -55,9 +55,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Sharding standard routing engine.
+ * Sharding standard route engine.
*/
-public final class ShardingStandardRoutingEngine implements ShardingRouteEngine {
+public final class ShardingStandardRouteEngine implements ShardingRouteEngine {
private final String logicTableName;
@@ -71,8 +71,8 @@ public final class ShardingStandardRoutingEngine implements ShardingRouteEngine
private final HintValueContext hintValueContext;
- public ShardingStandardRoutingEngine(final String logicTableName, final ShardingConditions shardingConditions, final SQLStatementContext sqlStatementContext,
- final HintValueContext hintValueContext, final ConfigurationProperties props) {
+ public ShardingStandardRouteEngine(final String logicTableName, final ShardingConditions shardingConditions, final SQLStatementContext sqlStatementContext,
+ final HintValueContext hintValueContext, final ConfigurationProperties props) {
this.logicTableName = logicTableName;
this.shardingConditions = shardingConditions;
this.sqlStatementContext = sqlStatementContext;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngine.java
similarity index 98%
rename from features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngine.java
rename to features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngine.java
index d10b3568a74..32afcd0d644 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngine.java
@@ -44,10 +44,10 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
/**
- * Sharding unicast routing engine.
+ * Sharding unicast route engine.
*/
@RequiredArgsConstructor
-public final class ShardingUnicastRoutingEngine implements ShardingRouteEngine {
+public final class ShardingUnicastRouteEngine implements ShardingRouteEngine {
private final SQLStatementContext sqlStatementContext;
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
index c79d9347c64..0737f323bdf 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
@@ -32,7 +32,7 @@ import org.apache.shardingsphere.sharding.exception.syntax.MissingGenerateKeyCol
import org.apache.shardingsphere.sharding.exception.syntax.UnsupportedShardingOperationException;
import org.apache.shardingsphere.sharding.exception.syntax.UnsupportedUpdatingShardingValueException;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRouteEngine;
import org.apache.shardingsphere.sharding.route.engine.validator.dml.ShardingDMLStatementValidator;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.assignment.ColumnAssignmentSegment;
@@ -99,7 +99,7 @@ public final class ShardingInsertStatementValidator extends ShardingDMLStatement
Collection<ColumnAssignmentSegment> assignments = insertStatement.getOnDuplicateKeyColumns()
.map(OnDuplicateKeyColumnsSegment::getColumns).orElse(Collections.emptyList());
Optional<ShardingConditions> onDuplicateKeyShardingConditions = createShardingConditions(sqlStatementContext, shardingRule, assignments, params);
- Optional<RouteContext> onDuplicateKeyRouteContext = onDuplicateKeyShardingConditions.map(optional -> new ShardingStandardRoutingEngine(tableName, optional,
+ Optional<RouteContext> onDuplicateKeyRouteContext = onDuplicateKeyShardingConditions.map(optional -> new ShardingStandardRouteEngine(tableName, optional,
sqlStatementContext, hintValueContext, props).route(shardingRule));
if (onDuplicateKeyRouteContext.isPresent() && !isSameRouteContext(routeContext, onDuplicateKeyRouteContext.get())) {
throw new UnsupportedUpdatingShardingValueException(tableName);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
index 42b81c372b8..8edc732b038 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.exception.syntax.DMLMultipleDataNodesWithLimitException;
import org.apache.shardingsphere.sharding.exception.syntax.UnsupportedUpdatingShardingValueException;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRouteEngine;
import org.apache.shardingsphere.sharding.route.engine.validator.dml.ShardingDMLStatementValidator;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.statement.core.statement.dml.UpdateStatement;
@@ -53,7 +53,7 @@ public final class ShardingUpdateStatementValidator extends ShardingDMLStatement
String tableName = updateStatementContext.getTablesContext().getTableNames().iterator().next();
UpdateStatement updateStatement = updateStatementContext.getSqlStatement();
Optional<ShardingConditions> shardingConditions = createShardingConditions(sqlStatementContext, shardingRule, updateStatement.getSetAssignment().getAssignments(), params);
- Optional<RouteContext> setAssignmentRouteContext = shardingConditions.map(optional -> new ShardingStandardRoutingEngine(tableName, optional, sqlStatementContext,
+ Optional<RouteContext> setAssignmentRouteContext = shardingConditions.map(optional -> new ShardingStandardRouteEngine(tableName, optional, sqlStatementContext,
hintValueContext, props).route(shardingRule));
if (setAssignmentRouteContext.isPresent() && !isSameRouteContext(routeContext, setAssignmentRouteContext.get())) {
throw new UnsupportedUpdatingShardingValueException(tableName);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRouteEngineFixtureBuilder.java
similarity index 99%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRouteEngineFixtureBuilder.java
index 3bf203bfad1..cdba1166b33 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRoutingEngineFixtureBuilder.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/fixture/ShardingRouteEngineFixtureBuilder.java
@@ -63,10 +63,10 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Sharding routing engine fixture builder.
+ * Sharding route engine fixture builder.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ShardingRoutingEngineFixtureBuilder {
+public final class ShardingRouteEngineFixtureBuilder {
/**
* Create based sharding rule.
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
index d9d82a49d3a..3d201348a05 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ShardingRouteEngineFactoryTest.java
@@ -33,14 +33,14 @@ import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSp
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDataSourceGroupBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDatabaseBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingInstanceBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingTableBroadcastRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingComplexRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.ignore.ShardingIgnoreRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRoutingEngine;
-import org.apache.shardingsphere.sharding.route.engine.type.unicast.ShardingUnicastRoutingEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDataSourceGroupBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingDatabaseBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingInstanceBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.broadcast.ShardingTableBroadcastRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.complex.ShardingComplexRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.ignore.ShardingIgnoreRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.standard.ShardingStandardRouteEngine;
+import org.apache.shardingsphere.sharding.route.engine.type.unicast.ShardingUnicastRouteEngine;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.TableNameSegment;
@@ -128,7 +128,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingDatabaseBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingDatabaseBroadcastRouteEngine.class));
}
private ConnectionContext mockConnectionContext() {
@@ -142,7 +142,7 @@ class ShardingRouteEngineFactoryTest {
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DDLStatement.class));
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual = ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingTableBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingTableBroadcastRouteEngine.class));
}
@Test
@@ -154,7 +154,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -164,7 +164,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingDataSourceGroupBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingDataSourceGroupBroadcastRouteEngine.class));
}
@Test
@@ -174,7 +174,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingDatabaseBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingDatabaseBroadcastRouteEngine.class));
}
@Test
@@ -192,7 +192,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingDatabaseBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingDatabaseBroadcastRouteEngine.class));
}
@Test
@@ -231,7 +231,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingIgnoreRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingIgnoreRouteEngine.class));
}
private void assertNewInstanceForDCLForSingleTableWithoutShardingRule(final GrantStatement grantStatement) {
@@ -240,7 +240,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingIgnoreRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingIgnoreRouteEngine.class));
}
@Test
@@ -250,7 +250,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingInstanceBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingInstanceBroadcastRouteEngine.class));
}
@Test
@@ -260,7 +260,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -270,7 +270,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -280,7 +280,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -293,7 +293,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingStandardRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingStandardRouteEngine.class));
}
@Test
@@ -306,7 +306,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingComplexRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingComplexRouteEngine.class));
}
@Test
@@ -318,7 +318,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -330,7 +330,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingUnicastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingUnicastRouteEngine.class));
}
@Test
@@ -345,7 +345,7 @@ class ShardingRouteEngineFactoryTest {
when(shardingRule.isAllShardingTables(Collections.singletonList("t_order"))).thenReturn(true);
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual = ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, mock(ConfigurationProperties.class));
- assertThat(actual, instanceOf(ShardingStandardRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingStandardRouteEngine.class));
}
@Test
@@ -355,7 +355,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingInstanceBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingInstanceBroadcastRouteEngine.class));
}
@Test
@@ -365,7 +365,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingInstanceBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingInstanceBroadcastRouteEngine.class));
}
@Test
@@ -377,7 +377,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingTableBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingTableBroadcastRouteEngine.class));
}
@Test
@@ -389,7 +389,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(sqlStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingIgnoreRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingIgnoreRouteEngine.class));
}
@Test
@@ -408,7 +408,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(cursorStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingStandardRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingStandardRouteEngine.class));
}
@Test
@@ -422,7 +422,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(cursorStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingIgnoreRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingIgnoreRouteEngine.class));
}
@Test
@@ -438,7 +438,7 @@ class ShardingRouteEngineFactoryTest {
QueryContext queryContext = new QueryContext(closeStatementContext, "", Collections.emptyList(), new HintValueContext(), mockConnectionContext(), mock(ShardingSphereMetaData.class));
ShardingRouteEngine actual =
ShardingRouteEngineFactory.newInstance(shardingRule, database, queryContext, shardingConditions, props);
- assertThat(actual, instanceOf(ShardingDatabaseBroadcastRoutingEngine.class));
+ assertThat(actual, instanceOf(ShardingDatabaseBroadcastRouteEngine.class));
}
private Collection<SimpleTableSegment> createSimpleTableSegments() {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngineTest.java
similarity index 92%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngineTest.java
index d13d380bcc2..f4e91205a77 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDataSourceGroupBroadcastRouteEngineTest.java
@@ -42,9 +42,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ShardingDataSourceGroupBroadcastRoutingEngineTest {
+class ShardingDataSourceGroupBroadcastRouteEngineTest {
- private final ShardingDataSourceGroupBroadcastRoutingEngine shardingDataSourceGroupBroadcastRoutingEngine = new ShardingDataSourceGroupBroadcastRoutingEngine();
+ private final ShardingDataSourceGroupBroadcastRouteEngine shardingDataSourceGroupBroadcastRouteEngine = new ShardingDataSourceGroupBroadcastRouteEngine();
@Mock
private ShardingRule shardingRule;
@@ -76,7 +76,7 @@ class ShardingDataSourceGroupBroadcastRoutingEngineTest {
shards.add(Arrays.asList("ds1", "ds2", "ds3"));
Map<String, ShardingTable> shardingTables = mockShardingTables(shards);
when(shardingRule.getShardingTables()).thenReturn(shardingTables);
- RouteContext routeContext = shardingDataSourceGroupBroadcastRoutingEngine.route(shardingRule);
+ RouteContext routeContext = shardingDataSourceGroupBroadcastRouteEngine.route(shardingRule);
assertThat(routeContext.getRouteUnits().size(), is(1));
Iterator<RouteUnit> iterator = routeContext.getRouteUnits().iterator();
assertThat(Arrays.asList("ds1", "ds2", "ds3"), hasItems(iterator.next().getDataSourceMapper().getActualName()));
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngineTest.java
similarity index 92%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngineTest.java
index 64b616b481d..8bafb983a8d 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingDatabaseBroadcastRouteEngineTest.java
@@ -34,15 +34,15 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-class ShardingDatabaseBroadcastRoutingEngineTest {
+class ShardingDatabaseBroadcastRouteEngineTest {
- private final ShardingDatabaseBroadcastRoutingEngine shardingDatabaseBroadcastRoutingEngine = new ShardingDatabaseBroadcastRoutingEngine();
+ private final ShardingDatabaseBroadcastRouteEngine shardingDatabaseBroadcastRouteEngine = new ShardingDatabaseBroadcastRouteEngine();
@Test
void assertRoute() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(new ShardingTableRuleConfiguration("t_order", "ds_${0..1}.t_order_${0..2}"));
- RouteContext routeContext = shardingDatabaseBroadcastRoutingEngine
+ RouteContext routeContext = shardingDatabaseBroadcastRouteEngine
.route(new ShardingRule(shardingRuleConfig, Maps.of("ds_0", new MockedDataSource(), "ds_1", new MockedDataSource()), mock(ComputeNodeInstanceContext.class)));
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(2));
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngineTest.java
similarity index 88%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngineTest.java
index d7ddf60472a..883de1aab84 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingInstanceBroadcastRouteEngineTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ShardingInstanceBroadcastRoutingEngineTest {
+class ShardingInstanceBroadcastRouteEngineTest {
private static final String DATASOURCE_NAME = "ds";
@@ -43,18 +43,18 @@ class ShardingInstanceBroadcastRoutingEngineTest {
@Mock
private ResourceMetaData resourceMetaData;
- private ShardingInstanceBroadcastRoutingEngine shardingInstanceBroadcastRoutingEngine;
+ private ShardingInstanceBroadcastRouteEngine shardingInstanceBroadcastRouteEngine;
@BeforeEach
void setUp() {
when(shardingRule.getDataSourceNames()).thenReturn(Collections.singletonList(DATASOURCE_NAME));
when(resourceMetaData.getAllInstanceDataSourceNames()).thenReturn(Collections.singleton(DATASOURCE_NAME));
- shardingInstanceBroadcastRoutingEngine = new ShardingInstanceBroadcastRoutingEngine(resourceMetaData);
+ shardingInstanceBroadcastRouteEngine = new ShardingInstanceBroadcastRouteEngine(resourceMetaData);
}
@Test
void assertRoute() {
- RouteContext routeContext = shardingInstanceBroadcastRoutingEngine.route(shardingRule);
+ RouteContext routeContext = shardingInstanceBroadcastRouteEngine.route(shardingRule);
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeContext.getRouteUnits().iterator().next().getDataSourceMapper().getActualName(), is(DATASOURCE_NAME));
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngineTest.java
similarity index 87%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngineTest.java
index 687f1c20c1c..3357d2e1568 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/broadcast/ShardingTableBroadcastRouteEngineTest.java
@@ -54,25 +54,25 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
-class ShardingTableBroadcastRoutingEngineTest {
+class ShardingTableBroadcastRouteEngineTest {
private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
void assertRouteForEmptyTable() {
Collection<String> tableNames = Collections.emptyList();
- ShardingTableBroadcastRoutingEngine shardingTableBroadcastRoutingEngine =
- new ShardingTableBroadcastRoutingEngine(mock(ShardingSphereDatabase.class), createSQLStatementContext(tableNames), tableNames);
- RouteContext routeContext = shardingTableBroadcastRoutingEngine.route(createShardingRule());
+ ShardingTableBroadcastRouteEngine shardingTableBroadcastRouteEngine =
+ new ShardingTableBroadcastRouteEngine(mock(ShardingSphereDatabase.class), createSQLStatementContext(tableNames), tableNames);
+ RouteContext routeContext = shardingTableBroadcastRouteEngine.route(createShardingRule());
assertRouteUnitWithoutTables(routeContext);
}
@Test
void assertRouteForNormalTable() {
Collection<String> tableNames = Collections.singletonList("t_order");
- ShardingTableBroadcastRoutingEngine shardingTableBroadcastRoutingEngine =
- new ShardingTableBroadcastRoutingEngine(mock(ShardingSphereDatabase.class), createSQLStatementContext(tableNames), tableNames);
- RouteContext routeContext = shardingTableBroadcastRoutingEngine.route(createShardingRule());
+ ShardingTableBroadcastRouteEngine shardingTableBroadcastRouteEngine =
+ new ShardingTableBroadcastRouteEngine(mock(ShardingSphereDatabase.class), createSQLStatementContext(tableNames), tableNames);
+ RouteContext routeContext = shardingTableBroadcastRouteEngine.route(createShardingRule());
assertThat(routeContext.getActualDataSourceNames().size(), is(2));
assertThat(routeContext.getRouteUnits().size(), is(4));
Iterator<RouteUnit> routeUnits = routeContext.getRouteUnits().iterator();
@@ -98,8 +98,8 @@ class ShardingTableBroadcastRoutingEngineTest {
Map<String, ShardingSphereSchema> schemas = Collections.singletonMap(DefaultDatabase.LOGIC_NAME, schema);
ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
databaseType, mock(ResourceMetaData.class), mock(RuleMetaData.class), schemas);
- ShardingTableBroadcastRoutingEngine shardingTableBroadcastRoutingEngine = new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, tableNames);
- RouteContext routeContext = shardingTableBroadcastRoutingEngine.route(createShardingRule());
+ ShardingTableBroadcastRouteEngine shardingTableBroadcastRouteEngine = new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, tableNames);
+ RouteContext routeContext = shardingTableBroadcastRouteEngine.route(createShardingRule());
assertThat(routeContext.getActualDataSourceNames().size(), is(2));
Iterator<RouteUnit> routeUnits = routeContext.getRouteUnits().iterator();
assertRouteUnit(routeUnits.next(), "ds0", "t_order_0");
@@ -121,8 +121,8 @@ class ShardingTableBroadcastRoutingEngineTest {
Map<String, ShardingSphereSchema> schemas = Collections.singletonMap(DefaultDatabase.LOGIC_NAME, schema);
ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
databaseType, mock(ResourceMetaData.class), mock(RuleMetaData.class), schemas);
- ShardingTableBroadcastRoutingEngine shardingTableBroadcastRoutingEngine = new ShardingTableBroadcastRoutingEngine(database, sqlStatementContext, tableNames);
- RouteContext routeContext = shardingTableBroadcastRoutingEngine.route(createShardingRule());
+ ShardingTableBroadcastRouteEngine shardingTableBroadcastRouteEngine = new ShardingTableBroadcastRouteEngine(database, sqlStatementContext, tableNames);
+ RouteContext routeContext = shardingTableBroadcastRouteEngine.route(createShardingRule());
assertRouteUnitWithoutTables(routeContext);
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngineTest.java
similarity index 78%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngineTest.java
index aaa9af43e90..e055b461927 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/complex/ShardingComplexRouteEngineTest.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sharding.exception.metadata.ShardingTableRuleNotFoundException;
-import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRouteEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.Test;
@@ -38,13 +38,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
-class ShardingComplexRoutingEngineTest {
+class ShardingComplexRouteEngineTest {
@Test
void assertRoutingForBindingTables() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ ShardingComplexRouteEngine routeEngine = new ShardingComplexRouteEngine(ShardingRouteEngineFixtureBuilder.createShardingConditions("t_order"),
mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_order_item"));
- RouteContext routeContext = complexRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBindingShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createBindingShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -55,9 +55,9 @@ class ShardingComplexRoutingEngineTest {
@Test
void assertRoutingForShardingTableJoinBroadcastTable() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ ShardingComplexRouteEngine routeEngine = new ShardingComplexRouteEngine(ShardingRouteEngineFixtureBuilder.createShardingConditions("t_order"),
mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("t_order", "t_config"));
- RouteContext routeContext = complexRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBroadcastShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createBroadcastShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -68,9 +68,9 @@ class ShardingComplexRoutingEngineTest {
@Test
void assertRoutingForShardingTableJoinWithUpperCase() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("T_ORDER"),
+ ShardingComplexRouteEngine routeEngine = new ShardingComplexRouteEngine(ShardingRouteEngineFixtureBuilder.createShardingConditions("T_ORDER"),
mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Arrays.asList("T_ORDER", "T_CONFIG"));
- RouteContext routeContext = complexRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBroadcastShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createBroadcastShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -81,8 +81,8 @@ class ShardingComplexRoutingEngineTest {
@Test
void assertRoutingForNonLogicTable() {
- ShardingComplexRoutingEngine complexRoutingEngine = new ShardingComplexRoutingEngine(ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"),
+ ShardingComplexRouteEngine routeEngine = new ShardingComplexRouteEngine(ShardingRouteEngineFixtureBuilder.createShardingConditions("t_order"),
mock(SQLStatementContext.class), new HintValueContext(), new ConfigurationProperties(new Properties()), Collections.emptyList());
- assertThrows(ShardingTableRuleNotFoundException.class, () -> complexRoutingEngine.route(mock(ShardingRule.class)));
+ assertThrows(ShardingTableRuleNotFoundException.class, () -> routeEngine.route(mock(ShardingRule.class)));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngineTest.java
similarity index 86%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngineTest.java
index 01d6cddcaaa..3fa3bfe60a3 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/ignore/ShardingIgnoreRouteEngineTest.java
@@ -24,12 +24,12 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
-class ShardingIgnoreRoutingEngineTest {
+class ShardingIgnoreRouteEngineTest {
@Test
void assertRoute() {
- ShardingIgnoreRoutingEngine ignoreRoutingEngine = new ShardingIgnoreRoutingEngine();
- RouteContext routeContext = ignoreRoutingEngine.route(mock(ShardingRule.class));
+ ShardingIgnoreRouteEngine routeEngine = new ShardingIgnoreRouteEngine();
+ RouteContext routeContext = routeEngine.route(mock(ShardingRule.class));
assertTrue(routeContext.getRouteUnits().isEmpty());
assertTrue(routeContext.getOriginalDataNodes().isEmpty());
assertTrue(routeContext.getRouteStageContexts().isEmpty());
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngineTest.java
similarity index 79%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngineTest.java
index 14138504656..47e3df70bc3 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/ShardingStandardRouteEngineTest.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sharding.exception.algorithm.ShardingRouteAlgorithmException;
import org.apache.shardingsphere.sharding.route.engine.condition.ShardingConditions;
-import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRouteEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
-class ShardingStandardRoutingEngineTest {
+class ShardingStandardRouteEngineTest {
@AfterEach
void tearDown() {
@@ -54,9 +54,9 @@ class ShardingStandardRoutingEngineTest {
@Test
void assertRouteByNonConditions() {
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order",
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_order",
new ShardingConditions(Collections.emptyList(), mock(SQLStatementContext.class), mock(ShardingRule.class)), mock(SQLStatementContext.class), new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBasedShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createBasedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(4));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));
@@ -79,9 +79,9 @@ class ShardingStandardRoutingEngineTest {
@Test
void assertRouteByShardingConditions() {
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order",
- ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_order"), mock(SQLStatementContext.class), new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createBasedShardingRule());
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_order",
+ ShardingRouteEngineFixtureBuilder.createShardingConditions("t_order"), mock(SQLStatementContext.class), new HintValueContext());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createBasedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -94,21 +94,21 @@ class ShardingStandardRoutingEngineTest {
@Disabled
@Test
void assertRouteByErrorShardingTableStrategy() {
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_order", ShardingRoutingEngineFixtureBuilder.createErrorShardingConditions("t_order"),
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_order", ShardingRouteEngineFixtureBuilder.createErrorShardingConditions("t_order"),
mock(SQLStatementContext.class), new HintValueContext());
- assertThrows(ShardingRouteAlgorithmException.class, () -> standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createErrorShardingRule()));
+ assertThrows(ShardingRouteAlgorithmException.class, () -> routeEngine.route(ShardingRouteEngineFixtureBuilder.createErrorShardingRule()));
}
@Test
void assertRouteByHint() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_hint_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_test",
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_hint_test",
new ShardingConditions(Collections.emptyList(), sqlStatementContext, mock(ShardingRule.class)), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_test", 1);
hintManager.addTableShardingValue("t_hint_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createHintShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createHintShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -121,11 +121,11 @@ class ShardingStandardRoutingEngineTest {
void assertRouteByMixedWithHintDataSource() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_hint_ds_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_ds_test",
- ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_hint_ds_test"), sqlStatementContext, new HintValueContext());
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_hint_ds_test",
+ ShardingRouteEngineFixtureBuilder.createShardingConditions("t_hint_ds_test"), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_ds_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -138,11 +138,11 @@ class ShardingStandardRoutingEngineTest {
void assertRouteByMixedWithHintDataSourceOnly() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_hint_ds_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_ds_test",
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_hint_ds_test",
new ShardingConditions(Collections.emptyList(), sqlStatementContext, mock(ShardingRule.class)), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_ds_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(2));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -159,11 +159,11 @@ class ShardingStandardRoutingEngineTest {
void assertRouteByMixedWithHintTable() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_hint_table_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_table_test",
- ShardingRoutingEngineFixtureBuilder.createShardingConditions("t_hint_table_test"), sqlStatementContext, new HintValueContext());
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_hint_table_test",
+ ShardingRouteEngineFixtureBuilder.createShardingConditions("t_hint_table_test"), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addTableShardingValue("t_hint_table_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_1"));
@@ -176,11 +176,11 @@ class ShardingStandardRoutingEngineTest {
void assertRouteByMixedWithHintTableOnly() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_hint_table_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_hint_table_test",
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_hint_table_test",
new ShardingConditions(Collections.emptyList(), sqlStatementContext, mock(ShardingRule.class)), sqlStatementContext, new HintValueContext());
HintManager hintManager = HintManager.getInstance();
hintManager.addTableShardingValue("t_hint_table_test", 1);
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createMixedShardingRule());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createMixedShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(2));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));
@@ -197,9 +197,9 @@ class ShardingStandardRoutingEngineTest {
void assertRouteByIntervalTableShardingStrategyOnly() {
SQLStatementContext sqlStatementContext = mock(SQLStatementContext.class, withSettings().extraInterfaces(TableAvailable.class).defaultAnswer(RETURNS_DEEP_STUBS));
when(((TableAvailable) sqlStatementContext).getTablesContext().getTableNames()).thenReturn(Collections.singleton("t_interval_test"));
- ShardingStandardRoutingEngine standardRoutingEngine = createShardingStandardRoutingEngine("t_interval_test",
- ShardingRoutingEngineFixtureBuilder.createIntervalShardingConditions("t_interval_test"), sqlStatementContext, new HintValueContext());
- RouteContext routeContext = standardRoutingEngine.route(ShardingRoutingEngineFixtureBuilder.createIntervalTableShardingRule());
+ ShardingStandardRouteEngine routeEngine = createShardingStandardRouteEngine("t_interval_test",
+ ShardingRouteEngineFixtureBuilder.createIntervalShardingConditions("t_interval_test"), sqlStatementContext, new HintValueContext());
+ RouteContext routeContext = routeEngine.route(ShardingRouteEngineFixtureBuilder.createIntervalTableShardingRule());
List<RouteUnit> routeUnits = new ArrayList<>(routeContext.getRouteUnits());
assertThat(routeContext.getRouteUnits().size(), is(1));
assertThat(routeUnits.get(0).getDataSourceMapper().getActualName(), is("ds_0"));
@@ -208,8 +208,8 @@ class ShardingStandardRoutingEngineTest {
assertThat(routeUnits.get(0).getTableMappers().iterator().next().getLogicName(), is("t_interval_test"));
}
- private ShardingStandardRoutingEngine createShardingStandardRoutingEngine(final String logicTableName, final ShardingConditions shardingConditions,
- final SQLStatementContext sqlStatementContext, final HintValueContext hintValueContext) {
- return new ShardingStandardRoutingEngine(logicTableName, shardingConditions, sqlStatementContext, hintValueContext, new ConfigurationProperties(new Properties()));
+ private ShardingStandardRouteEngine createShardingStandardRouteEngine(final String logicTableName, final ShardingConditions shardingConditions,
+ final SQLStatementContext sqlStatementContext, final HintValueContext hintValueContext) {
+ return new ShardingStandardRouteEngine(logicTableName, shardingConditions, sqlStatementContext, hintValueContext, new ConfigurationProperties(new Properties()));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
index 646e73b2b40..4d6e8a3774a 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/assertion/ShardingRouteAssert.java
@@ -38,7 +38,7 @@ import org.apache.shardingsphere.infra.route.engine.SQLRouteEngine;
import org.apache.shardingsphere.infra.session.connection.ConnectionContext;
import org.apache.shardingsphere.infra.session.query.QueryContext;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRoutingEngineFixtureBuilder;
+import org.apache.shardingsphere.sharding.route.engine.fixture.ShardingRouteEngineFixtureBuilder;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
@@ -70,9 +70,9 @@ public final class ShardingRouteAssert {
*/
public static RouteContext assertRoute(final String sql, final List<Object> params) {
DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "MySQL");
- ShardingRule shardingRule = ShardingRoutingEngineFixtureBuilder.createAllShardingRule();
- SingleRule singleRule = ShardingRoutingEngineFixtureBuilder.createSingleRule(Collections.singleton(shardingRule));
- TimestampServiceRule timestampServiceRule = ShardingRoutingEngineFixtureBuilder.createTimeServiceRule();
+ ShardingRule shardingRule = ShardingRouteEngineFixtureBuilder.createAllShardingRule();
+ SingleRule singleRule = ShardingRouteEngineFixtureBuilder.createSingleRule(Collections.singleton(shardingRule));
+ TimestampServiceRule timestampServiceRule = ShardingRouteEngineFixtureBuilder.createTimeServiceRule();
Map<String, ShardingSphereSchema> schemas = buildSchemas();
ConfigurationProperties props = new ConfigurationProperties(new Properties());
SQLStatementParserEngine sqlStatementParserEngine = new SQLStatementParserEngine(databaseType,
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngineTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngineTest.java
similarity index 77%
rename from features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngineTest.java
rename to features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngineTest.java
index edb3a260902..0e43304f2fb 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRoutingEngineTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/unicast/ShardingUnicastRouteEngineTest.java
@@ -41,53 +41,53 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
-class ShardingUnicastRoutingEngineTest {
+class ShardingUnicastRouteEngineTest {
- private ShardingRule shardingRule;
+ private ShardingRule rule;
@BeforeEach
void setUp() {
ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
shardingRuleConfig.getTables().add(new ShardingTableRuleConfiguration("t_order", "ds_${0..1}.t_order_${0..2}"));
- shardingRule = new ShardingRule(shardingRuleConfig,
+ rule = new ShardingRule(shardingRuleConfig,
Maps.of("ds_0", new MockedDataSource(), "ds_1", new MockedDataSource(), "ds_2", new MockedDataSource()), mock(ComputeNodeInstanceContext.class));
}
@Test
void assertRoutingForShardingTable() {
- RouteContext actual = new ShardingUnicastRoutingEngine(mock(SQLStatementContext.class), Collections.singleton("t_order"), new ConnectionContext(Collections::emptySet)).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(mock(SQLStatementContext.class), Collections.singleton("t_order"), new ConnectionContext(Collections::emptySet)).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
assertFalse("ds_2".equalsIgnoreCase(actual.getRouteUnits().iterator().next().getDataSourceMapper().getLogicName()));
}
@Test
void assertRoutingForBroadcastTable() {
- RouteContext actual = new ShardingUnicastRoutingEngine(mock(SQLStatementContext.class), Collections.singleton("t_config"), new ConnectionContext(Collections::emptySet)).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(mock(SQLStatementContext.class), Collections.singleton("t_config"), new ConnectionContext(Collections::emptySet)).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
}
@Test
void assertRoutingForNoTable() {
- RouteContext actual = new ShardingUnicastRoutingEngine(mock(SQLStatementContext.class), Collections.emptyList(), new ConnectionContext(Collections::emptySet)).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(mock(SQLStatementContext.class), Collections.emptyList(), new ConnectionContext(Collections::emptySet)).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
}
@Test
void assertRouteForWithNoIntersection() {
- assertThrows(ShardingTableRuleNotFoundException.class, () -> new ShardingUnicastRoutingEngine(
- mock(SQLStatementContext.class), Arrays.asList("t_order", "t_config", "t_product"), new ConnectionContext(Collections::emptySet)).route(shardingRule));
+ assertThrows(ShardingTableRuleNotFoundException.class, () -> new ShardingUnicastRouteEngine(
+ mock(SQLStatementContext.class), Arrays.asList("t_order", "t_config", "t_product"), new ConnectionContext(Collections::emptySet)).route(rule));
}
@Test
void assertRoutingForTableWithoutTableRule() {
- RouteContext actual = new ShardingUnicastRoutingEngine(mock(SQLStatementContext.class), Collections.singleton("t_other"), new ConnectionContext(Collections::emptySet)).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(mock(SQLStatementContext.class), Collections.singleton("t_other"), new ConnectionContext(Collections::emptySet)).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
}
@Test
void assertRoutingForBroadcastTableWithCursorStatement() {
- RouteContext actual = new ShardingUnicastRoutingEngine(
- mock(CursorStatementContext.class), Collections.singleton("t_config"), new ConnectionContext(Collections::emptySet)).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(
+ mock(CursorStatementContext.class), Collections.singleton("t_config"), new ConnectionContext(Collections::emptySet)).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
assertThat(actual.getRouteUnits().iterator().next().getDataSourceMapper().getActualName(), is("ds_0"));
}
@@ -95,7 +95,7 @@ class ShardingUnicastRoutingEngineTest {
@Test
void assertRoutingForBroadcastTableWithPreferredDataSource() {
ConnectionContext connectionContext = new ConnectionContext(() -> Collections.singleton("ds_1"));
- RouteContext actual = new ShardingUnicastRoutingEngine(mock(SelectStatementContext.class), Collections.singleton("t_config"), connectionContext).route(shardingRule);
+ RouteContext actual = new ShardingUnicastRouteEngine(mock(SelectStatementContext.class), Collections.singleton("t_config"), connectionContext).route(rule);
assertThat(actual.getRouteUnits().size(), is(1));
assertThat(actual.getRouteUnits().iterator().next().getDataSourceMapper().getActualName(), is("ds_1"));
}