Skip to content
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

Jump to bottom

Fix NPE in WriteBufferManager.addRecord #296

Merged
merged 2 commits into from
Nov 3, 2022
Merged

Fix NPE in WriteBufferManager.addRecord #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fad6cd6
Fix NPE in WriteBufferManager.addRecord
wForget Nov 3, 2022
c59cf4f
comment
wForget Nov 3, 2022
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
7 changes: 6 additions & 1 deletion client-spark/common/src/main/java/org/apache/spark/shuffle/writer/WriteBufferManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.reflect.ClassTag$;
import scala.reflect.ManifestFactory$;

import org.apache.uniffle.client.util.ClientUtils;
import org.apache.uniffle.common.ShuffleBlockInfo;
Expand Down Expand Up @@ -112,7 +113,11 @@ public List<ShuffleBlockInfo> addRecord(int partitionId, Object key, Object valu
final long start = System.currentTimeMillis();
arrayOutputStream.reset();
serializeStream.writeKey(key, ClassTag$.MODULE$.apply(key.getClass()));
serializeStream.writeValue(value, ClassTag$.MODULE$.apply(value.getClass()));
if (value != null) {
serializeStream.writeValue(value, ClassTag$.MODULE$.apply(value.getClass()));
} else {
serializeStream.writeValue(null, ManifestFactory$.MODULE$.Null());
}
serializeStream.flush();
serializeTime += System.currentTimeMillis() - start;
byte[] serializedData = arrayOutputStream.getBuf();
Expand Down
14 changes: 14 additions & 0 deletions ...nt-spark/common/src/test/java/org/apache/spark/shuffle/writer/WriteBufferManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ public void addHugeRecordTest() {
assertEquals(1, wbm.getBuffers().size());
}

@Test
public void addNullValueRecordTest() {
SparkConf conf = getConf();
WriteBufferManager wbm = createManager(conf);
String testKey = "key";
String testValue = null;
List<ShuffleBlockInfo> result = wbm.addRecord(0, testKey, testValue);
assertEquals(0, result.size());
assertEquals(512, wbm.getAllocatedBytes());
assertEquals(32, wbm.getUsedBytes());
assertEquals(0, wbm.getInSendListBytes());
assertEquals(1, wbm.getBuffers().size());
}

@Test
public void createBlockIdTest() {
SparkConf conf = getConf();
Expand Down