You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ga...@apache.org on 2020/06/16 06:25:48 UTC
[incubator-dolphinscheduler] branch dev updated: add break &
default logic for NettyDecoder.decode (#2969)
This is an automated email from the ASF dual-hosted git repository.
gabrywu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 8031c16 add break & default logic for NettyDecoder.decode (#2969)
8031c16 is described below
commit 8031c1624af3ecbd3f2a8cd89802c27cada73415
Author: superScala <66...@users.noreply.github.com>
AuthorDate: Tue Jun 16 14:25:40 2020 +0800
add break & default logic for NettyDecoder.decode (#2969)
* add break & default logic for NettyDecoder.decode
* fix the bad code smells
Co-authored-by: gabry <wu...@qq.com>
Co-authored-by: gabry.wu <85...@users.noreply.github.com>
Co-authored-by: dailidong <da...@gmail.com>
---
.../org/apache/dolphinscheduler/remote/codec/NettyDecoder.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyDecoder.java b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyDecoder.java
index caa4fbd..09f97d6 100644
--- a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyDecoder.java
+++ b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/codec/NettyDecoder.java
@@ -24,6 +24,8 @@ import io.netty.handler.codec.ReplayingDecoder;
import org.apache.dolphinscheduler.remote.command.Command;
import org.apache.dolphinscheduler.remote.command.CommandHeader;
import org.apache.dolphinscheduler.remote.command.CommandType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
@@ -31,6 +33,7 @@ import java.util.List;
* netty decoder
*/
public class NettyDecoder extends ReplayingDecoder<NettyDecoder.State> {
+ private static final Logger logger = LoggerFactory.getLogger(NettyDecoder.class);
public NettyDecoder(){
super(State.MAGIC);
@@ -52,15 +55,19 @@ public class NettyDecoder extends ReplayingDecoder<NettyDecoder.State> {
case MAGIC:
checkMagic(in.readByte());
checkpoint(State.COMMAND);
+ break;
case COMMAND:
commandHeader.setType(in.readByte());
checkpoint(State.OPAQUE);
+ break;
case OPAQUE:
commandHeader.setOpaque(in.readLong());
checkpoint(State.BODY_LENGTH);
+ break;
case BODY_LENGTH:
commandHeader.setBodyLength(in.readInt());
checkpoint(State.BODY);
+ break;
case BODY:
byte[] body = new byte[commandHeader.getBodyLength()];
in.readBytes(body);
@@ -72,6 +79,9 @@ public class NettyDecoder extends ReplayingDecoder<NettyDecoder.State> {
out.add(packet);
//
checkpoint(State.MAGIC);
+ break;
+ default:
+ logger.warn("unknown decoder state {}", state());
}
}