Move flatbuffer schema project functions around

spiraldb · Aug 22, 2024 · 7723725 · 7723725
1 parent 4038a40
commit 7723725
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/vortex-dtype/src/lib.rs b/vortex-dtype/src/lib.rs
@@ -4,24 +4,25 @@ pub use dtype::*;
 pub use extension::*;
 pub use half;
 pub use nullability::*;
-pub use project::*;
 pub use ptype::*;
 
 mod dtype;
 mod extension;
 pub mod field;
 mod nullability;
-#[cfg(feature = "flatbuffers")]
-mod project;
 mod ptype;
 mod serde;
 
 #[cfg(feature = "proto")]
 pub mod proto {
     pub use vortex_proto::dtype;
+
+    pub use super::serde::proto::*;
 }
 
 #[cfg(feature = "flatbuffers")]
 pub mod flatbuffers {
     pub use vortex_flatbuffers::dtype::*;
+
+    pub use super::serde::flatbuffers::*;
 }
diff --git a/vortex-dtype/src/serde/flatbuffers.rs → vortex-dtype/src/serde/flatbuffers/mod.rs b/vortex-dtype/src/serde/flatbuffers.rs → vortex-dtype/src/serde/flatbuffers/mod.rs
@@ -7,6 +7,9 @@ use vortex_flatbuffers::{FlatBufferRoot, WriteFlatBuffer};
 
 use crate::{flatbuffers as fb, DType, ExtDType, ExtID, ExtMetadata, PType, StructDType};
 
+mod project;
+pub use project::*;
+
 impl TryFrom<fb::DType<'_>> for DType {
     type Error = VortexError;
 

diff --git a/vortex-dtype/src/project.rs → ...ex-dtype/src/serde/flatbuffers/project.rs b/vortex-dtype/src/project.rs → ...ex-dtype/src/serde/flatbuffers/project.rs
diff --git a/vortex-dtype/src/serde/mod.rs b/vortex-dtype/src/serde/mod.rs
@@ -1,9 +1,9 @@
 #[cfg(feature = "flatbuffers")]
-mod flatbuffers;
+pub mod flatbuffers;
 #[cfg(feature = "proto")]
-mod proto;
+pub mod proto;
 #[allow(clippy::module_inception)]
-mod serde;
+pub mod serde;
 
 #[cfg(test)]
 #[cfg(feature = "serde")]

diff --git a/vortex-serde/Cargo.toml b/vortex-serde/Cargo.toml
@@ -24,7 +24,7 @@ pin-project = { workspace = true }
 tokio = { workspace = true, features = ["io-util", "fs"], optional = true }
 vortex-array = { workspace = true }
 vortex-buffer = { workspace = true }
-vortex-dtype = { workspace = true }
+vortex-dtype = { workspace = true, features = ["flatbuffers"] }
 vortex-error = { workspace = true, features = ["object_store"] }
 vortex-expr = { workspace = true }
 vortex-flatbuffers = { workspace = true, features = ["file"] }

diff --git a/vortex-serde/src/layouts/read/footer.rs b/vortex-serde/src/layouts/read/footer.rs
@@ -1,7 +1,8 @@
 use bytes::Bytes;
 use flatbuffers::root;
 use vortex_dtype::field::Field;
-use vortex_dtype::{deserialize_and_project, resolve_field_references, DType};
+use vortex_dtype::flatbuffers::{deserialize_and_project, resolve_field_references};
+use vortex_dtype::DType;
 use vortex_error::{vortex_err, VortexResult};
 use vortex_flatbuffers::{message as fb, ReadFlatBuffer};