Skip to content

[SPARK-24574][SQL] array_contains, array_position, array_remove and element_at functions deal with Column type #21581

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

[SPARK-24574][SQL] array_contains, array_position, array_remove and element_at functions deal with Column type #21581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27733f9
array_contains function deals with Column type for the second parameter.
Jun 17, 2018
28aa515
add unit test for Column type
Jun 17, 2018
e65611e
array_position deals with Column Type
Jun 18, 2018
b6e150c
array_remove function deals with Column Type
Jun 18, 2018
eabdb6e
element_at function deals with Column Type
Jun 18, 2018
8440d5b
reset doc for array_contains function
Jun 18, 2018
f8c5b43
use lit() and add unit tests
Jun 20, 2018
ddd94f7
use lit() to unify the cases
Jun 20, 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
array_position deals with Column Type
  • Loading branch information
Chongguang LIU authored and Chongguang LIU committed Jun 18, 2018
commit e65611e451bf49b38850af84a89510ac8a749cbd
5 changes: 4 additions & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/functions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3150,7 +3150,10 @@ object functions {
* @since 2.4.0
*/
def array_position(column: Column, value: Any): Column = withExpr {
ArrayPosition(column.expr, Literal(value))
value match {
case c: Column => ArrayPosition(column.expr, c.expr)
case _ => ArrayPosition(column.expr, Literal(value))
}
}

/**
Expand Down
11 changes: 7 additions & 4 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,9 +789,9 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext {

test("array position function") {
val df = Seq(
(Seq[Int](1, 2), "x"),
(Seq[Int](), "x")
).toDF("a", "b")
(Seq[Int](1, 2), "x", 1),
(Seq[Int](), "x", 1)
).toDF("a", "b", "c")

checkAnswer(
df.select(array_position(df("a"), 1)),
Expand All @@ -801,7 +801,10 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext {
df.selectExpr("array_position(a, 1)"),
Seq(Row(1L), Row(0L))
)

checkAnswer(
df.select(array_position(df("a"), df("c"))),
Seq(Row(1L), Row(0L))
)
checkAnswer(
df.select(array_position(df("a"), null)),
Seq(Row(null), Row(null))
Expand Down