diff options
author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-31 17:54:15 -0700 |
---|---|---|
committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-31 17:54:15 -0700 |
commit | e0dd24dc858777904335218f3001a24bffe73b27 (patch) | |
tree | ec33a79a21e4d0e5ee2417db5ddb65cfd41809c2 | |
parent | ad61349c8e903bbc8d6060f151233ec9ccdea4cd (diff) | |
parent | 96571c2524307c3569bdf5c43e0e8b53f3d51e4f (diff) | |
download | spark-e0dd24dc858777904335218f3001a24bffe73b27.tar.gz spark-e0dd24dc858777904335218f3001a24bffe73b27.tar.bz2 spark-e0dd24dc858777904335218f3001a24bffe73b27.zip |
Merge pull request #879 from AndreSchumacher/scala-2.10
PySpark: replacing class manifest by class tag for Scala 2.10.2 in rdd.py
-rw-r--r-- | python/pyspark/rdd.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/pyspark/rdd.py b/python/pyspark/rdd.py index a9fec17a9d..86bade9546 100644 --- a/python/pyspark/rdd.py +++ b/python/pyspark/rdd.py @@ -731,13 +731,13 @@ class PipelinedRDD(RDD): [x._jbroadcast for x in self.ctx._pickled_broadcast_vars], self.ctx._gateway._gateway_client) self.ctx._pickled_broadcast_vars.clear() - class_manifest = self._prev_jrdd.classManifest() + class_tag = self._prev_jrdd.classTag() env = copy.copy(self.ctx.environment) env['PYTHONPATH'] = os.environ.get("PYTHONPATH", "") env = MapConverter().convert(env, self.ctx._gateway._gateway_client) python_rdd = self.ctx._jvm.PythonRDD(self._prev_jrdd.rdd(), pipe_command, env, self.preservesPartitioning, self.ctx.pythonExec, - broadcast_vars, self.ctx._javaAccumulator, class_manifest) + broadcast_vars, self.ctx._javaAccumulator, class_tag) self._jrdd_val = python_rdd.asJavaRDD() return self._jrdd_val |