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/13 05:04:39 UTC
[3/8] git commit: Merge remote-tracking branch 'apache/master' into
error-handling
Merge remote-tracking branch 'apache/master' into error-handling
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/18f4889d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/18f4889d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/18f4889d
Branch: refs/heads/master
Commit: 18f4889d96b61b59569ec05f64900da1477404d0
Parents: 4d9b0ab 288a878
Author: Tathagata Das <ta...@gmail.com>
Authored: Sat Jan 11 23:40:57 2014 -0800
Committer: Tathagata Das <ta...@gmail.com>
Committed: Sat Jan 11 23:40:57 2014 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/Aggregator.scala | 61 ++--
.../scala/org/apache/spark/SparkContext.scala | 100 +++---
.../main/scala/org/apache/spark/SparkEnv.scala | 6 +-
.../org/apache/spark/executor/Executor.scala | 5 +
.../org/apache/spark/rdd/CoGroupedRDD.scala | 88 +++--
.../scala/org/apache/spark/rdd/HadoopRDD.scala | 37 +-
.../org/apache/spark/rdd/NewHadoopRDD.scala | 36 +-
.../org/apache/spark/rdd/PairRDDFunctions.scala | 7 +-
.../org/apache/spark/storage/BlockId.scala | 12 +-
.../org/apache/spark/storage/BlockManager.scala | 4 +-
.../spark/storage/BlockObjectWriter.scala | 4 +
.../apache/spark/storage/DiskBlockManager.scala | 11 +-
.../org/apache/spark/ui/jobs/StagePage.scala | 2 +-
.../org/apache/spark/ui/jobs/StageTable.scala | 2 +-
.../org/apache/spark/util/AppendOnlyMap.scala | 237 -------------
.../scala/org/apache/spark/util/Utils.scala | 28 +-
.../scala/org/apache/spark/util/Vector.scala | 8 +
.../spark/util/collection/AppendOnlyMap.scala | 297 ++++++++++++++++
.../util/collection/ExternalAppendOnlyMap.scala | 350 +++++++++++++++++++
.../collection/SizeTrackingAppendOnlyMap.scala | 101 ++++++
.../apache/spark/util/AppendOnlyMapSuite.scala | 154 --------
.../util/SizeTrackingAppendOnlyMapSuite.scala | 120 +++++++
.../org/apache/spark/util/VectorSuite.scala | 44 +++
.../util/collection/AppendOnlyMapSuite.scala | 198 +++++++++++
.../collection/ExternalAppendOnlyMapSuite.scala | 230 ++++++++++++
docs/configuration.md | 23 +-
ec2/spark_ec2.py | 12 +-
external/kafka/pom.xml | 4 +-
.../spark/streaming/mqtt/MQTTInputDStream.scala | 2 +-
.../apache/spark/mllib/recommendation/ALS.scala | 15 +-
project/SparkBuild.scala | 18 +-
.../apache/spark/streaming/JavaAPISuite.java | 29 +-
32 files changed, 1709 insertions(+), 536 deletions(-)
----------------------------------------------------------------------