style fixes

marmbrus · marmbrus · commit 366b6d9f0df1 · 2014-04-23T14:54:23.000-07:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala
@@ -38,9 +38,12 @@ trait Predicate extends Expression {
 }
 
 trait PredicateHelper {
-  protected def splitConjunctivePredicates(condition: Expression): Seq[Expression] = condition match {
-    case And(cond1, cond2) => splitConjunctivePredicates(cond1) ++ splitConjunctivePredicates(cond2)
-    case other => other :: Nil
+  protected def splitConjunctivePredicates(condition: Expression): Seq[Expression] = {
+    condition match {
+      case And(cond1, cond2) =>
+        splitConjunctivePredicates(cond1) ++ splitConjunctivePredicates(cond2)
+      case other => other :: Nil
+    }
   }
 
   private def combineConjunctivePredicates(predicates: Seq[Expression]) =

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,12 @@ trait Predicate extends Expression {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`trait PredicateHelper {`
`41`		`- protected def splitConjunctivePredicates(condition: Expression): Seq[Expression] = condition match {`
`42`		`- case And(cond1, cond2) => splitConjunctivePredicates(cond1) ++ splitConjunctivePredicates(cond2)`
`43`		`- case other => other :: Nil`
	`41`	`+ protected def splitConjunctivePredicates(condition: Expression): Seq[Expression] = {`
	`42`	`+ condition match {`
	`43`	`+ case And(cond1, cond2) =>`
	`44`	`+ splitConjunctivePredicates(cond1) ++ splitConjunctivePredicates(cond2)`
	`45`	`+ case other => other :: Nil`
	`46`	`+ }`
`44`	`47`	`}`
`45`	`48`
`46`	`49`	`private def combineConjunctivePredicates(predicates: Seq[Expression]) =`