From 2a732110d46712c535b75dd4f5a73761b6463aa8 Mon Sep 17 00:00:00 2001
From: chutium <teng.qiu@gmail.com>
Date: Sat, 19 Jul 2014 11:04:41 -0500
Subject: [PATCH] SPARK-2407: Added Parser of SQL SUBSTR()
follow-up of #1359
Author: chutium <teng.qiu@gmail.com>
Closes #1442 from chutium/master and squashes the following commits:
b49cc8a [chutium] SPARK-2407: Added Parser of SQL SUBSTRING() #1442
9a60ccf [chutium] SPARK-2407: Added Parser of SQL SUBSTR() #1442
06e933b [chutium] Merge https://github.com/apache/spark
c870172 [chutium] Merge https://github.com/apache/spark
094f773 [chutium] Merge https://github.com/apache/spark
88cb37d [chutium] Merge https://github.com/apache/spark
1de83a7 [chutium] SPARK-2407: Added Parse of SQL SUBSTR()
---
.../org/apache/spark/sql/catalyst/SqlParser.scala | 9 ++++++++-
.../org/apache/spark/sql/SQLQuerySuite.scala | 15 +++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
index e5653c5b14..a34b236c8a 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -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 =
@@ -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)
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
index 0743cfe8cf..6736189c96 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -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"),
--
GitLab