Skip to content

[SPARK-17339][SPARKR][CORE] Fix some R tests and use Path.toUri in SparkContext for Windows paths in SparkR #14960

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
HyukjinKwon wants to merge 7 commits into from
Closed

[SPARK-17339][SPARKR][CORE] Fix some R tests and use Path.toUri in SparkContext for Windows paths in SparkR #14960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0711682
Avoid direct use of URI for file paths in Windows
HyukjinKwon Sep 5, 2016
f42c182
Handle Windows specific path issues
HyukjinKwon Sep 5, 2016
f5bde71
Revert manual Windows path handling
HyukjinKwon Sep 5, 2016
cd8fe11
Fetch upstream
HyukjinKwon Sep 5, 2016
9392421
Use new Path(...).toUri
HyukjinKwon Sep 6, 2016
790d5b2
Fix R tests more
HyukjinKwon Sep 6, 2016
41aaaf1
Replace FileSystem.get to FileSystem.getLocal
HyukjinKwon Sep 7, 2016
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
14 changes: 10 additions & 4 deletions R/pkg/inst/tests/testthat/test_mllib.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ context("MLlib functions")
# Tests for MLlib functions in SparkR
sparkSession <- sparkR.session(enableHiveSupport = FALSE)

absoluteSparkPath <- function(x) {
sparkHome <- sparkR.conf("spark.home")
file.path(sparkHome, x)
}

test_that("formula of spark.glm", {
training <- suppressWarnings(createDataFrame(iris))
# directly calling the spark API
Expand Down Expand Up @@ -354,7 +359,8 @@ test_that("spark.kmeans", {
})

test_that("spark.mlp", {
df <- read.df("data/mllib/sample_multiclass_classification_data.txt", source = "libsvm")
df <- read.df(absoluteSparkPath("data/mllib/sample_multiclass_classification_data.txt"),
source = "libsvm")
model <- spark.mlp(df, blockSize = 128, layers = c(4, 5, 4, 3), solver = "l-bfgs", maxIter = 100,
tol = 0.5, stepSize = 1, seed = 1)

Expand Down Expand Up @@ -616,7 +622,7 @@ test_that("spark.gaussianMixture", {
})

test_that("spark.lda with libsvm", {
text <- read.df("data/mllib/sample_lda_libsvm_data.txt", source = "libsvm")
text <- read.df(absoluteSparkPath("data/mllib/sample_lda_libsvm_data.txt"), source = "libsvm")
model <- spark.lda(text, optimizer = "em")

stats <- summary(model, 10)
Expand Down Expand Up @@ -652,7 +658,7 @@ test_that("spark.lda with libsvm", {
})

test_that("spark.lda with text input", {
text <- read.text("data/mllib/sample_lda_data.txt")
text <- read.text(absoluteSparkPath("data/mllib/sample_lda_data.txt"))
model <- spark.lda(text, optimizer = "online", features = "value")

stats <- summary(model)
Expand Down Expand Up @@ -688,7 +694,7 @@ test_that("spark.lda with text input", {
})

test_that("spark.posterior and spark.perplexity", {
text <- read.text("data/mllib/sample_lda_data.txt")
text <- read.text(absoluteSparkPath("data/mllib/sample_lda_data.txt"))
model <- spark.lda(text, features = "value", k = 3)

# Assert perplexities are equal
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/SparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli

// This is a hack to enforce loading hdfs-site.xml.
// See SPARK-11227 for details.
FileSystem.get(new URI(path), hadoopConfiguration)
FileSystem.getLocal(hadoopConfiguration)

// A Hadoop configuration can be about 10 KB, which is pretty big, so broadcast it.
val confBroadcast = broadcast(new SerializableConfiguration(hadoopConfiguration))
Expand Down Expand Up @@ -1081,7 +1081,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli

// This is a hack to enforce loading hdfs-site.xml.
// See SPARK-11227 for details.
FileSystem.get(new URI(path), hadoopConfiguration)
FileSystem.getLocal(hadoopConfiguration)

// The call to NewHadoopJob automatically adds security credentials to conf,
// so we don't need to explicitly add them ourselves
Expand Down