You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by fe...@apache.org on 2018/05/15 02:20:30 UTC
spark git commit: [SPARK-23780][R] Failed to use googleVis library
with new SparkR
Repository: spark
Updated Branches:
refs/heads/master 061e0084c -> 9059f1ee6
[SPARK-23780][R] Failed to use googleVis library with new SparkR
## What changes were proposed in this pull request?
change generic to get it to work with googleVis
also fix lintr
## How was this patch tested?
manual test, unit tests
Author: Felix Cheung <fe...@hotmail.com>
Closes #21315 from felixcheung/googvis.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9059f1ee
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9059f1ee
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9059f1ee
Branch: refs/heads/master
Commit: 9059f1ee6ae13c8636c9b7fdbb708a349256fb8e
Parents: 061e008
Author: Felix Cheung <fe...@hotmail.com>
Authored: Mon May 14 19:20:25 2018 -0700
Committer: Felix Cheung <fe...@apache.org>
Committed: Mon May 14 19:20:25 2018 -0700
----------------------------------------------------------------------
R/pkg/R/client.R | 5 +++--
R/pkg/R/generics.R | 2 +-
R/pkg/R/sparkR.R | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9059f1ee/R/pkg/R/client.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/client.R b/R/pkg/R/client.R
index 14a17c6..4c87f64 100644
--- a/R/pkg/R/client.R
+++ b/R/pkg/R/client.R
@@ -63,7 +63,7 @@ generateSparkSubmitArgs <- function(args, sparkHome, jars, sparkSubmitOpts, pack
checkJavaVersion <- function() {
javaBin <- "java"
javaHome <- Sys.getenv("JAVA_HOME")
- javaReqs <- utils::packageDescription(utils::packageName(), fields=c("SystemRequirements"))
+ javaReqs <- utils::packageDescription(utils::packageName(), fields = c("SystemRequirements"))
sparkJavaVersion <- as.numeric(tail(strsplit(javaReqs, "[(=)]")[[1]], n = 1L))
if (javaHome != "") {
javaBin <- file.path(javaHome, "bin", javaBin)
@@ -90,7 +90,8 @@ checkJavaVersion <- function() {
# 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))
+ stop(paste("Java version", sparkJavaVersion, "is required for this package; found version:",
+ javaVersionStr))
}
}
http://git-wip-us.apache.org/repos/asf/spark/blob/9059f1ee/R/pkg/R/generics.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R
index 61da30b..3ea1811 100644
--- a/R/pkg/R/generics.R
+++ b/R/pkg/R/generics.R
@@ -624,7 +624,7 @@ setGeneric("summarize", function(x, ...) { standardGeneric("summarize") })
#' @rdname summary
setGeneric("summary", function(object, ...) { standardGeneric("summary") })
-setGeneric("toJSON", function(x) { standardGeneric("toJSON") })
+setGeneric("toJSON", function(x, ...) { standardGeneric("toJSON") })
setGeneric("toRDD", function(x) { standardGeneric("toRDD") })
http://git-wip-us.apache.org/repos/asf/spark/blob/9059f1ee/R/pkg/R/sparkR.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index d6a2d08..f7c1663 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -194,7 +194,7 @@ sparkR.sparkContext <- function(
# Don't use readString() so that we can provide a useful
# error message if the R and Java versions are mismatched.
- authSecretLen = readInt(f)
+ authSecretLen <- readInt(f)
if (length(authSecretLen) == 0 || authSecretLen == 0) {
stop("Unexpected EOF in JVM connection data. Mismatched versions?")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org