Merge branch 'master' of github.com:apache/incubator-spark into kill
Conflicts:
core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/9cd8786e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/9cd8786e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/9cd8786e
Branch: refs/heads/master
Commit: 9cd8786e4a6aebe29dabe802cc177e4338e140e6
Parents: 88866ea 3b11f43
Author: Reynold Xin <r...@apache.org>
Authored: Mon Oct 14 21:51:30 2013 -0700
Committer: Reynold Xin <r...@apache.org>
Committed: Mon Oct 14 21:51:30 2013 -0700
----------------------------------------------------------------------
core/pom.xml | 4 +
.../spark/network/netty/FileClientHandler.java | 3 +-
.../spark/network/netty/FileServerHandler.java | 6 +-
.../apache/spark/BlockStoreShuffleFetcher.scala | 11 +-
.../scala/org/apache/spark/CacheManager.scala | 8 +-
.../org/apache/spark/MapOutputTracker.scala | 4 +-
.../scala/org/apache/spark/SparkContext.scala | 37 +++---
.../spark/broadcast/BitTorrentBroadcast.scala | 4 +-
.../apache/spark/broadcast/HttpBroadcast.scala | 13 +-
.../apache/spark/broadcast/TreeBroadcast.scala | 8 +-
.../org/apache/spark/executor/Executor.scala | 4 +-
.../apache/spark/network/netty/FileHeader.scala | 22 ++--
.../spark/network/netty/ShuffleCopier.scala | 27 +++--
.../spark/network/netty/ShuffleSender.scala | 8 +-
.../scala/org/apache/spark/rdd/BlockRDD.scala | 6 +-
.../scala/org/apache/spark/rdd/HadoopRDD.scala | 54 +++------
.../apache/spark/scheduler/DAGScheduler.scala | 8 +-
.../org/apache/spark/scheduler/ResultTask.scala | 4 +-
.../apache/spark/scheduler/ShuffleMapTask.scala | 4 +-
.../org/apache/spark/scheduler/TaskResult.scala | 3 +-
.../cluster/ClusterTaskSetManager.scala | 4 +-
.../spark/serializer/KryoSerializer.scala | 10 +-
.../apache/spark/storage/BlockException.scala | 2 +-
.../spark/storage/BlockFetcherIterator.scala | 24 ++--
.../org/apache/spark/storage/BlockId.scala | 96 +++++++++++++++
.../org/apache/spark/storage/BlockManager.scala | 118 +++++++++++--------
.../spark/storage/BlockManagerMaster.scala | 8 +-
.../spark/storage/BlockManagerMasterActor.scala | 21 ++--
.../spark/storage/BlockManagerMessages.scala | 16 +--
.../spark/storage/BlockManagerWorker.scala | 4 +-
.../org/apache/spark/storage/BlockMessage.scala | 38 +++---
.../spark/storage/BlockMessageArray.scala | 7 +-
.../spark/storage/BlockObjectWriter.scala | 2 +-
.../org/apache/spark/storage/BlockStore.scala | 14 +--
.../org/apache/spark/storage/DiskStore.scala | 37 +++---
.../org/apache/spark/storage/MemoryStore.scala | 34 +++---
.../spark/storage/ShuffleBlockManager.scala | 16 +--
.../org/apache/spark/storage/StorageUtils.scala | 47 ++++----
.../apache/spark/storage/ThreadingTest.scala | 6 +-
.../org/apache/spark/ui/storage/RDDPage.scala | 23 ++--
.../org/apache/spark/util/MetadataCleaner.scala | 36 +++++-
.../org/apache/spark/CacheManagerSuite.scala | 12 +-
.../org/apache/spark/CheckpointSuite.scala | 6 +-
.../org/apache/spark/DistributedSuite.scala | 16 +--
.../spark/scheduler/DAGSchedulerSuite.scala | 20 ++--
.../cluster/TaskResultGetterSuite.scala | 3 +-
.../org/apache/spark/storage/BlockIdSuite.scala | 114 ++++++++++++++++++
.../spark/storage/BlockManagerSuite.scala | 102 ++++++++--------
.../org/apache/spark/examples/SparkKMeans.scala | 2 -
.../spark/streaming/NetworkInputTracker.scala | 11 +-
.../streaming/dstream/NetworkInputDStream.scala | 14 +--
.../streaming/dstream/RawInputDStream.scala | 4 +-
.../streaming/receivers/ActorReceiver.scala | 4 +-
53 files changed, 652 insertions(+), 457 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/BlockStoreShuffleFetcher.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/CacheManager.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/SparkContext.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/executor/Executor.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/rdd/HadoopRDD.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/scheduler/ResultTask.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/scheduler/ShuffleMapTask.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/main/scala/org/apache/spark/scheduler/cluster/ClusterTaskSetManager.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/test/scala/org/apache/spark/CacheManagerSuite.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/test/scala/org/apache/spark/CheckpointSuite.scala
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/9cd8786e/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
----------------------------------------------------------------------
diff --cc core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
index a3a2463,3952ee9..838179c
--- a/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/DAGSchedulerSuite.scala
@@@ -22,17 -22,17 +22,16 @@@ import scala.collection.mutable.{Map, H
import org.scalatest.FunSuite
import org.scalatest.BeforeAndAfter
- import org.apache.spark.FetchFailed
import org.apache.spark.LocalSparkContext
import org.apache.spark.MapOutputTracker
--import org.apache.spark.rdd.RDD
import org.apache.spark.SparkContext
import org.apache.spark.Partition
import org.apache.spark.TaskContext
import org.apache.spark.{Dependency, ShuffleDependency, OneToOneDependency}
- import org.apache.spark.{Success, TaskEndReason}
- import org.apache.spark.storage.{BlockManagerId, BlockManagerMaster}
+ import org.apache.spark.{FetchFailed, Success, TaskEndReason}
-import org.apache.spark.storage.{BlockId, BlockManagerId, BlockManagerMaster}
-
++import org.apache.spark.rdd.RDD
import org.apache.spark.scheduler.SchedulingMode.SchedulingMode
++import org.apache.spark.storage.{BlockId, BlockManagerId, BlockManagerMaster}
/**
* Tests for DAGScheduler. These tests directly call the event processing
functions in DAGScheduler
