Merge

Signed-off-by: Nicholas Gates <nick@nickgates.com>

Author: gatesn

bench-vortex/src/bin/compress.rs

@@ -10,9 +10,9 @@ 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::compress::bench::{self as compress};
 use bench_vortex::datasets::Dataset;
 use bench_vortex::datasets::struct_list_of_ints::StructListOfInts;
 use bench_vortex::datasets::taxi_data::TaxiData;
@@ -38,11 +38,11 @@ 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::builders::builder_with_capacity;
+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::utils::aliases::hash_map::HashMap;
 
 #[derive(Parser, Debug)]

bench-vortex/src/bin/random_access.rs

@@ -26,9 +26,9 @@ use bench_vortex::utils::new_tokio_runtime;
 use clap::Parser;
 use indicatif::ProgressBar;
 use tokio::runtime::Runtime;
-use vortex::Array;
-use vortex::ArrayRef;
-use vortex::ToCanonical;
+use vortex::array::Array;
+use vortex::array::ArrayRef;
+use vortex::array::ToCanonical;
 use vortex::buffer::Buffer;
 use vortex::buffer::buffer;
 use vortex::dtype::Nullability::NonNullable;

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;
-use vortex::arrays::ChunkedVTable;
+use vortex::array::Array;
+use vortex::array::arrays::ChunkedVTable;
 use vortex::utils::aliases::hash_map::HashMap;
 #[cfg(feature = "lance")]
 #[rustfmt::skip]

bench-vortex/src/compress/mod.rs

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

bench-vortex/src/compress/vortex.rs

@@ -7,7 +7,7 @@ use std::sync::Arc;
 use bytes::Bytes;
 use futures::StreamExt;
 use futures::pin_mut;
-use vortex::Array;
+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::ArrayRef;
-use vortex::arrow::FromArrowArray;
+use vortex::array::ArrayRef;
+use vortex::array::arrow::FromArrowArray;
+use vortex::array::iter::ArrayIteratorAdapter;
+use vortex::array::iter::ArrayIteratorExt;
+use vortex::array::stream::ArrayStream;
 use vortex::dtype::DType;
 use vortex::dtype::arrow::FromArrowType;
 use vortex::error::VortexError;
-use vortex::iter::ArrayIteratorAdapter;
-use vortex::iter::ArrayIteratorExt;
-use vortex::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/mod.rs

@@ -8,7 +8,7 @@ use async_trait::async_trait;
 use datafusion::prelude::SessionContext;
 use serde::Serialize;
 use url::Url;
-use vortex::ArrayRef;
+use vortex::array::ArrayRef;
 
 use crate::Format;
 use crate::clickbench;

bench-vortex/src/datasets/struct_list_of_ints.rs

@@ -6,14 +6,14 @@ use async_trait::async_trait;
 use rand::Rng;
 use rand::SeedableRng;
 use rand::rngs::StdRng;
-use vortex::ArrayRef;
-use vortex::IntoArray;
-use vortex::arrays::ChunkedArray;
-use vortex::arrays::ListArray;
-use vortex::arrays::PrimitiveArray;
-use vortex::arrays::StructArray;
+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::dtype::FieldNames;
-use vortex::validity::Validity;
 
 use crate::datasets::Dataset;
 

bench-vortex/src/datasets/taxi_data.rs

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

bench-vortex/src/datasets/tpch_l_comment.rs

@@ -5,11 +5,11 @@ use anyhow::Result;
 use async_trait::async_trait;
 use futures::TryStreamExt;
 use glob::glob;
-use vortex::Array;
-use vortex::ArrayRef;
-use vortex::IntoArray;
-use vortex::ToCanonical;
-use vortex::arrays::ChunkedArray;
+use vortex::array::Array;
+use vortex::array::ArrayRef;
+use vortex::array::IntoArray;
+use vortex::array::ToCanonical;
+use vortex::array::arrays::ChunkedArray;
 use vortex::dtype::Nullability::NonNullable;
 use vortex::expr::col;
 use vortex::expr::pack;