diff options
| author | Dongjoon Hyun <dongjoon@apache.org> | 2016-08-10 10:31:30 +0200 |
|---|---|---|
| committer | Herman van Hovell <hvanhovell@databricks.com> | 2016-08-10 10:31:30 +0200 |
| commit | 41a7dbdd34d2641d42eb00828f16285089356aa9 (patch) | |
| tree | cc3751488cfbd76fe6cc39a3018086dbe8c4e401 /sql/catalyst/src/main | |
| parent | bdd537164dcfeec5e9c51d54791ef16997ff2597 (diff) | |
| download | spark-41a7dbdd34d2641d42eb00828f16285089356aa9.tar.gz spark-41a7dbdd34d2641d42eb00828f16285089356aa9.tar.bz2 spark-41a7dbdd34d2641d42eb00828f16285089356aa9.zip | |
[SPARK-10601][SQL] Support `MINUS` set operator
## What changes were proposed in this pull request?
This PR adds `MINUS` set operator which is equivalent `EXCEPT DISTINCT`. This will slightly improve the compatibility with Oracle.
## How was this patch tested?
Pass the Jenkins with newly added testcases.
Author: Dongjoon Hyun <dongjoon@apache.org>
Closes #14570 from dongjoon-hyun/SPARK-10601.
Diffstat (limited to 'sql/catalyst/src/main')
| -rw-r--r-- | sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 | 5 | ||||
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 index d2b5c53487..ba65f2a889 100644 --- a/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 +++ b/sql/catalyst/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBase.g4 @@ -313,7 +313,7 @@ multiInsertQueryBody queryTerm : queryPrimary #queryTermDefault - | left=queryTerm operator=(INTERSECT | UNION | EXCEPT) setQuantifier? right=queryTerm #setOperation + | left=queryTerm operator=(INTERSECT | UNION | EXCEPT | SETMINUS) setQuantifier? right=queryTerm #setOperation ; queryPrimary @@ -611,7 +611,7 @@ qualifiedName identifier : strictIdentifier | ANTI | FULL | INNER | LEFT | SEMI | RIGHT | NATURAL | JOIN | CROSS | ON - | UNION | INTERSECT | EXCEPT + | UNION | INTERSECT | EXCEPT | SETMINUS ; strictIdentifier @@ -751,6 +751,7 @@ FUNCTIONS: 'FUNCTIONS'; DROP: 'DROP'; UNION: 'UNION'; EXCEPT: 'EXCEPT'; +SETMINUS: 'MINUS'; INTERSECT: 'INTERSECT'; TO: 'TO'; TABLESAMPLE: 'TABLESAMPLE'; diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala index 679adf2717..c7fdc287d1 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala @@ -410,6 +410,7 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging { * - UNION [DISTINCT] * - UNION ALL * - EXCEPT [DISTINCT] + * - MINUS [DISTINCT] * - INTERSECT [DISTINCT] */ override def visitSetOperation(ctx: SetOperationContext): LogicalPlan = withOrigin(ctx) { @@ -429,6 +430,10 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with Logging { throw new ParseException("EXCEPT ALL is not supported.", ctx) case SqlBaseParser.EXCEPT => Except(left, right) + case SqlBaseParser.SETMINUS if all => + throw new ParseException("MINUS ALL is not supported.", ctx) + case SqlBaseParser.SETMINUS => + Except(left, right) } } |