You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2018/12/13 12:06:16 UTC
[spark] branch master updated: [MINOR][R] Fix indents of sparkR
welcome message to be consistent with pyspark and spark-shell
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 19b63c5 [MINOR][R] Fix indents of sparkR welcome message to be consistent with pyspark and spark-shell
19b63c5 is described below
commit 19b63c560d92a0e30b2dfc523bcce4f1c9daf851
Author: Qi Shao <qi...@gmail.com>
AuthorDate: Thu Dec 13 20:05:49 2018 +0800
[MINOR][R] Fix indents of sparkR welcome message to be consistent with pyspark and spark-shell
## What changes were proposed in this pull request?
1. Removed empty space at the beginning of welcome message lines of sparkR to be consistent with welcome message of `pyspark` and `spark-shell`
2. Setting indent of logo message lines to 3 to be consistent with welcome message of `pyspark` and `spark-shell`
Output of `pyspark`:
```
Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/__ / .__/\_,_/_/ /_/\_\ version 2.4.0
/_/
Using Python version 3.6.6 (default, Jun 28 2018 11:07:29)
SparkSession available as 'spark'.
```
Output of `spark-shell`:
```
Spark session available as 'spark'.
Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 2.4.0
/_/
Using Scala version 2.11.12 (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_161)
Type in expressions to have them evaluated.
Type :help for more information.
```
## How was this patch tested?
Before:
Output of `sparkR`:
```
Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 2.4.0
/_/
SparkSession available as 'spark'.
```
After:
```
Welcome to
____ __
/ __/__ ___ _____/ /__
_\ \/ _ \/ _ `/ __/ '_/
/___/ .__/\_,_/_/ /_/\_\ version 2.4.0
/_/
SparkSession available as 'spark'.
```
Closes #23293 from AzureQ/master.
Authored-by: Qi Shao <qi...@gmail.com>
Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
R/pkg/inst/profile/shell.R | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/R/pkg/inst/profile/shell.R b/R/pkg/inst/profile/shell.R
index 32eb367..e4e0d03 100644
--- a/R/pkg/inst/profile/shell.R
+++ b/R/pkg/inst/profile/shell.R
@@ -33,19 +33,19 @@
sc <- SparkR:::callJStatic("org.apache.spark.sql.api.r.SQLUtils", "getJavaSparkContext", spark)
assign("sc", sc, envir = .GlobalEnv)
sparkVer <- SparkR:::callJMethod(sc, "version")
- cat("\n Welcome to")
+ cat("\nWelcome to")
cat("\n")
- cat(" ____ __", "\n")
- cat(" / __/__ ___ _____/ /__", "\n")
- cat(" _\\ \\/ _ \\/ _ `/ __/ '_/", "\n")
- cat(" /___/ .__/\\_,_/_/ /_/\\_\\")
+ cat(" ____ __", "\n")
+ cat(" / __/__ ___ _____/ /__", "\n")
+ cat(" _\\ \\/ _ \\/ _ `/ __/ '_/", "\n")
+ cat(" /___/ .__/\\_,_/_/ /_/\\_\\")
if (nchar(sparkVer) == 0) {
cat("\n")
} else {
- cat(" version ", sparkVer, "\n")
+ cat(" version", sparkVer, "\n")
}
- cat(" /_/", "\n")
+ cat(" /_/", "\n")
cat("\n")
- cat("\n SparkSession available as 'spark'.\n")
+ cat("\nSparkSession available as 'spark'.\n")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org