Skip to content

[SPARK-11583] [Core]MapStatus Using RoaringBitmap More Properly #9661

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

Closed
yaooqinn wants to merge 7 commits into from
Closed

[SPARK-11583] [Core]MapStatus Using RoaringBitmap More Properly #9661

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
75c3209
MapStatus Using RoaringBitmap More Properly
yaooqinn Nov 12, 2015
8f3eb7d
update roaringbitmap to 0.5.10 and runOptimize
yaooqinn Nov 13, 2015
b4b7a1c
add roaringbitmap runOptimise tests
yaooqinn Nov 13, 2015
372dc4c
Fix RoaringBitmap serialization with Kryo
gssiyankai Nov 15, 2015
b9cc414
runOptimize and trim only
yaooqinn Nov 16, 2015
64e7295
fix style
yaooqinn Nov 16, 2015
0c4bcba
Merge pull request #1 from gssiyankai/mapstatus-roaring
yaooqinn Nov 17, 2015
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 core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import org.apache.spark.scheduler.{CompressedMapStatus, HighlyCompressedMapStatu
import org.apache.spark.storage._
import org.apache.spark.util.collection.{BitSet, CompactBuffer}
import org.apache.spark.util.{BoundedPriorityQueue, SerializableConfiguration, SerializableJobConf, Utils}
import org.roaringbitmap.RoaringBitmap
import org.roaringbitmap._

import scala.collection.JavaConverters._
import scala.collection.mutable.ArrayBuffer
Copy link
Contributor

@davies davies Nov 16, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update your import rules to place scale package before third parties (as before this PR)?

Copy link
Member Author

@yaooqinn yaooqinn Nov 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

Expand Down Expand Up @@ -363,6 +363,11 @@ private[serializer] object KryoSerializer {
classOf[CompressedMapStatus],
classOf[HighlyCompressedMapStatus],
classOf[RoaringBitmap],
classOf[RoaringArray],
classOf[Array[Container]],
classOf[ArrayContainer],
classOf[BitmapContainer],
classOf[RunContainer],
classOf[BitSet],
classOf[CompactBuffer[_]],
classOf[BlockManagerId],
Expand Down
19 changes: 19 additions & 0 deletions core/src/test/scala/org/apache/spark/serializer/KryoSerializerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,30 @@ import org.apache.spark.{SharedSparkContext, SparkConf, SparkFunSuite}
import org.apache.spark.scheduler.HighlyCompressedMapStatus
import org.apache.spark.serializer.KryoTest._
import org.apache.spark.storage.BlockManagerId
import org.roaringbitmap.RoaringBitmap

class KryoSerializerSuite extends SparkFunSuite with SharedSparkContext {
conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer")
conf.set("spark.kryo.registrator", classOf[MyRegistrator].getName)

test("Roaring") {
val conf = new SparkConf(false)
conf.set("spark.kryo.registrationRequired", "true")
val ser = new KryoSerializer(conf).newInstance()
def check[T: ClassTag](t: T) {
assert(ser.deserialize[T](ser.serialize(t)) === t)
}
val b = new RoaringBitmap()
check(b)
for (i <- 1 to 1<<16 by 2) {
b.add(i)
}
check(b)
b.add(1, 1<<16)
b.runOptimize()
check(b)
}

test("SPARK-7392 configuration limits") {
val kryoBufferProperty = "spark.kryoserializer.buffer"
val kryoBufferMaxProperty = "spark.kryoserializer.buffer.max"
Expand Down