You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/05/19 08:01:45 UTC
spark git commit: [HOTFIX]: Java 6 Build Breaks
Repository: spark
Updated Branches:
refs/heads/master c9fa870a6 -> 9ebb44f8a
[HOTFIX]: Java 6 Build Breaks
These were blocking RC1 so I fixed them manually.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9ebb44f8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9ebb44f8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9ebb44f8
Branch: refs/heads/master
Commit: 9ebb44f8abb1a13f045eed60190954db904ffef7
Parents: c9fa870
Author: Patrick Wendell <pa...@databricks.com>
Authored: Tue May 19 06:00:13 2015 +0000
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Tue May 19 06:01:16 2015 +0000
----------------------------------------------------------------------
.../shuffle/unsafe/UnsafeShuffleWriterSuite.java | 14 --------------
.../org/apache/spark/sql/hive/orc/OrcRelation.scala | 3 ++-
2 files changed, 2 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9ebb44f8/core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java
----------------------------------------------------------------------
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 730d265..03116d8 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
@@ -253,20 +253,6 @@ public class UnsafeShuffleWriterSuite {
}
@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:
final ArrayList<Product2<Object, Object>> dataToWrite =
http://git-wip-us.apache.org/repos/asf/spark/blob/9ebb44f8/sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
----------------------------------------------------------------------
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 58b97ad..b69e14a 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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org