address comments.

apache · Jan 28, 2016 · 3be78c4 · 3be78c4
1 parent e566d79
commit 3be78c4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -451,10 +451,6 @@ class Analyzer(
           j.copy(right = dedupRight(left, right))
         case i @ Intersect(left, right) =>
           i.copy(right = dedupRight(left, right))
-        case e @ Except(left, right) =>
-          e.copy(right = dedupRight(left, right))
-        case cg: CoGroup =>
-          cg.copy(right = dedupRight(cg.left, cg.right))
         case other => other
       }
 

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala
@@ -113,7 +113,6 @@ object SamplePushDown extends Rule[LogicalPlan] {
 }
 
 /**
-<<<<<<< HEAD
  * Removes cases where we are unnecessarily going between the object and serialized (InternalRow)
  * representation of data item.  For example back to back map operations.
  */