Fix vortex::array namespace

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

bench-vortex/src/bin/compress.rs

@@ -2,47 +2,47 @@
 // SPDX-FileCopyrightText: Copyright the Vortex contributors
 
 use std::fs::File;
-use std::io::stdout;
 use std::io::Write;
+use std::io::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 as compress;
 use bench_vortex::compress::bench::CompressMeasurements;
 use bench_vortex::compress::bench::CompressOp;
+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::datasets::Dataset;
+use bench_vortex::display::DisplayFormat;
 use bench_vortex::display::print_measurements_json;
 use bench_vortex::display::render_table;
-use bench_vortex::display::DisplayFormat;
 use bench_vortex::downloadable_dataset::DownloadableDataset;
 use bench_vortex::measurements::CompressionTimingMeasurement;
 use bench_vortex::measurements::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::public_bi::PBI_DATASETS;
 use bench_vortex::setup_logging_and_tracing;
 use bench_vortex::utils::new_tokio_runtime;
-use bench_vortex::Engine;
-use bench_vortex::Format;
-use bench_vortex::Target;
 use clap::Parser;
 use indicatif::ProgressBar;
 use itertools::Itertools;
 use regex::Regex;
 use tokio::runtime::Runtime;
+use vortex::array::Array;
+use vortex::array::IntoArray;
 use vortex::array::arrays::ChunkedArray;
 use vortex::array::arrays::ChunkedVTable;
 use vortex::array::builders::builder_with_capacity;
-use vortex::array::Array;
-use vortex::array::IntoArray;
 use vortex::utils::aliases::hash_map::HashMap;
 
 #[derive(Parser, Debug)]

bench-vortex/src/bin/random_access.rs

@@ -3,15 +3,18 @@
 
 use std::fs::File;
 use std::future::Future;
-use std::io::stdout;
 use std::io::Write;
+use std::io::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;
 use bench_vortex::measurements::TimingMeasurement;
 #[cfg(feature = "lance")]
 use bench_vortex::random_access::take::take_lance;
@@ -20,17 +23,14 @@ use bench_vortex::random_access::take::take_vortex_tokio;
 use bench_vortex::setup_logging_and_tracing;
 use bench_vortex::utils::constants::STORAGE_NVME;
 use bench_vortex::utils::new_tokio_runtime;
-use bench_vortex::Engine;
-use bench_vortex::Format;
-use bench_vortex::Target;
 use clap::Parser;
 use indicatif::ProgressBar;
 use tokio::runtime::Runtime;
 use vortex::array::Array;
 use vortex::array::ArrayRef;
 use vortex::array::ToCanonical;
-use vortex::buffer::buffer;
 use vortex::buffer::Buffer;
+use vortex::buffer::buffer;
 use vortex::dtype::Nullability::NonNullable;
 use vortex::error::VortexExpect;
 use vortex::scalar::Scalar;

bench-vortex/src/compress/bench.rs

@@ -14,8 +14,8 @@ use parquet::basic::Compression;
 use parquet::basic::ZstdLevel;
 use serde::Serialize;
 use tokio::runtime::Runtime;
-use vortex::array::arrays::ChunkedVTable;
 use vortex::array::Array;
+use vortex::array::arrays::ChunkedVTable;
 use vortex::utils::aliases::hash_map::HashMap;
 #[cfg(feature = "lance")]
 #[rustfmt::skip]
@@ -31,6 +31,7 @@ use {
     std::sync::Arc,
 };
 
+use crate::Format;
 use crate::bench_run::run;
 use crate::compress::chunked_to_vec_record_batch;
 use crate::compress::parquet::parquet_compress_write;
@@ -39,7 +40,6 @@ use crate::compress::vortex::vortex_compress_write;
 use crate::compress::vortex::vortex_decompress_read;
 use crate::measurements::CompressionTimingMeasurement;
 use crate::measurements::CustomUnitMeasurement;
-use crate::Format;
 
 #[derive(Default)]
 pub struct CompressMeasurements {

bench-vortex/src/compress/mod.rs

@@ -3,10 +3,10 @@
 
 use std::sync::Arc;
 
+use ::vortex::array::arrays::ChunkedArray;
+use ::vortex::array::arrays::recursive_list_from_list_view;
 use arrow_array::RecordBatch;
 use arrow_schema::Schema;
-use ::vortex::array::arrays::recursive_list_from_list_view;
-use ::vortex::array::arrays::ChunkedArray;
 
 pub mod bench;
 

bench-vortex/src/compress/vortex.rs

@@ -5,8 +5,8 @@ use std::io::Cursor;
 use std::sync::Arc;
 
 use bytes::Bytes;
-use futures::pin_mut;
 use futures::StreamExt;
+use futures::pin_mut;
 use vortex::array::Array;
 use vortex::file::OpenOptionsSessionExt;
 use vortex::file::WriteOptionsSessionExt;

bench-vortex/src/conversions.rs

@@ -6,14 +6,14 @@ use std::path::PathBuf;
 
 use arrow_array::RecordBatchReader;
 use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
+use vortex::array::ArrayRef;
 use vortex::array::arrow::FromArrowArray;
 use vortex::array::iter::ArrayIteratorAdapter;
 use vortex::array::iter::ArrayIteratorExt;
-use vortex::array::ArrayRef;
-use vortex::dtype::arrow::FromArrowType;
+use vortex::array::stream::ArrayStream;
 use vortex::dtype::DType;
+use vortex::dtype::arrow::FromArrowType;
 use vortex::error::VortexError;
-use vortex::array::stream::ArrayStream;
 
 pub fn parquet_to_vortex(parquet_path: PathBuf) -> anyhow::Result<impl ArrayStream> {
     let reader = ParquetRecordBatchReaderBuilder::try_new(File::open(parquet_path)?)?.build()?;

bench-vortex/src/datasets/struct_list_of_ints.rs

@@ -3,16 +3,16 @@
 
 use anyhow::Result;
 use async_trait::async_trait;
-use rand::rngs::StdRng;
 use rand::Rng;
 use rand::SeedableRng;
+use rand::rngs::StdRng;
+use vortex::array::ArrayRef;
+use vortex::array::IntoArray;
 use vortex::array::arrays::ChunkedArray;
 use vortex::array::arrays::ListArray;
 use vortex::array::arrays::PrimitiveArray;
 use vortex::array::arrays::StructArray;
 use vortex::array::validity::Validity;
-use vortex::array::ArrayRef;
-use vortex::array::IntoArray;
 use vortex::dtype::FieldNames;
 
 use crate::datasets::Dataset;

bench-vortex/src/datasets/taxi_data.rs

@@ -8,9 +8,9 @@ use async_trait::async_trait;
 use tokio::fs::File as TokioFile;
 use tokio::io::AsyncWriteExt;
 use vortex::array::ArrayRef;
+use vortex::array::stream::ArrayStreamExt;
 use vortex::file::OpenOptionsSessionExt;
 use vortex::file::WriteOptionsSessionExt;
-use vortex::array::stream::ArrayStreamExt;
 #[cfg(feature = "lance")]
 #[rustfmt::skip]
 use {

bench-vortex/src/downloadable_dataset.rs

@@ -4,9 +4,9 @@
 use async_trait::async_trait;
 use tokio::fs::File;
 use vortex::array::ArrayRef;
+use vortex::array::stream::ArrayStreamExt;
 use vortex::file::OpenOptionsSessionExt;
 use vortex::file::WriteOptionsSessionExt;
-use vortex::array::stream::ArrayStreamExt;
 
 use crate::IdempotentPath;
 use crate::SESSION;

bench-vortex/src/random_access/take.rs

@@ -4,9 +4,9 @@
 use std::iter;
 use std::path::Path;
 
-use arrow_array::types::Int64Type;
 use arrow_array::PrimitiveArray;
 use arrow_array::RecordBatch;
+use arrow_array::types::Int64Type;
 use arrow_select::concat::concat_batches;
 use arrow_select::take::take_record_batch;
 use futures::stream;
@@ -17,17 +17,17 @@ use lance::dataset::{
     Dataset,
     ProjectionRequest
 };
+use parquet::arrow::ParquetRecordBatchStreamBuilder;
 use parquet::arrow::arrow_reader::ArrowReaderOptions;
 use parquet::arrow::async_reader::AsyncFileReader;
-use parquet::arrow::ParquetRecordBatchStreamBuilder;
 use parquet::file::metadata::RowGroupMetaData;
 use stream::StreamExt;
 use vortex::array::Array;
 use vortex::array::ArrayRef;
 use vortex::array::IntoArray;
+use vortex::array::stream::ArrayStreamExt;
 use vortex::buffer::Buffer;
 use vortex::file::OpenOptionsSessionExt;
-use vortex::array::stream::ArrayStreamExt;
 use vortex::utils::aliases::hash_map::HashMap;
 
 use crate::SESSION;