Skip to content
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.

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

[Spark][Connect] Move error framework to common module #3069

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
21 changes: 20 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ val LATEST_RELEASED_SPARK_VERSION = "3.5.0"
val SPARK_MASTER_VERSION = "4.0.0-SNAPSHOT"
val sparkVersion = settingKey[String]("Spark version")
spark / sparkVersion := getSparkVersion()
sparkCommon / sparkVersion := getSparkVersion()

// Dependent library versions
val defaultSparkVersion = LATEST_RELEASED_SPARK_VERSION
Expand Down Expand Up @@ -180,8 +181,26 @@ def crossSparkSettings(): Seq[Setting[_]] = getSparkVersion() match {
)
}

lazy val sparkCommon = (project in file("sparkCommon"))
.settings(
name := "delta-spark-common",
commonSettings,
scalaStyleSettings,
sparkMimaSettings,
releaseSettings,
crossSparkSettings(),
libraryDependencies ++= Seq(
"org.apache.spark" %% "spark-common-utils" % sparkVersion.value % "provided",
),
)
.configureUnidoc(
generatedJavaDoc = getSparkVersion() == LATEST_RELEASED_SPARK_VERSION,
generateScalaDoc = getSparkVersion() == LATEST_RELEASED_SPARK_VERSION
)

lazy val spark = (project in file("spark"))
.dependsOn(storage)
.dependsOn(sparkCommon)
.enablePlugins(Antlr4Plugin)
.settings (
name := "delta-spark",
Expand Down Expand Up @@ -1282,7 +1301,7 @@ val createTargetClassesDir = taskKey[Unit]("create target classes dir")

// Don't use these groups for any other projects
lazy val sparkGroup = project
.aggregate(spark, contribs, storage, storageS3DynamoDB, iceberg, testDeltaIcebergJar, sharing, hudi)
.aggregate(spark, sparkCommon, contribs, storage, storageS3DynamoDB, iceberg, testDeltaIcebergJar, sharing, hudi)
.settings(
// crossScalaVersions must be set to Nil on the aggregating project
crossScalaVersions := Nil,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import java.net.URL
import org.apache.spark.sql.delta.DeltaThrowableHelperShims._

import org.apache.spark.ErrorClassesJsonReader
import org.apache.spark.util.Utils
import org.apache.spark.util.SparkClassUtils

/**
* The helper object for Delta code base to pick error class template and compile
Expand All @@ -35,7 +35,7 @@ object DeltaThrowableHelper
* Try to find the error class source file and throw exception if it is no found.
*/
private def safeGetErrorClassesSource(sourceFile: String): URL = {
val classLoader = Utils.getContextOrSparkClassLoader
val classLoader = SparkClassUtils.getContextOrSparkClassLoader
Option(classLoader.getResource(sourceFile)).getOrElse {
throw new FileNotFoundException(
s"""Cannot find the error class definition file on path $sourceFile" through the """ +
Expand Down
Loading