diff options
Diffstat (limited to 'R/pkg')
| -rw-r--r-- | R/pkg/NAMESPACE | 1 | ||||
| -rw-r--r-- | R/pkg/R/functions.R | 80 | ||||
| -rw-r--r-- | R/pkg/R/generics.R | 6 | ||||
| -rw-r--r-- | R/pkg/inst/tests/testthat/test_sparkSQL.R | 1 |
4 files changed, 80 insertions, 8 deletions
diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE index 7c16ba3072..625c797f8a 100644 --- a/R/pkg/NAMESPACE +++ b/R/pkg/NAMESPACE @@ -325,6 +325,7 @@ exportMethods("%in%", "toDegrees", "toRadians", "to_date", + "to_timestamp", "to_utc_timestamp", "translate", "trim", diff --git a/R/pkg/R/functions.R b/R/pkg/R/functions.R index 6ffa0f5481..032cfecfc0 100644 --- a/R/pkg/R/functions.R +++ b/R/pkg/R/functions.R @@ -1730,24 +1730,90 @@ setMethod("toRadians", #' to_date #' -#' Converts the column into DateType. +#' Converts the column into a DateType. You may optionally specify a format +#' according to the rules in: +#' \url{http://docs.oracle.com/javase/tutorial/i18n/format/simpleDateFormat.html}. +#' If the string cannot be parsed according to the specified format (or default), +#' the value of the column will be null. +#' The default format is 'yyyy-MM-dd'. #' -#' @param x Column to compute on. +#' @param x Column to parse. +#' @param format string to use to parse x Column to DateType. (optional) #' #' @rdname to_date #' @name to_date #' @family datetime_funcs -#' @aliases to_date,Column-method +#' @aliases to_date,Column,missing-method #' @export -#' @examples \dontrun{to_date(df$c)} -#' @note to_date since 1.5.0 +#' @examples +#' \dontrun{ +#' to_date(df$c) +#' to_date(df$c, 'yyyy-MM-dd') +#' } +#' @note to_date(Column) since 1.5.0 setMethod("to_date", - signature(x = "Column"), - function(x) { + signature(x = "Column", format = "missing"), + function(x, format) { jc <- callJStatic("org.apache.spark.sql.functions", "to_date", x@jc) column(jc) }) +#' @rdname to_date +#' @name to_date +#' @family datetime_funcs +#' @aliases to_date,Column,character-method +#' @export +#' @note to_date(Column, character) since 2.2.0 +setMethod("to_date", + signature(x = "Column", format = "character"), + function(x, format) { + jc <- callJStatic("org.apache.spark.sql.functions", "to_date", x@jc, format) + column(jc) + }) + +#' to_timestamp +#' +#' Converts the column into a TimestampType. You may optionally specify a format +#' according to the rules in: +#' \url{http://docs.oracle.com/javase/tutorial/i18n/format/simpleDateFormat.html}. +#' If the string cannot be parsed according to the specified format (or default), +#' the value of the column will be null. +#' The default format is 'yyyy-MM-dd HH:mm:ss'. +#' +#' @param x Column to parse. +#' @param format string to use to parse x Column to DateType. (optional) +#' +#' @rdname to_timestamp +#' @name to_timestamp +#' @family datetime_funcs +#' @aliases to_timestamp,Column,missing-method +#' @export +#' @examples +#' \dontrun{ +#' to_timestamp(df$c) +#' to_timestamp(df$c, 'yyyy-MM-dd') +#' } +#' @note to_timestamp(Column) since 2.2.0 +setMethod("to_timestamp", + signature(x = "Column", format = "missing"), + function(x, format) { + jc <- callJStatic("org.apache.spark.sql.functions", "to_timestamp", x@jc) + column(jc) + }) + +#' @rdname to_timestamp +#' @name to_timestamp +#' @family datetime_funcs +#' @aliases to_timestamp,Column,character-method +#' @export +#' @note to_timestamp(Column, character) since 2.2.0 +setMethod("to_timestamp", + signature(x = "Column", format = "character"), + function(x, format) { + jc <- callJStatic("org.apache.spark.sql.functions", "to_timestamp", x@jc, format) + column(jc) + }) + #' trim #' #' Trim the spaces from both ends for the specified string column. diff --git a/R/pkg/R/generics.R b/R/pkg/R/generics.R index 0307bac349..d78b1a10d6 100644 --- a/R/pkg/R/generics.R +++ b/R/pkg/R/generics.R @@ -1256,7 +1256,11 @@ setGeneric("toRadians", function(x) { standardGeneric("toRadians") }) #' @rdname to_date #' @export -setGeneric("to_date", function(x) { standardGeneric("to_date") }) +setGeneric("to_date", function(x, format) { standardGeneric("to_date") }) + +#' @rdname to_timestamp +#' @export +setGeneric("to_timestamp", function(x, format) { standardGeneric("to_timestamp") }) #' @rdname to_utc_timestamp #' @export diff --git a/R/pkg/inst/tests/testthat/test_sparkSQL.R b/R/pkg/inst/tests/testthat/test_sparkSQL.R index 418f128ce8..233a20c3d3 100644 --- a/R/pkg/inst/tests/testthat/test_sparkSQL.R +++ b/R/pkg/inst/tests/testthat/test_sparkSQL.R @@ -1237,6 +1237,7 @@ test_that("column functions", { c17 <- cov(c, c1) + cov("c", "c1") + covar_samp(c, c1) + covar_samp("c", "c1") c18 <- covar_pop(c, c1) + covar_pop("c", "c1") c19 <- spark_partition_id() + c20 <- to_timestamp(c) + to_timestamp(c, "yyyy") + to_date(c, "yyyy") # Test if base::is.nan() is exposed expect_equal(is.nan(c("a", "b")), c(FALSE, FALSE)) |