Skip to content

[SPARK-20311][SQL] Support aliases for table value functions #17928

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

[SPARK-20311][SQL] Support aliases for table value functions #17928

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0904fc9
Support aliases for table value functions
maropu Apr 18, 2017
29281b1
Apply comments
maropu May 10, 2017
54a05da
Remove unnecessary line
maropu May 11, 2017
a7a732b
Apply comments
maropu May 11, 2017
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
Apply comments
  • Loading branch information
@maropu
maropu committed May 10, 2017
commit 29281b1af00ced947173701378e9ad1b67e4924c
4 changes: 2 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,11 +473,11 @@ class PlanParserSuite extends PlanTest {

test("SPARK-20311 range(N) as alias") {
assertEqual(
"select * from range(10) AS t",
"SELECT * FROM range(10) AS t",
SubqueryAlias("t", UnresolvedTableValuedFunction("range", Literal(10) :: Nil, Seq.empty))
.select(star()))
assertEqual(
"select * from range(7) AS t(a)",
"SELECT * FROM range(7) AS t(a)",
SubqueryAlias("t", UnresolvedTableValuedFunction("range", Literal(7) :: Nil, "a" :: Nil))
.select(star()))
}
Expand Down
3 changes: 3 additions & 0 deletions sql/core/src/test/resources/sql-tests/inputs/inline-table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ select * from values ("one", count(1)), ("two", 2) as data(a, b);

-- string to timestamp
select * from values (timestamp('1991-12-06 00:00:00.0'), array(timestamp('1991-12-06 01:00:00.0'), timestamp('1991-12-06 12:00:00.0'))) as data(a, b);

-- cross-join inline tables
SELECT * FROM VALUES ('one', 1), ('three', null) CROSS JOIN VALUES ('one', 1), ('three', null);
Copy link
Contributor

@cloud-fan cloud-fan May 11, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

does this expose the bug? If we treat CROSS as an alias, we still get the same result. how about we run EXPLAIN?

Copy link
Member Author

@maropu maropu May 11, 2017

Choose a reason for hiding this comment

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

Aha, ok

4 changes: 2 additions & 2 deletions sql/core/src/test/resources/sql-tests/inputs/table-valued-functions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ select * from RaNgE(2);
EXPLAIN select * from RaNgE(2);

-- cross-join table valued functions
set spark.sql.crossJoin.enabled=true;
EXPLAIN EXTENDED select * from range(3) cross join range(3);
SET spark.sql.crossJoin.enabled=true;
Copy link
Member

@gatorsmile gatorsmile May 10, 2017

Choose a reason for hiding this comment

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

Could you remove this line? If we specify CROSS JOIN in the query, no need to set this parm.

Copy link
Member Author

@maropu maropu May 11, 2017

Choose a reason for hiding this comment

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

ok

EXPLAIN EXTENDED SELECT * FROM range(3) CROSS JOIN range(3);
13 changes: 12 additions & 1 deletion sql/core/src/test/resources/sql-tests/results/inline-table.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-- Automatically generated by SQLQueryTestSuite
-- Number of queries: 17
-- Number of queries: 18


-- !query 0
Expand Down Expand Up @@ -151,3 +151,14 @@ select * from values (timestamp('1991-12-06 00:00:00.0'), array(timestamp('1991-
struct<a:timestamp,b:array<timestamp>>
-- !query 16 output
1991-12-06 00:00:00 [1991-12-06 01:00:00.0,1991-12-06 12:00:00.0]


-- !query 17
SELECT * FROM VALUES ('one', 1), ('three', null) CROSS JOIN VALUES ('one', 1), ('three', null)
-- !query 17 schema
struct<col1:string,col2:int,col1:string,col2:int>
-- !query 17 output
one 1 one 1
one 1 three NULL
three NULL one 1
three NULL three NULL
4 changes: 2 additions & 2 deletions sql/core/src/test/resources/sql-tests/results/table-valued-functions.sql.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ struct<plan:string>


-- !query 9
set spark.sql.crossJoin.enabled=true
SET spark.sql.crossJoin.enabled=true
-- !query 9 schema
struct<key:string,value:string>
-- !query 9 output
spark.sql.crossJoin.enabled true


-- !query 10
EXPLAIN EXTENDED select * from range(3) cross join range(3)
EXPLAIN EXTENDED SELECT * FROM range(3) CROSS JOIN range(3)
-- !query 10 schema
struct<plan:string>
-- !query 10 output
Expand Down