github/spark-sql-perf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issues with scala 2.11

Browse Source 
Updates the usual scala-logging issues to make the source code cross-compilable between scala 2.10 and scala 2.11.

Tests:
A scala 2.11 version of the code has been run against the official Spark 2.0.0 RC4 binary release (Scala 2.11)
A scala 2.10 version has been run against the official Spark 1.6.2 release

Author: Timothy Hunter <timhunter@databricks.com>

Closes #81 from thunterdb/1607-scala211.
This commit is contained in:
Timothy Hunter 2016-07-19 11:19:52 -07:00
parent 8830bffd46
commit 948c8369e7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -5,7 +5,7 @@ name := "spark-sql-perf"
organization := "com.databricks"
scalaVersion := "2.10.4"
scalaVersion := "2.10.6"
sparkPackageName := "databricks/spark-sql-perf"
@ -43,7 +43,7 @@ libraryDependencies += "org.scalatest" %% "scalatest" % "2.2.1" % "test"
libraryDependencies += "org.yaml" % "snakeyaml" % "1.17"
libraryDependencies += "com.typesafe" %% "scalalogging-slf4j" % "1.1.0"
libraryDependencies += "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2"
fork := true

2
src/main/scala/com/databricks/spark/sql/perf/Benchmarkable.scala
View File

@ -18,7 +18,7 @@ package com.databricks.spark.sql.perf
import java.util.UUID
import com.typesafe.scalalogging.slf4j.Logging
import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging}
import scala.concurrent.duration._
import scala.collection.mutable.ArrayBuffer

2
src/main/scala/com/databricks/spark/sql/perf/mllib/BenchmarkAlgorithm.scala
View File

@ -1,6 +1,6 @@
package com.databricks.spark.sql.perf.mllib
import com.typesafe.scalalogging.slf4j.Logging
import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging}
import org.apache.spark.ml.{Estimator, Transformer}
import org.apache.spark.ml.evaluation.Evaluator

2
src/main/scala/com/databricks/spark/sql/perf/mllib/MLLib.scala
View File

@ -4,7 +4,7 @@ import scala.language.implicitConversions
import com.databricks.spark.sql.perf._
import com.typesafe.scalalogging.slf4j.Logging
import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging}
import org.apache.spark.SparkContext
import org.apache.spark.sql.{DataFrame, SQLContext}

2
src/main/scala/com/databricks/spark/sql/perf/mllib/MLTransformerBenchmarkable.scala
View File

@ -1,7 +1,7 @@
package com.databricks.spark.sql.perf.mllib
import com.databricks.spark.sql.perf._
import com.typesafe.scalalogging.slf4j.Logging
import com.typesafe.scalalogging.slf4j.{LazyLogging => Logging}
import org.apache.spark.sql._
import scala.collection.mutable.ArrayBuffer