Skip to content

SPARK-2407: Added Parser of SQL SUBSTR() #1442

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

SPARK-2407: Added Parser of SQL SUBSTR() #1442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1de83a7
SPARK-2407: Added Parse of SQL SUBSTR()
chutium Jul 16, 2014
88cb37d
Merge https://github.com/apache/spark
chutium Jul 17, 2014
094f773
Merge https://github.com/apache/spark
chutium Jul 17, 2014
c870172
Merge https://github.com/apache/spark
chutium Jul 17, 2014
06e933b
Merge https://github.com/apache/spark
chutium Jul 17, 2014
9a60ccf
SPARK-2407: Added Parser of SQL SUBSTR() #1442
chutium Jul 17, 2014
b49cc8a
SPARK-2407: Added Parser of SQL SUBSTRING() #1442
chutium Jul 18, 2014
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
9 changes: 8 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
protected val WHERE = Keyword("WHERE")
protected val INTERSECT = Keyword("INTERSECT")
protected val EXCEPT = Keyword("EXCEPT")

protected val SUBSTR = Keyword("SUBSTR")
protected val SUBSTRING = Keyword("SUBSTRING")

// Use reflection to find the reserved words defined in this class.
protected val reservedWords =
Expand Down Expand Up @@ -316,6 +317,12 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
IF ~> "(" ~> expression ~ "," ~ expression ~ "," ~ expression <~ ")" ^^ {
case c ~ "," ~ t ~ "," ~ f => If(c,t,f)
} |
(SUBSTR | SUBSTRING) ~> "(" ~> expression ~ "," ~ expression <~ ")" ^^ {
case s ~ "," ~ p => Substring(s,p,Literal(Integer.MAX_VALUE))
} |
(SUBSTR | SUBSTRING) ~> "(" ~> expression ~ "," ~ expression ~ "," ~ expression <~ ")" ^^ {
case s ~ "," ~ p ~ "," ~ l => Substring(s,p,l)
} |
ident ~ "(" ~ repsep(expression, ",") <~ ")" ^^ {
case udfName ~ _ ~ exprs => UnresolvedFunction(udfName, exprs)
}
Expand Down
15 changes: 15 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,21 @@ class SQLQuerySuite extends QueryTest {
"test")
}

test("SPARK-2407 Added Parser of SQL SUBSTR()") {
checkAnswer(
sql("SELECT substr(tableName, 1, 2) FROM tableName"),
"te")
checkAnswer(
sql("SELECT substr(tableName, 3) FROM tableName"),
"st")
checkAnswer(
sql("SELECT substring(tableName, 1, 2) FROM tableName"),
"te")
checkAnswer(
sql("SELECT substring(tableName, 3) FROM tableName"),
"st")
}

test("index into array") {
checkAnswer(
sql("SELECT data, data[0], data[0] + data[1], data[0 + 1] FROM arrayData"),
Expand Down