You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/02/19 07:26:25 UTC
[shardingsphere] branch master updated: Refactor `RefreshDatabaseMetaDataHandler` (#24237)
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 443754b0b91 Refactor `RefreshDatabaseMetaDataHandler` (#24237)
443754b0b91 is described below
commit 443754b0b91d1f13cd69b3ed58abfbbbd1cd5797
Author: Zichao <57...@users.noreply.github.com>
AuthorDate: Sun Feb 19 15:26:15 2023 +0800
Refactor `RefreshDatabaseMetaDataHandler` (#24237)
* Refactor `RefreshDatabaseMetaDataHandler`
* Refactor `RefreshDatabaseMetaDataHandler`
---
.../distsql/ral/RALBackendHandlerFactory.java | 3 --
...er.java => RefreshDatabaseMetaDataUpdater.java} | 22 +++++++++------
...ingsphere.distsql.handler.ral.update.RALUpdater | 1 +
.../RefreshDatabaseMetaDataUpdaterTest.java} | 33 +++++++++-------------
4 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
index 29308799204..9a384ee6fbb 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableGlobalRuleRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.UpdatableRALStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.scaling.UpdatableScalingRALStatement;
-import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetaDataStatement;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.SetDistVariableStatement;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
@@ -35,7 +34,6 @@ import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.hint.HintRALBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.migration.update.UpdatableScalingRALBackendHandler;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshDatabaseMetaDataHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshTableMetaDataHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetDistVariableHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -53,7 +51,6 @@ public final class RALBackendHandlerFactory {
static {
HANDLERS.put(SetDistVariableStatement.class, SetDistVariableHandler.class);
- HANDLERS.put(RefreshDatabaseMetaDataStatement.class, RefreshDatabaseMetaDataHandler.class);
HANDLERS.put(RefreshTableMetaDataStatement.class, RefreshTableMetaDataHandler.class);
}
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java
similarity index 67%
copy from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
copy to proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java
index e1c02bd7266..1233f032453 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdater.java
@@ -20,29 +20,33 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
import com.google.common.base.Strings;
import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
+import org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
-import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
import java.util.Optional;
/**
- * Refresh database meta data handler.
+ * Refresh database meta data updater.
*/
-public final class RefreshDatabaseMetaDataHandler extends UpdatableRALBackendHandler<RefreshDatabaseMetaDataStatement> {
+public final class RefreshDatabaseMetaDataUpdater implements RALUpdater<RefreshDatabaseMetaDataStatement> {
@Override
- protected void update(final ContextManager contextManager) {
- contextManager.reloadDatabaseMetaData(getDatabaseName());
+ public void executeUpdate(final String databaseName, final RefreshDatabaseMetaDataStatement sqlStatement) {
+ ProxyContext.getInstance().getContextManager().reloadDatabaseMetaData(getDatabaseName(databaseName, sqlStatement));
}
- private String getDatabaseName() {
- Optional<String> databaseName = getSqlStatement().getDatabaseName();
- String result = databaseName.orElseGet(() -> getConnectionSession().getDatabaseName());
+ private String getDatabaseName(final String databaseName, final RefreshDatabaseMetaDataStatement sqlStatement) {
+ Optional<String> toBeRefreshedDatabaseName = sqlStatement.getDatabaseName();
+ String result = toBeRefreshedDatabaseName.orElse(databaseName);
ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(result), NoDatabaseSelectedException::new);
ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(result), () -> new UnknownDatabaseException(result));
return result;
}
+
+ @Override
+ public String getType() {
+ return RefreshDatabaseMetaDataStatement.class.getName();
+ }
}
diff --git a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater
index 80413ec94a4..20eef4e9707 100644
--- a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater
+++ b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.ral.update.RALUpdater
@@ -21,3 +21,4 @@ org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.UnlabelCom
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetInstanceStatusUpdater
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.ImportDatabaseConfigurationUpdater
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.AlterReadwriteSplittingStorageUnitStatusStatementUpdater
+org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.RefreshDatabaseMetaDataUpdater
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java
similarity index 51%
rename from proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
rename to proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java
index e1c02bd7266..063cba39d7d 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataHandler.java
+++ b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshDatabaseMetaDataUpdaterTest.java
@@ -17,32 +17,25 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable;
-import com.google.common.base.Strings;
-import org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
import org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
import org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshDatabaseMetaDataStatement;
-import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
+import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
+import org.junit.Test;
-import java.util.Optional;
+import java.sql.SQLException;
-/**
- * Refresh database meta data handler.
- */
-public final class RefreshDatabaseMetaDataHandler extends UpdatableRALBackendHandler<RefreshDatabaseMetaDataStatement> {
-
- @Override
- protected void update(final ContextManager contextManager) {
- contextManager.reloadDatabaseMetaData(getDatabaseName());
- }
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+
+public final class RefreshDatabaseMetaDataUpdaterTest extends ProxyContextRestorer {
- private String getDatabaseName() {
- Optional<String> databaseName = getSqlStatement().getDatabaseName();
- String result = databaseName.orElseGet(() -> getConnectionSession().getDatabaseName());
- ShardingSpherePreconditions.checkState(!Strings.isNullOrEmpty(result), NoDatabaseSelectedException::new);
- ShardingSpherePreconditions.checkState(ProxyContext.getInstance().databaseExists(result), () -> new UnknownDatabaseException(result));
- return result;
+ @Test(expected = UnknownDatabaseException.class)
+ public void assertExecuteWithNoDatabase() throws SQLException {
+ ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
+ ProxyContext.init(contextManager);
+ RefreshDatabaseMetaDataUpdater updater = new RefreshDatabaseMetaDataUpdater();
+ updater.executeUpdate("foo", mock(RefreshDatabaseMetaDataStatement.class));
}
}