This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new 03696b1b5 fix: [Iceberg] Fix decimal corruption (#1985)
03696b1b5 is described below
commit 03696b1b56299d4ba4b9c2ecd6b5409346ec92c8
Author: Andy Grove <[email protected]>
AuthorDate: Thu Jul 3 12:45:32 2025 -0600
fix: [Iceberg] Fix decimal corruption (#1985)
---
dev/diffs/iceberg/1.8.1.diff | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/dev/diffs/iceberg/1.8.1.diff b/dev/diffs/iceberg/1.8.1.diff
index 4920cb8bb..7c6fa0ad1 100644
--- a/dev/diffs/iceberg/1.8.1.diff
+++ b/dev/diffs/iceberg/1.8.1.diff
@@ -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}") {
@@ -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;
@@ -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
@@ -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}") {
@@ -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;
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
