(incubator-uniffle) branch master updated: [#2259] fix(server) dataLength of ShuffleBufferWithLinkedList not clear after toFlushEvent (#2260)

[maobaolong]

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

maobaolong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new 54611f3f2 [#2259] fix(server) dataLength of 
ShuffleBufferWithLinkedList not clear after toFlushEvent (#2260)
54611f3f2 is described below

commit 54611f3f2d0c32c4509bc6389bcb00c1d4184ab7
Author: leewish <mr.liwenl...@outlook.com>
AuthorDate: Mon Nov 25 14:03:26 2024 +0800

    [#2259] fix(server) dataLength of ShuffleBufferWithLinkedList not clear 
after toFlushEvent (#2260)
    
    Co-authored-by: wenlongwlli <wenlongw...@tencent.com>
    
    ### What changes were proposed in this pull request?
    The private variable dataLength of ShuffleBufferWithLinkedList will be 
cleared after toFlushEvent.
    
    ### Why are the changes needed?
    The private variable dataLength of ShuffleBufferWithLinkedList not be 
cleared after toFlushEvent.
    
    Fix: #2259
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    Tested by UT.
---
 .../apache/uniffle/server/buffer/ShuffleBufferWithLinkedList.java    | 1 +
 .../uniffle/server/buffer/ShuffleBufferWithLinkedListTest.java       | 5 +++++
 2 files changed, 6 insertions(+)

diff --git 
a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedList.java
 
b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedList.java
index 553b2870b..e35c42575 100644
--- 
a/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedList.java
+++ 
b/server/src/main/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedList.java
@@ -120,6 +120,7 @@ public class ShuffleBufferWithLinkedList extends 
AbstractShuffleBuffer {
     blocks = new LinkedHashSet<>();
     inFlushSize.addAndGet(encodedLength);
     encodedLength = 0;
+    dataLength = 0;
     return event;
   }
 
diff --git 
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedListTest.java
 
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedListTest.java
index acc86a6db..47fe3dd39 100644
--- 
a/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedListTest.java
+++ 
b/server/src/test/java/org/apache/uniffle/server/buffer/ShuffleBufferWithLinkedListTest.java
@@ -79,6 +79,11 @@ public class ShuffleBufferWithLinkedListTest extends 
BufferTestBase {
     assertEquals(42, shuffleBuffer.getEncodedLength());
     event = shuffleBuffer.toFlushEvent("appId", 0, 0, 1, null);
     assertEquals(42, event.getEncodedLength());
+    assertEquals(10, event.getDataLength());
+    shuffleBuffer.append(createData(10));
+    event = shuffleBuffer.toFlushEvent("appId", 0, 0, 1, null);
+    assertEquals(42, event.getEncodedLength());
+    assertEquals(10, event.getDataLength());
     assertEquals(0, shuffleBuffer.getEncodedLength());
     assertEquals(0, shuffleBuffer.getBlocks().size());
   }