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 2013/09/10 21:41:03 UTC

[49/50] git commit: Merge branch 'master' into branch-0.8

Merge branch 'master' into branch-0.8


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a1307ef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a1307ef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a1307ef9

Branch: refs/heads/branch-0.8
Commit: a1307ef97811f661da4283b02958abb6c27433be
Parents: 86ca660 8c14f4b
Author: Patrick Wendell <pw...@gmail.com>
Authored: Mon Sep 9 22:38:11 2013 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon Sep 9 22:38:11 2013 -0700

----------------------------------------------------------------------
 LICENSE                                         | 196 +++++++++++
 README.md                                       |  11 +
 assembly/README                                 |  11 +-
 bin/compute-classpath.cmd                       |  46 ++-
 conf/fairscheduler.xml.template                 |  18 +-
 conf/metrics.properties.template                |  50 ++-
 core/pom.xml                                    |   4 +
 .../org/apache/spark/ui/static/webui.css        |  17 +
 .../scala/org/apache/spark/CacheManager.scala   |   8 +-
 .../scala/org/apache/spark/SparkContext.scala   |  39 ++-
 .../main/scala/org/apache/spark/SparkEnv.scala  |   2 +-
 .../scala/org/apache/spark/TaskContext.scala    |   1 +
 .../spark/api/python/PythonWorkerFactory.scala  | 107 +++++-
 .../org/apache/spark/deploy/DeployMessage.scala |   4 +
 .../apache/spark/deploy/LocalSparkCluster.scala |   2 +-
 .../spark/deploy/master/ApplicationSource.scala |  17 +
 .../org/apache/spark/deploy/master/Master.scala |  21 +-
 .../spark/deploy/master/MasterSource.scala      |  17 +
 .../spark/deploy/worker/WorkerSource.scala      |  17 +
 .../org/apache/spark/executor/Executor.scala    |   2 +-
 .../apache/spark/executor/ExecutorSource.scala  |  22 +-
 .../apache/spark/metrics/MetricsConfig.scala    |   7 +-
 .../apache/spark/metrics/sink/GangliaSink.scala |  82 +++++
 .../spark/metrics/sink/MetricsServlet.scala     |  11 +-
 .../spark/network/netty/ShuffleSender.scala     |   3 +-
 .../main/scala/org/apache/spark/package.scala   |   4 +-
 .../main/scala/org/apache/spark/rdd/RDD.scala   |  17 +
 .../apache/spark/scheduler/DAGScheduler.scala   |  12 +-
 .../spark/scheduler/DAGSchedulerSource.scala    |  23 +-
 .../org/apache/spark/scheduler/ResultTask.scala |   6 +-
 .../apache/spark/scheduler/ShuffleMapTask.scala |   2 +-
 .../scheduler/cluster/ClusterScheduler.scala    |   2 +-
 .../cluster/ClusterTaskSetManager.scala         |   4 +-
 .../scheduler/cluster/SchedulableBuilder.scala  |   6 +-
 .../cluster/SparkDeploySchedulerBackend.scala   |  12 +-
 .../spark/scheduler/local/LocalScheduler.scala  |   2 +-
 .../spark/storage/BlockManagerSource.scala      |  23 +-
 .../org/apache/spark/storage/DiskStore.scala    |   2 +-
 .../org/apache/spark/storage/StorageLevel.scala |   6 +-
 .../scala/org/apache/spark/ui/SparkUI.scala     |   5 +-
 .../scala/org/apache/spark/ui/UIUtils.scala     |  39 ++-
 .../apache/spark/ui/UIWorkloadGenerator.scala   |   4 +-
 .../org/apache/spark/ui/exec/ExecutorsUI.scala  |  17 +
 .../spark/ui/jobs/JobProgressListener.scala     |  19 +-
 .../org/apache/spark/ui/jobs/PoolPage.scala     |  17 +
 .../org/apache/spark/ui/jobs/PoolTable.scala    |  20 +-
 .../org/apache/spark/ui/jobs/StageTable.scala   |  24 +-
 .../org/apache/spark/ui/storage/IndexPage.scala |   2 +-
 .../scala/org/apache/spark/util/Utils.scala     |  26 +-
 .../resources/test_metrics_config.properties    |  17 +
 .../resources/test_metrics_system.properties    |  17 +
 .../org/apache/spark/CacheManagerSuite.scala    |  91 ++++++
 .../scala/org/apache/spark/JavaAPISuite.java    |   2 +-
 .../apache/spark/PartitionPruningRDDSuite.scala |  17 +
 .../apache/spark/deploy/JsonProtocolSuite.scala |  92 ++++++
 .../apache/spark/io/CompressionCodecSuite.scala |   2 +-
 .../spark/metrics/MetricsConfigSuite.scala      |  19 +-
 .../scala/org/apache/spark/rdd/RDDSuite.scala   |  14 +-
 .../cluster/ClusterSchedulerSuite.scala         |   8 +-
 .../scheduler/local/LocalSchedulerSuite.scala   |   8 +-
 docs/_layouts/global.html                       |   9 +-
 docs/bagel-programming-guide.md                 |   2 +-
 docs/cluster-overview.md                        | 117 +++++++
 docs/configuration.md                           |  36 ++-
 docs/contributing-to-spark.md                   |  24 +-
 docs/css/bootstrap.min.css                      |   2 +-
 docs/ec2-scripts.md                             |   8 +-
 docs/hadoop-third-party-distributions.md        | 118 +++++++
 docs/img/cluster-overview.png                   | Bin 0 -> 28011 bytes
 docs/img/cluster-overview.pptx                  | Bin 0 -> 51771 bytes
 docs/img/spark-logo-hd.png                      | Bin 0 -> 13512 bytes
 docs/index.md                                   |  36 ++-
 docs/job-scheduling.md                          | 168 ++++++++++
 docs/mllib-guide.md                             | 192 ++++++++++-
 docs/monitoring.md                              |  70 ++++
 docs/python-programming-guide.md                |  44 +--
 docs/quick-start.md                             |  70 ++--
 docs/running-on-mesos.md                        |  19 +-
 docs/running-on-yarn.md                         |  35 +-
 docs/scala-programming-guide.md                 |   4 +-
 docs/spark-standalone.md                        |  48 ++-
 .../root/spark-ec2/ec2-variables.sh             |  17 +
 examples/pom.xml                                |  14 -
 .../apache/spark/examples/SparkPageRank.scala   |  17 +
 make-distribution.sh                            |   2 +-
 mllib/data/sample_svm_data.txt                  | 322 +++++++++++++++++++
 .../classification/ClassificationModel.scala    |  17 +
 .../apache/spark/mllib/classification/SVM.scala |  13 +-
 .../mllib/regression/LinearRegression.scala     |   4 +-
 .../spark/mllib/util/SVMDataGenerator.scala     |  17 +
 pom.xml                                         | 228 ++++++-------
 project/SparkBuild.scala                        |  18 +-
 project/project/SparkPluginBuild.scala          |  19 +-
 pyspark.cmd                                     |  23 ++
 pyspark2.cmd                                    |  55 ++++
 python/epydoc.conf                              |   1 +
 python/pyspark/__init__.py                      |  24 +-
 python/pyspark/context.py                       |  11 +
 python/pyspark/java_gateway.py                  |  17 +-
 python/pyspark/rdd.py                           |  19 ++
 python/pyspark/shell.py                         |   1 +
 python/pyspark/storagelevel.py                  |  43 +++
 python/pyspark/worker.py                        |  11 +-
 repl-bin/pom.xml                                |  10 -
 repl/pom.xml                                    |  12 -
 .../org/apache/spark/repl/SparkHelper.scala     |  17 +
 run-example.cmd                                 |  23 ++
 run-example2.cmd                                |  61 ++++
 run.cmd                                         |  20 --
 run2.cmd                                        | 100 ------
 sbt/sbt.cmd                                     |   2 +-
 spark-class                                     |   2 +-
 spark-class.cmd                                 |  23 ++
 spark-class2.cmd                                |  78 +++++
 spark-shell.cmd                                 |   4 +-
 yarn/pom.xml                                    |  65 ++--
 .../spark/deploy/yarn/ApplicationMaster.scala   |  78 +++--
 .../yarn/ApplicationMasterArguments.scala       |   2 +-
 .../org/apache/spark/deploy/yarn/Client.scala   |   5 +-
 .../spark/deploy/yarn/ClientArguments.scala     |   2 +-
 .../spark/deploy/yarn/WorkerRunnable.scala      |   3 +-
 .../deploy/yarn/YarnAllocationHandler.scala     |  13 +-
 .../cluster/YarnClusterScheduler.scala          |   3 +
 123 files changed, 3015 insertions(+), 699 deletions(-)
----------------------------------------------------------------------