From 0355fc4ee7c0cc94511ffc3a8534bb8cce8c1780 Mon Sep 17 00:00:00 2001
From: Sameer Agarwal <sameer@databricks.com>
Date: Mon, 23 May 2016 12:54:07 -0700
Subject: [PATCH] Fix build and switch to jdk8

* Fix Build

* more memory

* switch to jdk8

* old memory settings
---
 .gitignore                                                  | 1 +
 .travis.yml                                                 | 2 ++
 .../com/databricks/spark/sql/perf/DatasetPerformance.scala  | 6 +++++-
 .../spark/sql/perf}/DatasetPerformanceSuite.scala           | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)
 rename src/test/scala/{ => com/databricks/spark/sql/perf}/DatasetPerformanceSuite.scala (85%)

diff --git a/.gitignore b/.gitignore
index f53ed82..1bcb62a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 sbt/*.jar
 .idea
 .idea_modules
+*.iml
 
 # sbt specific
 build/*.jar
diff --git a/.travis.yml b/.travis.yml
index 6e29baf..f0cff8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: scala
 sudo: false
+jdk:
+  oraclejdk8
 cache:
   directories:
     - $HOME/.ivy2
diff --git a/src/main/scala/com/databricks/spark/sql/perf/DatasetPerformance.scala b/src/main/scala/com/databricks/spark/sql/perf/DatasetPerformance.scala
index 7c97348..c49da52 100644
--- a/src/main/scala/com/databricks/spark/sql/perf/DatasetPerformance.scala
+++ b/src/main/scala/com/databricks/spark/sql/perf/DatasetPerformance.scala
@@ -16,7 +16,7 @@
 
 package com.databricks.spark.sql.perf
 
-import org.apache.spark.sql.SQLContext
+import org.apache.spark.sql.{Encoder, SQLContext}
 import org.apache.spark.sql.expressions.Aggregator
 
 case class Data(id: Long)
@@ -108,6 +108,10 @@ class DatasetPerformance extends Benchmark {
       b
     }
 
+    override def bufferEncoder = implicitly[Encoder[SumAndCount]]
+
+    override def outputEncoder = implicitly[Encoder[Double]]
+
     override def finish(reduction: SumAndCount): Double = reduction.sum.toDouble / reduction.count
 
     override def merge(b1: SumAndCount, b2: SumAndCount): SumAndCount = {
diff --git a/src/test/scala/DatasetPerformanceSuite.scala b/src/test/scala/com/databricks/spark/sql/perf/DatasetPerformanceSuite.scala
similarity index 85%
rename from src/test/scala/DatasetPerformanceSuite.scala
rename to src/test/scala/com/databricks/spark/sql/perf/DatasetPerformanceSuite.scala
index d0c10c1..cd934fa 100644
--- a/src/test/scala/DatasetPerformanceSuite.scala
+++ b/src/test/scala/com/databricks/spark/sql/perf/DatasetPerformanceSuite.scala
@@ -1,6 +1,5 @@
 package com.databricks.spark.sql.perf
 
-import com.databricks.spark.sql.perf.{Benchmark, DatasetPerformance}
 import org.apache.spark.sql.hive.test.TestHive
 import org.scalatest.FunSuite