spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felixche...@apache.org
Subject spark git commit: [SPARKR][BRANCH-2.0] R merge API doc and example fix
Date Sun, 23 Oct 2016 17:53:55 GMT
Repository: spark
Updated Branches:
  refs/heads/master a81fba048 -> 3a423f5a0


[SPARKR][BRANCH-2.0] R merge API doc and example fix

## What changes were proposed in this pull request?

Fixes for R doc

## How was this patch tested?

N/A

Author: Felix Cheung <felixcheung_m@hotmail.com>

Closes #15589 from felixcheung/rdocmergefix.

(cherry picked from commit 0e0d83a597885ab1773cb69d6dcc10346d6976a3)
Signed-off-by: Felix Cheung <felixcheung@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3a423f5a
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3a423f5a
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3a423f5a

Branch: refs/heads/master
Commit: 3a423f5a0373de87ddfb4744852b2fda14fcc3cb
Parents: a81fba0
Author: Felix Cheung <felixcheung_m@hotmail.com>
Authored: Sun Oct 23 10:53:27 2016 -0700
Committer: Felix Cheung <felixcheung@apache.org>
Committed: Sun Oct 23 10:53:43 2016 -0700

----------------------------------------------------------------------
 R/pkg/R/DataFrame.R                       | 2 +-
 R/pkg/inst/tests/testthat/test_sparkSQL.R | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/3a423f5a/R/pkg/R/DataFrame.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R
index 8910a4b..b6ce838 100644
--- a/R/pkg/R/DataFrame.R
+++ b/R/pkg/R/DataFrame.R
@@ -365,7 +365,7 @@ setMethod("colnames<-",
 
             # Check if the column names have . in it
             if (any(regexec(".", value, fixed = TRUE)[[1]][1] != -1)) {
-              stop("Colum names cannot contain the '.' symbol.")
+              stop("Column names cannot contain the '.' symbol.")
             }
 
             sdf <- callJMethod(x@sdf, "toDF", as.list(value))

http://git-wip-us.apache.org/repos/asf/spark/blob/3a423f5a/R/pkg/inst/tests/testthat/test_sparkSQL.R
----------------------------------------------------------------------
diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R
index b4b43fd..e77dbde 100644
--- a/R/pkg/inst/tests/testthat/test_sparkSQL.R
+++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R
@@ -845,7 +845,7 @@ test_that("names() colnames() set the column names", {
   expect_equal(names(df)[1], "col3")
 
   expect_error(colnames(df) <- c("sepal.length", "sepal_width"),
-               "Colum names cannot contain the '.' symbol.")
+               "Column names cannot contain the '.' symbol.")
   expect_error(colnames(df) <- c(1, 2), "Invalid column names.")
   expect_error(colnames(df) <- c("a"),
                "Column names must have the same length as the number of columns in the dataset.")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message