Vortex Schema -> Vortex DType (#273)

I'm sorry... it had to be done
spiraldb · Apr 29, 2024 · e845b4c · e845b4c
1 parent d641f99
commit e845b4c
Show file tree

Hide file tree

Showing 90 changed files with 137 additions and 137 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ members = [
     "vortex-ipc",
     "vortex-ree",
     "vortex-roaring",
-    "vortex-schema",
+    "vortex-dtype",
     "vortex-zigzag",
 ]
 resolver = "2"

diff --git a/bench-vortex/Cargo.toml b/bench-vortex/Cargo.toml
@@ -47,7 +47,7 @@ vortex-error = { path = "../vortex-error", features = ["parquet"] }
 vortex-fastlanes = { path = "../vortex-fastlanes" }
 vortex-ipc = { path = "../vortex-ipc" }
 vortex-ree = { path = "../vortex-ree" }
-vortex-schema = { path = "../vortex-schema" }
+vortex-dtype = { path = "../vortex-dtype" }
 vortex-zigzag = { path = "../vortex-zigzag" }
 
 [dev-dependencies]

diff --git a/bench-vortex/src/data_downloads.rs b/bench-vortex/src/data_downloads.rs
@@ -13,9 +13,9 @@ use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
 use tokio::runtime::Runtime;
 use vortex::arrow::FromArrowType;
 use vortex::{IntoArray, SerdeContext, ToArrayData};
+use vortex_dtype::DType;
 use vortex_error::{VortexError, VortexResult};
 use vortex_ipc::writer::StreamWriter;
-use vortex_schema::DType;
 
 use crate::idempotent;
 use crate::reader::BATCH_SIZE;

diff --git a/bench-vortex/src/lib.rs b/bench-vortex/src/lib.rs
@@ -20,10 +20,10 @@ use vortex::{IntoArray, OwnedArray, ToArrayData};
 use vortex_alp::ALPEncoding;
 use vortex_datetime_parts::DateTimePartsEncoding;
 use vortex_dict::DictEncoding;
+use vortex_dtype::DType;
 use vortex_fastlanes::{BitPackedEncoding, FoREncoding};
 use vortex_ree::REEEncoding;
 use vortex_roaring::RoaringBoolEncoding;
-use vortex_schema::DType;
 
 use crate::data_downloads::FileType;
 use crate::reader::BATCH_SIZE;

diff --git a/bench-vortex/src/parquet_utils.rs b/bench-vortex/src/parquet_utils.rs
@@ -4,8 +4,8 @@ use std::path::Path;
 
 use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
 use vortex::arrow::FromArrowType;
+use vortex_dtype::DType;
 use vortex_error::VortexResult;
-use vortex_schema::DType;
 
 use crate::data_downloads::FileType;
 use crate::CompressionRunStats;

diff --git a/bench-vortex/src/reader.rs b/bench-vortex/src/reader.rs
@@ -22,11 +22,11 @@ use vortex::array::chunked::ChunkedArray;
 use vortex::arrow::FromArrowType;
 use vortex::compute::take::take;
 use vortex::{IntoArray, OwnedArray, SerdeContext, ToArrayData, ToStatic};
+use vortex_dtype::DType;
 use vortex_error::VortexResult;
 use vortex_ipc::iter::FallibleLendingIterator;
 use vortex_ipc::reader::StreamReader;
 use vortex_ipc::writer::StreamWriter;
-use vortex_schema::DType;
 
 use crate::compress_ctx;
 

diff --git a/bench-vortex/src/vortex_utils.rs b/bench-vortex/src/vortex_utils.rs
@@ -5,8 +5,8 @@ use std::path::Path;
 use vortex::array::chunked::ChunkedArray;
 use vortex::array::r#struct::StructArray;
 use vortex::ArrayDType;
+use vortex_dtype::DType;
 use vortex_error::VortexResult;
-use vortex_schema::DType;
 
 use crate::data_downloads::FileType;
 use crate::reader::open_vortex;

diff --git a/pyvortex/Cargo.toml b/pyvortex/Cargo.toml
@@ -27,7 +27,7 @@ vortex-error = { path = "../vortex-error" }
 vortex-fastlanes = { path = "../vortex-fastlanes" }
 vortex-ree = { path = "../vortex-ree" }
 vortex-roaring = { path = "../vortex-roaring" }
-vortex-schema = { path = "../vortex-schema" }
+vortex-dtype = { path = "../vortex-dtype" }
 vortex-zigzag = { path = "../vortex-zigzag" }
 itertools = { workspace = true }
 log = { workspace = true }

diff --git a/pyvortex/src/dtype.rs b/pyvortex/src/dtype.rs
@@ -3,7 +3,7 @@ use arrow::pyarrow::FromPyArrow;
 use pyo3::types::PyType;
 use pyo3::{pyclass, pymethods, Py, PyAny, PyResult, Python};
 use vortex::arrow::FromArrowType;
-use vortex_schema::DType;
+use vortex_dtype::DType;
 
 #[pyclass(name = "DType", module = "vortex", subclass)]
 pub struct PyDType {

diff --git a/pyvortex/src/encode.rs b/pyvortex/src/encode.rs
@@ -8,7 +8,7 @@ use pyo3::prelude::*;
 use vortex::array::chunked::ChunkedArray;
 use vortex::arrow::{FromArrowArray, FromArrowType};
 use vortex::{ArrayData, IntoArray, ToArrayData};
-use vortex_schema::DType;
+use vortex_dtype::DType;
 
 use crate::array::PyArray;
 use crate::error::PyVortexError;

diff --git a/pyvortex/src/lib.rs b/pyvortex/src/lib.rs
@@ -2,8 +2,8 @@ use dtype::PyDType;
 use log::debug;
 use pyo3::prelude::*;
 use vortex::encoding::VORTEX_ENCODINGS;
-use vortex_schema::DType;
-use vortex_schema::Signedness::{Signed, Unsigned};
+use vortex_dtype::DType;
+use vortex_dtype::Signedness::{Signed, Unsigned};
 
 use crate::array::*;
 

diff --git a/vortex-alp/Cargo.toml b/vortex-alp/Cargo.toml
@@ -23,7 +23,7 @@ paste = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 vortex-array = { path = "../vortex-array" }
 vortex-error = { path = "../vortex-error" }
-vortex-schema = { path = "../vortex-schema" }
+vortex-dtype = { path = "../vortex-dtype" }
 
 [dev-dependencies]
 divan = { workspace = true }

diff --git a/vortex-alp/src/array.rs b/vortex-alp/src/array.rs
@@ -4,8 +4,8 @@ use vortex::stats::ArrayStatisticsCompute;
 use vortex::validity::{ArrayValidity, LogicalValidity};
 use vortex::visitor::{AcceptArrayVisitor, ArrayVisitor};
 use vortex::{impl_encoding, ArrayDType, ArrayFlatten, IntoArrayData, OwnedArray, ToArrayData};
+use vortex_dtype::{IntWidth, Signedness};
 use vortex_error::{vortex_bail, VortexResult};
-use vortex_schema::{IntWidth, Signedness};
 
 use crate::alp::Exponents;
 use crate::compress::{alp_encode, decompress};

diff --git a/vortex-array/Cargo.toml b/vortex-array/Cargo.toml
@@ -39,7 +39,7 @@ thiserror = { workspace = true }
 vortex-alloc = { path = "../vortex-alloc" }
 vortex-error = { path = "../vortex-error", features = ["flexbuffers"] }
 vortex-flatbuffers = { path = "../vortex-flatbuffers" }
-vortex-schema = { path = "../vortex-schema", features = ["serde"] }
+vortex-dtype = { path = "../vortex-dtype", features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 
 [build-dependencies]

diff --git a/vortex-array/flatbuffers/scalar.fbs b/vortex-array/flatbuffers/scalar.fbs
@@ -1,4 +1,4 @@
-include "vortex-schema/flatbuffers/dtype.fbs";
+include "vortex-dtype/flatbuffers/dtype.fbs";
 
 namespace vortex.scalar;
 

diff --git a/vortex-array/src/array/bool/compute/fill.rs b/vortex-array/src/array/bool/compute/fill.rs
@@ -1,5 +1,5 @@
+use vortex_dtype::Nullability;
 use vortex_error::VortexResult;
-use vortex_schema::Nullability;
 
 use crate::array::bool::BoolArray;
 use crate::compute::fill::FillForwardFn;

diff --git a/vortex-array/src/array/chunked/mod.rs b/vortex-array/src/array/chunked/mod.rs
@@ -1,7 +1,7 @@
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
+use vortex_dtype::{IntWidth, Nullability, Signedness};
 use vortex_error::{vortex_bail, VortexResult};
-use vortex_schema::{IntWidth, Nullability, Signedness};
 
 use crate::array::primitive::PrimitiveArray;
 use crate::compute::scalar_at::scalar_at;
@@ -145,7 +145,7 @@ impl EncodingCompression for ChunkedEncoding {}
 
 #[cfg(test)]
 mod test {
-    use vortex_schema::{DType, IntWidth, Nullability, Signedness};
+    use vortex_dtype::{DType, IntWidth, Nullability, Signedness};
 
     use crate::array::chunked::{ChunkedArray, OwnedChunkedArray};
     use crate::ptype::NativePType;

diff --git a/vortex-array/src/array/composite/array.rs b/vortex-array/src/array/composite/array.rs
@@ -1,8 +1,8 @@
 use flatbuffers::root;
+use vortex_dtype::flatbuffers as fb;
+use vortex_dtype::{CompositeID, DTypeSerdeContext};
 use vortex_error::{vortex_err, VortexResult};
 use vortex_flatbuffers::{FlatBufferToBytes, ReadFlatBuffer};
-use vortex_schema::flatbuffers as fb;
-use vortex_schema::{CompositeID, DTypeSerdeContext};
 
 use crate::array::composite::{find_extension, CompositeExtensionRef, TypedCompositeArray};
 use crate::compute::ArrayCompute;

diff --git a/vortex-array/src/array/composite/mod.rs b/vortex-array/src/array/composite/mod.rs
@@ -1,7 +1,7 @@
 pub use array::*;
 use linkme::distributed_slice;
 pub use typed::*;
-use vortex_schema::CompositeID;
+use vortex_dtype::CompositeID;
 
 mod array;
 mod compute;

diff --git a/vortex-array/src/array/composite/typed.rs b/vortex-array/src/array/composite/typed.rs
@@ -1,8 +1,8 @@
 use std::fmt::Debug;
 
+use vortex_dtype::CompositeID;
+use vortex_dtype::DType;
 use vortex_error::{VortexError, VortexResult};
-use vortex_schema::CompositeID;
-use vortex_schema::DType;
 
 use crate::array::composite::array::CompositeArray;
 use crate::array::composite::UnderlyingMetadata;
@@ -75,7 +75,7 @@ macro_rules! impl_composite {
     ($id:expr, $T:ty) => {
         use linkme::distributed_slice;
         use paste::paste;
-        use vortex_schema::{CompositeID, DType, Nullability};
+        use vortex_dtype::{CompositeID, DType, Nullability};
         use $crate::array::composite::{
             CompositeArray, CompositeExtension, TypedCompositeArray, UnderlyingMetadata,
             VORTEX_COMPOSITE_EXTENSIONS,

diff --git a/vortex-array/src/array/constant/flatten.rs b/vortex-array/src/array/constant/flatten.rs
@@ -1,5 +1,5 @@
+use vortex_dtype::Nullability;
 use vortex_error::VortexResult;
-use vortex_schema::Nullability;
 
 use crate::array::bool::BoolArray;
 use crate::array::constant::ConstantArray;

diff --git a/vortex-array/src/array/constant/stats.rs b/vortex-array/src/array/constant/stats.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
+use vortex_dtype::DType;
 use vortex_error::VortexResult;
-use vortex_schema::DType;
 
 use crate::array::constant::ConstantArray;
 use crate::scalar::Scalar;

diff --git a/vortex-array/src/array/primitive/compute/cast.rs b/vortex-array/src/array/primitive/compute/cast.rs
@@ -1,5 +1,5 @@
+use vortex_dtype::DType;
 use vortex_error::{vortex_err, VortexResult};
-use vortex_schema::DType;
 
 use crate::array::primitive::PrimitiveArray;
 use crate::compute::cast::CastFn;

diff --git a/vortex-array/src/array/sparse/compute/mod.rs b/vortex-array/src/array/sparse/compute/mod.rs
@@ -137,7 +137,7 @@ fn take_search_sorted(
 #[cfg(test)]
 mod test {
     use itertools::Itertools;
-    use vortex_schema::{DType, FloatWidth, Nullability};
+    use vortex_dtype::{DType, FloatWidth, Nullability};
 
     use crate::array::primitive::PrimitiveArray;
     use crate::array::sparse::compute::take_map;