[inlong] branch master updated: [INLONG-8286][TubeMQ] Supports the return package type when querying messages (#8287)

[healchow]

This is an automated email from the ASF dual-hosted git repository.

healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d2a7ba559 [INLONG-8286][TubeMQ] Supports the return package type when 
querying messages (#8287)
6d2a7ba559 is described below

commit 6d2a7ba5597086621c762a08fcdde89b48e68b46
Author: Goson Zhang <4675...@qq.com>
AuthorDate: Tue Jun 20 17:10:46 2023 +0800

    [INLONG-8286][TubeMQ] Supports the return package type when querying 
messages (#8287)
---
 .../inlong/tubemq/server/broker/BrokerServiceServer.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
index 6efc25c47a..e732626c7f 100644
--- 
a/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
+++ 
b/inlong-tubemq/tubemq-server/src/main/java/org/apache/inlong/tubemq/server/broker/BrokerServiceServer.java
@@ -557,23 +557,19 @@ public class BrokerServiceServer implements 
BrokerReadService, BrokerWriteServic
                         .append(topicName).append(")!\"}");
                 return sb;
             } else {
-                List<String> transferMessageList = new ArrayList<>();
                 List<TransferedMessage> tmpMsgList = 
getMessageResult.transferedMessageList;
                 List<Message> messageList = 
DataConverterUtil.convertMessage(topicName, tmpMsgList);
-                int startPos = Math.max(messageList.size() - msgCount, 0);
-                for (; startPos < messageList.size(); startPos++) {
-                    String msgItem = new String(
-                            
Base64.encodeBase64(messageList.get(startPos).getData()));
-                    transferMessageList.add(msgItem);
-                }
                 int i = 0;
+                int startPos = Math.max(messageList.size() - msgCount, 0);
                 
sb.append("{\"result\":true,\"errCode\":200,\"errMsg\":\"Success!\",\"dataSet\":[");
-                for (String msgData : transferMessageList) {
+                for (; startPos < messageList.size(); startPos++) {
                     if (i > 0) {
                         sb.append(",");
                     }
-                    sb.append("{\"index\":").append(i++)
-                            
.append(",\"data\":\"").append(msgData).append("\"}");
+                    sb.append("{\"index\":").append(i++).append(",\"data\":\"")
+                            .append(new 
String(Base64.encodeBase64(messageList.get(startPos).getData())))
+                            
.append("\",\"attr\":\"").append(messageList.get(startPos).getAttribute())
+                            .append("\"}");
                 }
                 sb.append("]}");
                 return sb;