This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 6414c5cc3bb Rename RuleDefinitionBackendHandler (#29812)
6414c5cc3bb is described below
commit 6414c5cc3bb5e0a699da711237ed9c2c2d5de49e
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jan 23 16:10:23 2024 +0800
Rename RuleDefinitionBackendHandler (#29812)
---
.../handler/distsql/rdl/RDLBackendHandlerFactory.java | 8 ++++----
...{NewDatabaseRuleUpdater.java => DatabaseRuleUpdater.java} | 2 +-
.../{NewGlobalRuleUpdater.java => GlobalRuleUpdater.java} | 2 +-
...BackendHandler.java => RuleDefinitionBackendHandler.java} | 12 ++++++------
.../{GlobalRuleUpdater.java => LegacyGlobalRuleUpdater.java} | 4 ++--
...dHandler.java => LegacyRuleDefinitionBackendHandler.java} | 4 ++--
...Test.java => LegacyRuleDefinitionBackendHandlerTest.java} | 9 ++++-----
7 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
index 2736d1a6e00..d29139c497b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
@@ -29,8 +29,8 @@ import
org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.resource.ResourceDefinitionBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.NewRuleDefinitionBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.RuleDefinitionBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.RuleDefinitionBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.LegacyRuleDefinitionBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.proxy.backend.util.DatabaseNameUtils;
@@ -67,8 +67,8 @@ public final class RDLBackendHandlerFactory {
// TODO Remove when metadata structure adjustment completed. #25485
String modeType =
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType();
if ("Cluster".equals(modeType) || "Standalone".equals(modeType)) {
- return new NewRuleDefinitionBackendHandler<>(sqlStatement,
connectionSession);
+ return new RuleDefinitionBackendHandler<>(sqlStatement,
connectionSession);
}
- return new RuleDefinitionBackendHandler<>(sqlStatement,
connectionSession);
+ return new LegacyRuleDefinitionBackendHandler<>(sqlStatement,
connectionSession);
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewDatabaseRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/DatabaseRuleUpdater.java
similarity index 99%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewDatabaseRuleUpdater.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/DatabaseRuleUpdater.java
index b4df97d8ba8..1733240057f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewDatabaseRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/DatabaseRuleUpdater.java
@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
* @param <T> type of rule definition statement
*/
@RequiredArgsConstructor
-public final class NewDatabaseRuleUpdater<T extends RuleDefinitionStatement> {
+public final class DatabaseRuleUpdater<T extends RuleDefinitionStatement> {
private final T sqlStatement;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewGlobalRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/GlobalRuleUpdater.java
similarity index 98%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewGlobalRuleUpdater.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/GlobalRuleUpdater.java
index 297b0be3f7c..7a366edf6a6 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewGlobalRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/GlobalRuleUpdater.java
@@ -31,7 +31,7 @@ import java.util.Collection;
* Global rule updater.
*/
@RequiredArgsConstructor
-public final class NewGlobalRuleUpdater {
+public final class GlobalRuleUpdater {
private final RuleDefinitionStatement sqlStatement;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
similarity index 85%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
index e4fc0353a13..04a0360806f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/NewRuleDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandler.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.distsql.statement.rdl.RuleDefinitionStatement;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.GlobalRuleUpdater;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.LegacyGlobalRuleUpdater;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -33,12 +33,12 @@ import java.util.Optional;
/**
* TODO Rename to RuleDefinitionBackendHandler when metadata structure
adjustment completed. #25485
- * Database rule definition backend handler.
+ * Rule definition backend handler.
*
* @param <T> type of rule definition statement
*/
@RequiredArgsConstructor
-public final class NewRuleDefinitionBackendHandler<T extends
RuleDefinitionStatement> implements DistSQLBackendHandler {
+public final class RuleDefinitionBackendHandler<T extends
RuleDefinitionStatement> implements DistSQLBackendHandler {
private final T sqlStatement;
@@ -49,14 +49,14 @@ public final class NewRuleDefinitionBackendHandler<T
extends RuleDefinitionState
public ResponseHeader execute() {
Optional<DatabaseRuleRDLExecutor> databaseExecutor =
TypedSPILoader.findService(DatabaseRuleRDLExecutor.class,
sqlStatement.getClass());
if (databaseExecutor.isPresent()) {
- new NewDatabaseRuleUpdater(sqlStatement, connectionSession,
databaseExecutor.get()).executeUpdate();
+ new DatabaseRuleUpdater(sqlStatement, connectionSession,
databaseExecutor.get()).executeUpdate();
} else {
String modeType =
ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType();
GlobalRuleRDLExecutor globalExecutor =
TypedSPILoader.getService(GlobalRuleRDLExecutor.class, sqlStatement.getClass());
if ("Cluster".equals(modeType) || "Standalone".equals(modeType)) {
- new NewGlobalRuleUpdater(sqlStatement,
globalExecutor).executeUpdate();
+ new GlobalRuleUpdater(sqlStatement,
globalExecutor).executeUpdate();
} else {
- new GlobalRuleUpdater(sqlStatement).executeUpdate();
+ new LegacyGlobalRuleUpdater(sqlStatement).executeUpdate();
}
}
return new UpdateResponseHeader(sqlStatement);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/GlobalRuleUpdater.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
similarity index 97%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/GlobalRuleUpdater.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
index 292e35708a4..01b41843a86 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/GlobalRuleUpdater.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyGlobalRuleUpdater.java
@@ -30,10 +30,10 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * Global rule updater.
+ * Legacy global rule updater.
*/
@RequiredArgsConstructor
-public final class GlobalRuleUpdater {
+public final class LegacyGlobalRuleUpdater {
private final RuleDefinitionStatement sqlStatement;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/RuleDefinitionBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
similarity index 98%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/RuleDefinitionBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
index 5df0f23abb2..dc4fa0e3008 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/RuleDefinitionBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/legacy/LegacyRuleDefinitionBackendHandler.java
@@ -47,12 +47,12 @@ import java.util.Optional;
import java.util.stream.Collectors;
/**
- * Database rule definition backend handler.
+ * Legacy rule definition backend handler.
*
* @param <T> type of rule definition statement
*/
@RequiredArgsConstructor
-public final class RuleDefinitionBackendHandler<T extends
RuleDefinitionStatement> implements DistSQLBackendHandler {
+public final class LegacyRuleDefinitionBackendHandler<T extends
RuleDefinitionStatement> implements DistSQLBackendHandler {
private final T sqlStatement;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/LegacyRuleDefinitionBackendHandlerTest.java
similarity index 92%
rename from
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
rename to
proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/LegacyRuleDefinitionBackendHandlerTest.java
index a2a5d01efc7..391453eb2b8 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/RuleDefinitionBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/rule/LegacyRuleDefinitionBackendHandlerTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.fixture.CreateFixtureRuleStatement;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.RuleDefinitionBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rdl.rule.legacy.LegacyRuleDefinitionBackendHandler;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -34,7 +34,6 @@ import
org.apache.shardingsphere.transaction.api.TransactionType;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import java.sql.SQLException;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -46,17 +45,17 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class RuleDefinitionBackendHandlerTest {
+class LegacyRuleDefinitionBackendHandlerTest {
@Test
- void assertExecute() throws SQLException {
+ void assertExecute() {
ConnectionSession connectionSession = new
ConnectionSession(mock(MySQLDatabaseType.class), TransactionType.LOCAL, new
DefaultAttributeMap());
connectionSession.setCurrentDatabase("foo_db");
ShardingSphereDatabase database = mockDatabase();
ContextManager contextManager = mockContextManager(database);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
when(ProxyContext.getInstance().getDatabase("foo_db")).thenReturn(database);
- ResponseHeader response = new RuleDefinitionBackendHandler<>(new
CreateFixtureRuleStatement(), connectionSession).execute();
+ ResponseHeader response = new LegacyRuleDefinitionBackendHandler<>(new
CreateFixtureRuleStatement(), connectionSession).execute();
assertThat(response, instanceOf(UpdateResponseHeader.class));
assertThat(connectionSession.getTransactionStatus().getTransactionType(),
is(TransactionType.LOCAL));
}
