Repository: bigtop Updated Branches: refs/heads/master 44aa7bb0f -> 9767c2b77
BIGTOP-2809: Support R integration for Spark Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/9767c2b7 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/9767c2b7 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/9767c2b7 Branch: refs/heads/master Commit: 9767c2b77e07021e20da4eaadecb6ec20a9806e6 Parents: 44aa7bb Author: Youngwoo Kim <yw...@apache.org> Authored: Thu Jun 15 10:59:21 2017 +0900 Committer: Youngwoo Kim <yw...@apache.org> Committed: Tue Dec 26 23:00:14 2017 +0900 ---------------------------------------------------------------------- bigtop-packages/src/common/spark/do-component-build | 3 ++- bigtop-packages/src/common/spark/install_spark.sh | 2 +- bigtop-packages/src/deb/spark/control | 5 +++++ bigtop-packages/src/deb/spark/spark-sparkr.install | 3 +++ bigtop-packages/src/rpm/spark/SPECS/spark.spec | 16 ++++++++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/9767c2b7/bigtop-packages/src/common/spark/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build index 3b79b0d..c2a2322 100644 --- a/bigtop-packages/src/common/spark/do-component-build +++ b/bigtop-packages/src/common/spark/do-component-build @@ -30,9 +30,10 @@ BUILD_OPTS="-Divy.home=${HOME}/.ivy2 -Dsbt.ivy.home=${HOME}/.ivy2 -Duser.home=${ -DrecompileMode=all \ -Pyarn -Phadoop-2.7 \ -Phive -Phive-thriftserver \ + -Psparkr \ $SPARK_BUILD_OPTS" -./dev/make-distribution.sh $BUILD_OPTS -DskipTests +./dev/make-distribution.sh --r $BUILD_OPTS -DskipTests SPARK_SKIP_TESTS=$([ "$SPARK_RUN_TESTS" = "true" ] && echo false || echo true) http://git-wip-us.apache.org/repos/asf/bigtop/blob/9767c2b7/bigtop-packages/src/common/spark/install_spark.sh ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/install_spark.sh b/bigtop-packages/src/common/spark/install_spark.sh index 50c3f2b..2a7e1ae 100644 --- a/bigtop-packages/src/common/spark/install_spark.sh +++ b/bigtop-packages/src/common/spark/install_spark.sh @@ -141,7 +141,7 @@ ln -s /etc/spark/conf $PREFIX/$LIB_DIR/conf # Copy in the wrappers install -d -m 0755 $PREFIX/$BIN_DIR -for wrap in bin/spark-class bin/spark-shell bin/spark-sql bin/spark-submit bin/find-spark-home; do +for wrap in bin/spark-class bin/spark-shell bin/spark-sql bin/spark-submit bin/find-spark-home bin/sparkR; do cat > $PREFIX/$BIN_DIR/$(basename $wrap) <<EOF #!/bin/bash http://git-wip-us.apache.org/repos/asf/bigtop/blob/9767c2b7/bigtop-packages/src/deb/spark/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/control b/bigtop-packages/src/deb/spark/control index 01a393d..093711d 100644 --- a/bigtop-packages/src/deb/spark/control +++ b/bigtop-packages/src/deb/spark/control @@ -75,3 +75,8 @@ Package: spark-yarn-shuffle Architecture: all Description: Spark YARN Shuffle Service Spark YARN Shuffle Service + +Package: spark-sparkr +Architecture: all +Description: R package for Apache Spark + SparkR is an R package that provides a light-weight frontend to use Apache Spark from R http://git-wip-us.apache.org/repos/asf/bigtop/blob/9767c2b7/bigtop-packages/src/deb/spark/spark-sparkr.install ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/spark-sparkr.install b/bigtop-packages/src/deb/spark/spark-sparkr.install new file mode 100644 index 0000000..381b05b --- /dev/null +++ b/bigtop-packages/src/deb/spark/spark-sparkr.install @@ -0,0 +1,3 @@ +/usr/bin/sparkR +/usr/lib/spark/bin/sparkR +/usr/lib/spark/R http://git-wip-us.apache.org/repos/asf/bigtop/blob/9767c2b7/bigtop-packages/src/rpm/spark/SPECS/spark.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec index 2496109..c29c68a 100644 --- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec +++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec @@ -143,6 +143,13 @@ Group: Development/Libraries %description -n spark-yarn-shuffle Spark YARN Shuffle Service +%package -n spark-sparkr +Summary: R package for Apache Spark +Group: Development/Libraries + +%description -n spark-sparkr +SparkR is an R package that provides a light-weight frontend to use Apache Spark from R. + %prep %setup -n %{spark_name}-%{spark_base_version} @@ -229,6 +236,9 @@ done %attr(0755,spark,spark) %{var_log_spark} %{bin}/spark-* %{bin}/find-spark-home +%exclude %{lib_spark}/R +%exclude %{lib_spark}/bin/sparkR +%exclude %{bin}/sparkR %files -n spark-python %defattr(-,root,root,755) @@ -250,6 +260,12 @@ done %{lib_spark}/yarn/spark-*-yarn-shuffle.jar %{lib_spark}/yarn/lib/spark-yarn-shuffle.jar +%files -n spark-sparkr +%defattr(-,root,root,755) +%{lib_spark}/R +%{lib_spark}/bin/sparkR +%{bin}/sparkR + %define service_macro() \ %files -n %1 \ %attr(0755,root,root)/%{initd_dir}/%1 \
