You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/06/10 06:21:40 UTC
[shardingsphere] branch master updated: Remove RALBackendHandler.HandlerParameter (#18278)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 9c7c8f83541 Remove RALBackendHandler.HandlerParameter (#18278)
9c7c8f83541 is described below
commit 9c7c8f8354124536a1cd258f94289044dbe62bf9
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Jun 10 14:21:33 2022 +0800
Remove RALBackendHandler.HandlerParameter (#18278)
---
.../backend/text/distsql/ral/RALBackendHandler.java | 17 ++---------------
.../text/distsql/ral/RALBackendHandlerFactory.java | 2 +-
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
index 9c64760b1bc..abe0e6361a5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandler.java
@@ -17,9 +17,7 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.ral;
-import com.google.common.base.Preconditions;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.distsql.parser.statement.ral.RALStatement;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -40,7 +38,7 @@ public abstract class RALBackendHandler<E extends RALStatement> implements TextP
private ConnectionSession connectionSession;
/**
- * Method to initialize handler, this method needs to be rewritten when the handler has properties other than sql statement.
+ * Initialize.
*
* @param sqlStatement SQL statement
* @param connectionSession connection session
@@ -52,19 +50,8 @@ public abstract class RALBackendHandler<E extends RALStatement> implements TextP
@Override
public final ResponseHeader execute() throws SQLException {
- Preconditions.checkNotNull(sqlStatement, "sql statement cannot be empty.");
- ContextManager contextManager = ProxyContext.getInstance().getContextManager();
- return handle(contextManager, sqlStatement);
+ return handle(ProxyContext.getInstance().getContextManager(), sqlStatement);
}
protected abstract ResponseHeader handle(ContextManager contextManager, E sqlStatement) throws SQLException;
-
- @RequiredArgsConstructor
- @Getter
- public static class HandlerParameter<E extends RALStatement> {
-
- private final E statement;
-
- private final ConnectionSession connectionSession;
- }
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
index 3197429e005..5d7ed1f8fa7 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/ral/RALBackendHandlerFactory.java
@@ -156,7 +156,7 @@ public final class RALBackendHandlerFactory {
return getHandler(sqlStatement, connectionSession);
}
- private static RALBackendHandler newInstance(final Class<? extends RALBackendHandler> clazz) {
+ private static RALBackendHandler<?> newInstance(final Class<? extends RALBackendHandler> clazz) {
try {
return clazz.getDeclaredConstructor().newInstance();
} catch (final ReflectiveOperationException ex) {