You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@amaterasu.apache.org by ya...@apache.org on 2018/07/01 00:21:50 UTC
[incubator-amaterasu] 01/01: Merge pull request #29 from
apache/revert-27-RC4-RefactorFramework
This is an automated email from the ASF dual-hosted git repository.
yaniv pushed a commit to branch version-0.2.0-incubating-rc4
in repository https://gitbox.apache.org/repos/asf/incubator-amaterasu.git
commit 5c66d9d273ea8f4dd3eb9c8eaae51f06aa18eb29
Merge: abe3f29 4e21ef8
Author: Yaniv Rodenski <ro...@gmail.com>
AuthorDate: Sun Jul 1 10:21:47 2018 +1000
Merge pull request #29 from apache/revert-27-RC4-RefactorFramework
Revert "AMATERASU-24 Refactor Spark out of Amaterasu executor to it's own project"
build.gradle | 4 +
.../common/execution/actions/Notifier.scala | 4 +-
executor/build.gradle | 14 ++-
.../runners/spark/PySpark}/PySparkEntryPoint.java | 11 +-
.../src/main}/resources/codegen.py | 0
.../src/main}/resources/runtime.py | 0
.../main}/resources/spark-version-info.properties | 0
.../src/main/resources/spark_intp.py | 0
.../spark/PySpark}/PySparkExecutionQueue.scala | 2 +-
.../spark/PySpark}/PySparkResultQueue.scala | 4 +-
.../runners/spark/PySpark}/PySparkRunner.scala | 10 +-
.../runners/spark/PySpark}/ResultQueue.scala | 2 +-
.../actions/runners/spark}/SparkRRunner.scala | 28 ++---
.../runners/spark}/SparkRunnersProvider.scala | 10 +-
.../runners/spark/SparkSql}/SparkSqlRunner.scala | 9 +-
.../mesos/executors/MesosActionsExecutor.scala | 4 +-
.../amaterasu/executor}/runtime/AmaContext.scala | 8 +-
.../executor/yarn/executors/ActionsExecutor.scala | 8 +-
.../spark/repl/amaterasu}/AmaSparkILoop.scala | 2 +-
.../runners/spark}/SparkRunnerHelper.scala | 14 +--
.../runners/spark}/SparkScalaRunner.scala | 6 +-
.../resources/SparkSql/csv/SparkSqlTestCsv.csv | 0
.../resources/SparkSql/json/SparkSqlTestData.json | 0
...548d-1371-4c08-81d6-f2ba72defa12.gz.parquet.crc | Bin
...548d-1371-4c08-81d6-f2ba72defa12.gz.parquet.crc | Bin
.../src/test/resources/SparkSql/parquet/_SUCCESS | 0
.../resources/SparkSql/parquet/_common_metadata | Bin
.../src/test/resources/SparkSql/parquet/_metadata | Bin
...c370548d-1371-4c08-81d6-f2ba72defa12.gz.parquet | Bin
...c370548d-1371-4c08-81d6-f2ba72defa12.gz.parquet | Bin
.../src/test/resources/amaterasu.properties | 0
.../src/test}/resources/codegen.py | 0
.../src/test/resources/py4j-0.10.4-src.zip | Bin
.../src/test/resources/py4j.tar.gz | Bin
.../src/test/resources/pyspark-with-amacontext.py | 0
.../src/test/resources/pyspark.tar.gz | Bin
.../src/test/resources/pyspark.zip | Bin
.../src/test}/resources/runtime.py | 0
.../src/test/resources/simple-pyspark.py | 0
.../src/test/resources/simple-python-err.py | 0
.../src/test/resources/simple-python.py | 0
.../src/test/resources/simple-spark.scala | 5 +-
.../src/test/resources/spark_intp.py | 0
.../src/test/resources/step-2.scala | 3 +-
...c370548d-1371-4c08-81d6-f2ba72defa12.gz.parquet | Bin
...c370548d-1371-4c08-81d6-f2ba72defa12.gz.parquet | Bin
.../RunnersTests}/RunnersLoadingTests.scala | 2 +-
.../amaterasu/spark}/PySparkRunnerTests.scala | 3 +-
.../amaterasu/spark}/SparkScalaRunnerTests.scala | 9 +-
.../amaterasu/spark}/SparkSqlRunnerTests.scala | 9 +-
.../apache/amaterasu}/spark/SparkTestsSuite.scala | 10 +-
.../apache/amaterasu/utilities/TestNotifier.scala | 0
frameworks/spark/runner/build.gradle | 118 ---------------------
.../main/resources/spark-version-info.properties | 11 --
frameworks/spark/runtime/build.gradle | 89 ----------------
gradle/wrapper/gradle-wrapper.properties | 4 +-
gradlew | 16 +++
gradlew.bat | 18 ++++
.../apache/amaterasu/leader/yarn/ArgsParser.java | 6 +-
.../org/apache/amaterasu/leader/yarn/Client.java | 23 +---
.../apache/amaterasu/leader/dsl/JobParser.scala | 4 +-
.../frameworks/spark/SparkSetupProvider.scala | 1 +
.../mesos/schedulers/AmaterasuScheduler.scala | 1 +
.../leader/mesos/schedulers/JobScheduler.scala | 5 +-
.../leader/utilities/ActiveReportListener.scala | 2 +
.../amaterasu/leader/utilities/HttpServer.scala | 7 +-
.../amaterasu/leader/yarn/ApplicationMaster.scala | 39 +++----
.../leader/yarn/YarnRMCallbackHandler.scala | 5 +-
leader/src/main/scripts/ama-start-mesos.sh | 4 +-
leader/src/main/scripts/ama-start-yarn.sh | 4 +-
.../leader/mesos/ClusterSchedulerTests.scala | 2 +-
.../amaterasu/utilities/HttpServerTests.scala | 6 ++
settings.gradle | 14 +--
73 files changed, 192 insertions(+), 368 deletions(-)