merge

Signed-off-by: Nicholas Gates <[email protected]>

Author: gatesn

vortex-array/src/canonical.rs

@@ -4,7 +4,7 @@
 //! Encodings that enable zero-copy sharing of data with Arrow.
 
 use vortex_dtype::DType;
-use vortex_error::{vortex_panic, VortexResult};
+use vortex_error::{VortexResult, vortex_panic};
 
 use crate::arrays::{
     BoolArray, DecimalArray, ExtensionArray, FixedSizeListArray, ListViewArray,

vortex-ffi/examples/hello-vortex.c

@@ -35,7 +35,6 @@ int main(int argc, char *argv[]) {
     fprintf(stderr, "Failed to open file: %s\n%s", uri, vx_string_ptr(vx_error_get_message(error)));
     vx_error_free(error);
     vx_session_free(session);
-    vx_try_shutdown_runtime();
     return -1;
   }
 
@@ -58,7 +57,6 @@ int main(int argc, char *argv[]) {
     vx_error_free(error);
     vx_file_free(file);
     vx_session_free(session);
-    vx_try_shutdown_runtime();
     return -1;
   }
 
@@ -108,14 +106,11 @@ int main(int argc, char *argv[]) {
     fprintf(stderr, "Error during scan operation\n");
     vx_error_free(error);
     vx_session_free(session);
-    vx_try_shutdown_runtime();
     return -1;
   }
 
   printf("Scanning completed successfully\n");
   vx_session_free(session);
 
-  // Attempt to shutdown the shared runtime for clean exit
-  vx_try_shutdown_runtime();
   return 0;
 }

vortex-file/src/lib.rs

@@ -106,6 +106,20 @@ pub use footer::*;
 pub use forever_constant::*;
 pub use open::*;
 pub use strategy::*;
+use vortex_alp::{ALPEncoding, ALPRDEncoding};
+use vortex_array::{ArraySessionExt, EncodingRef};
+use vortex_bytebool::ByteBoolEncoding;
+use vortex_datetime_parts::DateTimePartsEncoding;
+use vortex_decimal_byte_parts::DecimalBytePartsEncoding;
+use vortex_dict::DictEncoding;
+use vortex_fastlanes::{BitPackedEncoding, DeltaEncoding, FoREncoding, RLEEncoding};
+use vortex_fsst::FSSTEncoding;
+use vortex_pco::PcoEncoding;
+use vortex_runend::RunEndEncoding;
+use vortex_sequence::SequenceEncoding;
+use vortex_session::VortexSession;
+use vortex_sparse::SparseEncoding;
+use vortex_zigzag::ZigZagEncoding;
 pub use writer::*;
 
 /// The current version of the Vortex file format
@@ -139,3 +153,28 @@ mod forever_constant {
         }
     }
 }
+
+/// Register the default encodings use in Vortex files with the provided session.
+///
+/// NOTE: this function will be changed in the future to encapsulate logic for using different
+/// Vortex "Editions" that may support different sets of encodings.
+pub fn register_default_encodings(session: &VortexSession) {
+    session.arrays().register_many([
+        EncodingRef::new_ref(ALPEncoding.as_ref()),
+        EncodingRef::new_ref(ALPRDEncoding.as_ref()),
+        EncodingRef::new_ref(BitPackedEncoding.as_ref()),
+        EncodingRef::new_ref(ByteBoolEncoding.as_ref()),
+        EncodingRef::new_ref(DateTimePartsEncoding.as_ref()),
+        EncodingRef::new_ref(DecimalBytePartsEncoding.as_ref()),
+        EncodingRef::new_ref(DeltaEncoding.as_ref()),
+        EncodingRef::new_ref(DictEncoding.as_ref()),
+        EncodingRef::new_ref(FSSTEncoding.as_ref()),
+        EncodingRef::new_ref(FoREncoding.as_ref()),
+        EncodingRef::new_ref(PcoEncoding.as_ref()),
+        EncodingRef::new_ref(RLEEncoding.as_ref()),
+        EncodingRef::new_ref(RunEndEncoding.as_ref()),
+        EncodingRef::new_ref(SequenceEncoding.as_ref()),
+        EncodingRef::new_ref(SparseEncoding.as_ref()),
+        EncodingRef::new_ref(ZigZagEncoding.as_ref()),
+    ]);
+}

vortex-file/src/tests.rs

@@ -35,11 +35,15 @@ use crate::{
 };
 
 static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
-    VortexSession::empty()
+    let session = VortexSession::empty()
         .with::<VortexMetrics>()
         .with::<ArraySession>()
         .with::<LayoutSession>()
-        .with::<RuntimeSession>()
+        .with::<RuntimeSession>();
+
+    crate::register_default_encodings(&session);
+
+    session
 });
 
 #[tokio::test]

vortex/src/lib.rs

@@ -4,26 +4,14 @@
 // https://github.com/rust-lang/cargo/pull/11645#issuecomment-1536905941
 #![doc = include_str!(concat!("../", env!("CARGO_PKG_README")))]
 
-use vortex_alp::{ALPEncoding, ALPRDEncoding};
 pub use vortex_array::*;
-use vortex_bytebool::ByteBoolEncoding;
-use vortex_datetime_parts::DateTimePartsEncoding;
-use vortex_decimal_byte_parts::DecimalBytePartsEncoding;
-use vortex_dict::DictEncoding;
 use vortex_expr::session::ExprSession;
-use vortex_fastlanes::{BitPackedEncoding, DeltaEncoding, FoREncoding, RLEEncoding};
 #[cfg(feature = "files")]
 pub use vortex_file as file;
-use vortex_fsst::FSSTEncoding;
 use vortex_io::session::RuntimeSession;
 use vortex_layout::session::LayoutSession;
 use vortex_metrics::VortexMetrics;
-use vortex_pco::PcoEncoding;
-use vortex_runend::RunEndEncoding;
-use vortex_sequence::SequenceEncoding;
 use vortex_session::VortexSession;
-use vortex_sparse::SparseEncoding;
-use vortex_zigzag::ZigZagEncoding;
 pub use {
     vortex_buffer as buffer, vortex_dtype as dtype, vortex_error as error, vortex_expr as expr,
     vortex_flatbuffers as flatbuffers, vortex_io as io, vortex_ipc as ipc, vortex_layout as layout,
@@ -64,25 +52,7 @@ impl VortexSessionDefault for VortexSession {
             .with::<ExprSession>()
             .with::<RuntimeSession>();
 
-        // Register the compressed encodings that Vortex ships with.
-        session.arrays().register_many([
-            EncodingRef::new_ref(ALPEncoding.as_ref()),
-            EncodingRef::new_ref(ALPRDEncoding.as_ref()),
-            EncodingRef::new_ref(BitPackedEncoding.as_ref()),
-            EncodingRef::new_ref(ByteBoolEncoding.as_ref()),
-            EncodingRef::new_ref(DateTimePartsEncoding.as_ref()),
-            EncodingRef::new_ref(DecimalBytePartsEncoding.as_ref()),
-            EncodingRef::new_ref(DeltaEncoding.as_ref()),
-            EncodingRef::new_ref(DictEncoding.as_ref()),
-            EncodingRef::new_ref(FSSTEncoding.as_ref()),
-            EncodingRef::new_ref(FoREncoding.as_ref()),
-            EncodingRef::new_ref(PcoEncoding.as_ref()),
-            EncodingRef::new_ref(RLEEncoding.as_ref()),
-            EncodingRef::new_ref(RunEndEncoding.as_ref()),
-            EncodingRef::new_ref(SequenceEncoding.as_ref()),
-            EncodingRef::new_ref(SparseEncoding.as_ref()),
-            EncodingRef::new_ref(ZigZagEncoding.as_ref()),
-        ]);
+        file::register_default_encodings(&session);
 
         session
     }