You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2014/01/22 23:02:21 UTC
[38/50] git commit: Merge remote-tracking branch 'upstream/master'
into sparsesvd
Merge remote-tracking branch 'upstream/master' into sparsesvd
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/f324d535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/f324d535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/f324d535
Branch: refs/heads/master
Commit: f324d5355514b1c7ae85019b476046bb64b5593e
Parents: 1afdeae ee6e7f9
Author: Reza Zadeh <ri...@gmail.com>
Authored: Sat Jan 11 13:27:15 2014 -0800
Committer: Reza Zadeh <ri...@gmail.com>
Committed: Sat Jan 11 13:27:15 2014 -0800
----------------------------------------------------------------------
conf/log4j.properties.template | 4 +-
.../org/apache/spark/log4j-defaults.properties | 4 +-
.../scala/org/apache/spark/Aggregator.scala | 61 ++--
.../scala/org/apache/spark/SparkContext.scala | 88 ++---
.../main/scala/org/apache/spark/SparkEnv.scala | 6 +-
.../deploy/master/ui/ApplicationPage.scala | 4 +-
.../org/apache/spark/executor/Executor.scala | 5 +
.../org/apache/spark/rdd/CoGroupedRDD.scala | 88 +++--
.../scala/org/apache/spark/rdd/HadoopRDD.scala | 29 +-
.../org/apache/spark/rdd/NewHadoopRDD.scala | 20 +-
.../org/apache/spark/rdd/PairRDDFunctions.scala | 7 +-
.../apache/spark/scheduler/DAGScheduler.scala | 4 +-
.../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 +-
.../spark/storage/ShuffleBlockManager.scala | 2 +-
.../org/apache/spark/ui/jobs/StagePage.scala | 2 +-
.../org/apache/spark/util/AppendOnlyMap.scala | 237 -------------
.../org/apache/spark/util/MetadataCleaner.scala | 2 +-
.../apache/spark/util/TimeStampedHashMap.scala | 17 +-
.../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 | 25 +-
docs/running-on-yarn.md | 15 +-
ec2/spark_ec2.py | 12 +-
.../streaming/examples/JavaFlumeEventCount.java | 2 +
.../streaming/examples/JavaKafkaWordCount.java | 2 +
.../examples/JavaNetworkWordCount.java | 11 +-
.../streaming/examples/JavaQueueStream.java | 2 +
.../streaming/examples/ActorWordCount.scala | 12 +-
.../streaming/examples/FlumeEventCount.scala | 4 +-
.../streaming/examples/HdfsWordCount.scala | 3 +-
.../streaming/examples/KafkaWordCount.scala | 5 +-
.../streaming/examples/MQTTWordCount.scala | 8 +-
.../streaming/examples/NetworkWordCount.scala | 7 +-
.../spark/streaming/examples/QueueStream.scala | 8 +-
.../streaming/examples/RawNetworkGrep.scala | 5 +-
.../examples/RecoverableNetworkWordCount.scala | 118 +++++++
.../examples/StatefulNetworkWordCount.scala | 2 +
.../streaming/examples/StreamingExamples.scala | 21 ++
.../streaming/examples/TwitterAlgebirdCMS.scala | 10 +-
.../streaming/examples/TwitterAlgebirdHLL.scala | 9 +-
.../streaming/examples/TwitterPopularTags.scala | 2 +
.../streaming/examples/ZeroMQWordCount.scala | 1 +
.../examples/clickstream/PageViewStream.scala | 4 +-
external/kafka/pom.xml | 4 +-
.../spark/streaming/mqtt/MQTTInputDStream.scala | 2 +-
project/SparkBuild.scala | 18 +-
.../org/apache/spark/streaming/Checkpoint.scala | 188 ++++++----
.../org/apache/spark/streaming/DStream.scala | 17 +-
.../spark/streaming/DStreamCheckpointData.scala | 106 +++---
.../apache/spark/streaming/DStreamGraph.scala | 38 +-
.../spark/streaming/StreamingContext.scala | 75 +++-
.../api/java/JavaStreamingContext.scala | 96 ++++-
.../streaming/dstream/FileInputDStream.scala | 42 ++-
.../streaming/scheduler/JobGenerator.scala | 31 +-
.../streaming/util/MasterFailureTest.scala | 55 +--
.../apache/spark/streaming/JavaAPISuite.java | 29 +-
.../spark/streaming/BasicOperationsSuite.scala | 2 +-
.../spark/streaming/CheckpointSuite.scala | 10 +-
.../spark/deploy/yarn/ApplicationMaster.scala | 13 +-
.../spark/deploy/yarn/WorkerLauncher.scala | 28 +-
.../cluster/YarnClientSchedulerBackend.scala | 50 +--
.../spark/deploy/yarn/ApplicationMaster.scala | 13 +-
.../org/apache/spark/deploy/yarn/Client.scala | 1 +
.../spark/deploy/yarn/WorkerLauncher.scala | 28 +-
75 files changed, 2458 insertions(+), 817 deletions(-)
----------------------------------------------------------------------