Use flatbuffers::follow instead of init_from_table (#1878)

spiraldb · Jan 9, 2025 · d76e945 · d76e945
1 parent 24ce4fd
commit d76e945
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/vortex-array/src/data/viewed.rs b/vortex-array/src/data/viewed.rs
@@ -2,6 +2,7 @@ use std::fmt::{Debug, Formatter};
 use std::sync::Arc;
 
 use enum_iterator::all;
+use flatbuffers::Follow;
 use itertools::Itertools;
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::{DType, Nullability, PType};
@@ -42,10 +43,7 @@ impl Debug for ViewedArrayData {
 
 impl ViewedArrayData {
     pub fn flatbuffer(&self) -> fb::Array {
-        unsafe {
-            let tab = flatbuffers::Table::new(self.flatbuffer.as_ref(), self.flatbuffer_loc);
-            fb::Array::init_from_table(tab)
-        }
+        unsafe { fb::Array::follow(self.flatbuffer.as_ref(), self.flatbuffer_loc) }
     }
 
     pub fn metadata_bytes(&self) -> Option<&[u8]> {

diff --git a/vortex-dtype/src/dtype.rs b/vortex-dtype/src/dtype.rs
@@ -2,7 +2,7 @@ use std::fmt::{Debug, Display, Formatter};
 use std::hash::Hash;
 use std::sync::Arc;
 
-use flatbuffers::root;
+use flatbuffers::{root, Follow};
 use itertools::Itertools;
 use vortex_error::{
     vortex_bail, vortex_err, vortex_panic, VortexExpect, VortexResult, VortexUnwrap,
@@ -205,12 +205,7 @@ impl ViewedDType {
 
     /// The viewed [`fbd::DType`] instance.
     pub fn flatbuffer(&self) -> fbd::DType<'_> {
-        unsafe {
-            fbd::DType::init_from_table(flatbuffers::Table::new(
-                self.flatbuffer.as_ref(),
-                self.flatbuffer_loc,
-            ))
-        }
+        unsafe { fbd::DType::follow(self.flatbuffer.as_ref(), self.flatbuffer_loc) }
     }
 
     /// Returns the underlying shared buffer

diff --git a/vortex-layout/src/data.rs b/vortex-layout/src/data.rs
@@ -3,7 +3,7 @@ use std::ops::Deref;
 use std::sync::Arc;
 
 use bytes::Bytes;
-use flatbuffers::{FlatBufferBuilder, Table, Verifiable, Verifier, VerifierOptions, WIPOffset};
+use flatbuffers::{FlatBufferBuilder, Follow, Verifiable, Verifier, VerifierOptions, WIPOffset};
 use vortex_array::ContextRef;
 use vortex_buffer::ByteBuffer;
 use vortex_dtype::DType;
@@ -50,10 +50,7 @@ struct ViewedLayoutData {
 impl ViewedLayoutData {
     /// Return the flatbuffer layout message.
     fn flatbuffer(&self) -> layout::Layout<'_> {
-        unsafe {
-            let tab = Table::new(self.flatbuffer.as_ref(), self.flatbuffer_loc);
-            layout::Layout::init_from_table(tab)
-        }
+        unsafe { layout::Layout::follow(self.flatbuffer.as_ref(), self.flatbuffer_loc) }
     }
 }
 
@@ -91,8 +88,7 @@ impl LayoutData {
         fb::Layout::run_verifier(&mut v, flatbuffer_loc)?;
 
         // SAFETY: we just verified the buffer contains a valid layout message.
-        let fb_layout =
-            unsafe { fb::Layout::init_from_table(Table::new(flatbuffer.as_ref(), flatbuffer_loc)) };
+        let fb_layout = unsafe { fb::Layout::follow(flatbuffer.as_ref(), flatbuffer_loc) };
         if fb_layout.encoding() != encoding.id().0 {
             vortex_bail!(
                 "Mismatched encoding, flatbuffer contains {}, given {}",