You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/11/07 08:34:41 UTC
[GitHub] [inlong] pocozh opened a new pull request, #6437: [INLONG-6417][SDK] Support proxy-send mode
pocozh opened a new pull request, #6437:
URL: https://github.com/apache/inlong/pull/6437
### Prepare a Pull Request
*(Change the title refer to the following example)*
- [INLONG-6417][SDK] Support proxy-send mode
*(The following *XYZ* should be replaced by the actual [GitHub Issue](https://github.com/apache/inlong/issues) number)*
- Fixes #6417
### Motivation
*Explain here the context, and why you're making that change. What is the problem you're trying to solve?*
### Modifications
*Describe the modifications you've done.*
### Verifying this change
*(Please pick either of the following options)*
- [ ] This change is a trivial rework/code cleanup without any test coverage.
- [ ] This change is already covered by existing tests, such as:
*(please describe tests)*
- [ ] This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a follow-up issue for adding the documentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] gosonzhang commented on a diff in pull request #6437: [INLONG-6417][SDK] Support proxy-send mode
Posted by GitBox <gi...@apache.org>.
gosonzhang commented on code in PR #6437:
URL: https://github.com/apache/inlong/pull/6437#discussion_r1016110260
##########
inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java:
##########
@@ -188,50 +189,68 @@ public String getSDKVersion() {
@Deprecated
public SendResult sendMessage(byte[] body, String attributes, String msgUUID,
- long timeout, TimeUnit timeUnit) {
+ long timeout, TimeUnit timeUnit) {
return sender.syncSendMessage(new EncodeObject(body, attributes,
idGenerator.getNextId()), msgUUID, timeout, timeUnit);
}
public SendResult sendMessage(byte[] body, String groupId, String streamId, long dt, String msgUUID,
- long timeout, TimeUnit timeUnit) {
+ long timeout, TimeUnit timeUnit) {
+ return sendMessage(body, groupId, streamId, dt, msgUUID, timeout, timeUnit, false);
+ }
+
+ public SendResult sendMessage(byte[] body, String groupId, String streamId, long dt, String msgUUID,
+ long timeout, TimeUnit timeUnit, boolean isProxySend) {
dt = ProxyUtils.covertZeroDt(dt);
if (!ProxyUtils.isBodyValid(body) || !ProxyUtils.isDtValid(dt)) {
return SendResult.INVALID_ATTRIBUTES;
}
addIndexCnt(groupId, streamId, 1);
+ String proxySend = AttributeConstants.MESSAGE_PROXY_SEND + "=false";
Review Comment:
If you don't need to enable, you don't need to carry this tag
##########
inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java:
##########
@@ -322,52 +360,69 @@ public SendResult sendMessage(List<byte[]> bodyList, String groupId, String stre
@Deprecated
public void asyncSendMessage(SendMessageCallback callback, byte[] body, String attributes,
- String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
sender.asyncSendMessage(new EncodeObject(body, attributes, idGenerator.getNextId()),
callback, msgUUID, timeout, timeUnit);
}
- public void asyncSendMessage(SendMessageCallback callback, byte[] body,
- String groupId, String streamId, long dt, String msgUUID,
- long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId, long dt,
+ String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ asyncSendMessage(callback, body, groupId, streamId, dt, msgUUID, timeout, timeUnit, false);
+ }
+
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId, long dt,
+ String msgUUID, long timeout, TimeUnit timeUnit, boolean isProxySend) throws ProxysdkException {
dt = ProxyUtils.covertZeroDt(dt);
if (!ProxyUtils.isBodyValid(body) || !ProxyUtils.isDtValid(dt)) {
throw new ProxysdkException(SendResult.INVALID_ATTRIBUTES.toString());
}
addIndexCnt(groupId, streamId, 1);
+ String proxySend = AttributeConstants.MESSAGE_PROXY_SEND + "=false";
+ if (isProxySend) {
+ proxySend = AttributeConstants.MESSAGE_PROXY_SEND + "=true";
+ }
boolean isCompressEnd = (isCompress && (body.length > cpsSize));
if (msgtype == 7 || msgtype == 8) {
EncodeObject encodeObject = new EncodeObject(body, this.getMsgtype(), isCompressEnd, isReport,
isGroupIdTransfer, dt / 1000, idGenerator.getNextInt(),
- groupId, streamId, "");
+ groupId, streamId, proxySend);
encodeObject.setSupportLF(isSupportLF);
sender.asyncSendMessage(encodeObject, callback, msgUUID, timeout, timeUnit);
} else if (msgtype == 3 || msgtype == 5) {
if (isCompressEnd) {
sender.asyncSendMessage(new EncodeObject(body, "groupId="
- + groupId + "&streamId=" + streamId + "&dt=" + dt + "&cp=snappy",
+ + groupId + "&streamId=" + streamId + "&dt=" + dt + "&cp=snappy" + "&" + proxySend,
Review Comment:
It is necessary to check whether the business uses the key of the reserved function. If it is used, it will return a failure to avoid the function being turned on by mistake.
##########
inlong-sdk/dataproxy-sdk/src/main/java/org/apache/inlong/sdk/dataproxy/DefaultMessageSender.java:
##########
@@ -322,52 +360,69 @@ public SendResult sendMessage(List<byte[]> bodyList, String groupId, String stre
@Deprecated
public void asyncSendMessage(SendMessageCallback callback, byte[] body, String attributes,
- String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
sender.asyncSendMessage(new EncodeObject(body, attributes, idGenerator.getNextId()),
callback, msgUUID, timeout, timeUnit);
}
- public void asyncSendMessage(SendMessageCallback callback, byte[] body,
- String groupId, String streamId, long dt, String msgUUID,
- long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId, long dt,
+ String msgUUID, long timeout, TimeUnit timeUnit) throws ProxysdkException {
+ asyncSendMessage(callback, body, groupId, streamId, dt, msgUUID, timeout, timeUnit, false);
+ }
+
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId, long dt,
+ String msgUUID, long timeout, TimeUnit timeUnit, boolean isProxySend) throws ProxysdkException {
dt = ProxyUtils.covertZeroDt(dt);
if (!ProxyUtils.isBodyValid(body) || !ProxyUtils.isDtValid(dt)) {
throw new ProxysdkException(SendResult.INVALID_ATTRIBUTES.toString());
}
addIndexCnt(groupId, streamId, 1);
+ String proxySend = AttributeConstants.MESSAGE_PROXY_SEND + "=false";
+ if (isProxySend) {
+ proxySend = AttributeConstants.MESSAGE_PROXY_SEND + "=true";
+ }
boolean isCompressEnd = (isCompress && (body.length > cpsSize));
if (msgtype == 7 || msgtype == 8) {
EncodeObject encodeObject = new EncodeObject(body, this.getMsgtype(), isCompressEnd, isReport,
isGroupIdTransfer, dt / 1000, idGenerator.getNextInt(),
- groupId, streamId, "");
+ groupId, streamId, proxySend);
encodeObject.setSupportLF(isSupportLF);
sender.asyncSendMessage(encodeObject, callback, msgUUID, timeout, timeUnit);
} else if (msgtype == 3 || msgtype == 5) {
if (isCompressEnd) {
sender.asyncSendMessage(new EncodeObject(body, "groupId="
- + groupId + "&streamId=" + streamId + "&dt=" + dt + "&cp=snappy",
+ + groupId + "&streamId=" + streamId + "&dt=" + dt + "&cp=snappy" + "&" + proxySend,
idGenerator.getNextId(), this.getMsgtype(), true, groupId),
callback, msgUUID, timeout, timeUnit);
} else {
sender.asyncSendMessage(
new EncodeObject(body, "groupId=" + groupId + "&streamId="
- + streamId + "&dt=" + dt, idGenerator.getNextId(),
+ + streamId + "&dt=" + dt + "&" + proxySend, idGenerator.getNextId(),
this.getMsgtype(), false, groupId), callback,
msgUUID, timeout, timeUnit);
}
}
}
- public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId,
- long dt, String msgUUID, long timeout, TimeUnit timeUnit,
- Map<String, String> extraAttrMap) throws ProxysdkException {
+ public void asyncSendMessage(SendMessageCallback callback, byte[] body, String groupId, String streamId, long dt,
Review Comment:
It is necessary to supplement the interface description of each API, including how to use each parameter
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] dockerzhang merged pull request #6437: [INLONG-6417][SDK] Support proxy-send mode
Posted by GitBox <gi...@apache.org>.
dockerzhang merged PR #6437:
URL: https://github.com/apache/inlong/pull/6437
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org