Skip to content

[SPARK-24187][R][SQL]Add array_join function to SparkR #21313

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

[SPARK-24187][R][SQL]Add array_join function to SparkR #21313

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c6ca7d
[SPARK-24187][R][SQL]Adding array_join function to SparkR
huaxingao May 13, 2018
01858f2
change null_replacement to nullReplacement
huaxingao May 13, 2018
e05e701
resolve conflicts
huaxingao May 14, 2018
92c41c5
address comments
huaxingao Jun 3, 2018
901ff32
change default value to NULL
huaxingao Jun 3, 2018
b0b1415
coerce nullReplacement to character type
huaxingao Jun 4, 2018
55b4518
address comment
huaxingao Jun 5, 2018
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
Next Next commit
address comments
  • Loading branch information
@huaxingao
huaxingao committed Jun 3, 2018
commit 92c41c5c98fe8e8802201cb1799b0cf5b56762ac
3 changes: 1 addition & 2 deletions R/pkg/R/functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3022,8 +3022,7 @@ setMethod("array_join",
function(x, delimiter, nullReplacement = NA) {
Copy link
Member

@felixcheung felixcheung Jun 3, 2018

Choose a reason for hiding this comment

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

wait.. why is nullReplacement default to NA? that's a bit unusual

Copy link
Contributor Author

@huaxingao huaxingao Jun 3, 2018

Choose a reason for hiding this comment

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

@felixcheung
I will change the default to NULL.

jc <- if (is.na(nullReplacement)) {
callJStatic("org.apache.spark.sql.functions", "array_join", x@jc, delimiter)
}
else {
} else {
callJStatic("org.apache.spark.sql.functions", "array_join", x@jc, delimiter,
nullReplacement)
Copy link
Member

@felixcheung felixcheung Jun 4, 2018

Choose a reason for hiding this comment

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

as.character(nullReplacement)

Copy link
Member

@felixcheung felixcheung Jun 4, 2018

Choose a reason for hiding this comment

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

re #21313 (comment)
so what's the behavior if delimiter is more than one character?
like array_join(df$a, "#Foo", "Beautiful")?

Copy link
Contributor Author

@huaxingao huaxingao Jun 4, 2018

Choose a reason for hiding this comment

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

It's Hello#FooBeautiful#FooWorld!

}
Expand Down
5 changes: 5 additions & 0 deletions R/pkg/tests/fulltests/test_sparkSQL.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,6 +1527,11 @@ test_that("column functions", {
expect_equal(result, "Hello#Beautiful#World!")
result <- collect(select(df2, array_join(df2[[1]], "#")))[[1]]
expect_equal(result, "Hello#World!")
df3 <- createDataFrame(list(list(list("Hello", NULL, "World!"))))
result <- collect(select(df3, array_join(df3[[1]], "#", "Beautiful")))[[1]]
expect_equal(result, "Hello#Beautiful#World!")
result <- collect(select(df3, array_join(df3[[1]], "#")))[[1]]
expect_equal(result, "Hello#World!")

# Test array_sort() and sort_array()
df <- createDataFrame(list(list(list(2L, 1L, 3L, NA)), list(list(NA, 6L, 5L, NA, 4L))))
Expand Down