From 3aec9f4e2d8fcce9ddf84ab4d0e10147c18afa16 Mon Sep 17 00:00:00 2001
From: Yu ISHIKAWA <yuu.ishikawa@gmail.com>
Date: Fri, 24 Jul 2015 09:10:11 -0700
Subject: [PATCH] [SPARK-9249] [SPARKR] local variable assigned but may not be
used
[[SPARK-9249] local variable assigned but may not be used - ASF JIRA](https://issues.apache.org/jira/browse/SPARK-9249)
https://gist.github.com/yu-iskw/0e5b0253c11769457ea5
Author: Yu ISHIKAWA <yuu.ishikawa@gmail.com>
Closes #7640 from yu-iskw/SPARK-9249 and squashes the following commits:
7a51cab [Yu ISHIKAWA] [SPARK-9249][SparkR] local variable assigned but may not be used
---
R/pkg/R/deserialize.R | 4 ++--
R/pkg/R/sparkR.R | 3 ---
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 <- "////"
}
--
GitLab