Skip to content
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

Jump to bottom

[SPARK-30724][SQL] Support 'LIKE ANY' and 'LIKE ALL' operators #27477

Closed
wants to merge 10 commits into from
Closed

[SPARK-30724][SQL] Support 'LIKE ANY' and 'LIKE ALL' operators #27477

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4548b0f
Support 'like any' and 'like all' operators
wangyum Feb 6, 2020
5475675
operator -> quantifier
wangyum Feb 6, 2020
de7c398
address comments
wangyum Feb 7, 2020
caea82a
SOME -> ALL
wangyum Feb 7, 2020
88ca4c2
Capitalize SQL keywords
wangyum Feb 7, 2020
1c3d98c
Merge remote-tracking branch 'upstream/master' into SPARK-30724
wangyum Feb 12, 2020
2b59cb0
Merge remote-tracking branch 'upstream/master' into SPARK-30724
wangyum Apr 11, 2020
0656b05
Add a test case from our customers
wangyum Apr 11, 2020
cf4666f
Address comments
wangyum Apr 23, 2020
f9af131
Fix test error
wangyum Apr 24, 2020
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
1 change: 1 addition & 0 deletions sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,7 @@ predicate
| NOT? kind=IN '(' expression (',' expression)* ')'
| NOT? kind=IN '(' query ')'
| NOT? kind=RLIKE pattern=valueExpression
| NOT? kind=LIKE quantifier=(ANY | ALL) ('('')' | '(' expression (',' expression)* ')')
Copy link
Member

Choose a reason for hiding this comment

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

What happened previously when we didn't have '('')' | here? I guessed that it was also a Parse Exception.

Copy link
Member Author

Choose a reason for hiding this comment

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

Otherwise it will throw AnalysisException:

-- !query
select company from like_any_table where company like any ()
-- !query schema
struct<>
-- !query output
org.apache.spark.sql.AnalysisException
Invalid number of arguments for function any. Expected: 1; Found: 0; line 1 pos 54

Copy link
Member

Choose a reason for hiding this comment

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

Oh, it's considered as function. I got it.

Copy link
Contributor

Choose a reason for hiding this comment

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

shall we support SOME as well? The BoolOr agg func can be called with any and some.

| NOT? kind=LIKE pattern=valueExpression (ESCAPE escapeChar=STRING)?
| IS NOT? kind=NULL
| IS NOT? kind=(TRUE | FALSE | UNKNOWN)
Expand Down
33 changes: 24 additions & 9 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1357,7 +1357,7 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
* Add a predicate to the given expression. Supported expressions are:
* - (NOT) BETWEEN
* - (NOT) IN
* - (NOT) LIKE
* - (NOT) LIKE (ANY | ALL)
* - (NOT) RLIKE
* - IS (NOT) NULL.
* - IS (NOT) (TRUE | FALSE | UNKNOWN)
Expand All @@ -1375,6 +1375,14 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
case other => Seq(other)
}

def getLikeQuantifierExps(expressions: java.util.List[ExpressionContext]): Seq[Expression] = {
if (expressions.isEmpty) {
throw new ParseException("Syntax error: expected something between '(' and ')'.", ctx)
Copy link
Member Author

Choose a reason for hiding this comment

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

Teradata's exception:
image

Copy link
Contributor

Choose a reason for hiding this comment

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

I think should remove Syntax error: , because ParseException could replace it.

} else {
expressions.asScala.map(expression).map(p => invertIfNotDefined(new Like(e, p)))
}
}

// Create the predicate.
ctx.kind.getType match {
case SqlBaseParser.BETWEEN =>
Expand All @@ -1387,14 +1395,21 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
case SqlBaseParser.IN =>
invertIfNotDefined(In(e, ctx.expression.asScala.map(expression)))
case SqlBaseParser.LIKE =>
val escapeChar = Option(ctx.escapeChar).map(string).map { str =>
if (str.length != 1) {
throw new ParseException("Invalid escape string." +
"Escape string must contains only one character.", ctx)
}
str
}.getOrElse('\\')
invertIfNotDefined(Like(e, expression(ctx.pattern), Literal(escapeChar)))
Option(ctx.quantifier).map(_.getType) match {
case Some(SqlBaseParser.ANY) =>
getLikeQuantifierExps(ctx.expression).reduceLeft(Or)
case Some(SqlBaseParser.ALL) =>
getLikeQuantifierExps(ctx.expression).reduceLeft(And)
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: getLikeQuantifierExps -> getLikeQuantifierExprs ?

case _ =>
val escapeChar = Option(ctx.escapeChar).map(string).map { str =>
if (str.length != 1) {
throw new ParseException("Invalid escape string." +
"Escape string must contains only one character.", ctx)
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: contains -> contain ?

}
str
}.getOrElse('\\')
invertIfNotDefined(Like(e, expression(ctx.pattern), Literal(escapeChar)))
}
case SqlBaseParser.RLIKE =>
invertIfNotDefined(RLike(e, expression(ctx.pattern)))
case SqlBaseParser.NULL if ctx.NOT != null =>
Expand Down
37 changes: 37 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/like-all.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
CREATE OR REPLACE TEMPORARY VIEW like_all_table AS SELECT * FROM (VALUES
('google', '%oo%'),
('facebook', '%oo%'),
('linkedin', '%in'))
as t1(company, pat);

SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', '%go%');

SELECT company FROM like_all_table WHERE company LIKE ALL ('microsoft', '%yoo%');

SELECT
company,
CASE
WHEN company LIKE ALL ('%oo%', '%go%') THEN 'Y'
ELSE 'N'
END AS is_available,
CASE
WHEN company LIKE ALL ('%oo%', 'go%') OR company LIKE ALL ('%in', 'ms%') THEN 'Y'
ELSE 'N'
END AS mix
FROM like_all_table ;

-- Mix test with constant pattern and column value
SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', pat);

-- not like all test
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('%oo%', '%in', 'fa%');
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('microsoft', '%yoo%');

-- null test
SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', NULL);
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('%oo%', NULL);
SELECT company FROM like_all_table WHERE company LIKE ALL (NULL, NULL);
SELECT company FROM like_all_table WHERE company NOT LIKE ALL (NULL, NULL);

-- negative case
SELECT company FROM like_any_table WHERE company LIKE ALL ();
Copy link
Member

Choose a reason for hiding this comment

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

Is using of non-existing table intentional? I guess the purpose was to check LIKE ALL ().

Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's a typo

37 changes: 37 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/like-any.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
CREATE OR REPLACE TEMPORARY VIEW like_any_table AS SELECT * FROM (VALUES
('google', '%oo%'),
('facebook', '%oo%'),
('linkedin', '%in'))
as t1(company, pat);

SELECT company FROM like_any_table WHERE company LIKE ANY ('%oo%', '%in', 'fa%');

SELECT company FROM like_any_table WHERE company LIKE ANY ('microsoft', '%yoo%');

select
company,
CASE
WHEN company LIKE ANY ('%oo%', '%in', 'fa%') THEN 'Y'
ELSE 'N'
END AS is_available,
CASE
WHEN company LIKE ANY ('%oo%', 'fa%') OR company LIKE ANY ('%in', 'ms%') THEN 'Y'
ELSE 'N'
END AS mix
FROM like_any_table;

-- Mix test with constant pattern and column value
SELECT company FROM like_any_table WHERE company LIKE ANY ('%zz%', pat);

-- not like any test
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('%oo%', '%in', 'fa%');
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('microsoft', '%yoo%');

-- null test
SELECT company FROM like_any_table WHERE company LIKE ANY ('%oo%', NULL);
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('%oo%', NULL);
SELECT company FROM like_any_table WHERE company LIKE ANY (NULL, NULL);
SELECT company FROM like_any_table WHERE company NOT LIKE ANY (NULL, NULL);

-- negative case
SELECT company FROM like_any_table WHERE company LIKE ANY ();
123 changes: 123 additions & 0 deletions sql/core/src/test/resources/sql-tests/results/like-all.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 12


Copy link
Member

Choose a reason for hiding this comment

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

note: I've checked that the output is the same with PostgreSQL output: https://gist.github.com/maropu/fa4bd6491e21751d6bbc44c545390b0c

-- !query
CREATE OR REPLACE TEMPORARY VIEW like_all_table AS SELECT * FROM (VALUES
('google', '%oo%'),
('facebook', '%oo%'),
('linkedin', '%in'))
as t1(company, pat)
-- !query schema
struct<>
-- !query output



-- !query
SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', '%go%')
-- !query schema
struct<company:string>
-- !query output
google


-- !query
SELECT company FROM like_all_table WHERE company LIKE ALL ('microsoft', '%yoo%')
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT
company,
CASE
WHEN company LIKE ALL ('%oo%', '%go%') THEN 'Y'
ELSE 'N'
END AS is_available,
CASE
WHEN company LIKE ALL ('%oo%', 'go%') OR company LIKE ALL ('%in', 'ms%') THEN 'Y'
ELSE 'N'
END AS mix
FROM like_all_table
-- !query schema
struct<company:string,is_available:string,mix:string>
-- !query output
facebook N N
google Y Y
linkedin N N


-- !query
SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', pat)
-- !query schema
struct<company:string>
-- !query output
facebook
google


-- !query
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('%oo%', '%in', 'fa%')
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('microsoft', '%yoo%')
-- !query schema
struct<company:string>
-- !query output
facebook
google
linkedin


-- !query
SELECT company FROM like_all_table WHERE company LIKE ALL ('%oo%', NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_all_table WHERE company NOT LIKE ALL ('%oo%', NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_all_table WHERE company LIKE ALL (NULL, NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_all_table WHERE company NOT LIKE ALL (NULL, NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_any_table WHERE company LIKE ALL ()
-- !query schema
struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException

Syntax error: expected something between '(' and ')'.(line 1, pos 49)

== SQL ==
SELECT company FROM like_any_table WHERE company LIKE ALL ()
-------------------------------------------------^^^
129 changes: 129 additions & 0 deletions sql/core/src/test/resources/sql-tests/results/like-any.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 12


-- !query
CREATE OR REPLACE TEMPORARY VIEW like_any_table AS SELECT * FROM (VALUES
('google', '%oo%'),
('facebook', '%oo%'),
('linkedin', '%in'))
as t1(company, pat)
-- !query schema
struct<>
-- !query output



-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY ('%oo%', '%in', 'fa%')
-- !query schema
struct<company:string>
-- !query output
facebook
google
linkedin


-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY ('microsoft', '%yoo%')
-- !query schema
struct<company:string>
-- !query output



-- !query
select
company,
CASE
WHEN company LIKE ANY ('%oo%', '%in', 'fa%') THEN 'Y'
ELSE 'N'
END AS is_available,
CASE
WHEN company LIKE ANY ('%oo%', 'fa%') OR company LIKE ANY ('%in', 'ms%') THEN 'Y'
ELSE 'N'
END AS mix
FROM like_any_table
-- !query schema
struct<company:string,is_available:string,mix:string>
-- !query output
facebook Y Y
google Y Y
linkedin Y Y


-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY ('%zz%', pat)
-- !query schema
struct<company:string>
-- !query output
facebook
google
linkedin


-- !query
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('%oo%', '%in', 'fa%')
-- !query schema
struct<company:string>
-- !query output
facebook
google
linkedin


-- !query
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('microsoft', '%yoo%')
-- !query schema
struct<company:string>
-- !query output
facebook
google
linkedin


-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY ('%oo%', NULL)
-- !query schema
struct<company:string>
-- !query output
facebook
google


-- !query
SELECT company FROM like_any_table WHERE company NOT LIKE ANY ('%oo%', NULL)
-- !query schema
struct<company:string>
-- !query output
linkedin


-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY (NULL, NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_any_table WHERE company NOT LIKE ANY (NULL, NULL)
-- !query schema
struct<company:string>
-- !query output



-- !query
SELECT company FROM like_any_table WHERE company LIKE ANY ()
-- !query schema
struct<>
-- !query output
org.apache.spark.sql.catalyst.parser.ParseException

Syntax error: expected something between '(' and ')'.(line 1, pos 49)

== SQL ==
SELECT company FROM like_any_table WHERE company LIKE ANY ()
-------------------------------------------------^^^