diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-11 14:51:47 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-08-11 14:51:47 -0700 |
| commit | 379648630b919d17968c72e0cc04ce83a25f6fca (patch) | |
| tree | 7bee0841ba127faba386d33bc42b2cfcbf39c576 /core | |
| parent | ff9ebfabb47e3439c7b78cb4e3c33423a1467a9a (diff) | |
| parent | 6402b539d0058bd2cfc600f348801e7279acadab (diff) | |
| download | spark-379648630b919d17968c72e0cc04ce83a25f6fca.tar.gz spark-379648630b919d17968c72e0cc04ce83a25f6fca.tar.bz2 spark-379648630b919d17968c72e0cc04ce83a25f6fca.zip | |
Merge pull request #805 from woggle/hadoop-rdd-jobconf
Use new Configuration() instead of slower new JobConf() in SerializableWritable
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/SerializableWritable.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/SerializableWritable.scala b/core/src/main/scala/spark/SerializableWritable.scala index 0236611ef9..936d8e6241 100644 --- a/core/src/main/scala/spark/SerializableWritable.scala +++ b/core/src/main/scala/spark/SerializableWritable.scala @@ -21,7 +21,7 @@ import java.io._ import org.apache.hadoop.io.ObjectWritable import org.apache.hadoop.io.Writable -import org.apache.hadoop.mapred.JobConf +import org.apache.hadoop.conf.Configuration class SerializableWritable[T <: Writable](@transient var t: T) extends Serializable { def value = t @@ -35,7 +35,7 @@ class SerializableWritable[T <: Writable](@transient var t: T) extends Serializa private def readObject(in: ObjectInputStream) { in.defaultReadObject() val ow = new ObjectWritable() - ow.setConf(new JobConf()) + ow.setConf(new Configuration()) ow.readFields(in) t = ow.get().asInstanceOf[T] } |