This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 7b80f8bef88 Remove useless generic type of CommandExecuteEngine
(#25857)
7b80f8bef88 is described below
commit 7b80f8bef88983e36135ad90332f315e1a04cb1e
Author: Liang Zhang <[email protected]>
AuthorDate: Tue May 23 00:45:12 2023 +0800
Remove useless generic type of CommandExecuteEngine (#25857)
* Remove useless generic type of CommandExecuteEngine
* Remove useless generic type of CommandExecuteEngine
---
.../packet/generic/PostgreSQLReadyForQueryPacket.java | 4 ++--
.../proxy/frontend/command/CommandExecutorTask.java | 4 +---
.../proxy/frontend/state/impl/CircuitBreakProxyState.java | 8 ++------
.../fixture/DatabaseProtocolFrontendEngineFixture.java | 2 +-
.../proxy/frontend/command/CommandExecuteEngine.java | 10 +++++-----
.../proxy/frontend/spi/DatabaseProtocolFrontendEngine.java | 2 +-
.../frontend/mysql/command/MySQLCommandExecuteEngine.java | 8 +-------
.../opengauss/command/OpenGaussCommandExecuteEngine.java | 5 +++--
.../postgresql/command/PostgreSQLCommandExecuteEngine.java | 4 ++--
9 files changed, 18 insertions(+), 29 deletions(-)
diff --git
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLReadyForQueryPacket.java
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLReadyForQueryPacket.java
index f7908c2fb9d..30aac9e24c9 100644
---
a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLReadyForQueryPacket.java
+++
b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/generic/PostgreSQLReadyForQueryPacket.java
@@ -29,10 +29,10 @@ import
org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacket
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
public final class PostgreSQLReadyForQueryPacket implements PostgreSQLPacket {
- public static final PostgreSQLReadyForQueryPacket NOT_IN_TRANSACTION = new
PostgreSQLReadyForQueryPacket((byte) 'I');
-
public static final PostgreSQLReadyForQueryPacket IN_TRANSACTION = new
PostgreSQLReadyForQueryPacket((byte) 'T');
+ public static final PostgreSQLReadyForQueryPacket NOT_IN_TRANSACTION = new
PostgreSQLReadyForQueryPacket((byte) 'I');
+
public static final PostgreSQLReadyForQueryPacket TRANSACTION_FAILED = new
PostgreSQLReadyForQueryPacket((byte) 'E');
private static final byte[] PREFIX = {(byte)
PostgreSQLMessagePacketType.READY_FOR_QUERY.getValue(), 0, 0, 0, 5};
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
index 433ec223ca6..e8cb7f26156 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
@@ -43,7 +43,6 @@ import org.slf4j.MDC;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
-import java.util.Optional;
import java.util.stream.Collectors;
/**
@@ -137,8 +136,7 @@ public final class CommandExecutorTask implements Runnable {
log.error("Exception occur: ", cause);
}
context.write(databaseProtocolFrontendEngine.getCommandExecuteEngine().getErrorPacket(cause));
- Optional<DatabasePacket<?>> databasePacket =
databaseProtocolFrontendEngine.getCommandExecuteEngine().getOtherPacket(connectionSession);
- databasePacket.ifPresent(context::write);
+
databaseProtocolFrontendEngine.getCommandExecuteEngine().getOtherPacket(connectionSession).ifPresent(context::write);
context.flush();
}
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/CircuitBreakProxyState.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/CircuitBreakProxyState.java
index da789ea4f49..c76808eb3af 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/CircuitBreakProxyState.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/state/impl/CircuitBreakProxyState.java
@@ -18,14 +18,11 @@
package org.apache.shardingsphere.proxy.frontend.state.impl;
import io.netty.channel.ChannelHandlerContext;
-import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
-import
org.apache.shardingsphere.proxy.frontend.exception.CircuitBreakException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
+import
org.apache.shardingsphere.proxy.frontend.exception.CircuitBreakException;
import
org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine;
import org.apache.shardingsphere.proxy.frontend.state.ProxyState;
-import java.util.Optional;
-
/**
* Circuit break proxy state.
*/
@@ -34,7 +31,6 @@ public final class CircuitBreakProxyState implements
ProxyState {
@Override
public void execute(final ChannelHandlerContext context, final Object
message, final DatabaseProtocolFrontendEngine databaseProtocolFrontendEngine,
final ConnectionSession connectionSession) {
context.writeAndFlush(databaseProtocolFrontendEngine.getCommandExecuteEngine().getErrorPacket(new
CircuitBreakException()));
- Optional<DatabasePacket<?>> databasePacket =
databaseProtocolFrontendEngine.getCommandExecuteEngine().getOtherPacket(connectionSession);
- databasePacket.ifPresent(context::writeAndFlush);
+
databaseProtocolFrontendEngine.getCommandExecuteEngine().getOtherPacket(connectionSession).ifPresent(context::writeAndFlush);
}
}
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
index 9a7f3276582..68897511bb4 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/fixture/DatabaseProtocolFrontendEngineFixture.java
@@ -38,7 +38,7 @@ public final class DatabaseProtocolFrontendEngineFixture
implements DatabaseProt
}
@Override
- public CommandExecuteEngine<DatabasePacket<?>> getCommandExecuteEngine() {
+ public CommandExecuteEngine getCommandExecuteEngine() {
return null;
}
diff --git
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
index f3d50cd82b4..22ffb8ee441 100644
---
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
+++
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecuteEngine.java
@@ -32,10 +32,8 @@ import java.util.Optional;
/**
* Command execute engine.
- *
- * @param <T> type of database packet
*/
-public interface CommandExecuteEngine<T extends DatabasePacket<?>> {
+public interface CommandExecuteEngine {
/**
* Get command packet type.
@@ -72,7 +70,7 @@ public interface CommandExecuteEngine<T extends
DatabasePacket<?>> {
* @param cause cause of error
* @return error packet
*/
- T getErrorPacket(Exception cause);
+ DatabasePacket<?> getErrorPacket(Exception cause);
/**
* Get other packet.
@@ -80,7 +78,9 @@ public interface CommandExecuteEngine<T extends
DatabasePacket<?>> {
* @param connectionSession connection session
* @return other packet
*/
- Optional<T> getOtherPacket(ConnectionSession connectionSession);
+ default Optional<DatabasePacket<?>> getOtherPacket(ConnectionSession
connectionSession) {
+ return Optional.empty();
+ }
/**
* Write query data.
diff --git
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
index 4829a8adb15..aafc7d3af53 100644
---
a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
+++
b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
@@ -59,7 +59,7 @@ public interface DatabaseProtocolFrontendEngine<T extends
DatabasePacket<?>> ext
*
* @return command execute engine
*/
- CommandExecuteEngine<T> getCommandExecuteEngine();
+ CommandExecuteEngine getCommandExecuteEngine();
/**
* Release resource.
diff --git
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
index 617a0d4d9cf..ee6f32e00d4 100644
---
a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
+++
b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
@@ -41,12 +41,11 @@ import
org.apache.shardingsphere.proxy.frontend.command.executor.ResponseType;
import
org.apache.shardingsphere.proxy.frontend.mysql.err.MySQLErrPacketFactory;
import java.sql.SQLException;
-import java.util.Optional;
/**
* Command execute engine for MySQL.
*/
-public final class MySQLCommandExecuteEngine implements
CommandExecuteEngine<MySQLPacket> {
+public final class MySQLCommandExecuteEngine implements CommandExecuteEngine {
@Override
public MySQLCommandPacketType getCommandPacketType(final PacketPayload
payload) {
@@ -70,11 +69,6 @@ public final class MySQLCommandExecuteEngine implements
CommandExecuteEngine<MyS
return MySQLErrPacketFactory.newInstance(cause);
}
- @Override
- public Optional<MySQLPacket> getOtherPacket(final ConnectionSession
connectionSession) {
- return Optional.empty();
- }
-
@Override
public void writeQueryData(final ChannelHandlerContext context,
final ProxyDatabaseConnectionManager
databaseConnectionManager, final QueryCommandExecutor queryCommandExecutor,
final int headerPackagesCount) throws SQLException {
diff --git
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecuteEngine.java
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecuteEngine.java
index 0885be8ec32..cc0ce1f29ea 100644
---
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecuteEngine.java
+++
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/OpenGaussCommandExecuteEngine.java
@@ -22,6 +22,7 @@ import
org.apache.shardingsphere.db.protocol.opengauss.packet.command.OpenGaussC
import
org.apache.shardingsphere.db.protocol.opengauss.packet.command.OpenGaussCommandPacketType;
import org.apache.shardingsphere.db.protocol.packet.CommandPacket;
import org.apache.shardingsphere.db.protocol.packet.CommandPacketType;
+import org.apache.shardingsphere.db.protocol.packet.DatabasePacket;
import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacket;
@@ -42,7 +43,7 @@ import java.util.Optional;
/**
* Command execute engine for openGauss.
*/
-public final class OpenGaussCommandExecuteEngine implements
CommandExecuteEngine<PostgreSQLPacket> {
+public final class OpenGaussCommandExecuteEngine implements
CommandExecuteEngine {
private final PostgreSQLCommandExecuteEngine
postgreSQLCommandExecuteEngine = new PostgreSQLCommandExecuteEngine();
@@ -68,7 +69,7 @@ public final class OpenGaussCommandExecuteEngine implements
CommandExecuteEngine
}
@Override
- public Optional<PostgreSQLPacket> getOtherPacket(final ConnectionSession
connectionSession) {
+ public Optional<DatabasePacket<?>> getOtherPacket(final ConnectionSession
connectionSession) {
return
postgreSQLCommandExecuteEngine.getOtherPacket(connectionSession);
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
index ff854dba74f..f8438dc07d8 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
@@ -48,7 +48,7 @@ import java.util.Optional;
/**
* Command execute engine for PostgreSQL.
*/
-public final class PostgreSQLCommandExecuteEngine implements
CommandExecuteEngine<PostgreSQLPacket> {
+public final class PostgreSQLCommandExecuteEngine implements
CommandExecuteEngine {
@Override
public PostgreSQLCommandPacketType getCommandPacketType(final
PacketPayload payload) {
@@ -72,7 +72,7 @@ public final class PostgreSQLCommandExecuteEngine implements
CommandExecuteEngin
}
@Override
- public Optional<PostgreSQLPacket> getOtherPacket(final ConnectionSession
connectionSession) {
+ public Optional<DatabasePacket<?>> getOtherPacket(final ConnectionSession
connectionSession) {
return
Optional.of(connectionSession.getTransactionStatus().isInTransaction() ?
PostgreSQLReadyForQueryPacket.TRANSACTION_FAILED :
PostgreSQLReadyForQueryPacket.NOT_IN_TRANSACTION);
}
