Repository: spark
Updated Branches:
  refs/heads/branch-1.4 40989cea0 -> e18d623d9


[SPARK-7724] [SQL] Support Intersect/Except in Catalyst DSL.

Author: Santiago M. Mola <[email protected]>

Closes #6327 from smola/feature/catalyst-dsl-set-ops and squashes the following 
commits:

11db778 [Santiago M. Mola] [SPARK-7724] [SQL] Support Intersect/Except in 
Catalyst DSL.

(cherry picked from commit e4aef91fe70d6c9765d530b913a9d79103fc27ce)
Signed-off-by: Michael Armbrust <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e18d623d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e18d623d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e18d623d

Branch: refs/heads/branch-1.4
Commit: e18d623d93505bc5fddeec0281ee3baef3638c3e
Parents: 40989ce
Author: Santiago M. Mola <[email protected]>
Authored: Fri May 22 15:10:27 2015 -0700
Committer: Michael Armbrust <[email protected]>
Committed: Fri May 22 15:12:27 2015 -0700

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/sql/catalyst/dsl/package.scala   | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/e18d623d/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
----------------------------------------------------------------------
diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
index 4c0d702..307a9ca 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala
@@ -276,6 +276,10 @@ package object dsl {
 
     def unionAll(otherPlan: LogicalPlan): LogicalPlan = Union(logicalPlan, 
otherPlan)
 
+    def except(otherPlan: LogicalPlan): LogicalPlan = Except(logicalPlan, 
otherPlan)
+
+    def intersect(otherPlan: LogicalPlan): LogicalPlan = 
Intersect(logicalPlan, otherPlan)
+
     def sfilter[T1](arg1: Symbol)(udf: (T1) => Boolean): LogicalPlan =
       Filter(ScalaUdf(udf, BooleanType, Seq(UnresolvedAttribute(arg1.name))), 
logicalPlan)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to