Skip to content

Commit 239fc1e

Browse files
authored
Fix Iceberg 1.8.1 diff style (#2700)
1 parent fc3e6e9 commit 239fc1e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dev/diffs/iceberg/1.8.1.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index 7327b38905d..7967109f039 100644
1717
exclude group: 'org.apache.avro', module: 'avro'
1818
// already shaded by Parquet
1919
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
20-
index 04ffa8f4edc..a909cd552c1 100644
20+
index 04ffa8f4edc..3a57af3156a 100644
2121
--- a/gradle/libs.versions.toml
2222
+++ b/gradle/libs.versions.toml
2323
@@ -34,6 +34,7 @@ azuresdk-bom = "1.2.31"
@@ -1202,7 +1202,7 @@ index 019f3919dc5..656e0600ac0 100644
12021202
+ }
12031203
}
12041204
diff --git a/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java b/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java
1205-
index 404ba728460..19d0cd5c827 100644
1205+
index 404ba728460..26d6f9b613f 100644
12061206
--- a/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java
12071207
+++ b/spark/v3.5/spark/src/test/java/org/apache/iceberg/SparkDistributedDataScanTestBase.java
12081208
@@ -90,6 +90,16 @@ public abstract class SparkDistributedDataScanTestBase
@@ -1211,8 +1211,8 @@ index 404ba728460..19d0cd5c827 100644
12111211
.config(SQLConf.SHUFFLE_PARTITIONS().key(), "4")
12121212
+ .config("spark.plugins", "org.apache.spark.CometPlugin")
12131213
+ .config(
1214-
+ "spark.shuffle.manager",
1215-
+ "org.apache.spark.sql.comet.execution.shuffle.CometShuffleManager")
1214+
+ "spark.shuffle.manager",
1215+
+ "org.apache.spark.sql.comet.execution.shuffle.CometShuffleManager")
12161216
+ .config("spark.comet.explainFallback.enabled", "true")
12171217
+ .config("spark.sql.iceberg.parquet.reader-type", "COMET")
12181218
+ .config("spark.memory.offHeap.enabled", "true")

0 commit comments

Comments
 (0)