Skip to content

Added Support for Spark 2.0 #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaibhavkhanduja wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added Support for Spark 2.0 #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9511259
added support for spark 2.0
Jan 6, 2017
3db1a56
added support for spark 2.0
Jan 6, 2017
33de628
fixed test case
Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ lazy val rootProjectName = settingKey[String]("Name of the root project")

lazy val commonMetaInformationSettings = Seq(
organization := "de.frosner",
version := "4.0.0-gamma-SNAPSHOT",
scalaVersion := "2.10.6",
version := "5.0.0-gamma-SNAPSHOT",
scalaVersion := "2.11.8",
rootProjectName := "spawncamping-dds"
)

Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala/de/frosner/dds/core/ScalaFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import de.frosner.dds.servables._
import org.apache.spark.sql.Row
import org.apache.spark.sql.catalyst.ScalaReflection.Schema
import org.apache.spark.sql.catalyst.{CatalystTypeConverters, CatalystTypeConvertersAdapter, ScalaReflection}
import org.apache.spark.sql.catalyst.expressions.GenericMutableRow
import org.apache.spark.sql.types.{StringType, StructField, StructType}
import org.apache.spark.unsafe.types.UTF8String

Expand Down
6 changes: 5 additions & 1 deletion core/src/main/scala/de/frosner/dds/core/SparkSqlFunctions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.reflect.ClassTag

import org.apache.spark.sql.types.StructType

import de.frosner.dds.util.DataFrameUtils._

object SparkSqlFunctions {
Expand Down Expand Up @@ -323,7 +325,9 @@ object SparkSqlFunctions {
val nominalColumnStatistics = columnStatistics.nominalColumns
val nominalFields = getNominalFields(dataFrame)
val nominalServables = for ((index, field) <- nominalFields) yield {
val groupCounts = dataFrame.groupBy(new Column(field.name)).count.map(row =>
//The Spark 2.0 does not support implicit encoding of structure fields other than for
//basic types. The only other way is using a predefined case class.
val groupCounts = dataFrame.groupBy(new Column(field.name)).count().rdd.map(row =>
(if (row.isNullAt(0)) "NULL" else row.get(0).toString, row.getLong(1))
)
val cardinality = groupCounts.count
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import sbt._
object Dependencies {

// Versions
lazy val sparkVersion = "1.5.0"
lazy val sprayVersion = "1.3.2"
lazy val sparkVersion = "2.1.0"
lazy val sprayVersion = "1.3.3"
lazy val replHelperVersion = "2.0.0"

// Dependencies
Expand All @@ -26,7 +26,7 @@ object Dependencies {
val datasetsDependencies = sparkDependencies ++ scalaTestDependencies
val webUiDependencies = scalaTestDependencies ++ sparkDependencies ++ Seq(
"io.spray" %% "spray-can" % sprayVersion,
"io.spray" %% "spray-routing" % sprayVersion,
"io.spray" %% "spray-routing-shapeless2" % sprayVersion,
"io.spray" %% "spray-caching" % sprayVersion,
"io.spray" %% "spray-json" % "1.3.1",
"com.typesafe.akka" %% "akka-actor" % "2.3.6",
Expand Down
3 changes: 2 additions & 1 deletion web-ui/src/test/scala/de/frosner/dds/webui/servables/ServableJsonProtocolTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ class ServableJsonProtocolTest extends FlatSpec with Matchers {
StructField("9", FloatType, true),
StructField("10", DoubleType, false),
StructField("11", DoubleType, true),
StructField("12", DecimalType.Unlimited, true),
//https://github.com/apache/spark/pull/7605/files#diff-89643554d9757dd3e91abff1cc6096c7L134
StructField("12", DecimalType.SYSTEM_DEFAULT, true),
StructField("13", StringType, true),
StructField("15", BooleanType, false),
StructField("16", BooleanType, true),
Expand Down