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 38fb3cefd1a Rename DatabaseBackendHandler to
DatabaseProxyBackendHandler (#36802)
38fb3cefd1a is described below
commit 38fb3cefd1a1d8dbe21062641c656145434cc8f0
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Oct 7 11:56:19 2025 +0800
Rename DatabaseBackendHandler to DatabaseProxyBackendHandler (#36802)
---
.../reachability-metadata.json | 14 +++++++-------
...ndler.java => CreateDatabaseProxyBackendHandler.java} | 4 ++--
.../database/DatabaseOperateBackendHandlerFactory.java | 4 ++--
...Handler.java => DropDatabaseProxyBackendHandler.java} | 4 ++--
.../data/DatabaseProxyBackendHandlerFactoryTest.java | 6 +++---
.../impl/UnicastDatabaseProxyBackendHandlerTest.java | 16 ++++++++--------
.../database/CreateDatabaseProxyBackendHandlerTest.java | 4 ++--
.../DatabaseOperateBackendHandlerFactoryTest.java | 8 ++++----
.../database/DropDatabaseProxyBackendHandlerTest.java | 4 ++--
9 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
index 17e4954046e..b6e7d9b27b9 100644
---
a/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
+++
b/infra/reachability-metadata/src/main/resources/META-INF/native-image/org.apache.shardingsphere/generated-reachability-metadata/reachability-metadata.json
@@ -560,7 +560,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type": "java.lang.Object"
},
@@ -4421,7 +4421,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.infra.yaml.data.pojo.YamlRowStatistics"
},
@@ -5738,7 +5738,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.metadata.DatabaseMetaDataNodePath"
},
@@ -6417,7 +6417,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDataNodePath"
},
@@ -6570,7 +6570,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsDatabaseNodePath"
},
@@ -6688,7 +6688,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsSchemaNodePath"
},
@@ -6800,7 +6800,7 @@
},
{
"condition": {
- "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseBackendHandler"
+ "typeReached":
"org.apache.shardingsphere.proxy.backend.handler.database.CreateDatabaseProxyBackendHandler"
},
"type":
"org.apache.shardingsphere.mode.node.path.type.database.statistics.StatisticsTableNodePath"
},
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandler.java
similarity index 94%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandler.java
index 869dcedc37d..939e589bb67 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandler.java
@@ -28,10 +28,10 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.da
import java.sql.SQLException;
/**
- * Create database backend handler.
+ * Create database proxy backend handler.
*/
@RequiredArgsConstructor
-public final class CreateDatabaseBackendHandler implements ProxyBackendHandler
{
+public final class CreateDatabaseProxyBackendHandler implements
ProxyBackendHandler {
private final CreateDatabaseStatement sqlStatement;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
index 877ef2338c4..b3bebf98ccf 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactory.java
@@ -45,10 +45,10 @@ public final class DatabaseOperateBackendHandlerFactory {
private static ProxyBackendHandler createBackendHandler(final SQLStatement
sqlStatement, final ConnectionSession connectionSession) {
if (sqlStatement instanceof CreateDatabaseStatement) {
- return new CreateDatabaseBackendHandler((CreateDatabaseStatement)
sqlStatement);
+ return new
CreateDatabaseProxyBackendHandler((CreateDatabaseStatement) sqlStatement);
}
if (sqlStatement instanceof DropDatabaseStatement) {
- return new DropDatabaseBackendHandler((DropDatabaseStatement)
sqlStatement, connectionSession);
+ return new DropDatabaseProxyBackendHandler((DropDatabaseStatement)
sqlStatement, connectionSession);
}
throw new
UnsupportedSQLOperationException(sqlStatement.getClass().getName());
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandler.java
similarity index 97%
rename from
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
rename to
proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandler.java
index deeb8c19885..5570ac7dbd4 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseBackendHandler.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandler.java
@@ -38,10 +38,10 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.type.ddl.da
import java.sql.SQLException;
/**
- * Drop database backend handler.
+ * Drop database proxy backend handler.
*/
@RequiredArgsConstructor
-public final class DropDatabaseBackendHandler implements ProxyBackendHandler {
+public final class DropDatabaseProxyBackendHandler implements
ProxyBackendHandler {
private final DropDatabaseStatement sqlStatement;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseProxyBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseProxyBackendHandlerFactoryTest.java
index 6f2bab3517e..40ee64d5c15 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/DatabaseProxyBackendHandlerFactoryTest.java
@@ -61,7 +61,7 @@ class DatabaseProxyBackendHandlerFactoryTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
@Test
- void assertNewInstanceReturnedUnicastDatabaseBackendHandlerWithDAL() {
+ void assertNewInstanceReturnedUnicastDatabaseProxyBackendHandlerWithDAL() {
String sql = "DESC tbl";
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getSqlStatement()).thenReturn(mock(DALStatement.class,
RETURNS_DEEP_STUBS));
@@ -78,7 +78,7 @@ class DatabaseProxyBackendHandlerFactoryTest {
}
@Test
- void
assertNewInstanceReturnedUnicastDatabaseBackendHandlerWithQueryWithoutFrom() {
+ void
assertNewInstanceReturnedUnicastDatabaseProxyBackendHandlerWithQueryWithoutFrom()
{
String sql = "SELECT 1";
SQLStatementContext sqlStatementContext = new
CommonSQLStatementContext(new SelectStatement(databaseType));
DatabaseProxyBackendHandler actual =
DatabaseProxyBackendHandlerFactory.newInstance(
@@ -87,7 +87,7 @@ class DatabaseProxyBackendHandlerFactoryTest {
}
@Test
- void assertNewInstanceReturnedSchemaAssignedDatabaseBackendHandler() {
+ void assertNewInstanceReturnedSchemaAssignedDatabaseProxyBackendHandler() {
String sql = "SELECT 1 FROM user WHERE id = 1";
SQLStatementContext sqlStatementContext = mockSQLStatementContext();
ConnectionSession connectionSession = mockConnectionSession();
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
index 257c9fda8d2..8aba36ae932 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/data/impl/UnicastDatabaseProxyBackendHandlerTest.java
@@ -74,7 +74,7 @@ class UnicastDatabaseProxyBackendHandlerTest {
private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
- private UnicastDatabaseProxyBackendHandler unicastDatabaseBackendHandler;
+ private UnicastDatabaseProxyBackendHandler
unicastDatabaseProxyBackendHandler;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private ConnectionSession connectionSession;
@@ -91,9 +91,9 @@ class UnicastDatabaseProxyBackendHandlerTest {
mockDatabaseProxyConnector(new UpdateResponseHeader(mock()));
SQLStatementContext sqlStatementContext =
mock(SQLStatementContext.class, RETURNS_DEEP_STUBS);
when(sqlStatementContext.getTablesContext().getDatabaseNames()).thenReturn(Collections.emptyList());
- unicastDatabaseBackendHandler = new UnicastDatabaseProxyBackendHandler(
+ unicastDatabaseProxyBackendHandler = new
UnicastDatabaseProxyBackendHandler(
new QueryContext(sqlStatementContext, EXECUTE_SQL,
Collections.emptyList(), new HintValueContext(), mockConnectionContext(),
mock()), connectionSession);
- setBackendHandlerFactory(unicastDatabaseBackendHandler);
+ setBackendHandlerFactory(unicastDatabaseProxyBackendHandler);
}
private ConnectionContext mockConnectionContext() {
@@ -113,12 +113,12 @@ class UnicastDatabaseProxyBackendHandlerTest {
}
@Test
- void assertExecuteDatabaseBackendHandler() throws SQLException {
+ void assertExecuteDatabaseProxyBackendHandler() throws SQLException {
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
ShardingSphereDatabase database = createDatabases().iterator().next();
when(contextManager.getDatabase("db_0")).thenReturn(database);
- ResponseHeader actual = unicastDatabaseBackendHandler.execute();
+ ResponseHeader actual = unicastDatabaseProxyBackendHandler.execute();
assertThat(actual, isA(UpdateResponseHeader.class));
}
@@ -128,9 +128,9 @@ class UnicastDatabaseProxyBackendHandlerTest {
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
ShardingSphereDatabase database = createDatabases().iterator().next();
when(contextManager.getDatabase("db_0")).thenReturn(database);
- unicastDatabaseBackendHandler.execute();
- while (unicastDatabaseBackendHandler.next()) {
-
assertThat(unicastDatabaseBackendHandler.getRowData().getData().size(), is(1));
+ unicastDatabaseProxyBackendHandler.execute();
+ while (unicastDatabaseProxyBackendHandler.next()) {
+
assertThat(unicastDatabaseProxyBackendHandler.getRowData().getData().size(),
is(1));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandlerTest.java
index 8853ff4a64f..5e96f2a4690 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/CreateDatabaseProxyBackendHandlerTest.java
@@ -47,11 +47,11 @@ class CreateDatabaseProxyBackendHandlerTest {
@Mock
private CreateDatabaseStatement statement;
- private CreateDatabaseBackendHandler handler;
+ private CreateDatabaseProxyBackendHandler handler;
@BeforeEach
void setUp() {
- handler = new CreateDatabaseBackendHandler(statement);
+ handler = new CreateDatabaseProxyBackendHandler(statement);
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
index 3df1d4cfe1f..14be77e5f30 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
@@ -138,13 +138,13 @@ class DatabaseOperateBackendHandlerFactoryTest {
}
@Test
- void
assertDatabaseOperateBackendHandlerFactoryReturnCreateDatabaseBackendHandler() {
-
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(CreateDatabaseStatement.class),
mock(ConnectionSession.class)), isA(CreateDatabaseBackendHandler.class));
+ void
assertDatabaseOperateBackendHandlerFactoryReturnCreateDatabaseProxyBackendHandler()
{
+
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(CreateDatabaseStatement.class),
mock(ConnectionSession.class)), isA(CreateDatabaseProxyBackendHandler.class));
}
@Test
- void
assertDatabaseOperateBackendHandlerFactoryReturnDropDatabaseBackendHandler() {
-
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(DropDatabaseStatement.class),
mock(ConnectionSession.class)), isA(DropDatabaseBackendHandler.class));
+ void
assertDatabaseOperateBackendHandlerFactoryReturnDropDatabaseProxyBackendHandler()
{
+
assertThat(DatabaseOperateBackendHandlerFactory.newInstance(mock(DropDatabaseStatement.class),
mock(ConnectionSession.class)), isA(DropDatabaseProxyBackendHandler.class));
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandlerTest.java
index 695305ea251..06dc4812ee0 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DropDatabaseProxyBackendHandlerTest.java
@@ -65,7 +65,7 @@ class DropDatabaseProxyBackendHandlerTest {
@Mock
private DropDatabaseStatement sqlStatement;
- private DropDatabaseBackendHandler handler;
+ private DropDatabaseProxyBackendHandler handler;
@BeforeEach
void setUp() {
@@ -74,7 +74,7 @@ class DropDatabaseProxyBackendHandlerTest {
when(ProxyContext.getInstance().databaseExists("foo_db")).thenReturn(true);
when(ProxyContext.getInstance().databaseExists("bar_db")).thenReturn(true);
when(connectionSession.getConnectionContext().getGrantee()).thenReturn(null);
- handler = new DropDatabaseBackendHandler(sqlStatement,
connectionSession);
+ handler = new DropDatabaseProxyBackendHandler(sqlStatement,
connectionSession);
}
private ContextManager mockContextManager() {
