fix test

apache · Jul 22, 2015 · dede020 · dede020
1 parent 84c9807
commit dede020
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastNestedLoopJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/BroadcastNestedLoopJoin.scala
@@ -47,13 +47,12 @@ case class BroadcastNestedLoopJoin(
   override def outputsUnsafeRows: Boolean = left.outputsUnsafeRows || right.outputsUnsafeRows
   override def canProcessUnsafeRows: Boolean = true
 
-  @transient private[this] lazy val resultProjection: Projection = {
+  @transient private[this] lazy val resultProjection: InternalRow => InternalRow =
     if (outputsUnsafeRows) {
       UnsafeProjection.create(schema)
     } else {
-      ((r: InternalRow) => r).asInstanceOf[Projection]
+      (r: InternalRow) => r
     }
-  }
 
   override def outputPartitioning: Partitioning = streamed.outputPartitioning
 

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashJoin.scala
@@ -70,11 +70,12 @@ trait HashJoin {
 
       // Mutable per row objects.
       private[this] val joinRow = new JoinedRow2
-      private[this] val resultProjection: Projection = if (supportUnsafe) {
-        UnsafeProjection.create(self.schema)
-      } else {
-        ((r: InternalRow) => r).asInstanceOf[Projection]
-      }
+      private[this] val resultProjection: InternalRow => InternalRow =
+        if (supportUnsafe) {
+          UnsafeProjection.create(self.schema)
+        } else {
+          (r: InternalRow) => r
+        }
 
       private[this] val joinKeys = streamSideKeyGenerator
 

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/joins/HashOuterJoin.scala
@@ -92,12 +92,11 @@ trait HashOuterJoin {
     }
   }
 
-  @transient private[this] lazy val resultProjection: Projection =
+  @transient private[this] lazy val resultProjection: InternalRow => InternalRow =
     if (supportUnsafe) {
-      // Converted returned JoinRow into UnsafeRow
       UnsafeProjection.create(self.schema)
     } else {
-      ((x: InternalRow) => x).asInstanceOf[Projection]
+      (r: InternalRow) => r
     }
 
   @transient private[this] lazy val DUMMY_LIST = CompactBuffer[InternalRow](null)