Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions dev/diffs/iceberg/1.10.0.diff
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,20 @@ index 4c1a509591..b22f3f9ad9 100644
.enableHiveSupport()
.getOrCreate();

diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
index 893f9931cf..17e5fef217 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
+++ b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
@@ -460,7 +460,8 @@ public abstract class SparkRowLevelOperationsTestBase extends ExtensionsTestBase

protected void assertAllBatchScansVectorized(SparkPlan plan) {
List<SparkPlan> batchScans = SparkPlanUtil.collectBatchScans(plan);
- assertThat(batchScans).hasSizeGreaterThan(0).allMatch(SparkPlan::supportsColumnar);
+ // When Comet is enabled, its native scan replaces BatchScanExec nodes entirely
+ assertThat(batchScans).allMatch(SparkPlan::supportsColumnar);
}

protected void createTableWithDeleteGranularity(
diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
index ecf9e6f8a5..23dbcf7af2 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
Expand Down
14 changes: 14 additions & 0 deletions dev/diffs/iceberg/1.11.0.diff
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ index f766fbb79a..c5e31185a9 100644
.config(TestBase.DISABLE_UI)
.enableHiveSupport()
.getOrCreate();
diff --git a/spark/v4.1/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java b/spark/v4.1/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
index b5d6415763..0763a723d3 100644
--- a/spark/v4.1/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
+++ b/spark/v4.1/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
@@ -448,7 +448,8 @@ public abstract class SparkRowLevelOperationsTestBase extends ExtensionsTestBase

protected void assertAllBatchScansVectorized(SparkPlan plan) {
List<SparkPlan> batchScans = SparkPlanUtil.collectBatchScans(plan);
- assertThat(batchScans).hasSizeGreaterThan(0).allMatch(SparkPlan::supportsColumnar);
+ // When Comet is enabled, its native scan replaces BatchScanExec nodes entirely
+ assertThat(batchScans).allMatch(SparkPlan::supportsColumnar);
Comment thread
parthchandra marked this conversation as resolved.
}

protected void createTableWithDeleteGranularity(
diff --git a/spark/v4.1/spark/src/jmh/java/org/apache/iceberg/spark/action/DeleteOrphanFilesBenchmark.java b/spark/v4.1/spark/src/jmh/java/org/apache/iceberg/spark/action/DeleteOrphanFilesBenchmark.java
index 3fd84553f0..350b4a7561 100644
--- a/spark/v4.1/spark/src/jmh/java/org/apache/iceberg/spark/action/DeleteOrphanFilesBenchmark.java
Expand Down
14 changes: 14 additions & 0 deletions dev/diffs/iceberg/1.8.1.diff
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,20 @@ index 4f137f5b8d..145ef2d00c 100644
.getOrCreate();

SparkTestBase.catalog =
diff --git a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
index 5fa76f9da6..9184aaba83 100644
--- a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
+++ b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
@@ -452,7 +452,8 @@ public abstract class SparkRowLevelOperationsTestBase extends SparkExtensionsTes

protected void assertAllBatchScansVectorized(SparkPlan plan) {
List<SparkPlan> batchScans = SparkPlanUtil.collectBatchScans(plan);
- assertThat(batchScans).hasSizeGreaterThan(0).allMatch(SparkPlan::supportsColumnar);
+ // When Comet is enabled, its native scan replaces BatchScanExec nodes entirely
+ assertThat(batchScans).allMatch(SparkPlan::supportsColumnar);
}

protected void createTableWithDeleteGranularity(
diff --git a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java b/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
index 55a413063e..a1895c2faf 100644
--- a/spark/v3.4/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
Expand Down
14 changes: 14 additions & 0 deletions dev/diffs/iceberg/1.9.1.diff
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,20 @@ index 578845e3da..3cc1598035 100644
.enableHiveSupport()
.getOrCreate();

diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
index b5d6415763..0763a723d3 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
+++ b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/SparkRowLevelOperationsTestBase.java
@@ -448,7 +448,8 @@ public abstract class SparkRowLevelOperationsTestBase extends ExtensionsTestBase

protected void assertAllBatchScansVectorized(SparkPlan plan) {
List<SparkPlan> batchScans = SparkPlanUtil.collectBatchScans(plan);
- assertThat(batchScans).hasSizeGreaterThan(0).allMatch(SparkPlan::supportsColumnar);
+ // When Comet is enabled, its native scan replaces BatchScanExec nodes entirely
+ assertThat(batchScans).allMatch(SparkPlan::supportsColumnar);
}

protected void createTableWithDeleteGranularity(
diff --git a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java b/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
index ecf9e6f8a5..23dbcf7af2 100644
--- a/spark/v3.5/spark-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestCallStatementParser.java
Expand Down
4 changes: 2 additions & 2 deletions native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ object_store = { version = "0.13.2", features = ["gcp", "azure", "aws", "http"]
url = "2.2"
aws-config = "1.8.18"
aws-credential-types = "1.2.13"
iceberg = { git = "https://github.com/apache/iceberg-rust", rev = "4532da8" }
iceberg-storage-opendal = { git = "https://github.com/apache/iceberg-rust", rev = "4532da8", features = ["opendal-memory", "opendal-fs", "opendal-s3", "opendal-gcs", "opendal-oss", "opendal-azdls"] }
iceberg = { git = "https://github.com/apache/iceberg-rust", rev = "3d84c81353b1b23b6e4ae8eea8f8a021cc6927a7" }
iceberg-storage-opendal = { git = "https://github.com/apache/iceberg-rust", rev = "3d84c81353b1b23b6e4ae8eea8f8a021cc6927a7", features = ["opendal-memory", "opendal-fs", "opendal-s3", "opendal-gcs", "opendal-oss", "opendal-azdls"] }
reqsign-core = "3"

[profile.release]
Expand Down
1 change: 1 addition & 0 deletions native/core/src/execution/operators/iceberg_scan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ mod tests {
partition: None,
partition_spec: None,
name_mapping: None,
unified_partition_type: None,
case_sensitive: false,
key_metadata: None,
}
Expand Down
Loading
Loading