From fd28006f045d0392cfd83a260b93ad50703d569a Mon Sep 17 00:00:00 2001 From: Alex Bianchi <75697973+alexanderbianchi@users.noreply.github.com> Date: Mon, 28 Sep 2026 22:03:09 -0400 Subject: [PATCH 1/3] fix: keep Iceberg test fixtures inside the crate --- iceberg/AGENTS.md | 2 +- iceberg/src/test_utils/fixture.rs | 4 ++-- iceberg/src/test_utils/harness.rs | 2 +- .../iceberg => iceberg/testdata}/taxi/README.md | 2 +- .../taxi/data/pickup_date=2024-01-08/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-09/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-10/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-11/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-12/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-13/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-14/data_0.parquet | 0 ...a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json | 0 .../019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro | Bin ...5929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro | Bin .../testdata}/taxi/metadata/v1.metadata.json | 0 15 files changed, 5 insertions(+), 5 deletions(-) rename {testdata/iceberg => iceberg/testdata}/taxi/README.md (98%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-08/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-09/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-10/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-11/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-12/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-13/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/data/pickup_date=2024-01-14/data_0.parquet (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro (100%) rename {testdata/iceberg => iceberg/testdata}/taxi/metadata/v1.metadata.json (100%) diff --git a/iceberg/AGENTS.md b/iceberg/AGENTS.md index 5d68d69c3..79a3fba30 100644 --- a/iceberg/AGENTS.md +++ b/iceberg/AGENTS.md @@ -2,7 +2,7 @@ ## Tests -- Reuse `src/test_utils/harness.rs` and `testdata/iceberg/taxi` as much as +- Reuse `src/test_utils/harness.rs` and `testdata/taxi` as much as possible. - Prefer integration tests over unit tests when possible. Each isolated feature should have its own dedicated file in `tests/`. diff --git a/iceberg/src/test_utils/fixture.rs b/iceberg/src/test_utils/fixture.rs index e6065d725..830503292 100644 --- a/iceberg/src/test_utils/fixture.rs +++ b/iceberg/src/test_utils/fixture.rs @@ -3,7 +3,7 @@ use iceberg::spec::{TableMetadata, TableMetadataBuilder}; /// The complete, checked-in taxi metadata, including its original summary. pub fn taxi_metadata() -> TableMetadata { serde_json::from_str(include_str!( - "../../../testdata/iceberg/taxi/metadata/v1.metadata.json" + "../../testdata/taxi/metadata/v1.metadata.json" )) .expect("taxi metadata is valid JSON") } @@ -11,7 +11,7 @@ pub fn taxi_metadata() -> TableMetadata { /// Starts a fixture history with the original schema and partition IDs and no snapshots. pub fn empty_taxi_metadata_builder() -> TableMetadataBuilder { let metadata = serde_json::from_str(include_str!( - "../../../testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json" + "../../testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json" )) .expect("initial taxi metadata is valid JSON"); TableMetadataBuilder::new_from_metadata(metadata, None) diff --git a/iceberg/src/test_utils/harness.rs b/iceberg/src/test_utils/harness.rs index 0520fa37c..86ac69dc7 100644 --- a/iceberg/src/test_utils/harness.rs +++ b/iceberg/src/test_utils/harness.rs @@ -219,7 +219,7 @@ struct FixtureStorageFactory { impl Default for FixtureStorageFactory { fn default() -> Self { Self { - root: PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata/iceberg"), + root: PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("testdata"), files: HashMap::new(), } } diff --git a/testdata/iceberg/taxi/README.md b/iceberg/testdata/taxi/README.md similarity index 98% rename from testdata/iceberg/taxi/README.md rename to iceberg/testdata/taxi/README.md index b4fed84e7..b86043bb6 100644 --- a/testdata/iceberg/taxi/README.md +++ b/iceberg/testdata/taxi/README.md @@ -67,7 +67,7 @@ COPY ( SELECT * EXCLUDE (row_number) FROM sampled WHERE row_number <= 25000 -) TO 'testdata/iceberg/taxi/data' ( +) TO 'iceberg/testdata/taxi/data' ( FORMAT parquet, PARTITION_BY (pickup_date), COMPRESSION zstd, diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-08/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-08/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-08/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-08/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-09/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-09/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-09/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-09/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-10/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-10/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-10/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-10/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-11/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-11/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-11/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-11/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-12/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-12/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-12/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-12/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-13/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-13/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-13/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-13/data_0.parquet diff --git a/testdata/iceberg/taxi/data/pickup_date=2024-01-14/data_0.parquet b/iceberg/testdata/taxi/data/pickup_date=2024-01-14/data_0.parquet similarity index 100% rename from testdata/iceberg/taxi/data/pickup_date=2024-01-14/data_0.parquet rename to iceberg/testdata/taxi/data/pickup_date=2024-01-14/data_0.parquet diff --git a/testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json b/iceberg/testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json similarity index 100% rename from testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json rename to iceberg/testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json diff --git a/testdata/iceberg/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro b/iceberg/testdata/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro similarity index 100% rename from testdata/iceberg/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro rename to iceberg/testdata/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro diff --git a/testdata/iceberg/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro b/iceberg/testdata/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro similarity index 100% rename from testdata/iceberg/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro rename to iceberg/testdata/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro diff --git a/testdata/iceberg/taxi/metadata/v1.metadata.json b/iceberg/testdata/taxi/metadata/v1.metadata.json similarity index 100% rename from testdata/iceberg/taxi/metadata/v1.metadata.json rename to iceberg/testdata/taxi/metadata/v1.metadata.json From 4c03a397f4222ba39915fbb1f998c30b04c7552a Mon Sep 17 00:00:00 2001 From: Alex Bianchi <75697973+alexanderbianchi@users.noreply.github.com> Date: Wed, 30 Sep 2026 12:11:28 -0400 Subject: [PATCH 2/3] fix: gate Iceberg test utilities instead of moving fixtures --- docs/upgrade/5.0.0.md | 6 ++++++ iceberg/AGENTS.md | 2 +- iceberg/Cargo.toml | 2 +- iceberg/README.md | 2 +- iceberg/src/lib.rs | 1 + iceberg/src/test_utils/fixture.rs | 4 ++-- iceberg/src/test_utils/harness.rs | 2 +- iceberg/tests/desired_task_count.rs | 3 +-- iceberg/tests/external_table.rs | 2 +- iceberg/tests/filter_pushdown.rs | 2 +- iceberg/tests/limit_pushdown.rs | 2 +- iceberg/tests/projection_pushdown.rs | 2 +- iceberg/tests/statistics.rs | 2 +- .../testdata => testdata/iceberg}/taxi/README.md | 2 +- .../taxi/data/pickup_date=2024-01-08/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-09/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-10/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-11/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-12/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-13/data_0.parquet | 0 .../taxi/data/pickup_date=2024-01-14/data_0.parquet | 0 ...a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json | 0 .../019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro | Bin ...5929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro | Bin .../iceberg}/taxi/metadata/v1.metadata.json | 0 25 files changed, 20 insertions(+), 14 deletions(-) rename {iceberg/testdata => testdata/iceberg}/taxi/README.md (98%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-08/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-09/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-10/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-11/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-12/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-13/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/data/pickup_date=2024-01-14/data_0.parquet (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro (100%) rename {iceberg/testdata => testdata/iceberg}/taxi/metadata/v1.metadata.json (100%) diff --git a/docs/upgrade/5.0.0.md b/docs/upgrade/5.0.0.md index e5d0f1ec7..b2e8f1712 100644 --- a/docs/upgrade/5.0.0.md +++ b/docs/upgrade/5.0.0.md @@ -102,3 +102,9 @@ Some(Ok(DesiredTaskCountEventResponse::desired(scan.shards.len()))) // Fractional hints can now be preserved until the planner needs a concrete count. Some(Ok(DesiredTaskCountEventResponse::desired(0.25))) ``` + +## 4. Iceberg test utilities require the `integration` feature + +Enable the `integration` feature on `datafusion-distributed-iceberg` when importing +its `test_utils` module. Run its integration tests with +`cargo test -p datafusion-distributed-iceberg --features integration`. diff --git a/iceberg/AGENTS.md b/iceberg/AGENTS.md index 79a3fba30..5d68d69c3 100644 --- a/iceberg/AGENTS.md +++ b/iceberg/AGENTS.md @@ -2,7 +2,7 @@ ## Tests -- Reuse `src/test_utils/harness.rs` and `testdata/taxi` as much as +- Reuse `src/test_utils/harness.rs` and `testdata/iceberg/taxi` as much as possible. - Prefer integration tests over unit tests when possible. Each isolated feature should have its own dedicated file in `tests/`. diff --git a/iceberg/Cargo.toml b/iceberg/Cargo.toml index 9526a5fb0..b307470c4 100644 --- a/iceberg/Cargo.toml +++ b/iceberg/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" repository = "https://github.com/datafusion-contrib/datafusion-distributed" [features] -# Distributed worker support for the test harness. +# Integration tests and public test utilities, including distributed worker support. integration = ["datafusion-distributed/integration"] [dependencies] diff --git a/iceberg/README.md b/iceberg/README.md index 404ec9c3c..ee023743e 100644 --- a/iceberg/README.md +++ b/iceberg/README.md @@ -30,7 +30,7 @@ The default storage factory resolves `file://`, S3 (`s3://`, `s3a://`, `IcebergIntegrationOptions` to supply custom storage or an Iceberg runtime. ```bash -cargo test -p datafusion-distributed-iceberg +cargo test -p datafusion-distributed-iceberg --features integration ``` Local TPC-H Iceberg benchmarks use the separate diff --git a/iceberg/src/lib.rs b/iceberg/src/lib.rs index 655c35a08..fb35c27eb 100644 --- a/iceberg/src/lib.rs +++ b/iceberg/src/lib.rs @@ -16,6 +16,7 @@ mod table_provider; mod work_unit_feed; mod codec; +#[cfg(any(feature = "integration", test))] #[doc(hidden)] pub mod test_utils; diff --git a/iceberg/src/test_utils/fixture.rs b/iceberg/src/test_utils/fixture.rs index 830503292..e6065d725 100644 --- a/iceberg/src/test_utils/fixture.rs +++ b/iceberg/src/test_utils/fixture.rs @@ -3,7 +3,7 @@ use iceberg::spec::{TableMetadata, TableMetadataBuilder}; /// The complete, checked-in taxi metadata, including its original summary. pub fn taxi_metadata() -> TableMetadata { serde_json::from_str(include_str!( - "../../testdata/taxi/metadata/v1.metadata.json" + "../../../testdata/iceberg/taxi/metadata/v1.metadata.json" )) .expect("taxi metadata is valid JSON") } @@ -11,7 +11,7 @@ pub fn taxi_metadata() -> TableMetadata { /// Starts a fixture history with the original schema and partition IDs and no snapshots. pub fn empty_taxi_metadata_builder() -> TableMetadataBuilder { let metadata = serde_json::from_str(include_str!( - "../../testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json" + "../../../testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json" )) .expect("initial taxi metadata is valid JSON"); TableMetadataBuilder::new_from_metadata(metadata, None) diff --git a/iceberg/src/test_utils/harness.rs b/iceberg/src/test_utils/harness.rs index 86ac69dc7..0520fa37c 100644 --- a/iceberg/src/test_utils/harness.rs +++ b/iceberg/src/test_utils/harness.rs @@ -219,7 +219,7 @@ struct FixtureStorageFactory { impl Default for FixtureStorageFactory { fn default() -> Self { Self { - root: PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("testdata"), + root: PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../testdata/iceberg"), files: HashMap::new(), } } diff --git a/iceberg/tests/desired_task_count.rs b/iceberg/tests/desired_task_count.rs index 72337309a..9ca4ee462 100644 --- a/iceberg/tests/desired_task_count.rs +++ b/iceberg/tests/desired_task_count.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use datafusion::common::Result; use datafusion_distributed::DistributedExt; @@ -7,7 +7,6 @@ mod tests { }; use iceberg::spec::{Snapshot, TableMetadata}; - #[cfg(feature = "integration")] #[tokio::test] async fn executes_with_estimated_scan_tasks() -> Result<()> { // 4,480,382 bytes / 1 MB / 2 partitions rounds up to 3 tasks, not all 4 workers. diff --git a/iceberg/tests/external_table.rs b/iceberg/tests/external_table.rs index 8a3d11b33..ee6daff43 100644 --- a/iceberg/tests/external_table.rs +++ b/iceberg/tests/external_table.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use datafusion::error::Result; use datafusion_distributed_iceberg::test_utils::{FIXTURE_URI, IcebergTestHarness}; diff --git a/iceberg/tests/filter_pushdown.rs b/iceberg/tests/filter_pushdown.rs index 532674aaf..5082193f0 100644 --- a/iceberg/tests/filter_pushdown.rs +++ b/iceberg/tests/filter_pushdown.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use datafusion::error::Result; use datafusion_distributed_iceberg::test_utils::IcebergTestHarness; diff --git a/iceberg/tests/limit_pushdown.rs b/iceberg/tests/limit_pushdown.rs index 532845a98..f59fca4a1 100644 --- a/iceberg/tests/limit_pushdown.rs +++ b/iceberg/tests/limit_pushdown.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use datafusion::error::Result; use datafusion_distributed_iceberg::test_utils::IcebergTestHarness; diff --git a/iceberg/tests/projection_pushdown.rs b/iceberg/tests/projection_pushdown.rs index 3689f4e82..2943411b1 100644 --- a/iceberg/tests/projection_pushdown.rs +++ b/iceberg/tests/projection_pushdown.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use datafusion::error::Result; use datafusion_distributed_iceberg::test_utils::IcebergTestHarness; diff --git a/iceberg/tests/statistics.rs b/iceberg/tests/statistics.rs index d23239c96..3712d04b8 100644 --- a/iceberg/tests/statistics.rs +++ b/iceberg/tests/statistics.rs @@ -1,4 +1,4 @@ -#[cfg(test)] +#[cfg(all(feature = "integration", test))] mod tests { use std::error::Error; use std::sync::Arc; diff --git a/iceberg/testdata/taxi/README.md b/testdata/iceberg/taxi/README.md similarity index 98% rename from iceberg/testdata/taxi/README.md rename to testdata/iceberg/taxi/README.md index b86043bb6..b4fed84e7 100644 --- a/iceberg/testdata/taxi/README.md +++ b/testdata/iceberg/taxi/README.md @@ -67,7 +67,7 @@ COPY ( SELECT * EXCLUDE (row_number) FROM sampled WHERE row_number <= 25000 -) TO 'iceberg/testdata/taxi/data' ( +) TO 'testdata/iceberg/taxi/data' ( FORMAT parquet, PARTITION_BY (pickup_date), COMPRESSION zstd, diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-08/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-08/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-08/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-08/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-09/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-09/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-09/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-09/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-10/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-10/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-10/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-10/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-11/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-11/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-11/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-11/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-12/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-12/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-12/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-12/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-13/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-13/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-13/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-13/data_0.parquet diff --git a/iceberg/testdata/taxi/data/pickup_date=2024-01-14/data_0.parquet b/testdata/iceberg/taxi/data/pickup_date=2024-01-14/data_0.parquet similarity index 100% rename from iceberg/testdata/taxi/data/pickup_date=2024-01-14/data_0.parquet rename to testdata/iceberg/taxi/data/pickup_date=2024-01-14/data_0.parquet diff --git a/iceberg/testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json b/testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json similarity index 100% rename from iceberg/testdata/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json rename to testdata/iceberg/taxi/metadata/00000-00a113a6-47e0-4c4b-9522-4a7c44d74036.metadata.json diff --git a/iceberg/testdata/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro b/testdata/iceberg/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro similarity index 100% rename from iceberg/testdata/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro rename to testdata/iceberg/taxi/metadata/019fdb82-eb66-7582-99a7-9f864b92a53f-m0.avro diff --git a/iceberg/testdata/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro b/testdata/iceberg/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro similarity index 100% rename from iceberg/testdata/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro rename to testdata/iceberg/taxi/metadata/snap-3167948105555765929-0-019fdb82-eb66-7582-99a7-9f864b92a53f.avro diff --git a/iceberg/testdata/taxi/metadata/v1.metadata.json b/testdata/iceberg/taxi/metadata/v1.metadata.json similarity index 100% rename from iceberg/testdata/taxi/metadata/v1.metadata.json rename to testdata/iceberg/taxi/metadata/v1.metadata.json From b6b80c33d31e68eb6fb4cc77761889f786d7f6f1 Mon Sep 17 00:00:00 2001 From: Alex Bianchi <75697973+alexanderbianchi@users.noreply.github.com> Date: Wed, 30 Sep 2026 12:27:54 -0400 Subject: [PATCH 3/3] docs: remove migration note for unreleased Iceberg helpers --- docs/upgrade/5.0.0.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docs/upgrade/5.0.0.md b/docs/upgrade/5.0.0.md index b2e8f1712..e5d0f1ec7 100644 --- a/docs/upgrade/5.0.0.md +++ b/docs/upgrade/5.0.0.md @@ -102,9 +102,3 @@ Some(Ok(DesiredTaskCountEventResponse::desired(scan.shards.len()))) // Fractional hints can now be preserved until the planner needs a concrete count. Some(Ok(DesiredTaskCountEventResponse::desired(0.25))) ``` - -## 4. Iceberg test utilities require the `integration` feature - -Enable the `integration` feature on `datafusion-distributed-iceberg` when importing -its `test_utils` module. Run its integration tests with -`cargo test -p datafusion-distributed-iceberg --features integration`.