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

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
Next Next commit
array_contains function deals with Column type for the second parameter.
  • Loading branch information
Chongguang LIU authored and Chongguang LIU committed Jun 17, 2018
commit 27733f9ad56657925c176ae394114e0429aa9a0b
8 changes: 6 additions & 2 deletions 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 @@ -3077,12 +3077,16 @@ object functions {
//////////////////////////////////////////////////////////////////////////////////////////////

/**
* Returns null if the array is null, true if the array contains `value`, and false otherwise.
* Returns null if the array is null, true if the array contains `value` or the content of
Copy link
Member

@maropu maropu Jun 18, 2018

Choose a reason for hiding this comment

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

We need to update this comment? I think content of value is a little ambiguous.

Copy link
Contributor Author

@chongguang chongguang Jun 18, 2018

Choose a reason for hiding this comment

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

Hey, thanks for the message. Do you want me to change the comment back? I see that you have started the test, is it too late?

Copy link
Member

@maropu maropu Jun 18, 2018

Choose a reason for hiding this comment

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

you can fix now

* `value` if it is of type Column, and false otherwise.
* @group collection_funcs
* @since 1.5.0
*/
def array_contains(column: Column, value: Any): Column = withExpr {
ArrayContains(column.expr, Literal(value))
Copy link
Member

@viirya viirya Jun 18, 2018

Choose a reason for hiding this comment

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

Other similar expressions are ArrayPosition, ElementAt, ArrayRemove.

Copy link
Member

@viirya viirya Jun 18, 2018

Choose a reason for hiding this comment

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

Oh, I just found @maropu has pointed it out in #21581 (comment).

value match {
Copy link
Member

@ueshin ueshin Jun 20, 2018

Choose a reason for hiding this comment

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

On second thoughts, we should use lit(), e.g., ArrayContains(column.expr, lit(value).expr)? WDYT? @viirya @maropu @HyukjinKwon

Copy link
Member

@HyukjinKwon HyukjinKwon Jun 20, 2018

Choose a reason for hiding this comment

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

Yup, that's what I was thinking too from my glance.

Copy link
Member

@viirya viirya Jun 20, 2018

Choose a reason for hiding this comment

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

Yes, I think so.

Copy link
Member

@maropu maropu Jun 20, 2018

Choose a reason for hiding this comment

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

+1

Copy link
Member

@ueshin ueshin Jun 20, 2018

Choose a reason for hiding this comment

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

@chongguang I mean, use just ArrayContains(column.expr, lit(value).expr) instead of value match { .... The lit() should handle literals and columns well.

case c: Column => ArrayContains(column.expr, c.expr)
case _ => ArrayContains(column.expr, Literal(value))
}
}

/**
Expand Down