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:01:52 UTC
[09/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/7c04b313
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/7c04b313
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/7c04b313
Branch: refs/heads/master
Commit: 7c04b3134a4257f9aea736caecbcec1f451c2443
Parents: ae5102a c1d928a
Author: Reza Zadeh <ri...@gmail.com>
Authored: Wed Jan 1 18:12:35 2014 -0800
Committer: Reza Zadeh <ri...@gmail.com>
Committed: Wed Jan 1 18:12:35 2014 -0800
----------------------------------------------------------------------
core/pom.xml | 422 ++++++++++---------
.../apache/spark/network/netty/FileClient.java | 32 +-
.../netty/FileClientChannelInitializer.java | 6 +-
.../spark/network/netty/FileClientHandler.java | 12 +-
.../apache/spark/network/netty/FileServer.java | 29 +-
.../netty/FileServerChannelInitializer.java | 3 +-
.../spark/network/netty/FileServerHandler.java | 18 +-
.../org/apache/spark/default-log4j.properties | 8 +
.../scala/org/apache/spark/HttpServer.scala | 1 +
.../main/scala/org/apache/spark/Logging.scala | 41 +-
.../scala/org/apache/spark/SparkContext.scala | 26 +-
.../scala/org/apache/spark/TaskEndReason.scala | 2 -
.../org/apache/spark/api/java/JavaPairRDD.scala | 36 ++
.../org/apache/spark/api/java/JavaRDDLike.scala | 11 +
.../spark/api/java/JavaSparkContext.scala | 15 +-
.../spark/deploy/worker/ui/WorkerWebUI.scala | 6 +-
.../org/apache/spark/executor/Executor.scala | 2 -
.../apache/spark/metrics/MetricsConfig.scala | 1 -
.../apache/spark/metrics/MetricsSystem.scala | 1 -
.../org/apache/spark/rdd/CheckpointRDD.scala | 32 +-
.../org/apache/spark/rdd/PairRDDFunctions.scala | 42 ++
.../main/scala/org/apache/spark/rdd/RDD.scala | 16 +-
.../apache/spark/rdd/RDDCheckpointData.scala | 15 +-
.../apache/spark/scheduler/DAGScheduler.scala | 44 +-
.../org/apache/spark/scheduler/JobLogger.scala | 6 +-
.../scala/org/apache/spark/scheduler/Pool.scala | 4 -
.../apache/spark/scheduler/Schedulable.scala | 1 -
.../apache/spark/scheduler/SparkListener.scala | 20 +-
.../spark/scheduler/SparkListenerBus.scala | 2 +-
.../spark/scheduler/TaskSchedulerImpl.scala | 7 -
.../apache/spark/scheduler/TaskSetManager.scala | 10 -
.../spark/storage/BlockManagerMasterActor.scala | 2 -
.../spark/storage/BlockManagerWorker.scala | 3 -
.../spark/storage/BlockMessageArray.scala | 2 -
.../spark/ui/jobs/JobProgressListener.scala | 11 +-
.../spark/util/SerializableHyperLogLog.scala | 50 +++
.../org/apache/spark/CheckpointSuite.scala | 2 -
.../scala/org/apache/spark/JavaAPISuite.java | 36 +-
.../spark/rdd/PairRDDFunctionsSuite.scala | 34 ++
.../scala/org/apache/spark/rdd/RDDSuite.scala | 13 +
.../apache/spark/scheduler/JobLoggerSuite.scala | 2 +-
.../spark/scheduler/SparkListenerSuite.scala | 2 +-
.../spark/serializer/KryoSerializerSuite.scala | 4 +
pom.xml | 7 +-
project/SparkBuild.scala | 5 +-
python/pyspark/context.py | 9 +-
python/pyspark/tests.py | 4 +-
spark-class | 9 +-
spark-class2.cmd | 2 +-
.../org/apache/spark/streaming/Checkpoint.scala | 52 ++-
.../org/apache/spark/streaming/DStream.scala | 2 -
.../apache/spark/streaming/DStreamGraph.scala | 1 -
.../spark/streaming/StreamingContext.scala | 34 +-
.../api/java/JavaStreamingContext.scala | 13 +-
.../streaming/dstream/FileInputDStream.scala | 153 ++++---
.../streaming/dstream/NetworkInputDStream.scala | 2 -
.../streaming/scheduler/JobGenerator.scala | 67 ++-
.../streaming/scheduler/JobScheduler.scala | 2 -
.../streaming/util/MasterFailureTest.scala | 3 -
.../spark/streaming/CheckpointSuite.scala | 44 +-
.../spark/streaming/InputStreamsSuite.scala | 2 +-
61 files changed, 889 insertions(+), 554 deletions(-)
----------------------------------------------------------------------