From c25a1a9554b3348eda99220284bccd0d28ed1c8c Mon Sep 17 00:00:00 2001 From: Scott Donnelly Date: Tue, 30 Jul 2024 20:19:11 +0100 Subject: [PATCH] style: fmt --- .../iceberg/benches/table_scan_plan_files.rs | 32 +++++++++---------- crates/iceberg/benches/utils.rs | 3 +- crates/iceberg/tests/read_performance_test.rs | 7 ++-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/crates/iceberg/benches/table_scan_plan_files.rs b/crates/iceberg/benches/table_scan_plan_files.rs index bdf8f7ad6..2e885f5b5 100644 --- a/crates/iceberg/benches/table_scan_plan_files.rs +++ b/crates/iceberg/benches/table_scan_plan_files.rs @@ -20,12 +20,11 @@ use futures_util::StreamExt; use tokio::runtime::Runtime; mod utils; -use utils::build_catalog; - use iceberg::expr::Reference; use iceberg::spec::Datum; use iceberg::table::Table; use iceberg::Catalog; +use utils::build_catalog; async fn setup_async() -> Table { let catalog = build_catalog().await; @@ -82,20 +81,21 @@ async fn all_files_some_rows(table: &Table) { } async fn one_file_some_rows(table: &Table) { - let scan = table - .scan() - .with_filter( - Reference::new("tpep_pickup_datetime") - .greater_than_or_equal_to( - Datum::timestamptz_from_str("2024-02-01T00:00:00.000 UTC").unwrap(), - ) - .and(Reference::new("tpep_pickup_datetime").less_than( - Datum::timestamptz_from_str("2024-02-02T00:00:00.000 UTC").unwrap(), - )) - .and(Reference::new("passenger_count").equal_to(Datum::double(1.0))), - ) - .build() - .unwrap(); + let scan = + table + .scan() + .with_filter( + Reference::new("tpep_pickup_datetime") + .greater_than_or_equal_to( + Datum::timestamptz_from_str("2024-02-01T00:00:00.000 UTC").unwrap(), + ) + .and(Reference::new("tpep_pickup_datetime").less_than( + Datum::timestamptz_from_str("2024-02-02T00:00:00.000 UTC").unwrap(), + )) + .and(Reference::new("passenger_count").equal_to(Datum::double(1.0))), + ) + .build() + .unwrap(); let mut stream = scan.plan_files().await.unwrap(); while let Some(item) = stream.next().await { diff --git a/crates/iceberg/benches/utils.rs b/crates/iceberg/benches/utils.rs index ccefe2b7d..3703dd406 100644 --- a/crates/iceberg/benches/utils.rs +++ b/crates/iceberg/benches/utils.rs @@ -15,10 +15,11 @@ // specific language governing permissions and limitations // under the License. +use std::collections::HashMap; + use iceberg::io::{S3_ACCESS_KEY_ID, S3_ENDPOINT, S3_REGION, S3_SECRET_ACCESS_KEY}; use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig}; use iceberg_test_utils::docker::DockerCompose; -use std::collections::HashMap; pub fn get_docker_compose() -> DockerCompose { DockerCompose::new( diff --git a/crates/iceberg/tests/read_performance_test.rs b/crates/iceberg/tests/read_performance_test.rs index e670f74a8..409d7e6ea 100644 --- a/crates/iceberg/tests/read_performance_test.rs +++ b/crates/iceberg/tests/read_performance_test.rs @@ -17,6 +17,10 @@ //! Performance tests for FileIO S3 table scans +use std::collections::HashMap; +use std::process::Command; +use std::sync::RwLock; + use ctor::{ctor, dtor}; use futures_util::stream::TryStreamExt; use iceberg::io::{ @@ -26,9 +30,6 @@ use iceberg::Catalog; use iceberg_catalog_rest::{RestCatalog, RestCatalogConfig}; use iceberg_test_utils::docker::DockerCompose; use iceberg_test_utils::{normalize_test_name, set_up}; -use std::collections::HashMap; -use std::process::Command; -use std::sync::RwLock; static DOCKER_COMPOSE_ENV: RwLock> = RwLock::new(None);