addressed the comments.

apache · Feb 8, 2016 · afd1725 · afd1725
1 parent 796e725
commit afd1725
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/SparkSqlParser.g b/sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/SparkSqlParser.g
@@ -2223,9 +2223,8 @@ setOperator
     : KW_UNION KW_ALL -> ^(TOK_UNIONALL)
     | KW_UNION KW_DISTINCT? -> ^(TOK_UNIONDISTINCT)
     | KW_EXCEPT -> ^(TOK_EXCEPT)
-    | KW_INTERSECT (all=KW_ALL | distinct=KW_DISTINCT)?
-    -> {$all == null}? ^(TOK_INTERSECTDISTINCT)
-    ->                 ^(TOK_INTERSECTALL)
+    | KW_INTERSECT KW_ALL -> ^(TOK_INTERSECTALL)
+    | KW_INTERSECT KW_DISTINCT? -> ^(TOK_INTERSECTDISTINCT)
     ;
 
 queryStatementExpression[boolean topLevel]