Skip to content

fix: [Iceberg] Fix decimal corruption #1985

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
andygrove merged 2 commits into from
Jul 3, 2025
Merged

fix: [Iceberg] Fix decimal corruption #1985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a848e50
fix iceberg diff
andygrove Jul 3, 2025
1222ad1
fix iceberg diff
andygrove Jul 3, 2025
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
26 changes: 22 additions & 4 deletions dev/diffs/iceberg/1.8.1.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ index 04ffa8f..d4107be 100644
testcontainers = "1.20.4"
tez010 = "0.10.4"
diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
index 6eb26e8..c288e72 100644
index 6eb26e8..50cefce 100644
--- a/spark/v3.4/build.gradle
+++ b/spark/v3.4/build.gradle
@@ -75,7 +75,7 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
Expand Down Expand Up @@ -67,7 +67,7 @@ index 0ca1236..87daef4 100644
// Controls whether reading/writing timestamps without timezones is allowed
@Deprecated
diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
index 4794863..8d02f02 100644
index 4794863..0be31c1 100644
--- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
+++ b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
@@ -20,11 +20,11 @@ package org.apache.iceberg.spark.data.vectorized;
Expand All @@ -83,6 +83,15 @@ index 4794863..8d02f02 100644
import org.apache.comet.shaded.arrow.memory.RootAllocator;
import org.apache.iceberg.parquet.VectorizedReader;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -96,7 +96,7 @@ class CometColumnReader implements VectorizedReader<ColumnVector> {
}

this.importer = new CometSchemaImporter(new RootAllocator());
- this.delegate = Utils.getColumnReader(sparkType, descriptor, importer, batchSize, false, false);
+ this.delegate = Utils.getColumnReader(sparkType, descriptor, importer, batchSize, true, false);
this.initialized = true;
}

diff --git a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java b/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java
index a361a7f..9021cd5 100644
--- a/spark/v3.4/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java
Expand Down Expand Up @@ -145,7 +154,7 @@ index 47a0e87..531b7ce 100644
removeTables();
sql("CREATE TABLE %s (id double, data string) USING iceberg", tableName);
diff --git a/spark/v3.5/build.gradle b/spark/v3.5/build.gradle
index e2d2c7a..8b5bff8 100644
index e2d2c7a..d23acef 100644
--- a/spark/v3.5/build.gradle
+++ b/spark/v3.5/build.gradle
@@ -75,7 +75,7 @@ project(":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}") {
Expand Down Expand Up @@ -200,7 +209,7 @@ index d6c16bb..123a300 100644
public static final String CHECK_NULLABILITY = "spark.sql.iceberg.check-nullability";
public static final boolean CHECK_NULLABILITY_DEFAULT = true;
diff --git a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
index 4794863..8d02f02 100644
index 4794863..0be31c1 100644
--- a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
+++ b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/data/vectorized/CometColumnReader.java
@@ -20,11 +20,11 @@ package org.apache.iceberg.spark.data.vectorized;
Expand All @@ -216,6 +225,15 @@ index 4794863..8d02f02 100644
import org.apache.comet.shaded.arrow.memory.RootAllocator;
import org.apache.iceberg.parquet.VectorizedReader;
import org.apache.iceberg.relocated.com.google.common.base.Preconditions;
@@ -96,7 +96,7 @@ class CometColumnReader implements VectorizedReader<ColumnVector> {
}

this.importer = new CometSchemaImporter(new RootAllocator());
- this.delegate = Utils.getColumnReader(sparkType, descriptor, importer, batchSize, false, false);
+ this.delegate = Utils.getColumnReader(sparkType, descriptor, importer, batchSize, true, false);
this.initialized = true;
}

diff --git a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java b/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java
index a361a7f..9021cd5 100644
--- a/spark/v3.5/spark/src/main/java/org/apache/iceberg/spark/source/SparkBatchQueryScan.java
Expand Down
Loading