1f31bdaef6
## What changes were proposed in this pull request?
This PR removes a patch on ListConverter from https://github.com/apache/spark/pull/5570, as it is no longer necessary. The underlying issue in Py4J https://github.com/bartdag/py4j/issues/160 was patched in 224b94b666 and is present in 0.10.3, the version currently in use in Spark.
## How was this patch tested?
The original test added in https://github.com/apache/spark/pull/5570 remains.
Author: Jason White <jason.white@shopify.com>
Closes #15254 from JasonMWhite/remove_listconverter_patch.
139 lines
4.3 KiB
Python
139 lines
4.3 KiB
Python
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
# The ASF licenses this file to You under the Apache License, Version 2.0
|
|
# (the "License"); you may not use this file except in compliance with
|
|
# the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
import sys
|
|
if sys.version >= '3':
|
|
long = int
|
|
unicode = str
|
|
|
|
import py4j.protocol
|
|
from py4j.protocol import Py4JJavaError
|
|
from py4j.java_gateway import JavaObject
|
|
from py4j.java_collections import JavaArray, JavaList
|
|
|
|
from pyspark import RDD, SparkContext
|
|
from pyspark.serializers import PickleSerializer, AutoBatchedSerializer
|
|
from pyspark.sql import DataFrame, SQLContext
|
|
|
|
# Hack for support float('inf') in Py4j
|
|
_old_smart_decode = py4j.protocol.smart_decode
|
|
|
|
_float_str_mapping = {
|
|
'nan': 'NaN',
|
|
'inf': 'Infinity',
|
|
'-inf': '-Infinity',
|
|
}
|
|
|
|
|
|
def _new_smart_decode(obj):
|
|
if isinstance(obj, float):
|
|
s = str(obj)
|
|
return _float_str_mapping.get(s, s)
|
|
return _old_smart_decode(obj)
|
|
|
|
py4j.protocol.smart_decode = _new_smart_decode
|
|
|
|
|
|
_picklable_classes = [
|
|
'SparseVector',
|
|
'DenseVector',
|
|
'SparseMatrix',
|
|
'DenseMatrix',
|
|
]
|
|
|
|
|
|
# this will call the ML version of pythonToJava()
|
|
def _to_java_object_rdd(rdd):
|
|
""" Return an JavaRDD of Object by unpickling
|
|
|
|
It will convert each Python object into Java object by Pyrolite, whenever the
|
|
RDD is serialized in batch or not.
|
|
"""
|
|
rdd = rdd._reserialize(AutoBatchedSerializer(PickleSerializer()))
|
|
return rdd.ctx._jvm.org.apache.spark.ml.python.MLSerDe.pythonToJava(rdd._jrdd, True)
|
|
|
|
|
|
def _py2java(sc, obj):
|
|
""" Convert Python object into Java """
|
|
if isinstance(obj, RDD):
|
|
obj = _to_java_object_rdd(obj)
|
|
elif isinstance(obj, DataFrame):
|
|
obj = obj._jdf
|
|
elif isinstance(obj, SparkContext):
|
|
obj = obj._jsc
|
|
elif isinstance(obj, list):
|
|
obj = [_py2java(sc, x) for x in obj]
|
|
elif isinstance(obj, JavaObject):
|
|
pass
|
|
elif isinstance(obj, (int, long, float, bool, bytes, unicode)):
|
|
pass
|
|
else:
|
|
data = bytearray(PickleSerializer().dumps(obj))
|
|
obj = sc._jvm.org.apache.spark.ml.python.MLSerDe.loads(data)
|
|
return obj
|
|
|
|
|
|
def _java2py(sc, r, encoding="bytes"):
|
|
if isinstance(r, JavaObject):
|
|
clsName = r.getClass().getSimpleName()
|
|
# convert RDD into JavaRDD
|
|
if clsName != 'JavaRDD' and clsName.endswith("RDD"):
|
|
r = r.toJavaRDD()
|
|
clsName = 'JavaRDD'
|
|
|
|
if clsName == 'JavaRDD':
|
|
jrdd = sc._jvm.org.apache.spark.ml.python.MLSerDe.javaToPython(r)
|
|
return RDD(jrdd, sc)
|
|
|
|
if clsName == 'Dataset':
|
|
return DataFrame(r, SQLContext.getOrCreate(sc))
|
|
|
|
if clsName in _picklable_classes:
|
|
r = sc._jvm.org.apache.spark.ml.python.MLSerDe.dumps(r)
|
|
elif isinstance(r, (JavaArray, JavaList)):
|
|
try:
|
|
r = sc._jvm.org.apache.spark.ml.python.MLSerDe.dumps(r)
|
|
except Py4JJavaError:
|
|
pass # not pickable
|
|
|
|
if isinstance(r, (bytearray, bytes)):
|
|
r = PickleSerializer().loads(bytes(r), encoding=encoding)
|
|
return r
|
|
|
|
|
|
def callJavaFunc(sc, func, *args):
|
|
""" Call Java Function """
|
|
args = [_py2java(sc, a) for a in args]
|
|
return _java2py(sc, func(*args))
|
|
|
|
|
|
def inherit_doc(cls):
|
|
"""
|
|
A decorator that makes a class inherit documentation from its parents.
|
|
"""
|
|
for name, func in vars(cls).items():
|
|
# only inherit docstring for public functions
|
|
if name.startswith("_"):
|
|
continue
|
|
if not func.__doc__:
|
|
for parent in cls.__bases__:
|
|
parent_func = getattr(parent, name, None)
|
|
if parent_func and getattr(parent_func, "__doc__", None):
|
|
func.__doc__ = parent_func.__doc__
|
|
break
|
|
return cls
|