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.

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

Bump delta to 3.0.0 #17

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Bump delta to 3.0.0 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
383bbf1
Bump delta to 3.0.0
izhangzhihao Oct 18, 2023
33bc291
renamed to delta-spark
izhangzhihao Oct 18, 2023
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 spark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ dependencies {
implementation "org.apache.spark:spark-streaming-kafka-0-10_$scalaVersion:$sparkVersion"
implementation "org.apache.kafka:kafka-clients:2.0.0"
if (sparkVersion.startsWith("3.5")) {
implementation "io.delta:delta-core_$scalaVersion:2.4.0"
implementation "io.delta:delta-spark_$scalaVersion:3.0.0"
} else if (sparkVersion.startsWith("3.4")) {
implementation "io.delta:delta-core_$scalaVersion:2.4.0"
} else if (sparkVersion.startsWith("3.3")) {
Expand Down Expand Up @@ -377,7 +377,7 @@ shadowJar {
include dependency("net.liftweb:lift-json_$scalaVersion:3.4.3")

if (sparkVersion.startsWith("3.5")) {
addDeps("io.delta:delta-core_$scalaVersion:2.4.0")
addDeps("io.delta:delta-spark_$scalaVersion:3.0.0")
} else if (sparkVersion.startsWith("3.4")) {
addDeps("io.delta:delta-core_$scalaVersion:2.4.0")
} else if (sparkVersion.startsWith("3.3")) {
Expand Down
4 changes: 2 additions & 2 deletions spark/src/test/scala/com/github/sharpdata/sharpetl/spark/end2end/delta/DeltaLakeSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class DeltaLakeSpec extends DeltaSuit {
)

it("delta should works") {
if (spark.version.startsWith("2.3") || spark.version.startsWith("3.5")) {
ETLLogger.error("Delta Lake does NOT support Spark 2.3.x and Spark 3.5.x")
if (spark.version.startsWith("2.3")) {
ETLLogger.error("Delta Lake does NOT support Spark 2.3.x")
} else if (spark.version.startsWith("2.4") || spark.version.startsWith("3.0") || spark.version.startsWith("3.1")) {
ETLLogger.error("Delta Lake does not works well on Spark 2.4.x, " +
"CREATE TABLE USING delta is not supported by Spark before 3.0.0 and Delta Lake before 0.7.0.")
Expand Down
4 changes: 2 additions & 2 deletions spark/src/test/scala/com/github/sharpdata/sharpetl/spark/end2end/delta/FlyDeltaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class FlyDeltaSpec extends AnyFunSpec
with BeforeAndAfterEach {

it("should just run with delta") {
if (spark.version.startsWith("2.3") || spark.version.startsWith("3.5")) {
ETLLogger.error("Delta Lake does NOT support Spark 2.3.x and Spark 3.5.x")
if (spark.version.startsWith("2.3")) {
ETLLogger.error("Delta Lake does NOT support Spark 2.3.x")
} else if (spark.version.startsWith("2.4") || spark.version.startsWith("3.0") || spark.version.startsWith("3.1")) {
ETLLogger.error("Delta Lake does not works well on Spark 2.4.x, " +
"CREATE TABLE USING delta is not supported by Spark before 3.0.0 and Delta Lake before 0.7.0.")
Expand Down
Loading