Skip to content
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
address comments
  • Loading branch information
huaxingao committed Jul 11, 2018
commit 1b6a11364da0b99bf44d6c05d448a0e357e320a9
10 changes: 6 additions & 4 deletions R/pkg/R/functions.R
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ NULL
#' \itemize{
#' \item \code{array_contains}: a value to be checked if contained in the column.
#' \item \code{array_position}: a value to locate in the given array.
#' \item \code{array_remove}: a value to remove in the given array.
#' }
#' @param ... additional argument(s). In \code{to_json} and \code{from_json}, this contains
#' additional named properties to control how it is converted, accepts the same
#' options as the JSON data source.
#' options as the JSON data source. In \code{arrays_zip}, this contains additional
#' Columns of arrays to be merged.
#' @name column_collection_functions
#' @rdname column_collection_functions
#' @family collection functions
Expand Down Expand Up @@ -3157,9 +3159,9 @@ setMethod("arrays_overlap",
setMethod("arrays_zip",
signature(x = "Column"),
function(x, ...) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jcols <- lapply(list(x, ...), function(x) {
stopifnot(class(x) == "Column")
x@jc
jcols <- lapply(list(x, ...), function(arg) {
stopifnot(class(arg) == "Column")
arg@jc
})
jc <- callJStatic("org.apache.spark.sql.functions", "arrays_zip", jcols)
column(jc)
Expand Down