Skip to content

[SPARK-28756][R] Fix checkJavaVersion to accept JDK8+ #25472

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
dongjoon-hyun wants to merge 4 commits into from
Closed

[SPARK-28756][R] Fix checkJavaVersion to accept JDK8+ #25472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68b0112
[SPARK-28756][R] Fix checkJavaVersion to accept JDK8+
dongjoon-hyun Aug 16, 2019
d15bd85
Address comments
dongjoon-hyun Aug 16, 2019
22e11b2
fix
dongjoon-hyun Aug 16, 2019
4531ced
fix
dongjoon-hyun Aug 16, 2019
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
2 changes: 1 addition & 1 deletion R/pkg/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),
License: Apache License (== 2.0)
URL: https://www.apache.org/ https://spark.apache.org/
BugReports: https://spark.apache.org/contributing.html
SystemRequirements: Java (== 8)
SystemRequirements: Java (>= 8)
Depends:
R (>= 3.1),
methods
Expand Down
16 changes: 11 additions & 5 deletions R/pkg/R/client.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,17 @@ checkJavaVersion <- function() {
}, javaVersionOut)

javaVersionStr <- strsplit(javaVersionFilter[[1]], "[\"]")[[1L]][2]
# javaVersionStr is of the form 1.8.0_92.
# Extract 8 from it to compare to sparkJavaVersion
javaVersionNum <- as.integer(strsplit(javaVersionStr, "[.]")[[1L]][2])
if (javaVersionNum != sparkJavaVersion) {
stop(paste("Java version", sparkJavaVersion, "is required for this package; found version:",
# javaVersionStr is of the form 1.8.0_92/9.0.x/11.0.x.
# We are using 8, 9, 10, 11 for sparkJavaVersion.
versions <- strsplit(javaVersionStr, "[.]")[[1L]]
if ("1" == versions[1]) {
javaVersionNum <- as.integer(versions[2])
} else {
javaVersionNum <- as.integer(versions[1])
}
if (javaVersionNum < sparkJavaVersion) {
stop(paste("Java version", sparkJavaVersion,
", or greater, is required for this package; found version:",
javaVersionStr))
}
return(javaVersionNum)
Expand Down