Skip to content

[SPARK-8603][SPARKR] Use shell() instead of system2() for SparkR on Windows #13165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 17 commits into from
Closed

[SPARK-8603][SPARKR] Use shell() instead of system2() for SparkR on Windows #13165

Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6f0f5ab
[SPARK-8603] [sparkR] In windows, Incorrect file seperator passed to …
pcp-dev Jun 25, 2015
24e37e1
Fetch upstream
HyukjinKwon May 18, 2016
454b7f5
Correct condition, fix style and comments
HyukjinKwon May 18, 2016
201887d
Fetch upstream
HyukjinKwon May 18, 2016
3057844
Update indentation
HyukjinKwon May 18, 2016
935d796
Fix typo
HyukjinKwon May 18, 2016
6f0933d
Address comments, fix failing tests on windos, add a test.
HyukjinKwon May 25, 2016
64141d2
Skip Windows test on Linux and repleace jars to list
HyukjinKwon May 25, 2016
4a53360
Fix R style
HyukjinKwon May 25, 2016
397fd14
Fix logical bool for capture (to make sure it waits)
HyukjinKwon May 25, 2016
0a288b1
Address comments
HyukjinKwon May 26, 2016
0482ebb
R style improvement
HyukjinKwon May 26, 2016
a3ccac6
Reuse determineSparkSubmitBin()
HyukjinKwon May 26, 2016
a1ccd5f
Fix style and correct arguments
HyukjinKwon May 26, 2016
7eadefd
Fetch upstream
HyukjinKwon May 26, 2016
521f07b
Change test context name
HyukjinKwon May 26, 2016
752c40a
Fix a typo
HyukjinKwon May 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion R/pkg/R/client.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,17 @@ determineSparkSubmitBin <- function() {
sparkSubmitBinName
}

# R supports both file separator in the file path (Unix : / and Windows: \) irrespective
# of the operating system. So, this should be manaully changed.
determinefileSeperator <- function() {
if (.Platform$OS.type == "windows") {
fileSeperator <- "\\"
Copy link
Member

@srowen srowen May 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: separator not seperator

Copy link
Member Author

@HyukjinKwon HyukjinKwon May 18, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much.

} else {
fileSeperator <- .Platform$file.sep
}
fileSeperator
}

generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
jars <- paste0(jars, collapse = ",")
if (jars != "") {
Expand All @@ -63,7 +74,8 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack
launchBackend <- function(args, sparkHome, jars, sparkSubmitOpts, packages) {
sparkSubmitBinName <- determineSparkSubmitBin()
if (sparkHome != "") {
sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName)
fileSeperator <- determinefileSeperator()
sparkSubmitBin <- file.path(sparkHome, "bin", sparkSubmitBinName, fsep = fileSeperator)
} else {
sparkSubmitBin <- sparkSubmitBinName
}
Expand Down