diff options
| author | Xiangrui Meng <meng@databricks.com> | 2015-05-04 23:52:42 -0700 |
|---|---|---|
| committer | Xiangrui Meng <meng@databricks.com> | 2015-05-04 23:52:42 -0700 |
| commit | e9b16e67c636a8a91ab9fb0f4ef98146abbde1e9 (patch) | |
| tree | 80caee0c22cc2aba536d8a28f3a743c447e90b15 | |
| parent | 8aa5aea7fee0ae9cd34e16c30655ee02b8747455 (diff) | |
| download | spark-e9b16e67c636a8a91ab9fb0f4ef98146abbde1e9.tar.gz spark-e9b16e67c636a8a91ab9fb0f4ef98146abbde1e9.tar.bz2 spark-e9b16e67c636a8a91ab9fb0f4ef98146abbde1e9.zip | |
[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 <meng@databricks.com>
Closes #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
| -rw-r--r-- | core/pom.xml | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/pom.xml b/core/pom.xml index 2dfb00d7ec..c5779447f0 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -362,7 +362,7 @@ <dependency> <groupId>org.spark-project</groupId> <artifactId>pyrolite</artifactId> - <version>2.0.1</version> + <version>4.4</version> </dependency> <dependency> <groupId>net.sf.py4j</groupId> diff --git a/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala b/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala index 257491e90d..1f1debcf84 100644 --- a/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala +++ b/core/src/main/scala/org/apache/spark/api/python/SerDeUtil.scala @@ -56,16 +56,13 @@ private[spark] object SerDeUtil extends Logging { // {'\0', 0, 0, 0} /* Sentinel */ // }; // TODO: support Py_UNICODE with 2 bytes - // FIXME: unpickle array of float is wrong in Pyrolite, so we reverse the - // machine code for float/double here to workaround it. - // we should fix this after Pyrolite fix them val machineCodes: Map[Char, Int] = if (ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN)) { Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 3, 'h' -> 5, 'I' -> 7, 'i' -> 9, - 'L' -> 11, 'l' -> 13, 'f' -> 14, 'd' -> 16, 'u' -> 21 + 'L' -> 11, 'l' -> 13, 'f' -> 15, 'd' -> 17, 'u' -> 21 ) } else { Map('c' -> 1, 'B' -> 0, 'b' -> 1, 'H' -> 2, 'h' -> 4, 'I' -> 6, 'i' -> 8, - 'L' -> 10, 'l' -> 12, 'f' -> 15, 'd' -> 17, 'u' -> 20 + 'L' -> 10, 'l' -> 12, 'f' -> 14, 'd' -> 16, 'u' -> 20 ) } override def construct(args: Array[Object]): Object = { |