cleanup

Signed-off-by: Andrew Duffy <andrew@a10y.dev>

Author: a10y

vortex-cuda/cudf-test/src/lib.rs

@@ -3,13 +3,13 @@
 
 //! This file is a simple C-compatible API that is called from the cudf-test-harness at CI time.
 
-use std::sync::LazyLock;
-
+use arrow_schema::DataType;
+use arrow_schema::ffi::FFI_ArrowSchema;
 use futures::executor::block_on;
+use std::sync::LazyLock;
 use vortex::array::IntoArray;
 use vortex::array::arrays::PrimitiveArray;
 use vortex::array::session::ArraySession;
-use vortex::error::VortexResult;
 use vortex::expr::session::ExprSession;
 use vortex::io::session::RuntimeSession;
 use vortex::layout::session::LayoutSession;
@@ -31,11 +31,16 @@ static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
 
 /// External array
 #[unsafe(no_mangle)]
-pub extern "C" fn export_array(array_ptr: &mut ArrowDeviceArray) -> i32 {
+pub extern "C" fn export_array(
+    schema_ptr: &mut FFI_ArrowSchema,
+    array_ptr: &mut ArrowDeviceArray,
+) -> i32 {
     let mut ctx = CudaSession::create_execution_ctx(&SESSION).unwrap();
 
     let primitive = PrimitiveArray::from_iter(0u32..1024);
 
+    *schema_ptr = FFI_ArrowSchema::try_from(DataType::UInt32).unwrap();
+
     match block_on(primitive.into_array().export_device_array(&mut ctx)) {
         Ok(exported) => {
             *array_ptr = exported;

vortex-cuda/src/lib.rs

@@ -15,7 +15,6 @@ mod session;
 mod stream;
 mod stream_pool;
 
-pub(crate) use arrow::CanonicalDeviceArrayExport;
 pub use arrow::ExportDeviceArray;
 pub use canonical::CanonicalCudaExt;
 pub use device_buffer::CudaBufferExt;

vortex-cuda/src/session.rs

@@ -5,7 +5,6 @@ use std::fmt::Debug;
 use std::sync::Arc;
 
 use cudarc::driver::CudaContext;
-use vortex_array::ArrayRef;
 use vortex_array::VortexSessionExecute;
 use vortex_array::vtable::ArrayId;
 use vortex_error::VortexResult;
@@ -14,7 +13,6 @@ use vortex_session::SessionExt;
 use vortex_utils::aliases::dash_map::DashMap;
 
 use crate::ExportDeviceArray;
-use crate::arrow::ArrowDeviceArray;
 use crate::arrow::CanonicalDeviceArrayExport;
 use crate::executor::CudaExecute;
 pub use crate::executor::CudaExecutionCtx;