This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 a79d0b3ac46 Remove useless ExtraProxyBackendHandler (#32681)
a79d0b3ac46 is described below
commit a79d0b3ac46c4852ae6647e02af1c2cc3c1751f0
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 26 18:25:50 2024 +0800
Remove useless ExtraProxyBackendHandler (#32681)
---
.../handler/ProxyBackendHandlerFactory.java | 16 +---------
.../handler/extra/ExtraProxyBackendHandler.java | 37 ----------------------
2 files changed, 1 insertion(+), 52 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
index 4028b6510b0..cceba192459 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactory.java
@@ -30,6 +30,7 @@ import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import
org.apache.shardingsphere.infra.exception.generic.UnsupportedSQLOperationException;
+import org.apache.shardingsphere.infra.executor.checker.SQLExecutionChecker;
import org.apache.shardingsphere.infra.hint.HintValueContext;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
@@ -41,11 +42,9 @@ import
org.apache.shardingsphere.infra.state.cluster.ClusterState;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.distsql.DistSQLStatementContext;
import
org.apache.shardingsphere.proxy.backend.handler.admin.DatabaseAdminBackendHandlerFactory;
-import org.apache.shardingsphere.infra.executor.checker.SQLExecutionChecker;
import
org.apache.shardingsphere.proxy.backend.handler.data.DatabaseBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.handler.database.DatabaseOperateBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.DistSQLBackendHandlerFactory;
-import
org.apache.shardingsphere.proxy.backend.handler.extra.ExtraProxyBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionBackendHandlerFactory;
import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionalErrorAllowedSQLStatementHandler;
@@ -130,10 +129,6 @@ public final class ProxyBackendHandlerFactory {
if (backendHandler.isPresent()) {
return backendHandler.get();
}
- Optional<ExtraProxyBackendHandler> extraHandler =
findExtraProxyBackendHandler(sqlStatement);
- if (extraHandler.isPresent()) {
- return extraHandler.get();
- }
Optional<ProxyBackendHandler> databaseOperateHandler =
findDatabaseOperateBackendHandler(sqlStatement, connectionSession);
if (databaseOperateHandler.isPresent()) {
return databaseOperateHandler.get();
@@ -179,15 +174,6 @@ public final class ProxyBackendHandlerFactory {
}
}
- private static Optional<ExtraProxyBackendHandler>
findExtraProxyBackendHandler(final SQLStatement sqlStatement) {
- for (ExtraProxyBackendHandler each :
ShardingSphereServiceLoader.getServiceInstances(ExtraProxyBackendHandler.class))
{
- if (each.accept(sqlStatement)) {
- return Optional.of(each);
- }
- }
- return Optional.empty();
- }
-
private static Optional<ProxyBackendHandler>
findDatabaseOperateBackendHandler(final SQLStatement sqlStatement, final
ConnectionSession connectionSession) {
if (sqlStatement instanceof CreateDatabaseStatement || sqlStatement
instanceof DropDatabaseStatement) {
return
Optional.of(DatabaseOperateBackendHandlerFactory.newInstance(sqlStatement,
connectionSession));
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/extra/ExtraProxyBackendHandler.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/extra/ExtraProxyBackendHandler.java
deleted file mode 100644
index 96e2d74881d..00000000000
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/extra/ExtraProxyBackendHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.proxy.backend.handler.extra;
-
-import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
-import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
-import
org.apache.shardingsphere.sql.parser.statement.core.statement.SQLStatement;
-
-/**
- * Extra proxy backend handler.
- */
-@SingletonSPI
-public interface ExtraProxyBackendHandler extends ProxyBackendHandler {
-
- /**
- * Whether accept to process SQL statement.
- *
- * @param sqlStatement SQL statement to be judged
- * @return accept or not
- */
- boolean accept(SQLStatement sqlStatement);
-}
