diff options
author | Patrick Wendell <pwendell@gmail.com> | 2014-01-23 18:30:11 -0800 |
---|---|---|
committer | Patrick Wendell <pwendell@gmail.com> | 2014-01-23 18:30:11 -0800 |
commit | 268ecbd2318d5dc44c483a44148688646b7ae416 (patch) | |
tree | 76902dfdaecb605fedf1f3e0d37625054ca39544 | |
parent | c58d4ea3d46ec7b72f7ced17d5c4193ee42befa0 (diff) | |
download | spark-268ecbd2318d5dc44c483a44148688646b7ae416.tar.gz spark-268ecbd2318d5dc44c483a44148688646b7ae416.tar.bz2 spark-268ecbd2318d5dc44c483a44148688646b7ae416.zip |
Minor changes after auditing diff from earlier version
3 files changed, 1 insertions, 7 deletions
diff --git a/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala b/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala index 72826ef48e..ad74d4636f 100644 --- a/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala @@ -19,10 +19,7 @@ package org.apache.spark.rdd import java.io.EOFException -import scala.reflect.ClassTag - import org.apache.hadoop.conf.{Configuration, Configurable} -import org.apache.hadoop.io.Writable import org.apache.hadoop.mapred.InputFormat import org.apache.hadoop.mapred.InputSplit import org.apache.hadoop.mapred.JobConf diff --git a/core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala b/core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala index 955ba310ee..d1fff29687 100644 --- a/core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala +++ b/core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala @@ -113,9 +113,7 @@ class NewHadoopRDD[K, V]( throw new java.util.NoSuchElementException("End of stream") } havePair = false - val key = reader.getCurrentKey - val value = reader.getCurrentValue - (key, value) + (reader.getCurrentKey, reader.getCurrentValue) } private def close() { diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala index 64acfbd352..61d8ef5efe 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -26,7 +26,6 @@ import scala.collection.JavaConversions._ import scala.collection.Map import scala.collection.mutable.ArrayBuffer import scala.io.Source -import scala.reflect.ClassTag import com.google.common.io.Files import com.google.common.util.concurrent.ThreadFactoryBuilder |