Move Arrow dtype conversion into vortex-dtype (#2588)

Also bring datetime extension types in

Author: gatesn

Cargo.lock

@@ -9,7 +9,6 @@ members = [
     "vortex-btrblocks",
     "vortex-buffer",
     "vortex-datafusion",
-    "vortex-datetime-dtype",
     "vortex-dtype",
     "vortex-error",
     "vortex-expr",
@@ -171,7 +170,6 @@ vortex-btrblocks = { version = "0.25.2", path = "./vortex-btrblocks" }
 vortex-buffer = { version = "0.25.2", path = "./vortex-buffer" }
 vortex-bytebool = { version = "0.25.2", path = "./encodings/bytebool" }
 vortex-datafusion = { version = "0.25.2", path = "./vortex-datafusion" }
-vortex-datetime-dtype = { version = "0.25.2", path = "./vortex-datetime-dtype" }
 vortex-datetime-parts = { version = "0.25.2", path = "./encodings/datetime-parts" }
 vortex-dict = { version = "0.25.2", path = "./encodings/dict" }
 vortex-dtype = { version = "0.25.2", path = "./vortex-dtype", default-features = false }

Cargo.toml

@@ -10,7 +10,7 @@ use vortex::arrays::{
     VarBinViewArray,
 };
 use vortex::buffer::buffer;
-use vortex::datetime_dtype::{TIME_ID, TemporalMetadata, TimeUnit};
+use vortex::dtype::datetime::{TIME_ID, TemporalMetadata, TimeUnit};
 use vortex::dtype::{DType, ExtDType, Nullability, PType};
 use vortex::encodings::alp::{ALPArray, Exponents, RDEncoder};
 use vortex::encodings::bytebool::ByteBoolArray;

bench-vortex/src/bin/notimplemented.rs

@@ -11,8 +11,8 @@ use futures::{StreamExt, TryStreamExt, stream};
 use tokio::fs::{OpenOptions, create_dir_all};
 use tracing::info;
 use vortex::TryIntoArray;
-use vortex::arrow::FromArrowType;
 use vortex::dtype::DType;
+use vortex::dtype::arrow::FromArrowType;
 use vortex::error::{VortexError, vortex_err};
 use vortex::file::{DEFAULT_REGISTRY, VORTEX_FILE_EXTENSION, VortexWriteOptions};
 use vortex::layout::{LayoutRegistry, LayoutRegistryExt};

bench-vortex/src/clickbench.rs

@@ -4,8 +4,8 @@ use std::path::PathBuf;
 use arrow_array::RecordBatchReader;
 use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
 use vortex::TryIntoArray;
-use vortex::arrow::FromArrowType;
 use vortex::dtype::DType;
+use vortex::dtype::arrow::FromArrowType;
 use vortex::error::{VortexError, VortexResult};
 use vortex::iter::{ArrayIteratorAdapter, ArrayIteratorExt};
 use vortex::stream::ArrayStream;

bench-vortex/src/parquet_reader.rs

@@ -21,7 +21,7 @@ use object_store::path::Path as ObjectStorePath;
 use tokio::fs::OpenOptions;
 use url::Url;
 use vortex::arrays::ChunkedArray;
-use vortex::arrow::{FromArrowArray, FromArrowType};
+use vortex::arrow::FromArrowArray;
 use vortex::dtype::DType;
 use vortex::error::VortexExpect as _;
 use vortex::file::{DEFAULT_REGISTRY, VORTEX_FILE_EXTENSION, VortexWriteOptions};
@@ -38,6 +38,7 @@ mod execute;
 pub mod schema;
 
 pub use execute::*;
+use vortex::dtype::arrow::FromArrowType;
 use vortex::error::VortexError;
 use vortex::stream::ArrayStreamAdapter;
 

bench-vortex/src/tpch/mod.rs

@@ -21,7 +21,6 @@ getrandom_v02 = { workspace = true }
 rkyv = { workspace = true }
 vortex-array = { workspace = true }
 vortex-buffer = { workspace = true }
-vortex-datetime-dtype = { workspace = true }
 vortex-dtype = { workspace = true }
 vortex-error = { workspace = true }
 vortex-mask = { workspace = true }

encodings/datetime-parts/Cargo.toml

@@ -3,8 +3,8 @@ use vortex_array::compute::try_cast;
 use vortex_array::validity::Validity;
 use vortex_array::{Array, ArrayCanonicalImpl, Canonical, ToCanonical};
 use vortex_buffer::BufferMut;
-use vortex_datetime_dtype::{TemporalMetadata, TimeUnit};
 use vortex_dtype::Nullability::NonNullable;
+use vortex_dtype::datetime::{TemporalMetadata, TimeUnit};
 use vortex_dtype::{DType, PType};
 use vortex_error::{VortexExpect as _, VortexResult, vortex_bail};
 use vortex_scalar::PrimitiveScalar;
@@ -103,7 +103,7 @@ mod test {
     use vortex_array::validity::Validity;
     use vortex_array::{Array, ToCanonical};
     use vortex_buffer::buffer;
-    use vortex_datetime_dtype::TimeUnit;
+    use vortex_dtype::datetime::TimeUnit;
 
     use crate::DateTimePartsArray;
     use crate::canonical::decode_to_temporal;

encodings/datetime-parts/src/canonical.rs

@@ -68,7 +68,7 @@ mod tests {
     use vortex_array::validity::Validity;
     use vortex_array::{Array, ToCanonical};
     use vortex_buffer::buffer;
-    use vortex_datetime_dtype::TimeUnit;
+    use vortex_dtype::datetime::TimeUnit;
 
     use crate::{TemporalParts, split_temporal};
 

encodings/datetime-parts/src/compress.rs

@@ -32,7 +32,7 @@ mod tests {
     use vortex_array::validity::Validity;
     use vortex_array::{Array, ArrayRef};
     use vortex_buffer::buffer;
-    use vortex_datetime_dtype::TimeUnit;
+    use vortex_dtype::datetime::TimeUnit;
     use vortex_dtype::{DType, Nullability};
 
     use crate::DateTimePartsArray;