Repository: spark Updated Branches: refs/heads/branch-1.4 0de1737a8 -> 0c3f7fc88
[HOTFIX] Fix whitespace style error Author: Michael Armbrust <mich...@databricks.com> Closes #7102 from marmbrus/fixStyle and squashes the following commits: 8c08124 [Michael Armbrust] [HOTFIX] Fix whitespace style error Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0c3f7fc8 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0c3f7fc8 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0c3f7fc8 Branch: refs/heads/branch-1.4 Commit: 0c3f7fc88a8e87d0581e2a4c7a73d47642dea129 Parents: 0de1737 Author: Michael Armbrust <mich...@databricks.com> Authored: Mon Jun 29 15:57:36 2015 -0700 Committer: Reynold Xin <r...@databricks.com> Committed: Mon Jun 29 15:57:36 2015 -0700 ---------------------------------------------------------------------- .../org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/0c3f7fc8/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala index e62a1f9..d5ffccf 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/HiveTypeCoercion.scala @@ -308,8 +308,7 @@ trait HiveTypeCoercion { object InConversion extends Rule[LogicalPlan] { def apply(plan: LogicalPlan): LogicalPlan = plan transformAllExpressions { // Skip nodes who's children have not been resolved yet. - case e if !e.childrenResolved => e - + case e if !e.childrenResolved => e case i @ In(a, b) if b.exists(_.dataType != a.dataType) => i.makeCopy(Array(a, b.map(Cast(_, a.dataType)))) } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org