fix

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

bench-vortex/rustfmt.toml

@@ -0,0 +1 @@
+imports_granularity = "Module"

bench-vortex/src/bench_run.rs

@@ -3,8 +3,7 @@
 
 use std::future::Future;
 use std::hint::black_box;
-use std::time::Duration;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use tokio::runtime::Runtime;
 

bench-vortex/src/benchmark_driver.rs

@@ -12,25 +12,15 @@ use log::warn;
 use vortex::error::VortexExpect;
 use vortex_datafusion::metrics::VortexMetricsFinder;
 
-use crate::Engine;
-use crate::Format;
-use crate::Target;
 use crate::benchmark_trait::Benchmark;
-use crate::df;
 use crate::display::DisplayFormat;
-use crate::engines::EngineCtx;
-use crate::engines::benchmark_datafusion_query;
-use crate::measurements::MemoryMeasurement;
-use crate::measurements::QueryMeasurement;
+use crate::engines::{EngineCtx, benchmark_datafusion_query};
+use crate::measurements::{MemoryMeasurement, QueryMeasurement};
 use crate::memory::BenchmarkMemoryTracker;
-use crate::metrics::MetricsSetExt;
-use crate::metrics::export_plan_spans;
-use crate::query_bench::filter_queries;
-use crate::query_bench::print_memory_usage;
-use crate::query_bench::print_results;
-use crate::utils::new_tokio_runtime;
-use crate::utils::url_scheme_to_storage;
-use crate::vortex_panic;
+use crate::metrics::{MetricsSetExt, export_plan_spans};
+use crate::query_bench::{filter_queries, print_memory_usage, print_results};
+use crate::utils::{new_tokio_runtime, url_scheme_to_storage};
+use crate::{Engine, Format, Target, df, vortex_panic};
 
 /// Mode for EXPLAIN queries
 #[derive(Debug, Clone, Copy)]

bench-vortex/src/benchmark_trait.rs

@@ -6,12 +6,8 @@
 use anyhow::Result;
 use url::Url;
 
-use crate::BenchmarkDataset;
-use crate::Engine;
-use crate::Format;
-use crate::Target;
-use crate::df;
 use crate::engines::EngineCtx;
+use crate::{BenchmarkDataset, Engine, Format, Target, df};
 
 /// Core benchmark operations that all benchmark types implement
 pub trait Benchmark {

bench-vortex/src/bin/compress.rs

@@ -2,48 +2,33 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::fs::File;
-use std::io::Write;
-use std::io::stdout;
+use std::io::{Write, stdout};
 use std::path::PathBuf;
 use std::time::Duration;
 
-use bench_vortex::Engine;
-use bench_vortex::Format;
-use bench_vortex::Target;
-use bench_vortex::compress::bench::CompressMeasurements;
-use bench_vortex::compress::bench::CompressOp;
-use bench_vortex::compress::bench::{self as compress};
+use bench_vortex::compress::bench::{
+    CompressMeasurements, CompressOp, {self as compress},
+};
 use bench_vortex::datasets::Dataset;
 use bench_vortex::datasets::struct_list_of_ints::StructListOfInts;
 use bench_vortex::datasets::taxi_data::TaxiData;
-use bench_vortex::datasets::tpch_l_comment::TPCHLCommentCanonical;
-use bench_vortex::datasets::tpch_l_comment::TPCHLCommentChunked;
-use bench_vortex::display::DisplayFormat;
-use bench_vortex::display::print_measurements_json;
-use bench_vortex::display::render_table;
+use bench_vortex::datasets::tpch_l_comment::{TPCHLCommentCanonical, TPCHLCommentChunked};
+use bench_vortex::display::{DisplayFormat, print_measurements_json, render_table};
 use bench_vortex::downloadable_dataset::DownloadableDataset;
-use bench_vortex::measurements::CompressionTimingMeasurement;
-use bench_vortex::measurements::CustomUnitMeasurement;
+use bench_vortex::measurements::{CompressionTimingMeasurement, CustomUnitMeasurement};
 use bench_vortex::public_bi::PBI_DATASETS;
-use bench_vortex::public_bi::PBIDataset::Arade;
-use bench_vortex::public_bi::PBIDataset::Bimbo;
-use bench_vortex::public_bi::PBIDataset::CMSprovider;
-use bench_vortex::public_bi::PBIDataset::Euro2016;
-use bench_vortex::public_bi::PBIDataset::Food;
-use bench_vortex::public_bi::PBIDataset::HashTags;
-use bench_vortex::setup_logging_and_tracing;
+use bench_vortex::public_bi::PBIDataset::{Arade, Bimbo, CMSprovider, Euro2016, Food, HashTags};
 use bench_vortex::utils::new_tokio_runtime;
+use bench_vortex::{Engine, Format, Target, setup_logging_and_tracing};
 use clap::Parser;
 use indicatif::ProgressBar;
 use itertools::Itertools;
 use regex::Regex;
 use tokio::runtime::Runtime;
-use vortex::Array;
-use vortex::IntoArray;
-use vortex::arrays::ChunkedArray;
-use vortex::arrays::ChunkedVTable;
+use vortex::arrays::{ChunkedArray, ChunkedVTable};
 use vortex::builders::builder_with_capacity;
 use vortex::utils::aliases::hash_map::HashMap;
+use vortex::{Array, IntoArray};
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

bench-vortex/src/bin/public_bi.rs

@@ -2,34 +2,22 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::fs::File;
-use std::io::Write;
-use std::io::stdout;
+use std::io::{Write, stdout};
 use std::path::PathBuf;
 use std::time::Instant;
 
-use bench_vortex::BenchmarkDataset;
-use bench_vortex::Format;
-use bench_vortex::Target;
-use bench_vortex::df;
-use bench_vortex::display::DisplayFormat;
-use bench_vortex::display::print_measurements_json;
-use bench_vortex::display::render_table;
+use bench_vortex::display::{DisplayFormat, print_measurements_json, render_table};
 use bench_vortex::measurements::QueryMeasurement;
 use bench_vortex::metrics::MetricsSetExt;
-use bench_vortex::public_bi::FileType;
-use bench_vortex::public_bi::PBI_DATASETS;
-use bench_vortex::public_bi::PBIDataset;
-use bench_vortex::setup_logging_and_tracing;
+use bench_vortex::public_bi::{FileType, PBI_DATASETS, PBIDataset};
 use bench_vortex::utils::constants::STORAGE_NVME;
 use bench_vortex::utils::new_tokio_runtime;
-use clap::Parser;
-use clap::value_parser;
+use bench_vortex::{BenchmarkDataset, Format, Target, df, setup_logging_and_tracing};
+use clap::{Parser, value_parser};
 use indicatif::ProgressBar;
 use itertools::Itertools;
-use tracing::Instrument;
-use tracing::info_span;
-use vortex::error::VortexExpect;
-use vortex::error::vortex_panic;
+use tracing::{Instrument, info_span};
+use vortex::error::{VortexExpect, vortex_panic};
 use vortex_datafusion::metrics::VortexMetricsFinder;
 
 #[derive(Parser, Debug)]

bench-vortex/src/bin/query_bench.rs

@@ -3,22 +3,16 @@
 
 use std::path::PathBuf;
 
-use bench_vortex::IdempotentPath as _;
-use bench_vortex::Target;
-use bench_vortex::benchmark_driver::DriverConfig;
-use bench_vortex::benchmark_driver::run_benchmark;
-use bench_vortex::clickbench::ClickBenchBenchmark;
-use bench_vortex::clickbench::Flavor;
+use bench_vortex::benchmark_driver::{DriverConfig, run_benchmark};
+use bench_vortex::clickbench::{ClickBenchBenchmark, Flavor};
 use bench_vortex::display::DisplayFormat;
 use bench_vortex::fineweb::Fineweb;
 use bench_vortex::realnest::gharchive::GithubArchive;
-use bench_vortex::setup_logging_and_tracing;
 use bench_vortex::statpopgen::StatPopGenBenchmark;
 use bench_vortex::tpcds::TpcDsBenchmark;
 use bench_vortex::tpch::tpch_benchmark::TpcHBenchmark;
-use clap::Parser;
-use clap::Subcommand;
-use clap::value_parser;
+use bench_vortex::{IdempotentPath as _, Target, setup_logging_and_tracing};
+use clap::{Parser, Subcommand, value_parser};
 use url::Url;
 
 #[derive(Parser, Debug)]

bench-vortex/src/bin/random_access.rs

@@ -3,37 +3,27 @@
 
 use std::fs::File;
 use std::future::Future;
-use std::io::Write;
-use std::io::stdout;
+use std::io::{Write, stdout};
 use std::path::PathBuf;
 
-use bench_vortex::Engine;
-use bench_vortex::Format;
-use bench_vortex::Target;
 use bench_vortex::bench_run::run_timed_with_setup;
 use bench_vortex::datasets::taxi_data::*;
-use bench_vortex::display::DisplayFormat;
-use bench_vortex::display::print_measurements_json;
-use bench_vortex::display::render_table;
+use bench_vortex::display::{DisplayFormat, print_measurements_json, render_table};
 use bench_vortex::measurements::TimingMeasurement;
 #[cfg(feature = "lance")]
 use bench_vortex::random_access::take::take_lance;
-use bench_vortex::random_access::take::take_parquet;
-use bench_vortex::random_access::take::take_vortex_tokio;
-use bench_vortex::setup_logging_and_tracing;
+use bench_vortex::random_access::take::{take_parquet, take_vortex_tokio};
 use bench_vortex::utils::constants::STORAGE_NVME;
 use bench_vortex::utils::new_tokio_runtime;
+use bench_vortex::{Engine, Format, Target, setup_logging_and_tracing};
 use clap::Parser;
 use indicatif::ProgressBar;
 use tokio::runtime::Runtime;
-use vortex::Array;
-use vortex::ArrayRef;
-use vortex::ToCanonical;
-use vortex::buffer::Buffer;
-use vortex::buffer::buffer;
+use vortex::buffer::{Buffer, buffer};
 use vortex::dtype::Nullability::NonNullable;
 use vortex::error::VortexExpect;
 use vortex::scalar::Scalar;
+use vortex::{Array, ArrayRef, ToCanonical};
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]

bench-vortex/src/clickbench/clickbench_benchmark.rs

@@ -9,14 +9,10 @@ use tokio::runtime::Runtime;
 use url::Url;
 use vortex::error::VortexExpect;
 
-use crate::BenchmarkDataset;
-use crate::CompactionStrategy;
-use crate::Format;
-use crate::IdempotentPath;
-use crate::Target;
 use crate::benchmark_trait::Benchmark;
 use crate::clickbench::*;
 use crate::engines::EngineCtx;
+use crate::{BenchmarkDataset, CompactionStrategy, Format, IdempotentPath, Target};
 
 /// ClickBench benchmark implementation
 pub struct ClickBenchBenchmark {

bench-vortex/src/clickbench/clickbench_data.rs

@@ -1,55 +1,39 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-use std::fmt;
 use std::fmt::Display;
-use std::fs;
 use std::fs::File;
-use std::path::Path;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::sync::LazyLock;
+use std::path::{Path, PathBuf};
+use std::sync::{Arc, LazyLock};
 use std::time::Duration;
+use std::{fmt, fs};
 
-use arrow_schema::DataType;
-use arrow_schema::Field;
-use arrow_schema::Schema;
-use arrow_schema::TimeUnit;
+use arrow_schema::{DataType, Field, Schema, TimeUnit};
 use clap::ValueEnum;
 use datafusion::datasource::file_format::parquet::ParquetFormat;
-use datafusion::datasource::listing::ListingOptions;
-use datafusion::datasource::listing::ListingTable;
-use datafusion::datasource::listing::ListingTableConfig;
-use datafusion::datasource::listing::ListingTableUrl;
+use datafusion::datasource::listing::{
+    ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl,
+};
 use datafusion::prelude::SessionContext;
-use futures::StreamExt;
-use futures::TryStreamExt;
-use futures::stream;
+use futures::{StreamExt, TryStreamExt, stream};
 use glob::Pattern;
 use log::trace;
-use rayon::prelude::IntoParallelIterator;
-use rayon::prelude::ParallelIterator;
+use rayon::prelude::{IntoParallelIterator, ParallelIterator};
 use reqwest::IntoUrl;
 use reqwest::blocking::Response;
 use serde::Serialize;
-use tokio::fs::OpenOptions;
-use tokio::fs::create_dir_all;
-use tracing::Instrument;
-use tracing::info;
-use tracing::warn;
+use tokio::fs::{OpenOptions, create_dir_all};
+use tracing::{Instrument, info, warn};
 use url::Url;
 use vortex::error::VortexExpect;
 use vortex::file::WriteOptionsSessionExt;
 use vortex_datafusion::VortexFormat;
 
-use crate::CompactionStrategy;
-use crate::Format;
-use crate::SESSION;
 use crate::conversions::parquet_to_vortex;
 #[cfg(feature = "lance")]
 use crate::utils;
-use crate::utils::file_utils::idempotent;
-use crate::utils::file_utils::idempotent_async;
+use crate::utils::file_utils::{idempotent, idempotent_async};
+use crate::{CompactionStrategy, Format, SESSION};
 
 pub static HITS_SCHEMA: LazyLock<Schema> = LazyLock::new(|| {
     use DataType::*;