(inlong) branch master updated: [INLONG-11179][Agent] Delete useless code (#11180)

[aloyszhang]

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

aloyszhang 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 819cbbe605 [INLONG-11179][Agent] Delete useless code (#11180)
819cbbe605 is described below

commit 819cbbe605be73b1c5513813719a906cc0992173
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Mon Sep 23 14:06:55 2024 +0800

    [INLONG-11179][Agent] Delete useless code (#11180)
---
 .../apache/inlong/agent/message/file/ProxyMessage.java    | 15 ---------------
 .../inlong/agent/message/file/ProxyMessageCache.java      |  4 ----
 .../org/apache/inlong/agent/plugin/sinks/ProxySink.java   |  1 -
 3 files changed, 20 deletions(-)

diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessage.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessage.java
index 12ebe4d0f3..9dbeeec637 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessage.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessage.java
@@ -22,7 +22,6 @@ import org.apache.inlong.agent.plugin.Message;
 
 import java.util.Map;
 
-import static org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_DATA;
 import static 
org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_GROUP_ID;
 import static 
org.apache.inlong.agent.constant.CommonConstants.PROXY_KEY_STREAM_ID;
 
@@ -37,9 +36,6 @@ public class ProxyMessage implements Message {
     private final Map<String, String> header;
     private final String inlongGroupId;
     private final String inlongStreamId;
-    // determine the group key when making batch
-    private final String batchKey;
-    private final String dataKey;
     OffsetAckInfo ackInfo;
 
     public ProxyMessage(byte[] body, Map<String, String> header) {
@@ -47,9 +43,6 @@ public class ProxyMessage implements Message {
         this.header = header;
         this.inlongGroupId = header.get(PROXY_KEY_GROUP_ID);
         this.inlongStreamId = header.getOrDefault(PROXY_KEY_STREAM_ID, 
DEFAULT_INLONG_STREAM_ID);
-        this.dataKey = header.getOrDefault(PROXY_KEY_DATA, "");
-        // use the batch key of user and inlongStreamId to determine one batch
-        this.batchKey = dataKey + inlongStreamId;
         ackInfo = new OffsetAckInfo(header.get(TaskConstants.OFFSET), 
body.length, false);
     }
 
@@ -57,10 +50,6 @@ public class ProxyMessage implements Message {
         this(message.getBody(), message.getHeader());
     }
 
-    public String getDataKey() {
-        return dataKey;
-    }
-
     /**
      * Get first line of body list
      *
@@ -92,8 +81,4 @@ public class ProxyMessage implements Message {
     public String getInlongStreamId() {
         return inlongStreamId;
     }
-
-    public String getBatchKey() {
-        return batchKey;
-    }
 }
diff --git 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessageCache.java
 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessageCache.java
index 1ba844d2c2..c7b151a26c 100644
--- 
a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessageCache.java
+++ 
b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/message/file/ProxyMessageCache.java
@@ -88,10 +88,6 @@ public class ProxyMessageCache {
         }
     }
 
-    public void generateExtraMap(String dataKey) {
-        this.extraMap.put(AttributeConstants.MESSAGE_PARTITION_KEY, dataKey);
-    }
-
     /**
      * Check whether queue is nearly full
      *
diff --git 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
index a622c85598..b7ddc79a15 100755
--- 
a/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
+++ 
b/inlong-agent/agent-plugins/src/main/java/org/apache/inlong/agent/plugin/sinks/ProxySink.java
@@ -99,7 +99,6 @@ public class ProxySink extends AbstractSink {
                 
MemoryManager.getInstance().printDetail(AGENT_GLOBAL_WRITER_PERMIT, "proxy 
sink");
                 return false;
             }
-            cache.generateExtraMap(proxyMessage.getDataKey());
             // add message to package proxy
             boolean suc = cache.add(proxyMessage);
             if (suc) {