This is an automated email from the ASF dual-hosted git repository. gabotechs pushed a commit to branch gabotechs/ci in repository https://gitbox.apache.org/repos/asf/datafusion-iceberg.git
commit e7ce1174e4a6fbb3389884bfaf86d3480d208023 Author: Gabriel <[email protected]> AuthorDate: Mon Sep 21 12:40:58 2026 +0200 Format the codebase --- crates/datafusion/src/physical_plan/commit.rs | 11 ++++--- crates/datafusion/src/physical_plan/project.rs | 26 ++++++++++------ crates/datafusion/src/physical_plan/sort.rs | 11 ++++--- crates/datafusion/src/physical_plan/write.rs | 7 +++-- crates/datafusion/src/schema.rs | 11 ++++--- crates/datafusion/src/task_writer.rs | 43 ++++++++++++++++---------- crates/playground/src/catalog.rs | 2 +- crates/sqllogictest/src/engine/datafusion.rs | 2 +- crates/sqllogictest/src/schedule.rs | 7 +++-- 9 files changed, 73 insertions(+), 47 deletions(-) diff --git a/crates/datafusion/src/physical_plan/commit.rs b/crates/datafusion/src/physical_plan/commit.rs index bb50721..ff4960b 100644 --- a/crates/datafusion/src/physical_plan/commit.rs +++ b/crates/datafusion/src/physical_plan/commit.rs @@ -655,10 +655,13 @@ mod tests { let batches: Vec<RecordBatch> = (1..4) .map(|idx| { - RecordBatch::try_new(arrow_schema.clone(), vec![ - Arc::new(Int32Array::from(vec![idx])) as ArrayRef, - Arc::new(StringArray::from(vec![format!("Name{idx}")])) as ArrayRef, - ]) + RecordBatch::try_new( + arrow_schema.clone(), + vec![ + Arc::new(Int32Array::from(vec![idx])) as ArrayRef, + Arc::new(StringArray::from(vec![format!("Name{idx}")])) as ArrayRef, + ], + ) }) .collect::<Result<_, _>>()?; diff --git a/crates/datafusion/src/physical_plan/project.rs b/crates/datafusion/src/physical_plan/project.rs index a77abd0..2c66642 100644 --- a/crates/datafusion/src/physical_plan/project.rs +++ b/crates/datafusion/src/physical_plan/project.rs @@ -287,12 +287,15 @@ mod tests { Field::new("data", DataType::Utf8, false), ])); - let batch = RecordBatch::try_new(arrow_schema.clone(), vec![ - Arc::new(Int32Array::from(vec![10, 20, 30])), - Arc::new(datafusion::arrow::array::StringArray::from(vec![ - "a", "b", "c", - ])), - ]) + let batch = RecordBatch::try_new( + arrow_schema.clone(), + vec![ + Arc::new(Int32Array::from(vec![10, 20, 30])), + Arc::new(datafusion::arrow::array::StringArray::from(vec![ + "a", "b", "c", + ])), + ], + ) .unwrap(); let partition_spec = Arc::new(partition_spec); @@ -373,10 +376,13 @@ mod tests { ), ]); - let batch = RecordBatch::try_new(arrow_schema.clone(), vec![ - Arc::new(Int32Array::from(vec![1, 2])), - Arc::new(struct_array), - ]) + let batch = RecordBatch::try_new( + arrow_schema.clone(), + vec![ + Arc::new(Int32Array::from(vec![1, 2])), + Arc::new(struct_array), + ], + ) .unwrap(); let calculator = PartitionValueCalculator::try_new(&partition_spec, &table_schema).unwrap(); diff --git a/crates/datafusion/src/physical_plan/sort.rs b/crates/datafusion/src/physical_plan/sort.rs index 587ab12..5df09bc 100644 --- a/crates/datafusion/src/physical_plan/sort.rs +++ b/crates/datafusion/src/physical_plan/sort.rs @@ -147,10 +147,13 @@ mod tests { Field::new("name", DataType::Utf8, false), ])); - let batch = RecordBatch::try_new(schema.clone(), vec![ - Arc::new(Int32Array::from(vec![1, 2, 3])), - Arc::new(StringArray::from(vec!["a", "b", "c"])), - ]) + let batch = RecordBatch::try_new( + schema.clone(), + vec![ + Arc::new(Int32Array::from(vec![1, 2, 3])), + Arc::new(StringArray::from(vec!["a", "b", "c"])), + ], + ) .unwrap(); let ctx = SessionContext::new(); diff --git a/crates/datafusion/src/physical_plan/write.rs b/crates/datafusion/src/physical_plan/write.rs index 40ad9fa..d2e0ed3 100644 --- a/crates/datafusion/src/physical_plan/write.rs +++ b/crates/datafusion/src/physical_plan/write.rs @@ -511,9 +511,10 @@ mod tests { })?; // 3. Create mock input execution plan - let input_plan = Arc::new(MockExecutionPlan::new(arrow_schema.clone(), vec![ - batch.clone(), - ])); + let input_plan = Arc::new(MockExecutionPlan::new( + arrow_schema.clone(), + vec![batch.clone()], + )); // 4. Create IcebergWriteExec let write_exec = IcebergWriteExec::new(table.clone(), input_plan); diff --git a/crates/datafusion/src/schema.rs b/crates/datafusion/src/schema.rs index 545863f..7b74b8f 100644 --- a/crates/datafusion/src/schema.rs +++ b/crates/datafusion/src/schema.rs @@ -334,10 +334,13 @@ mod tests { Field::new("name", DataType::Utf8, true), ])); - let batch = RecordBatch::try_new(arrow_schema.clone(), vec![ - Arc::new(Int32Array::from(vec![1, 2, 3])), - Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie"])), - ]) + let batch = RecordBatch::try_new( + arrow_schema.clone(), + vec![ + Arc::new(Int32Array::from(vec![1, 2, 3])), + Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie"])), + ], + ) .unwrap(); let mem_table = MemTable::try_new(arrow_schema, vec![vec![batch]]).unwrap(); diff --git a/crates/datafusion/src/task_writer.rs b/crates/datafusion/src/task_writer.rs index 99ba5c0..2e85036 100644 --- a/crates/datafusion/src/task_writer.rs +++ b/crates/datafusion/src/task_writer.rs @@ -379,11 +379,14 @@ mod tests { let mut task_writer = TaskWriter::try_new(writer_builder, false, schema, partition_spec)?; // Write data - let batch = RecordBatch::try_new(arrow_schema, vec![ - Arc::new(Int32Array::from(vec![1, 2, 3])), - Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie"])), - Arc::new(StringArray::from(vec!["US", "EU", "US"])), - ])?; + let batch = RecordBatch::try_new( + arrow_schema, + vec![ + Arc::new(Int32Array::from(vec![1, 2, 3])), + Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie"])), + Arc::new(StringArray::from(vec!["US", "EU", "US"])), + ], + )?; task_writer.write(batch).await?; let data_files = task_writer.close().await?; @@ -454,12 +457,15 @@ mod tests { Arc::new(partition_values) as ArrayRef, )]); - let batch = RecordBatch::try_new(arrow_schema, vec![ - Arc::new(Int32Array::from(vec![1, 2, 3, 4])), - Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie", "Dave"])), - Arc::new(StringArray::from(vec!["US", "EU", "US", "EU"])), - Arc::new(partition_struct), - ])?; + let batch = RecordBatch::try_new( + arrow_schema, + vec![ + Arc::new(Int32Array::from(vec![1, 2, 3, 4])), + Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie", "Dave"])), + Arc::new(StringArray::from(vec!["US", "EU", "US", "EU"])), + Arc::new(partition_struct), + ], + )?; task_writer.write(batch).await?; let data_files = task_writer.close().await?; @@ -498,12 +504,15 @@ mod tests { )]); // ClusteredWriter expects data to be pre-sorted by partition - let batch = RecordBatch::try_new(arrow_schema, vec![ - Arc::new(Int32Array::from(vec![1, 2, 3, 4])), - Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie", "Dave"])), - Arc::new(StringArray::from(vec!["ASIA", "ASIA", "EU", "EU"])), - Arc::new(partition_struct), - ])?; + let batch = RecordBatch::try_new( + arrow_schema, + vec![ + Arc::new(Int32Array::from(vec![1, 2, 3, 4])), + Arc::new(StringArray::from(vec!["Alice", "Bob", "Charlie", "Dave"])), + Arc::new(StringArray::from(vec!["ASIA", "ASIA", "EU", "EU"])), + Arc::new(partition_struct), + ], + )?; task_writer.write(batch).await?; let data_files = task_writer.close().await?; diff --git a/crates/playground/src/catalog.rs b/crates/playground/src/catalog.rs index 10a7ac3..36f63c3 100644 --- a/crates/playground/src/catalog.rs +++ b/crates/playground/src/catalog.rs @@ -21,11 +21,11 @@ use std::sync::Arc; use anyhow::anyhow; use datafusion::catalog::{CatalogProvider, CatalogProviderList}; +use datafusion_iceberg::IcebergCatalogProvider; use fs_err::read_to_string; use iceberg::CatalogBuilder; use iceberg::memory::MemoryCatalogBuilder; use iceberg_catalog_rest::RestCatalogBuilder; -use datafusion_iceberg::IcebergCatalogProvider; use toml::{Table as TomlTable, Value}; const CONFIG_NAME_CATALOGS: &str = "catalogs"; diff --git a/crates/sqllogictest/src/engine/datafusion.rs b/crates/sqllogictest/src/engine/datafusion.rs index 56008a0..5402c97 100644 --- a/crates/sqllogictest/src/engine/datafusion.rs +++ b/crates/sqllogictest/src/engine/datafusion.rs @@ -21,6 +21,7 @@ use std::sync::Arc; use datafusion::catalog::CatalogProvider; use datafusion::prelude::{SessionConfig, SessionContext}; +use datafusion_iceberg::IcebergCatalogProvider; use datafusion_sqllogictest::DataFusion; use iceberg::encryption::kms::MemoryKmsClientFactory; use iceberg::memory::{MEMORY_CATALOG_WAREHOUSE, MemoryCatalogBuilder}; @@ -28,7 +29,6 @@ use iceberg::spec::{ NestedField, PrimitiveType, Schema, TableProperties, Transform, Type, UnboundPartitionSpec, }; use iceberg::{Catalog, CatalogBuilder, NamespaceIdent, TableCreation}; -use datafusion_iceberg::IcebergCatalogProvider; use indicatif::ProgressBar; use crate::engine::{DatafusionCatalogConfig, EngineRunner, run_slt_with_runner}; diff --git a/crates/sqllogictest/src/schedule.rs b/crates/sqllogictest/src/schedule.rs index 29e37c5..4dc3da3 100644 --- a/crates/sqllogictest/src/schedule.rs +++ b/crates/sqllogictest/src/schedule.rs @@ -147,9 +147,10 @@ mod tests { assert_eq!(config.engines.len(), 1); assert!(config.engines.contains_key("df")); - assert!(matches!(config.engines["df"], EngineConfig::Datafusion { - catalog: None - })); + assert!(matches!( + config.engines["df"], + EngineConfig::Datafusion { catalog: None } + )); assert_eq!(config.steps.len(), 1); assert_eq!(config.steps[0].engine, "df"); assert_eq!(config.steps[0].slt, "test.slt"); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
