From 9ebb44f8abb1a13f045eed60190954db904ffef7 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <patrick@databricks.com>
Date: Tue, 19 May 2015 06:00:13 +0000
Subject: [PATCH] [HOTFIX]: Java 6 Build Breaks
These were blocking RC1 so I fixed them manually.
---
.../shuffle/unsafe/UnsafeShuffleWriterSuite.java | 14 --------------
.../apache/spark/sql/hive/orc/OrcRelation.scala | 3 ++-
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java b/core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java
index 730d265c87..03116d8fc2 100644
--- a/core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java
+++ b/core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java
@@ -252,20 +252,6 @@ public class UnsafeShuffleWriterSuite {
createWriter(false).stop(false);
}
- @Test
- public void writeEmptyIterator() throws Exception {
- final UnsafeShuffleWriter<Object, Object> writer = createWriter(true);
- writer.write(Collections.<Product2<Object, Object>>emptyIterator());
- final Option<MapStatus> mapStatus = writer.stop(true);
- assertTrue(mapStatus.isDefined());
- assertTrue(mergedOutputFile.exists());
- assertArrayEquals(new long[NUM_PARTITITONS], partitionSizesInMergedFile);
- assertEquals(0, taskMetrics.shuffleWriteMetrics().get().shuffleRecordsWritten());
- assertEquals(0, taskMetrics.shuffleWriteMetrics().get().shuffleBytesWritten());
- assertEquals(0, taskMetrics.diskBytesSpilled());
- assertEquals(0, taskMetrics.memoryBytesSpilled());
- }
-
@Test
public void writeWithoutSpilling() throws Exception {
// In this example, each partition should have exactly one record:
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
index 58b97adb46..b69e14a179 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
@@ -17,8 +17,9 @@
package org.apache.spark.sql.hive.orc
-import java.util.{Objects, Properties}
+import java.util.Properties
+import com.google.common.base.Objects
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.{FileStatus, Path}
import org.apache.hadoop.hive.conf.HiveConf.ConfVars
--
GitLab