Merge pull request #25 from marmbrus/rowOrderingWhile

Replace foreach with while in RowOrdering. Fixes #23
marmbrus · Jan 26, 2014 · 4e50679 · 4e50679
2 parents 0b31176 + be1fff7
commit 4e50679
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/scala/catalyst/expressions/Row.scala b/src/main/scala/catalyst/expressions/Row.scala
@@ -82,7 +82,9 @@ class GenericRow(input: Seq[Any]) extends Row {
 
 class RowOrdering(ordering: Seq[SortOrder]) extends Ordering[Row] {
   def compare(a: Row, b: Row): Int = {
-    ordering.foreach { order =>
+    var i = 0
+    while(i < ordering.size) {
+      val order = ordering(i)
       val left = Evaluate(order.child, Vector(a))
       val right = Evaluate(order.child, Vector(b))
 
@@ -101,6 +103,7 @@ class RowOrdering(ordering: Seq[SortOrder]) extends Ordering[Row] {
         }
         if (comparison != 0) return comparison
       }
+      i += 1
     }
     return 0
   }