From 6a99fa88c37a0933cf7baa7c88201d6b47ec15a2 Mon Sep 17 00:00:00 2001 From: ZePeng Chen <84842773+Roc-00@users.noreply.github.com> Date: Fri, 16 Jul 2021 16:36:00 +0800 Subject: [PATCH] [ISSUE #428]Fix Chinese annotation (#431) * The Chinese in the notes is translated into English. * Translation improvement * Translation improvement * fix Chinese annotation on runtime module --- .../eventmesh/common/command/HttpCommand.java | 4 +- .../body/client/HeartbeatResponseBody.java | 6 +- .../message/ReplyMessageResponseBody.java | 6 +- .../message/SendMessageBatchResponseBody.java | 6 +- .../SendMessageBatchV2ResponseBody.java | 6 +- .../protocol/http/common/ClientRetCode.java | 2 +- .../protocol/http/common/ProtocolKey.java | 6 +- .../header/client/HeartbeatRequestHeader.java | 20 +-- .../http/header/client/RegResponseHeader.java | 10 +- .../header/client/UnRegRequestHeader.java | 20 +-- .../message/PushMessageRequestHeader.java | 6 +- .../message/PushMessageResponseHeader.java | 20 +-- .../message/ReplyMessageRequestHeader.java | 20 +-- .../message/ReplyMessageResponseHeader.java | 10 +- .../SendMessageBatchRequestHeader.java | 20 +-- .../SendMessageBatchResponseHeader.java | 10 +- .../SendMessageBatchV2RequestHeader.java | 20 +-- .../SendMessageBatchV2ResponseHeader.java | 10 +- .../message/SendMessageRequestHeader.java | 20 +-- .../message/SendMessageResponseHeader.java | 10 +- .../common/protocol/tcp/Command.java | 124 +++++++++--------- eventmesh-runtime/bin/start.sh | 8 +- eventmesh-runtime/bin/stop.sh | 6 +- .../http/consumer/ConsumerManager.java | 4 +- .../http/processor/ReplyMessageProcessor.java | 2 +- .../http/processor/SubscribeProcessor.java | 6 +- .../http/processor/UnSubscribeProcessor.java | 8 +- .../dispatch/DownstreamDispatchStrategy.java | 2 +- .../push/retry/EventMeshTcpRetryer.java | 4 +- .../runtime/metrics/http/SummaryMetrics.java | 4 +- .../metrics/http/TcpSummaryMetrics.java | 2 +- .../eventmesh/runtime/util/EventMeshUtil.java | 4 +- .../apache/eventmesh/runtime/util/Utils.java | 12 +- .../test/java/client/common/TCPClient.java | 4 +- .../test/java/client/hook/ReceiveMsgHook.java | 2 +- .../test/java/client/impl/PubClientImpl.java | 10 +- .../test/java/client/impl/SubClientImpl.java | 2 +- .../src/test/java/demo/CClientDemo.java | 6 +- 38 files changed, 221 insertions(+), 221 deletions(-) diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java index d36a1ae613..65bc770efe 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/command/HttpCommand.java @@ -47,10 +47,10 @@ public class HttpCommand { public Body body; - //Command 请求时间 + //Command request time public long reqTime; - //Command 回复时间 + //Command response time public long resTime; public CmdType cmdType = CmdType.REQ; diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java index 0f05f512ce..2d213ce017 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/client/HeartbeatResponseBody.java @@ -27,13 +27,13 @@ public class HeartbeatResponseBody extends Body { - //响应码 + //return code private Integer retCode; - //响应信息 + //response message private String retMsg; - //回复时间 + //response time private long resTime = System.currentTimeMillis(); public Integer getRetCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java index b5a2069481..2f9ba960d3 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/ReplyMessageResponseBody.java @@ -27,13 +27,13 @@ public class ReplyMessageResponseBody extends Body { - //响应码 + //return code private Integer retCode; - //响应信息 + //response message private String retMsg; - //回复时间 + //response time private long resTime = System.currentTimeMillis(); public Integer getRetCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java index cf5ad72906..bdf8004de0 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchResponseBody.java @@ -27,13 +27,13 @@ public class SendMessageBatchResponseBody extends Body { - //响应码 + //return code private Integer retCode; - //响应信息 + //response message private String retMsg; - //回复时间 + //response time private long resTime = System.currentTimeMillis(); public Integer getRetCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java index fd0b49a22c..a2f69fb84f 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/message/SendMessageBatchV2ResponseBody.java @@ -27,13 +27,13 @@ public class SendMessageBatchV2ResponseBody extends Body { - //响应码 + //return code private Integer retCode; - //响应信息 + //response message private String retMsg; - //回复时间 + //response time private long resTime = System.currentTimeMillis(); public Integer getRetCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java index 30986efa9c..47f781b940 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ClientRetCode.java @@ -20,7 +20,7 @@ public enum ClientRetCode { /** - * 这个RETRY的意思是 客户端发现投递的消息它没有监听时, 告诉EventMesh 发往下一个, 重试几次以实现灰度 , 预留 + * The "RETRY" means:when the client finds the delivered message and it does not listen, tell EventMesh to send next,try again several times to achieve grayscale, reserve */ OK(1, "ok, SDK返回"), diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java index 12e79ad30d..28e944ea30 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/common/ProtocolKey.java @@ -24,7 +24,7 @@ public class ProtocolKey { public static final String VERSION = "Version"; public static class ClientInstanceKey { - ////////////////////////////////////协议层请求方描述/////////// + ////////////////////////////////////Protocol layer requester description/////////// public static final String ENV = "Env"; public static final String IDC = "Idc"; public static final String SYS = "Sys"; @@ -36,7 +36,7 @@ public static class ClientInstanceKey { public static class EventMeshInstanceKey { - ///////////////////////////////////////////////协议层EventMesh描述 + ///////////////////////////////////////////////Protocol layer EventMesh description public static final String EVENTMESHCLUSTER = "EventMeshCluster"; public static final String EVENTMESHIP = "EventMeshIp"; public static final String EVENTMESHENV = "EventMeshEnv"; @@ -44,7 +44,7 @@ public static class EventMeshInstanceKey { } - //CLIENT <-> EventMesh 的 返回 + //return of CLIENT <-> EventMesh public static final String RETCODE = "retCode"; public static final String RETMSG = "retMsg"; public static final String RESTIME = "resTime"; diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java index 5cd07242e2..2713e8db29 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java @@ -29,36 +29,36 @@ public class HeartbeatRequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; private String producerGroup; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java index 503a527ea1..54ca794d57 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/RegResponseHeader.java @@ -26,19 +26,19 @@ public class RegResponseHeader extends Header { - //响应码, 与对应Request的code一致 + //response code, as same as the request code private int code; - //处理该次Request请求的eventMesh的集群名 + //The cluster name of the EventMesh that processes the request private String eventMeshCluster; - //处理该次Request请求的eventMesh的IP + //IP of the EventMesh that processes the request private String eventMeshIp; - //处理该次Request请求的eventMesh所在的环境编号 + //Environment number of the EventMesh that processes the request private String eventMeshEnv; - //处理该次Request请求的eventMesh所在IDC + //IDC of the EventMesh that processes the request private String eventMeshIdc; public int getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java index 09c3a6d378..7503c7c5ff 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java @@ -29,34 +29,34 @@ public class UnRegRequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public static UnRegRequestHeader buildHeader(Map headerParam) { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java index 18f6cfc659..99a558796c 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageRequestHeader.java @@ -29,13 +29,13 @@ public class PushMessageRequestHeader extends Header { - //请求码 + //request code private int code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; private String eventMeshCluster; diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java index 2f8fc63f70..6d61b8262e 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/PushMessageResponseHeader.java @@ -28,34 +28,34 @@ public class PushMessageResponseHeader extends Header { - //响应码 + //response code private int code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getUsername() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java index e7d347efa0..769fe4a470 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageRequestHeader.java @@ -29,34 +29,34 @@ public class ReplyMessageRequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getUsername() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java index 33fd373251..f52428e4ef 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/ReplyMessageResponseHeader.java @@ -26,19 +26,19 @@ public class ReplyMessageResponseHeader extends Header { - //响应码, 与对应Request的code一致 + //response code, as same as the request code private int code; - //处理该次Request请求的eventMesh的集群名 + //The cluster name of the EventMesh that processes the request private String eventMeshCluster; - //处理该次Request请求的eventMesh的IP + //IP of the EventMesh that processes the request private String eventMeshIp; - //处理该次Request请求的eventMesh所在的环境编号 + //Environment number of the EventMesh that processes the request private String eventMeshEnv; - //处理该次Request请求的eventMesh所在IDC + //IDC of the EventMesh that processes the request private String eventMeshIdc; public int getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java index f981ceb2bf..88d3c006ce 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchRequestHeader.java @@ -30,34 +30,34 @@ public class SendMessageBatchRequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getUsername() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java index d06660e5b5..8bee0b1158 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchResponseHeader.java @@ -26,19 +26,19 @@ public class SendMessageBatchResponseHeader extends Header { - //响应码, 与对应Request的code一致 + //response code, as same as the request code private int code; - //处理该次Request请求的eventMesh的集群名 + //The cluster name of the EventMesh that processes the request private String eventMeshCluster; - //处理该次Request请求的eventMesh的IP + //IP of the EventMesh that processes the request private String eventMeshIp; - //处理该次Request请求的eventMesh所在的环境编号 + //Environment number of the EventMesh that processes the request private String eventMeshEnv; - //处理该次Request请求的eventMesh所在IDC + //IDC of the EventMesh that processes the request private String eventMeshIdc; public int getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java index 1e7468e45d..aabc2d68e5 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2RequestHeader.java @@ -29,34 +29,34 @@ public class SendMessageBatchV2RequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getUsername() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java index 1544381b04..ed4898fd02 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageBatchV2ResponseHeader.java @@ -25,19 +25,19 @@ public class SendMessageBatchV2ResponseHeader extends Header { - //响应码, 与对应Request的code一致 + //response code, as same as the request code private int code; - //处理该次Request请求的eventMesh的集群名 + //The cluster name of the EventMesh that processes the request private String eventMeshCluster; - //处理该次Request请求的eventMesh的IP + //IP of the EventMesh that processes the request private String eventMeshIp; - //处理该次Request请求的eventMesh所在的环境编号 + //Environment number of the EventMesh that processes the request private String eventMeshEnv; - //处理该次Request请求的eventMesh所在IDC + //IDC of the EventMesh that processes the request private String eventMeshIdc; public int getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java index 8512529baa..8745fe157c 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageRequestHeader.java @@ -29,34 +29,34 @@ public class SendMessageRequestHeader extends Header { - //请求码 + //request code private String code; - //请求方语言描述 + //requester language description private String language; - //请求方采用的协议版本, 默认1.0 + //protocol version adopted by requester, default:1.0 private ProtocolVersion version; - //请求方所在环境编号 + //the environment number of the requester private String env; - //请求方所在IDC + //the IDC of the requester private String idc; - //请求方的子系统 + //subsystem of the requester private String sys; - //请求方的进程号 + //PID of the requester private String pid; - //请求方的IP + //IP of the requester private String ip; - //请求方的USERNAME + //USERNAME of the requester private String username = "username"; - //请求方的PASSWD + //PASSWD of the requester private String passwd = "user@123"; public String getUsername() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java index caa5eed8ad..aa10c2a8c3 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/message/SendMessageResponseHeader.java @@ -26,19 +26,19 @@ public class SendMessageResponseHeader extends Header { - //响应码, 与对应Request的code一致 + //response code, as same as the request code private int code; - //处理该次Request请求的eventMesh的集群名 + //The cluster name of the EventMesh that processes the request private String eventMeshCluster; - //处理该次Request请求的eventMesh的IP + //IP of the EventMesh that processes the request private String eventMeshIp; - //处理该次Request请求的eventMesh所在的环境编号 + //Environment number of the EventMesh that processes the request private String eventMeshEnv; - //处理该次Request请求的eventMesh所在IDC + //IDC of the EventMesh that processes the request private String eventMeshIdc; public int getCode() { diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java index 54d75b4a61..6381f29413 100644 --- a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java +++ b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/Command.java @@ -19,70 +19,70 @@ public enum Command { - //心跳 - HEARTBEAT_REQUEST(0), //client发给server的心跳包 - HEARTBEAT_RESPONSE(1), //server回复client的心跳包 - - //握手 - HELLO_REQUEST(2), //client发给server的握手请求 - HELLO_RESPONSE(3), //server回复client的握手请求 - - //断连 - CLIENT_GOODBYE_REQUEST(4), //client主动断连时通知server - CLIENT_GOODBYE_RESPONSE(5), //server回复client的主动断连通知 - SERVER_GOODBYE_REQUEST(6), //server主动断连时通知client - SERVER_GOODBYE_RESPONSE(7), //client回复server的主动断连通知 - - //订阅管理 - SUBSCRIBE_REQUEST(8), //client发给server的订阅请求 - SUBSCRIBE_RESPONSE(9), //server回复client的订阅请求 - UNSUBSCRIBE_REQUEST(10), //client发给server的取消订阅请求 - UNSUBSCRIBE_RESPONSE(11), //server回复client的取消订阅请求 - - //监听 - LISTEN_REQUEST(12), //client发给server的启动topic监听的请求 - LISTEN_RESPONSE(13), //server回复client的监听请求 + //heartbeat + HEARTBEAT_REQUEST(0), //client send heartbeat packet to server + HEARTBEAT_RESPONSE(1), //server response heartbeat packet of client + + //handshake + HELLO_REQUEST(2), //client send handshake request to server + HELLO_RESPONSE(3), //server response handshake request of client + + //disconnection + CLIENT_GOODBYE_REQUEST(4), //Notify server when client actively disconnects + CLIENT_GOODBYE_RESPONSE(5), //Server replies to client's active disconnection notification + SERVER_GOODBYE_REQUEST(6), //Notify client when server actively disconnects + SERVER_GOODBYE_RESPONSE(7), //Client replies to server's active disconnection notification + + //subscription management + SUBSCRIBE_REQUEST(8), //Subscription request sent by client to server + SUBSCRIBE_RESPONSE(9), //Server replies to client's subscription request + UNSUBSCRIBE_REQUEST(10), //Unsubscribe request from client to server + UNSUBSCRIBE_RESPONSE(11), //Server replies to client's unsubscribe request + + //monitor + LISTEN_REQUEST(12), //Request from client to server to start topic listening + LISTEN_RESPONSE(13), //The server replies to the client's listening request //RR - REQUEST_TO_SERVER(14), //client将RR请求发送给server - REQUEST_TO_CLIENT(15), //server将RR请求推送给client - REQUEST_TO_CLIENT_ACK(16), //client收到RR请求后ACK给server - RESPONSE_TO_SERVER(17), //client将RR回包发送给server - RESPONSE_TO_CLIENT(18), //server将RR回包推送给client - RESPONSE_TO_CLIENT_ACK(19), //client收到回包后ACK给server - - //异步事件 - ASYNC_MESSAGE_TO_SERVER(20), //client将异步事件发送给server - ASYNC_MESSAGE_TO_SERVER_ACK(21), //server收到异步事件后ACK给client - ASYNC_MESSAGE_TO_CLIENT(22), //server将异步事件推送给client - ASYNC_MESSAGE_TO_CLIENT_ACK(23), //client收到异步事件后ACK给server - - //广播 - BROADCAST_MESSAGE_TO_SERVER(24), //client将广播消息发送给server - BROADCAST_MESSAGE_TO_SERVER_ACK(25), //server收到广播消息后ACK给client - BROADCAST_MESSAGE_TO_CLIENT(26), //server将广播消息推送给client - BROADCAST_MESSAGE_TO_CLIENT_ACK(27), //client收到广播消息后ACK给server - - //日志上报 - SYS_LOG_TO_LOGSERVER(28), //业务日志上报 - - //RMB跟踪日志上报 - TRACE_LOG_TO_LOGSERVER(29), //RMB跟踪日志上报 - - //重定向指令 - REDIRECT_TO_CLIENT(30), //server将重定向指令推动给client - - //服务注册 - REGISTER_REQUEST(31), //client发送注册请求给server - REGISTER_RESPONSE(32), //server将注册结果给client - - //服务去注册 - UNREGISTER_REQUEST(33), //client发送去注册请求给server - UNREGISTER_RESPONSE(34), //server将去注册结果给client - - //client询问EventMesh推荐连哪个EventMesh - RECOMMEND_REQUEST(35), //client发送推荐请求给server - RECOMMEND_RESPONSE(36); //server将推荐结果给client + REQUEST_TO_SERVER(14), //The client sends the RR request to the server + REQUEST_TO_CLIENT(15), //The server pushes the RR request to the client + REQUEST_TO_CLIENT_ACK(16), //After receiving RR request, the client sends ACK to the server + RESPONSE_TO_SERVER(17), //The client sends the RR packet back to the server + RESPONSE_TO_CLIENT(18), //The server pushes the RR packet back to the client + RESPONSE_TO_CLIENT_ACK(19), //After receiving the return packet, the client sends ACK to the server + + //Asynchronous events + ASYNC_MESSAGE_TO_SERVER(20), //The client sends asynchronous events to the server + ASYNC_MESSAGE_TO_SERVER_ACK(21), //After receiving the asynchronous event, the server sends ack to the client + ASYNC_MESSAGE_TO_CLIENT(22), //The server pushes asynchronous events to the client + ASYNC_MESSAGE_TO_CLIENT_ACK(23), //After the client receives the asynchronous event, the ACK is sent to the server + + //radio broadcast + BROADCAST_MESSAGE_TO_SERVER(24), //The client sends the broadcast message to the server + BROADCAST_MESSAGE_TO_SERVER_ACK(25), //After receiving the broadcast message, the server sends ACK to the client + BROADCAST_MESSAGE_TO_CLIENT(26), //The server pushes the broadcast message to the client + BROADCAST_MESSAGE_TO_CLIENT_ACK(27), //After the client receives the broadcast message, the ACK is sent to the server + + //Log reporting + SYS_LOG_TO_LOGSERVER(28), //Business log reporting + + //RMB tracking log reporting + TRACE_LOG_TO_LOGSERVER(29), //RMB tracking log reporting + + //Redirecting instruction + REDIRECT_TO_CLIENT(30), //The server pushes the redirection instruction to the client + + //service register + REGISTER_REQUEST(31), //Client sends registration request to server + REGISTER_RESPONSE(32), //The server sends the registration result to the client + + //service unregister + UNREGISTER_REQUEST(33), //The client sends a de registration request to the server + UNREGISTER_RESPONSE(34), //The server will register the result to the client + + //The client asks which EventMesh to recommend + RECOMMEND_REQUEST(35), //Client sends recommendation request to server + RECOMMEND_RESPONSE(36); //The server will recommend the results to the client private final byte value; diff --git a/eventmesh-runtime/bin/start.sh b/eventmesh-runtime/bin/start.sh index 9c0724bdd0..5be0636166 100644 --- a/eventmesh-runtime/bin/start.sh +++ b/eventmesh-runtime/bin/start.sh @@ -35,7 +35,7 @@ # Java Environment Setting #=========================================================================================== set -e -#服务器配置可能不一致,增加这些配置避免乱码问题 +#Server configuration may be inconsistent, add these configurations to avoid garbled code problems export LANG=en_US.UTF-8 export LC_CTYPE=en_US.UTF-8 export LC_ALL=en_US.UTF-8 @@ -69,13 +69,13 @@ function get_pid { ppid=$(cat ${EVENTMESH_HOME}/bin/pid.file) else if [[ $OS =~ Msys ]]; then - # 在Msys上存在可能无法kill识别出的进程的BUG + # There is a Bug on Msys that may not be able to kill the identified process ppid=`jps -v | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep java | grep -v grep | awk -F ' ' {'print $1'}` elif [[ $OS =~ Darwin ]]; then - # 已知问题：grep java 可能无法精确识别java进程 + # Known problem: grep Java may not be able to accurately identify Java processes ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) else - #在Linux服务器上要求尽可能精确识别进程 + # It is required to identify the process as accurately as possible on Linux ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_HOME | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) fi fi diff --git a/eventmesh-runtime/bin/stop.sh b/eventmesh-runtime/bin/stop.sh index 4897c77612..ff5b27ccda 100644 --- a/eventmesh-runtime/bin/stop.sh +++ b/eventmesh-runtime/bin/stop.sh @@ -30,13 +30,13 @@ function get_pid { ppid=$(cat ${EVENTMESH_HOME}/bin/pid.file) else if [[ $OS =~ Msys ]]; then - # 在Msys上存在可能无法kill识别出的进程的BUG + # There is a Bug on Msys that may not be able to kill the identified process ppid=`jps -v | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep java | grep -v grep | awk -F ' ' {'print $1'}` elif [[ $OS =~ Darwin ]]; then - # 已知问题：grep java 可能无法精确识别java进程 + # Known problem: grep Java may not be able to accurately identify Java processes ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) else - #在Linux服务器上要求尽可能精确识别进程 + # It is required to identify the process as accurately as possible on Linux ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_HOME | grep -i "org.apache.eventmesh.runtime.boot.EventMeshStartup" | grep -Ev "^root" |awk -F ' ' {'print $2'}) fi fi diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java index 51ede0bdd8..88574811b2 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/consumer/ConsumerManager.java @@ -81,7 +81,7 @@ public void run() { boolean isChange = false; while (clientIterator.hasNext()) { Client client = clientIterator.next(); - //时间差大于3次心跳周期 + //The time difference is greater than 3 heartbeat cycles if (System.currentTimeMillis() - client.lastUpTime.getTime() > DEFAULT_UPDATE_TIME) { logger.warn("client {} lastUpdate time {} over three heartbeat cycles", JSONObject.toJSONString(client), client.lastUpTime); @@ -152,7 +152,7 @@ public void run() { } /** - * notify ConsumerManager 组级别 + * notify ConsumerManager groupLevel */ public void notifyConsumerManager(String consumerGroup, ConsumerGroupConf latestConsumerGroupConfig, ConcurrentHashMap localConsumerGroupMapping) throws Exception { diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/ReplyMessageProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/ReplyMessageProcessor.java index 5d8745b611..6b86b2ecd4 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/ReplyMessageProcessor.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/ReplyMessageProcessor.java @@ -80,7 +80,7 @@ public void processRequest(ChannelHandlerContext ctx, AsyncContext IPUtil.getLocalAddress(), eventMeshHTTPServer.getEventMeshHttpConfiguration().eventMeshEnv, eventMeshHTTPServer.getEventMeshHttpConfiguration().eventMeshIDC); - //HEADER校验 + //validate HEADER if (StringUtils.isBlank(replyMessageRequestHeader.getIdc()) || StringUtils.isBlank(replyMessageRequestHeader.getPid()) || !StringUtils.isNumeric(replyMessageRequestHeader.getPid()) diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java index e22a86c7c1..1e8daf0ee9 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/SubscribeProcessor.java @@ -126,7 +126,7 @@ public void processRequest(ChannelHandlerContext ctx, AsyncContext } ConsumerGroupConf consumerGroupConf = eventMeshHTTPServer.localConsumerGroupMapping.get(consumerGroup); if (consumerGroupConf == null) { - // 新订阅 + // new subscription consumerGroupConf = new ConsumerGroupConf(consumerGroup); ConsumerGroupTopicConf consumeTopicConfig = new ConsumerGroupTopicConf(); consumeTopicConfig.setConsumerGroup(consumerGroup); @@ -140,7 +140,7 @@ public void processRequest(ChannelHandlerContext ctx, AsyncContext map.put(subTopic.getTopic(), consumeTopicConfig); consumerGroupConf.setConsumerGroupTopicConf(map); } else { - // 已有订阅 + // already subscribed Map map = consumerGroupConf.getConsumerGroupTopicConf(); for (String key : map.keySet()) { if (StringUtils.equals(subTopic.getTopic(), key)) { @@ -163,7 +163,7 @@ public void processRequest(ChannelHandlerContext ctx, AsyncContext long startTime = System.currentTimeMillis(); try { - // 订阅关系变化通知 + // subscription relationship change notification eventMeshHTTPServer.getConsumerManager().notifyConsumerManager(consumerGroup, eventMeshHTTPServer.localConsumerGroupMapping.get(consumerGroup), eventMeshHTTPServer.localConsumerGroupMapping); diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java index d45781293b..e5feb7619b 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/UnSubscribeProcessor.java @@ -141,7 +141,7 @@ public void onResponse(HttpCommand httpCommand) { Map> idcUrls = new HashMap<>(); Set clientUrls = new HashSet<>(); for (Client client : groupTopicClients) { - // 去除订阅的url + // remove subscribed url if (!StringUtils.equals(unSubscribeUrl, client.url)) { clientUrls.add(client.url); if (idcUrls.containsKey(client.idc)) { @@ -158,7 +158,7 @@ public void onResponse(HttpCommand httpCommand) { ConsumerGroupConf consumerGroupConf = eventMeshHTTPServer.localConsumerGroupMapping.get(consumerGroup); Map map = consumerGroupConf.getConsumerGroupTopicConf(); for (String topicKey : map.keySet()) { - // 仅修改去订阅的topic + // only modify the topic to subscribe if (StringUtils.equals(unSubTopic, topicKey)) { ConsumerGroupTopicConf latestTopicConf = new ConsumerGroupTopicConf(); latestTopicConf.setConsumerGroup(consumerGroup); @@ -209,9 +209,9 @@ public void onResponse(HttpCommand httpCommand) { responseEventMeshCommand = asyncContext.getRequest().createHttpCommandResponse( EventMeshRetCode.SUCCESS.getRetCode(), EventMeshRetCode.SUCCESS.getErrMsg()); asyncContext.onComplete(responseEventMeshCommand, handler); - // 清理ClientInfo + // clean ClientInfo eventMeshHTTPServer.localClientInfoMapping.keySet().removeIf(s -> StringUtils.contains(s, consumerGroup)); - // 清理ConsumerGroupInfo + // clean ConsumerGroupInfo eventMeshHTTPServer.localConsumerGroupMapping.keySet().removeIf(s -> StringUtils.equals(consumerGroup, s)); } catch (Exception e) { HttpCommand err = asyncContext.getRequest().createHttpCommandResponse( diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/DownstreamDispatchStrategy.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/DownstreamDispatchStrategy.java index 27169ff47a..fe0e589620 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/DownstreamDispatchStrategy.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/group/dispatch/DownstreamDispatchStrategy.java @@ -24,7 +24,7 @@ public interface DownstreamDispatchStrategy { /** - * 选择一个SESSION + * select a SESSION * * @param group * @param consumeSessions diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/retry/EventMeshTcpRetryer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/retry/EventMeshTcpRetryer.java index 57165a9d85..aeec1dbb32 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/retry/EventMeshTcpRetryer.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/session/push/retry/EventMeshTcpRetryer.java @@ -132,10 +132,10 @@ private void retryHandle(DownStreamMsgContext downStreamMsgContext) { if (rechoosen == null) { logger.warn("retry, found no session to downstream msg,seq:{}, retryTimes:{}, bizSeq:{}", downStreamMsgContext.seq, downStreamMsgContext.retryTimes, EventMeshUtil.getMessageBizSeq(downStreamMsgContext.msgExt)); -// //需要手动ack掉没有下发成功的消息 +// //Need to manually ack the message that did not send a successful message // eventMeshAckMsg(downStreamMsgContext); -// //重试找不到下发session不再回发broker或者重试其它eventMesh +// //Retry cannot find the delivered session, no longer post back to the broker or retry other event Mesh // String bizSeqNo = finalDownStreamMsgContext.msgExt.getKeys(); // String uniqueId = MapUtils.getString(finalDownStreamMsgContext.msgExt.getProperties(), WeMQConstant.RMB_UNIQ_ID, ""); // if(EventMeshTCPServer.getAccessConfiguration().eventMeshTcpSendBackEnabled){ diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/SummaryMetrics.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/SummaryMetrics.java index 01ef0439cd..8a8a0e7611 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/SummaryMetrics.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/SummaryMetrics.java @@ -59,14 +59,14 @@ private float avg(LinkedList linkedList) { } //////////////////////////////////////////////////////////////////////////////// - public static final String EVENTMESH_MONITOR_FORMAT_HTTP = "{\"maxHTTPTPS\":\"%.1f\",\"avgHTTPTPS\":\"%.1f\"," + //EVENTMESH 接受外部HTTP 请求的TPS相关 + public static final String EVENTMESH_MONITOR_FORMAT_HTTP = "{\"maxHTTPTPS\":\"%.1f\",\"avgHTTPTPS\":\"%.1f\"," + //EVENTMESH tps related to accepting external http requests "\"maxHTTPCOST\":\"%s\",\"avgHTTPCOST\":\"%.1f\",\"avgHTTPBodyDecodeCost\":\"%.1f\", \"httpDiscard\":\"%s\"}"; private float wholeCost = 0f; private AtomicLong wholeRequestNum = new AtomicLong(0); - //累计值 + //cumulative value private AtomicLong httpDiscard = new AtomicLong(0); private AtomicLong maxCost = new AtomicLong(0); diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/TcpSummaryMetrics.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/TcpSummaryMetrics.java index 4c69c67729..ce5944d46c 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/TcpSummaryMetrics.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/metrics/http/TcpSummaryMetrics.java @@ -58,7 +58,7 @@ private float avg(LinkedList linkedList) { } //////////////////////////////////////////////////////////////////////////////// - public static final String EVENTMESH_MONITOR_FORMAT_HTTP = "%15s : {\"maxHTTPTPS\":\"%.1f\",\"avgHTTPTPS\":\"%.1f\"," + //EVENTMESH 接受外部HTTP 请求的TPS相关 + public static final String EVENTMESH_MONITOR_FORMAT_HTTP = "%15s : {\"maxHTTPTPS\":\"%.1f\",\"avgHTTPTPS\":\"%.1f\"," + //EVENTMESH tps related to accepting external http requests "\"maxHTTPCOST\":\"%s\",\"avgHTTPCOST\":\"%.1f\",\"avgHTTPBodyDecodeCost\":\"%.1f\"}"; private float wholeCost = 0f; diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java index eca44b9ee6..1d0cd9cb85 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/EventMeshUtil.java @@ -80,7 +80,7 @@ public static String buildClientGroup(String systemId) { } /** - * 自定义取堆栈 + * custom fetch stack * * @param e * @return @@ -119,7 +119,7 @@ public static ObjectMapper createJsoner() { /** - * 打印mq消息的一部分内容 + * print part of the mq message * * @param eventMeshMessage * @return diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java index f3596e6a74..cf97d05a8f 100644 --- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java +++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/Utils.java @@ -38,7 +38,7 @@ public class Utils { private final static Logger messageLogger = LoggerFactory.getLogger("message"); /** - * 用于向客户端发送消息 + * used to send messages to the client * * @param pkg * @param startTime @@ -75,7 +75,7 @@ public void operationComplete(ChannelFuture future) throws Exception { } /** - * 打印发送失败的消息流水 + * print the message flow of failed sending * * @param future * @param pkg @@ -97,7 +97,7 @@ private static void logFailedMessageFlow(Package pkg, UserAgent user, long start } /** - * 打印发送发成的消息流水 + * print the message flow of successful sending * * @param pkg * @param user @@ -147,7 +147,7 @@ public static void logSucceedMessageFlow(Package pkg, UserAgent user, long start // } /** - * 打印mq消息的一部分内容 + * print part of the mq message * * @param eventMeshMessage * @return @@ -166,7 +166,7 @@ public static String printMqMessage(EventMeshMessage eventMeshMessage) { } /** - * 打印mq消息的一部分内容 + * print part of the mq message * * @param message * @return @@ -180,7 +180,7 @@ public static String printMqMessage(EventMeshMessage eventMeshMessage) { // } /** - * 根据topic获取serviceId + * get serviceId according to topic */ public static String getServiceId(String topic) { String[] topicStrArr = topic.split("-"); diff --git a/eventmesh-runtime/src/test/java/client/common/TCPClient.java b/eventmesh-runtime/src/test/java/client/common/TCPClient.java index c0068de8eb..410cf3d4b9 100644 --- a/eventmesh-runtime/src/test/java/client/common/TCPClient.java +++ b/eventmesh-runtime/src/test/java/client/common/TCPClient.java @@ -49,8 +49,8 @@ /** - * 一个Client连一个ACCESS - * 提供最基础的连接, send能力, 不能提供断线重连能力， 该业务是具备请求依赖的，如果提供了断线重连能力，会引起业务上的无感知，即不会走业务上的重连逻辑 + * one Client connects one ACCESS + * Provides the most basic connection, send capability, and cannot provide disconnected reconnection capability, The service is request-dependent. If the disconnection and reconnection capability is provided, it will cause business insensitivity, that is, it will not follow the business reconnection logic. */ public abstract class TCPClient implements Closeable { diff --git a/eventmesh-runtime/src/test/java/client/hook/ReceiveMsgHook.java b/eventmesh-runtime/src/test/java/client/hook/ReceiveMsgHook.java index 6aca270f46..4239bcec34 100644 --- a/eventmesh-runtime/src/test/java/client/hook/ReceiveMsgHook.java +++ b/eventmesh-runtime/src/test/java/client/hook/ReceiveMsgHook.java @@ -22,7 +22,7 @@ import org.apache.eventmesh.common.protocol.tcp.Package; /** - * 业务回调钩子, 这是针对所有类型的消息都会进行的回调 + * Business callback hook, which is a callback for all types of messages */ public interface ReceiveMsgHook { void handle(Package msg, ChannelHandlerContext ctx); diff --git a/eventmesh-runtime/src/test/java/client/impl/PubClientImpl.java b/eventmesh-runtime/src/test/java/client/impl/PubClientImpl.java index ee01069dc1..a723471076 100644 --- a/eventmesh-runtime/src/test/java/client/impl/PubClientImpl.java +++ b/eventmesh-runtime/src/test/java/client/impl/PubClientImpl.java @@ -111,7 +111,7 @@ private void hello() throws Exception { } /** - * 发送RR消息 + * send RR message */ @Override public Package rr(Package msg, long timeout) throws Exception { @@ -120,7 +120,7 @@ public Package rr(Package msg, long timeout) throws Exception { } /** - * 在原本的IO基础上增加测试用例的断言 + * Add test case assertions on the basis of the original IO */ public Package dispatcher(Package request, long timeout) throws Exception { Assert.assertNotNull(request); @@ -157,7 +157,7 @@ public Package dispatcher(Package request, long timeout) throws Exception { } /** - * 发送事件消息, 有返回值是ACCESS 给了ACK + * Send an event message, the return value is ACCESS and ACK is given */ public Package publish(Package msg, long timeout) throws Exception { publogger.info("PubClientImpl|{}|publish|send|command={}|msg={}", clientNo, msg.getHeader().getCommand(), msg); @@ -165,7 +165,7 @@ public Package publish(Package msg, long timeout) throws Exception { } /** - * 发送广播消息 + * send broadcast message */ public Package broadcast(Package msg, long timeout) throws Exception { publogger.info("PubClientImpl|{}|broadcast|send|type={}|msg={}", clientNo, msg.getHeader().getCommand(), msg); @@ -187,7 +187,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Package msg) throws Excep callback.handle(msg, ctx); } /** - * RR发送接受回包, 并Ack + * RR send and accept the return packet ,and Ack */ if (cmd == Command.RESPONSE_TO_CLIENT) { Package responseToClientAck = MessageUtils.responseToClientAck(msg); diff --git a/eventmesh-runtime/src/test/java/client/impl/SubClientImpl.java b/eventmesh-runtime/src/test/java/client/impl/SubClientImpl.java index e77171558c..f62f43c58b 100644 --- a/eventmesh-runtime/src/test/java/client/impl/SubClientImpl.java +++ b/eventmesh-runtime/src/test/java/client/impl/SubClientImpl.java @@ -224,7 +224,7 @@ protected void channelRead0(ChannelHandlerContext ctx, Package msg) throws Excep System.err.println("server goodby request: ---------------------------" + msg.toString()); close(); } else { - //控制指令集 + //control instruction set RequestContext context = contexts.get(RequestContext._key(msg)); if (context != null) { contexts.remove(context.getKey()); diff --git a/eventmesh-runtime/src/test/java/demo/CClientDemo.java b/eventmesh-runtime/src/test/java/demo/CClientDemo.java index a0ade78c96..c03fff972e 100644 --- a/eventmesh-runtime/src/test/java/demo/CClientDemo.java +++ b/eventmesh-runtime/src/test/java/demo/CClientDemo.java @@ -31,7 +31,7 @@ import client.impl.EventMeshClientImpl; /** - * SIMPLE客户端使用样例 + * simple client usage example */ public class CClientDemo { @@ -71,9 +71,9 @@ public void handle(Package msg, ChannelHandlerContext ctx) { }); for (int i = 0; i < 10000; i++) { // ThreadUtil.randomSleep(0,200); - //广播消息 + //broadcast message client.broadcast(MessageUtils.broadcastMessage("TEST-TOPIC-TCP-BROADCAST", i), 5000); - //异步消息 + //asynchronous message client.publish(MessageUtils.asyncMessage(ASYNC_TOPIC, i), 5000); } //