[SPARK-12222][CORE] Deserialize RoaringBitmap using Kryo serializer throw Buffer underflow exception

adrian-wang · sarutak · commit a9c52d4954aa · 2015-12-29T07:02:49.000+09:00
Since we only need to implement `def skipBytes(n: Int)`, code in apache#10213 could be simplified. davies scwf Author: Daoyuan Wang <daoyuan.wang@intel.com> Closes apache#10253 from adrian-wang/kryo. (cherry picked from commit a6d3853) Signed-off-by: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
@@ -399,12 +399,7 @@ private[serializer] class KryoInputDataInputBridge(input: KryoInput) extends Dat
   override def readInt(): Int = input.readInt()
   override def readUnsignedShort(): Int = input.readShortUnsigned()
   override def skipBytes(n: Int): Int = {
-    var remaining: Long = n
-    while (remaining > 0) {
-      val skip = Math.min(Integer.MAX_VALUE, remaining).asInstanceOf[Int]
-      input.skip(skip)
-      remaining -= skip
-    }
+    input.skip(n)
     n
   }
   override def readFully(b: Array[Byte]): Unit = input.read(b)

Original file line number	Diff line number	Diff line change
`@@ -399,12 +399,7 @@ private[serializer] class KryoInputDataInputBridge(input: KryoInput) extends Dat`
`399`	`399`	`override def readInt(): Int = input.readInt()`
`400`	`400`	`override def readUnsignedShort(): Int = input.readShortUnsigned()`
`401`	`401`	`override def skipBytes(n: Int): Int = {`
`402`		`- var remaining: Long = n`
`403`		`- while (remaining > 0) {`
`404`		`- val skip = Math.min(Integer.MAX_VALUE, remaining).asInstanceOf[Int]`
`405`		`- input.skip(skip)`
`406`		`- remaining -= skip`
`407`		`- }`
	`402`	`+ input.skip(n)`
`408`	`403`	`n`
`409`	`404`	`}`
`410`	`405`	`override def readFully(b: Array[Byte]): Unit = input.read(b)`