Skip to content

Commit 1628c53

Browse files
mengxrjeanlyn
authored andcommitted
[SPARK-7314] [SPARK-3524] [PYSPARK] upgrade Pyrolite to 4.4
This PR upgrades Pyrolite to 4.4, which contains the bug fix for SPARK-3524 and some other performance improvements (e.g., SPARK-6288). The artifact is still under `org.spark-project` on Maven Central since there is no official release published there. Author: Xiangrui Meng <[email protected]> Closes apache#5850 from mengxr/SPARK-7314 and squashes the following commits: 2ed4a95 [Xiangrui Meng] Merge remote-tracking branch 'apache/master' into SPARK-7314 da3c2dd [Xiangrui Meng] remove my repo fe7e29b [Xiangrui Meng] switch to maven central 6ddac0e [Xiangrui Meng] reverse the machine code for float/double d2d5b5b [Xiangrui Meng] change back to 4.4 7824a9c [Xiangrui Meng] use Pyrolite 3.1 cc3903a [Xiangrui Meng] upgrade Pyrolite to 4.4-0 for testing
1 parent e536938 commit 1628c53

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
<dependency>
363363
<groupId>org.spark-project</groupId>
364364
<artifactId>pyrolite</artifactId>
365-
<version>2.0.1</version>
365+
<version>4.4</version>
366366
</dependency>
367367
<dependency>
368368
<groupId>net.sf.py4j</groupId>

core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,13 @@ private[spark] object SerDeUtil extends Logging {
5656
// {'\0', 0, 0, 0} /* Sentinel */
5757
// };
5858
// TODO: support Py_UNICODE with 2 bytes
59-
// FIXME: unpickle array of float is wrong in Pyrolite, so we reverse the
60-
// machine code for float/double here to workaround it.
61-
// we should fix this after Pyrolite fix them
6259
val machineCodes: Map[Char, Int] = if (ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) {
6360
Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 3, 'h' -> 5, 'I' -> 7, 'i' -> 9,
64-
'L' -> 11, 'l' -> 13, 'f' -> 14, 'd' -> 16, 'u' -> 21
61+
'L' -> 11, 'l' -> 13, 'f' -> 15, 'd' -> 17, 'u' -> 21
6562
)
6663
} else {
6764
Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 2, 'h' -> 4, 'I' -> 6, 'i' -> 8,
68-
'L' -> 10, 'l' -> 12, 'f' -> 15, 'd' -> 17, 'u' -> 20
65+
'L' -> 10, 'l' -> 12, 'f' -> 14, 'd' -> 16, 'u' -> 20
6966
)
7067
}
7168
override def construct(args: Array[Object]): Object = {

0 commit comments

Comments
 (0)