From 499e8e154bdcc9d7b2f685b159e0ddb4eae48fe4 Mon Sep 17 00:00:00 2001
From: Luciano Resende <lresende@apache.org>
Date: Fri, 28 Aug 2015 09:13:21 -0700
Subject: [PATCH] [SPARK-8952] [SPARKR] - Wrap normalizePath calls with
suppressWarnings
This is based on davies comment on SPARK-8952 which suggests to only call normalizePath() when path starts with '~'
Author: Luciano Resende <lresende@apache.org>
Closes #8343 from lresende/SPARK-8952.
---
R/pkg/R/SQLContext.R | 4 ++--
R/pkg/R/sparkR.R | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/R/pkg/R/SQLContext.R b/R/pkg/R/SQLContext.R
index 110117a18c..1bc6445311 100644
--- a/R/pkg/R/SQLContext.R
+++ b/R/pkg/R/SQLContext.R
@@ -201,7 +201,7 @@ setMethod("toDF", signature(x = "RDD"),
jsonFile <- function(sqlContext, path) {
# Allow the user to have a more flexible definiton of the text file path
- path <- normalizePath(path)
+ path <- suppressWarnings(normalizePath(path))
# Convert a string vector of paths to a string containing comma separated paths
path <- paste(path, collapse = ",")
sdf <- callJMethod(sqlContext, "jsonFile", path)
@@ -251,7 +251,7 @@ jsonRDD <- function(sqlContext, rdd, schema = NULL, samplingRatio = 1.0) {
# TODO: Implement saveasParquetFile and write examples for both
parquetFile <- function(sqlContext, ...) {
# Allow the user to have a more flexible definiton of the text file path
- paths <- lapply(list(...), normalizePath)
+ paths <- lapply(list(...), function(x) suppressWarnings(normalizePath(x)))
sdf <- callJMethod(sqlContext, "parquetFile", paths)
dataFrame(sdf)
}
diff --git a/R/pkg/R/sparkR.R b/R/pkg/R/sparkR.R
index e83104f116..3c57a44db2 100644
--- a/R/pkg/R/sparkR.R
+++ b/R/pkg/R/sparkR.R
@@ -160,7 +160,7 @@ sparkR.init <- function(
})
if (nchar(sparkHome) != 0) {
- sparkHome <- normalizePath(sparkHome)
+ sparkHome <- suppressWarnings(normalizePath(sparkHome))
}
sparkEnvirMap <- new.env()
--
GitLab