fix conflicts empty lines and spaces

apache · Jul 29, 2015 · 952dcab · 952dcab
1 parent e693c54
commit 952dcab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -189,10 +189,10 @@ class SqlParser extends AbstractSparkSQLParser with DataTypeParser {
 
   protected lazy val joinType: Parser[JoinType] =
     ( INNER           ^^^ Inner
-    | LEFT  ~ SEMI     ^^^ LeftSemi
-    | LEFT  ~ OUTER.?  ^^^ LeftOuter
+    | LEFT  ~ SEMI    ^^^ LeftSemi
+    | LEFT  ~ OUTER.? ^^^ LeftOuter
     | RIGHT ~ OUTER.? ^^^ RightOuter
-    | FULL  ~ OUTER.?  ^^^ FullOuter
+    | FULL  ~ OUTER.? ^^^ FullOuter
     )
 
   protected lazy val sortType: Parser[LogicalPlan => LogicalPlan] =
@@ -222,9 +222,9 @@ class SqlParser extends AbstractSparkSQLParser with DataTypeParser {
 
   protected lazy val comparisonExpression: Parser[Expression] =
     ( termExpression ~ ("="  ~> termExpression) ^^ { case e1 ~ e2 => EqualTo(e1, e2) }
-    | termExpression ~ ("<"  ~> termExpression)  ^^ { case e1 ~ e2 => LessThan(e1, e2) }
+    | termExpression ~ ("<"  ~> termExpression) ^^ { case e1 ~ e2 => LessThan(e1, e2) }
     | termExpression ~ ("<=" ~> termExpression) ^^ { case e1 ~ e2 => LessThanOrEqual(e1, e2) }
-    | termExpression ~ (">"  ~> termExpression)  ^^ { case e1 ~ e2 => GreaterThan(e1, e2) }
+    | termExpression ~ (">"  ~> termExpression) ^^ { case e1 ~ e2 => GreaterThan(e1, e2) }
     | termExpression ~ (">=" ~> termExpression) ^^ { case e1 ~ e2 => GreaterThanOrEqual(e1, e2) }
     | termExpression ~ ("!=" ~> termExpression) ^^ { case e1 ~ e2 => Not(EqualTo(e1, e2)) }
     | termExpression ~ ("<>" ~> termExpression) ^^ { case e1 ~ e2 => Not(EqualTo(e1, e2)) }

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkStrategies.scala
@@ -161,17 +161,17 @@ private[sql] abstract class SparkStrategies extends QueryPlanner[SparkPlan] {
                   allAggregates(rewrittenAggregateExpressions)) &&
                codegenEnabled &&
                !canBeConvertedToNewAggregation(plan) =>
-        execution.GeneratedAggregate(
-          partial = false,
-          namedGroupingAttributes,
-          rewrittenAggregateExpressions,
-          unsafeEnabled,
           execution.GeneratedAggregate(
-            partial = true,
-            groupingExpressions,
-            partialComputation,
+            partial = false,
+            namedGroupingAttributes,
+            rewrittenAggregateExpressions,
             unsafeEnabled,
-            planLater(child))) :: Nil
+            execution.GeneratedAggregate(
+              partial = true,
+              groupingExpressions,
+              partialComputation,
+              unsafeEnabled,
+              planLater(child))) :: Nil
 
       // Cases where some aggregate can not be codegened
       case PartialAggregation(