You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/01/02 22:21:14 UTC
[10/13] git commit: Merge branch 'apache-master' into
window-improvement
Merge branch 'apache-master' into window-improvement
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/3579647c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/3579647c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/3579647c
Branch: refs/heads/master
Commit: 3579647cdc8ace0170566783faaf7102ef1f2052
Parents: c4a54f5 e240bad
Author: Tathagata Das <ta...@gmail.com>
Authored: Thu Dec 26 12:12:10 2013 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Thu Dec 26 12:12:10 2013 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/SparkContext.scala | 41 +-
.../spark/scheduler/ExecutorLossReason.scala | 38 +
.../spark/scheduler/SchedulerBackend.scala | 37 +
.../spark/scheduler/TaskResultGetter.scala | 107 +++
.../apache/spark/scheduler/TaskScheduler.scala | 11 +-
.../spark/scheduler/TaskSchedulerImpl.scala | 474 ++++++++++++
.../apache/spark/scheduler/TaskSetManager.scala | 704 +++++++++++++++++-
.../apache/spark/scheduler/WorkerOffer.scala | 24 +
.../scheduler/cluster/ClusterScheduler.scala | 473 ------------
.../cluster/ClusterTaskSetManager.scala | 713 -------------------
.../cluster/CoarseGrainedSchedulerBackend.scala | 6 +-
.../scheduler/cluster/ExecutorLossReason.scala | 38 -
.../scheduler/cluster/SchedulerBackend.scala | 37 -
.../cluster/SimrSchedulerBackend.scala | 4 +-
.../cluster/SparkDeploySchedulerBackend.scala | 6 +-
.../scheduler/cluster/TaskResultGetter.scala | 108 ---
.../spark/scheduler/cluster/WorkerOffer.scala | 24 -
.../mesos/CoarseMesosSchedulerBackend.scala | 5 +-
.../cluster/mesos/MesosSchedulerBackend.scala | 7 +-
.../spark/scheduler/local/LocalBackend.scala | 108 +++
.../spark/scheduler/local/LocalScheduler.scala | 222 ------
.../scheduler/local/LocalTaskSetManager.scala | 191 -----
.../spark/storage/ShuffleBlockManager.scala | 25 +-
.../org/apache/spark/util/MetadataCleaner.scala | 2 +-
.../apache/spark/util/TimeStampedHashMap.scala | 15 +-
.../scala/org/apache/spark/FailureSuite.scala | 4 +-
.../SparkContextSchedulerCreationSuite.scala | 58 +-
.../spark/scheduler/ClusterSchedulerSuite.scala | 265 +++++++
.../org/apache/spark/scheduler/FakeTask.scala | 26 +
.../spark/scheduler/SparkListenerSuite.scala | 19 +-
.../spark/scheduler/TaskResultGetterSuite.scala | 112 +++
.../spark/scheduler/TaskSetManagerSuite.scala | 319 +++++++++
.../cluster/ClusterSchedulerSuite.scala | 267 -------
.../cluster/ClusterTaskSetManagerSuite.scala | 319 ---------
.../spark/scheduler/cluster/FakeTask.scala | 27 -
.../cluster/TaskResultGetterSuite.scala | 114 ---
.../scheduler/local/LocalSchedulerSuite.scala | 227 ------
.../streaming/examples/JavaKafkaWordCount.java | 2 +-
.../spark/mllib/api/python/PythonMLLibAPI.scala | 232 ++++++
.../org/apache/spark/deploy/yarn/Client.scala | 4 +-
.../deploy/yarn/YarnAllocationHandler.scala | 10 +-
.../cluster/YarnClientClusterScheduler.scala | 3 +-
.../cluster/YarnClientSchedulerBackend.scala | 3 +-
.../cluster/YarnClusterScheduler.scala | 3 +-
python/pyspark/java_gateway.py | 1 +
python/pyspark/mllib/__init__.py | 20 +
python/pyspark/mllib/_common.py | 227 ++++++
python/pyspark/mllib/classification.py | 86 +++
python/pyspark/mllib/clustering.py | 79 ++
python/pyspark/mllib/recommendation.py | 74 ++
python/pyspark/mllib/regression.py | 110 +++
python/pyspark/serializers.py | 2 +-
python/pyspark/shell.py | 2 +-
spark-class | 6 +-
spark-class2.cmd | 2 +-
.../deploy/yarn/YarnAllocationHandler.scala | 10 +-
.../cluster/YarnClientClusterScheduler.scala | 3 +-
.../cluster/YarnClientSchedulerBackend.scala | 3 +-
.../cluster/YarnClusterScheduler.scala | 10 +-
59 files changed, 3181 insertions(+), 2888 deletions(-)
----------------------------------------------------------------------