diff options
| author | Felix Cheung <felixcheung_m@hotmail.com> | 2016-10-23 10:53:27 -0700 |
|---|---|---|
| committer | Felix Cheung <felixcheung@apache.org> | 2016-10-23 10:53:43 -0700 |
| commit | 3a423f5a0373de87ddfb4744852b2fda14fcc3cb (patch) | |
| tree | 0f54d2cec6ccd2ed6945c4632e3e84191d34151e /R/pkg | |
| parent | a81fba048fabcd413730548ab65955802508d4e4 (diff) | |
| download | spark-3a423f5a0373de87ddfb4744852b2fda14fcc3cb.tar.gz spark-3a423f5a0373de87ddfb4744852b2fda14fcc3cb.tar.bz2 spark-3a423f5a0373de87ddfb4744852b2fda14fcc3cb.zip | |
[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>
Diffstat (limited to 'R/pkg')
| -rw-r--r-- | R/pkg/R/DataFrame.R | 2 | ||||
| -rw-r--r-- | R/pkg/inst/tests/testthat/test_sparkSQL.R | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/R/pkg/R/DataFrame.R b/R/pkg/R/DataFrame.R index 8910a4b138..b6ce838969 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)) diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index b4b43fdba4..e77dbde44e 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.") |