[#2259] fix(server) dataLength of ShuffleBufferWithLinkedList not cle…

…ar after toFlushEvent (#2260) Co-authored-by: wenlongwlli <[email protected]> ### 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 · Nov 25, 2024 · 54611f3 · 54611f3
1 parent ab1d3ae
commit 54611f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
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
@@ -120,6 +120,7 @@ public synchronized ShuffleDataFlushEvent toFlushEvent(
     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
@@ -79,6 +79,11 @@ public void toFlushEventTest() {
     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());
   }