From e6516838b46bff38a7bc07e2ee9e82a235bbf29e Mon Sep 17 00:00:00 2001
From: Lianhui Wang <lianhuiwang09@gmail.com>
Date: Thu, 16 Jul 2015 22:47:22 +0800
Subject: [PATCH] merge with master

---
 .../apache/spark/sql/execution/UnsafeExternalAggregation.java | 4 ++--
 1 file changed, 2 insertions(+), 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
index 2a2fa5a11ffe3..077fcb0dff7bc 100644
--- 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(