Skip to content

Spark: Bump Spark 3.5 to 3.5.5 #12396

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

Merged
nastra merged 1 commit into from
Feb 28, 2025
Merged

Spark: Bump Spark 3.5 to 3.5.5 #12396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ scala-collection-compat = "2.13.0"
slf4j = "2.0.16"
snowflake-jdbc = "3.22.0"
spark-hive34 = "3.4.4"
spark-hive35 = "3.5.4"
spark-hive35 = "3.5.5"
Comment thread
manuzhang marked this conversation as resolved.
sqlite-jdbc = "3.49.1.0"
testcontainers = "1.20.5"
tez08 = { strictly = "0.8.4"} # see rich version usage explanation above
Expand Down
7 changes: 0 additions & 7 deletions spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
import org.apache.spark.sql.types.MapType;
import org.apache.spark.sql.types.StructField;
import org.apache.spark.sql.types.StructType;
import org.apache.spark.sql.types.TimestampNTZType;
import org.apache.spark.sql.types.TimestampType$;
import org.apache.spark.sql.vectorized.ColumnarBatch;
import org.apache.spark.unsafe.types.UTF8String;
import scala.collection.Seq;
Expand Down Expand Up @@ -784,11 +782,6 @@ private static void assertEquals(
for (int i = 0; i < actual.numFields(); i += 1) {
StructField field = struct.fields()[i];
DataType type = field.dataType();
// ColumnarRow.get doesn't support TimestampNTZType, causing tests to fail. the representation
Copy link
Copy Markdown
Contributor

@nastra nastra Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for removing this. This also fixes #11945

// is identical to TimestampType so this uses that type to validate.
if (type instanceof TimestampNTZType) {
type = TimestampType$.MODULE$;
}

assertEquals(
context + "." + field.name(),
Expand Down