From 95db7ad8f914e47045b53a39f5bad50aee511be9 Mon Sep 17 00:00:00 2001 From: Daoyuan Wang Date: Sun, 29 Mar 2015 21:24:30 -0700 Subject: [PATCH] fix brackets for if-statement --- .../sql/execution/joins/SortMergeJoin.scala | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala index 1bf3baa75ace0..c241a7ae69cde 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/SortMergeJoin.scala @@ -119,31 +119,36 @@ case class SortMergeJoin( currentlMatches = null var stop: Boolean = false while (!stop && leftElement != null && rightElement != null) { - if (ordering.compare(leftKey, rightKey) > 0) + if (ordering.compare(leftKey, rightKey) > 0) { fetchRight() - else if (ordering.compare(leftKey, rightKey) < 0) + } else if (ordering.compare(leftKey, rightKey) < 0) { fetchLeft() - else + } else { stop = true + } } currentrMatches = new CompactBuffer[Row]() while (stop && rightElement != null) { - if (!rightKey.anyNull) + if (!rightKey.anyNull) { currentrMatches += rightElement + } fetchRight() - if (ordering.compare(leftKey, rightKey) != 0) + if (ordering.compare(leftKey, rightKey) != 0) { stop = false + } } if (currentrMatches.size > 0) { stop = false currentlMatches = new CompactBuffer[Row]() val leftMatch = leftKey.copy() while (!stop && leftElement != null) { - if (!leftKey.anyNull) + if (!leftKey.anyNull) { currentlMatches += leftElement + } fetchLeft() - if (ordering.compare(leftKey, leftMatch) != 0) + if (ordering.compare(leftKey, leftMatch) != 0) { stop = true + } } }