aboutsummaryrefslogtreecommitdiff
path: root/R
diff options
context:
space:
mode:
Diffstat (limited to 'R')
-rw-r--r--R/pkg/R/deserialize.R4
-rw-r--r--R/pkg/R/sparkR.R3
2 files changed, 2 insertions, 5 deletions
diff --git a/R/pkg/R/deserialize.R b/R/pkg/R/deserialize.R
index 7d1f6b0819..6d364f77be 100644
--- a/R/pkg/R/deserialize.R
+++ b/R/pkg/R/deserialize.R
@@ -102,11 +102,11 @@ readList <- function(con) {
readRaw <- function(con) {
dataLen <- readInt(con)
- data <- readBin(con, raw(), as.integer(dataLen), endian = "big")
+ readBin(con, raw(), as.integer(dataLen), endian = "big")
}
readRawLen <- function(con, dataLen) {
- data <- readBin(con, raw(), as.integer(dataLen), endian = "big")
+ readBin(con, raw(), as.integer(dataLen), endian = "big")
}
readDeserialize <- function(con) {
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index 79b79d7094..76c15875b5 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -104,16 +104,13 @@ sparkR.init <- function(
return(get(".sparkRjsc", envir = .sparkREnv))
}
- sparkMem <- Sys.getenv("SPARK_MEM", "1024m")
jars <- suppressWarnings(normalizePath(as.character(sparkJars)))
# Classpath separator is ";" on Windows
# URI needs four /// as from http://stackoverflow.com/a/18522792
if (.Platform$OS.type == "unix") {
- collapseChar <- ":"
uriSep <- "//"
} else {
- collapseChar <- ";"
uriSep <- "////"
}