[Improvement] Use OR operation instead of serialization for cloning BitMaps by kaijchen · Pull Request #103 · apache/uniffle · GitHub
Skip to content

[Improvement] Use OR operation instead of serialization for cloning BitMaps #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roryqi merged 1 commit into from
Jul 29, 2022
Merged

[Improvement] Use OR operation instead of serialization for cloning BitMaps #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions client/src/main/java/org/apache/uniffle/client/impl/ShuffleReadClientImpl.java
View file
Open in desktop
6 changes: 6 additions & 0 deletions common/src/main/java/org/apache/uniffle/common/util/RssUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ public static Roaring64NavigableMap deserializeBitMap(byte[] bytes) throws IOExc
return bitmap;
}

public static Roaring64NavigableMap cloneBitMap(Roaring64NavigableMap bitmap) {
Roaring64NavigableMap clone = Roaring64NavigableMap.bitmapOf();
clone.or(bitmap);
return clone;
}

public static List<ShuffleDataSegment> transIndexDataToSegments(
ShuffleIndexResult shuffleIndexResult, int readBufferSize) {
if (shuffleIndexResult == null || shuffleIndexResult.isEmpty()) {
Expand Down
9 changes: 9 additions & 0 deletions common/src/test/java/org/apache/uniffle/common/util/RssUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

Expand Down Expand Up @@ -88,6 +89,14 @@ public void testSerializeBitmap() throws Exception {
assertEquals(Roaring64NavigableMap.bitmapOf(), RssUtils.deserializeBitMap(new byte[]{}));
}

@Test
public void testCloneBitmap() {
Roaring64NavigableMap bitmap1 = Roaring64NavigableMap.bitmapOf(1, 2, 100, 10000);
Roaring64NavigableMap bitmap2 = RssUtils.cloneBitMap(bitmap1);
assertNotSame(bitmap1, bitmap2);
assertEquals(bitmap1, bitmap2);
}

@Test
public void testShuffleIndexSegment() {
ShuffleIndexResult shuffleIndexResult = new ShuffleIndexResult();
Expand Down
2 changes: 1 addition & 1 deletion ...ion-test/spark-common/src/test/java/org/apache/uniffle/test/SparkClientWithLocalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ public void readTest9() throws Exception {
ShuffleReadClientImpl readClient;

createTestData(testAppId, expectedData, blockIdBitmap, taskIdBitmap);
Roaring64NavigableMap beforeAdded = RssUtils.deserializeBitMap(RssUtils.serializeBitMap(blockIdBitmap));
Roaring64NavigableMap beforeAdded = RssUtils.cloneBitMap(blockIdBitmap);
// write data by another task, read data again, the cache for index file should be updated
blocks = createShuffleBlockList(
0, 0, 1, 3, 25, blockIdBitmap, Maps.newHashMap(), mockSSI);
Expand Down
7 changes: 2 additions & 5 deletions server/src/main/java/org/apache/uniffle/server/ShuffleTaskManager.java
View file
Open in desktop