Fix bug of stale value in joinedRow

xiliu82 · Jul 31, 2014 · 72b1394 · 72b1394
1 parent 55baef7
commit 72b1394
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins.scala
@@ -78,11 +78,11 @@ trait BinaryRepeatableIteratorNode extends BinaryNode {
       (if (!key.anyNull) rightIter else BinaryJoinNode.EMPTY_NULL_LIST).collect {
         case r if (boundCondition(joinedRow.withRight(r))) => {
           matched = true
-          joinedRow
+          joinedRow.copy
         }
       } ++ BinaryJoinNode.SINGLE_NULL_LIST.collect {
         case dummy if (!matched) => {
-          joinedRow.withRight(rightNullRow)
+          joinedRow.withRight(rightNullRow).copy
         }
       }
     }
@@ -107,11 +107,11 @@ trait BinaryRepeatableIteratorNode extends BinaryNode {
       (if (!key.anyNull) leftIter else BinaryJoinNode.EMPTY_NULL_LIST).collect { 
         case l if (boundCondition(joinedRow.withLeft(l))) => {
           matched = true
-          joinedRow
+          joinedRow.copy
         }
       } ++ BinaryJoinNode.SINGLE_NULL_LIST.collect {
         case dummy if (!matched) => {
-          joinedRow.withLeft(leftNullRow)
+          joinedRow.withLeft(leftNullRow).copy
         }
       }
     }
@@ -128,23 +128,23 @@ trait BinaryRepeatableIteratorNode extends BinaryNode {
           case (r, idx) if (boundCondition(joinedRow.withRight(r)))=> {
               matched = true
               rightMatchedSet.add(idx)
-              joinedRow
+              joinedRow.copy
             }
         } ++ BinaryJoinNode.SINGLE_NULL_LIST.collect {
           case dummy if (!matched) => {
-            joinedRow.withRight(rightNullRow)
+            joinedRow.withRight(rightNullRow).copy
           } 
         }
       } ++ rightIter.zipWithIndex.collect {
         case (r, idx) if (!rightMatchedSet.contains(idx)) => {
-          joinedRow(leftNullRow, r)
+          joinedRow(leftNullRow, r).copy
         }
       }
     } else {
       leftIter.iterator.map[Row] { l =>
-        joinedRow(l, rightNullRow)
+        joinedRow(l, rightNullRow).copy
       } ++ rightIter.iterator.map[Row] { r =>
-        joinedRow(leftNullRow, r)
+        joinedRow(leftNullRow, r).copy
       }
     }
   }