ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[HOTFIX]: Java 6 Build Breaks

Browse source 
These were blocking RC1 so I fixed them manually.
This commit is contained in:
Patrick Wendell 2015-05-19 06:00:13 +00:00
parent 758ca74bab
commit be1fc938f8
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/src/test/java/org/apache/spark/shuffle/unsafe/UnsafeShuffleWriterSuite.java
View file

@ -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:

3
sql/hive/src/main/scala/org/apache/spark/sql/hive/orc/OrcRelation.scala
View file

@ -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