You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by yx...@apache.org on 2023/04/14 17:47:24 UTC
[shardingsphere] branch master updated: Refactor WriteCompleteEvent (#25176)
This is an automated email from the ASF dual-hosted git repository.
yx9o 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 db9418c3b8c Refactor WriteCompleteEvent (#25176)
db9418c3b8c is described below
commit db9418c3b8c77ff1eb234a635a8ea3ae07a30775
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Apr 15 01:47:10 2023 +0800
Refactor WriteCompleteEvent (#25176)
---
.../db/protocol/event/WriteCompleteEvent.java | 15 ---------------
.../db/protocol/netty/ProxyFlowControlHandler.java | 6 +++---
.../db/protocol/netty/ProxyFlowControlHandlerTest.java | 6 +++---
.../mysql/netty/MySQLSequenceIDInboundHandlerTest.java | 2 +-
.../proxy/frontend/command/CommandExecutorTask.java | 2 +-
5 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/event/WriteCompleteEvent.java b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/event/WriteCompleteEvent.java
index ecdad5b8153..9416bb79ab8 100644
--- a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/event/WriteCompleteEvent.java
+++ b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/event/WriteCompleteEvent.java
@@ -17,23 +17,8 @@
package org.apache.shardingsphere.db.protocol.event;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-
/**
* Write complete event.
*/
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class WriteCompleteEvent {
-
- private static final WriteCompleteEvent INSTANCE = new WriteCompleteEvent();
-
- /**
- * Get instance of {@link WriteCompleteEvent}.
- *
- * @return instance of {@link WriteCompleteEvent}
- */
- public static WriteCompleteEvent getInstance() {
- return INSTANCE;
- }
}
diff --git a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandler.java b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandler.java
index c8c90fd31a2..d519bc38b82 100644
--- a/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandler.java
+++ b/db-protocol/core/src/main/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandler.java
@@ -27,10 +27,10 @@ import org.apache.shardingsphere.db.protocol.event.WriteCompleteEvent;
public final class ProxyFlowControlHandler extends FlowControlHandler {
@Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
- if (WriteCompleteEvent.getInstance() == evt) {
+ public void userEventTriggered(final ChannelHandlerContext ctx, final Object event) {
+ if (event instanceof WriteCompleteEvent) {
ctx.channel().config().setAutoRead(true);
}
- ctx.fireUserEventTriggered(evt);
+ ctx.fireUserEventTriggered(event);
}
}
diff --git a/db-protocol/core/src/test/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandlerTest.java b/db-protocol/core/src/test/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandlerTest.java
index bb15481d1d4..2352a281f81 100644
--- a/db-protocol/core/src/test/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandlerTest.java
+++ b/db-protocol/core/src/test/java/org/apache/shardingsphere/db/protocol/netty/ProxyFlowControlHandlerTest.java
@@ -35,12 +35,12 @@ class ProxyFlowControlHandlerTest {
EmbeddedChannel channel = new EmbeddedChannel(new ProxyFlowControlHandler(), new ChannelInboundHandlerAdapter() {
@Override
- public void userEventTriggered(final ChannelHandlerContext ctx, final Object evt) {
- eventReceived.set(WriteCompleteEvent.getInstance() == evt);
+ public void userEventTriggered(final ChannelHandlerContext ctx, final Object event) {
+ eventReceived.set(event instanceof WriteCompleteEvent);
}
});
channel.config().setAutoRead(false);
- channel.pipeline().fireUserEventTriggered(WriteCompleteEvent.getInstance());
+ channel.pipeline().fireUserEventTriggered(new WriteCompleteEvent());
assertTrue(channel.config().isAutoRead());
assertTrue(eventReceived.get());
}
diff --git a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/netty/MySQLSequenceIDInboundHandlerTest.java b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/netty/MySQLSequenceIDInboundHandlerTest.java
index 17f422896f3..d64d0d54fca 100644
--- a/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/netty/MySQLSequenceIDInboundHandlerTest.java
+++ b/db-protocol/mysql/src/test/java/org/apache/shardingsphere/db/protocol/mysql/netty/MySQLSequenceIDInboundHandlerTest.java
@@ -62,7 +62,7 @@ class MySQLSequenceIDInboundHandlerTest {
context.channel().config().setAutoRead(false);
context.executor().execute(() -> {
context.writeAndFlush(Unpooled.EMPTY_BUFFER);
- context.channel().pipeline().fireUserEventTriggered(WriteCompleteEvent.getInstance());
+ context.channel().pipeline().fireUserEventTriggered(new WriteCompleteEvent());
});
}
}
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 de85ab0fef5..83b0d33f991 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
@@ -96,7 +96,7 @@ public final class CommandExecutorTask implements Runnable {
context.flush();
}
processClosedExceptions(exceptions);
- context.pipeline().fireUserEventTriggered(WriteCompleteEvent.getInstance());
+ context.pipeline().fireUserEventTriggered(new WriteCompleteEvent());
if (sqlShowEnabled) {
clearLogMDC();
}