Minor changes after auditing diff from earlier version
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/268ecbd2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/268ecbd2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/268ecbd2 Branch: refs/heads/master Commit: 268ecbd2318d5dc44c483a44148688646b7ae416 Parents: c58d4ea Author: Patrick Wendell <pwend...@gmail.com> Authored: Thu Jan 23 18:30:11 2014 -0800 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Thu Jan 23 18:30:11 2014 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala | 3 --- core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala | 4 +--- core/src/main/scala/org/apache/spark/util/Utils.scala | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/268ecbd2/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala ---------------------------------------------------------------------- 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 72826ef..ad74d46 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 http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/268ecbd2/core/src/main/scala/org/apache/spark/rdd/NewHadoopRDD.scala ---------------------------------------------------------------------- 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 955ba31..d1fff29 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() { http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/268ecbd2/core/src/main/scala/org/apache/spark/util/Utils.scala ---------------------------------------------------------------------- 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 64acfbd..61d8ef5 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
