You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sh...@apache.org on 2015/06/23 21:47:57 UTC
spark git commit: [SPARK-8111] [SPARKR] SparkR shell should display
Spark logo and version banner on startup.
Repository: spark
Updated Branches:
refs/heads/master f2022fa0d -> f2fb0285a
[SPARK-8111] [SPARKR] SparkR shell should display Spark logo and version banner on startup.
spark version is taken from the environment variable SPARK_VERSION
Author: Alok Singh <si...@Aloks-MacBook-Pro.local>
Author: Alok Singh <si...@aloks-mbp.usca.ibm.com>
Closes #6944 from aloknsingh/aloknsingh_spark_jiras and squashes the following commits:
ed607bd [Alok Singh] [SPARK-8111][SparkR] As per suggestion, 1) using the version from sparkContext rather than the Sys.env. 2) change "Welcome to SparkR!" to "Welcome to" followed by Spark logo and version
acd5b85 [Alok Singh] fix the jira SPARK-8111 to add the spark version and logo. Currently spark version is taken from the environment variable SPARK_VERSION
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f2fb0285
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f2fb0285
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f2fb0285
Branch: refs/heads/master
Commit: f2fb0285ab6d4225c5350f109dea6c1c017bb491
Parents: f2022fa
Author: Alok Singh <si...@Aloks-MacBook-Pro.local>
Authored: Tue Jun 23 12:47:55 2015 -0700
Committer: Shivaram Venkataraman <sh...@cs.berkeley.edu>
Committed: Tue Jun 23 12:47:55 2015 -0700
----------------------------------------------------------------------
R/pkg/inst/profile/shell.R | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f2fb0285/R/pkg/inst/profile/shell.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/profile/shell.R b/R/pkg/inst/profile/shell.R
index 773b6ec..7189f1a 100644
--- a/R/pkg/inst/profile/shell.R
+++ b/R/pkg/inst/profile/shell.R
@@ -27,7 +27,21 @@
sc <- SparkR::sparkR.init()
assign("sc", sc, envir=.GlobalEnv)
sqlContext <- SparkR::sparkRSQL.init(sc)
+ sparkVer <- SparkR:::callJMethod(sc, "version")
assign("sqlContext", sqlContext, envir=.GlobalEnv)
- cat("\n Welcome to SparkR!")
+ cat("\n Welcome to")
+ cat("\n")
+ cat(" ____ __", "\n")
+ cat(" / __/__ ___ _____/ /__", "\n")
+ cat(" _\\ \\/ _ \\/ _ `/ __/ '_/", "\n")
+ cat(" /___/ .__/\\_,_/_/ /_/\\_\\")
+ if (nchar(sparkVer) == 0) {
+ cat("\n")
+ } else {
+ cat(" version ", sparkVer, "\n")
+ }
+ cat(" /_/", "\n")
+ cat("\n")
+
cat("\n Spark context is available as sc, SQL context is available as sqlContext\n")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org