Skip to content

Commit d39cd12

Browse files
committed
Merge pull request apache#1 from marmbrus/pr/837
Add a test.
2 parents 4c726e5 + 6713c09 commit d39cd12

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
128128
protected val OUTER = Keyword("OUTER")
129129
protected val RIGHT = Keyword("RIGHT")
130130
protected val SELECT = Keyword("SELECT")
131+
protected val SEMI = Keyword("SEMI")
131132
protected val STRING = Keyword("STRING")
132133
protected val SUM = Keyword("SUM")
133134
protected val TRUE = Keyword("TRUE")
@@ -238,6 +239,7 @@ class SqlParser extends StandardTokenParsers with PackratParsers {
238239

239240
protected lazy val joinType: Parser[JoinType] =
240241
INNER ^^^ Inner |
242+
LEFT ~ SEMI ^^^ LeftSemi |
241243
LEFT ~ opt(OUTER) ^^^ LeftOuter |
242244
RIGHT ~ opt(OUTER) ^^^ RightOuter |
243245
FULL ~ opt(OUTER) ^^^ FullOuter

sql/core/src/test/scala/org/apache/spark/sql/QueryTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class QueryTest extends FunSuite {
4444
fail(
4545
s"""
4646
|Exception thrown while executing query:
47-
|${rdd.logicalPlan}
47+
|${rdd.queryExecution}
4848
|== Exception ==
4949
|$e
5050
""".stripMargin)

sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ class SQLQuerySuite extends QueryTest {
3434
arrayData.map(d => (d.data, d.data(0), d.data(0) + d.data(1), d.data(1))).collect().toSeq)
3535
}
3636

37+
test("left semi greater than predicate") {
38+
checkAnswer(
39+
sql("SELECT * FROM testData2 x LEFT SEMI JOIN testData2 y ON x.a >= y.a + 2"),
40+
Seq((3,1), (3,2))
41+
)
42+
}
43+
3744
test("index into array of arrays") {
3845
checkAnswer(
3946
sql(

0 commit comments

Comments
 (0)