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

[ML-3870] Make spark-sql-perf master compiled with spark 2.3 and scala 2.11 (#155)

Browse Source 
Change the build config to update spark 2.3 and update the scala dependence in bin/spark-perf
This commit is contained in:
ludatabricks 2018-06-15 06:40:14 -07:00 committed by Xiangrui Meng
parent 49717a72dd
commit e8aa132bb8
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,4 +1,6 @@
language: scala language: scala
scala:
- 2.11.8
sudo: false sudo: false
jdk: jdk:
oraclejdk8 oraclejdk8

4
bin/spark-perf
View File

@ -5,5 +5,5 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
VERSION=`git -C $DIR/../ tag | tail -n 1 | cut -c 2-` VERSION=`git -C $DIR/../ tag | tail -n 1 | cut -c 2-`
ARGS="sparkPackage com.databricks:spark-sql-perf_2.10:$VERSION com.databricks.spark.sql.perf.RunBenchmark $@" ARGS="sparkPackage com.databricks:spark-sql-perf_2.11:$VERSION com.databricks.spark.sql.perf.RunBenchmark $@"
build/sbt "$ARGS" build/sbt "$ARGS"

4
build.sbt
View File

@ -7,14 +7,14 @@ organization := "com.databricks"
scalaVersion := "2.11.8" scalaVersion := "2.11.8"
crossScalaVersions := Seq("2.10.6", "2.11.8") crossScalaVersions := Seq("2.11.8")
sparkPackageName := "databricks/spark-sql-perf" sparkPackageName := "databricks/spark-sql-perf"
// All Spark Packages need a license // All Spark Packages need a license
licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0")) licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
sparkVersion := "2.2.0" sparkVersion := "2.3.0"
sparkComponents ++= Seq("sql", "hive", "mllib") sparkComponents ++= Seq("sql", "hive", "mllib")