Skip to content

Commit 076411b

Browse files
committed
[SPARK-27216][CORE] Upgrade RoaringBitmap to 0.7.45
1 parent cef8928 commit 076411b

File tree

5 files changed

+4
-64
lines changed

5 files changed

+4
-64
lines changed

core/src/main/scala/org/apache/spark/storage/ShuffleBlockFetcherIterator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ final class ShuffleBlockFetcherIterator(
453453
// since the last call.
454454
val msg = s"Received a zero-size buffer for block $blockId from $address " +
455455
s"(expectedApproxSize = $size, isNetworkReqDone=$isNetworkReqDone)"
456-
// throwFetchFailedException(blockId, address, new IOException(msg))
456+
throwFetchFailedException(blockId, address, new IOException(msg))
457457
}
458458

459459
val in = try {

core/src/test/scala/org/apache/spark/serializer/UnsafeKryoSerializerSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class UnsafeKryoSerializerSuite extends KryoSerializerSuite {
3535
super.afterAll()
3636
}
3737

38-
test("SPARK-27216: kryo serialization with RoaringBitmap") {
38+
test("SPARK-27216: Upgrade RoaringBitmap to 0.7.45 to fix Kryo unsafe ser/dser issue") {
3939
val expected = new RoaringBitmap
4040
expected.add(1787)
4141

@@ -47,6 +47,6 @@ class UnsafeKryoSerializerSuite extends KryoSerializerSuite {
4747
conf.set(KRYO_USE_UNSAFE, true)
4848
val unsafeSer = new KryoSerializer(conf).newInstance()
4949
actual = unsafeSer.deserialize(unsafeSer.serialize(expected))
50-
assert(actual !== expected)
50+
assert(actual === expected)
5151
}
5252
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
<dependency>
607607
<groupId>org.roaringbitmap</groupId>
608608
<artifactId>RoaringBitmap</artifactId>
609-
<version>0.5.11</version>
609+
<version>0.7.45</version>
610610
</dependency>
611611
<dependency>
612612
<groupId>commons-net</groupId>
-65 KB
Binary file not shown.

sql/core/src/test/scala/org/apache/spark/sql/SQLQueryWithKryoSuite.scala

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)