merge with master

apache · Jul 16, 2015 · e651683 · e651683
1 parent d503fce
commit e651683
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalAggregation.java b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalAggregation.java
@@ -42,7 +42,7 @@
 import org.apache.spark.sql.types.StructType;
 import org.apache.spark.storage.BlockId;
 import org.apache.spark.storage.BlockManager;
-import org.apache.spark.storage.BlockObjectWriter;
+import org.apache.spark.storage.DiskBlockObjectWriter;
 import org.apache.spark.storage.TempLocalBlockId;
 import org.apache.spark.unsafe.PlatformDependent;
 import org.apache.spark.unsafe.memory.MemoryBlock;
@@ -740,7 +740,7 @@ public class UnsafeSorterKVSpillWriter {
     private final File file;
     private final BlockId blockId;
     private final int numRecordsToWrite;
-    private BlockObjectWriter writer;
+    private DiskBlockObjectWriter writer;
     private int numRecordsSpilled = 0;
 
     public UnsafeSorterKVSpillWriter(