merge

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

Author: gatesn

vortex-ffi/cinclude/vortex.h

@@ -662,8 +662,8 @@ void vx_file_free(const vx_file *ptr);
 /**
  * Open a file at the given path on the file system.
  */
-const vx_file *vx_file_open_reader(const vx_file_open_options *options,
-                                   const vx_session *session,
+const vx_file *vx_file_open_reader(const vx_session *session,
+                                   const vx_file_open_options *options,
                                    vx_error **error_out);
 
 void vx_file_write_array(const vx_session *session,

vortex-ffi/examples/hello-vortex.c

@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) {
       .property_len = 0,
   };
 
-  const vx_file *file = vx_file_open_reader(&open_opts, session, &error);
+  const vx_file *file = vx_file_open_reader(session, &open_opts, &error);
   if (error != NULL) {
     fprintf(stderr, "Failed to open file: %s\n%s", uri, vx_string_ptr(vx_error_get_message(error)));
     vx_error_free(error);
@@ -51,7 +51,7 @@ int main(int argc, char *argv[]) {
 
   // Start scanning
   printf("\nScanning file...\n");
-  vx_array_iterator *scan = vx_file_scan(file, NULL, &error);
+  vx_array_iterator *scan = vx_file_scan(session, file, NULL, &error);
   if (error != NULL) {
     fprintf(stderr, "Failed to create file scan iterator\n");
     vx_error_free(error);

vortex-ffi/src/file.rs

@@ -141,8 +141,8 @@ impl vx_file_scan_options {
 /// Open a file at the given path on the file system.
 #[unsafe(no_mangle)]
 pub unsafe extern "C-unwind" fn vx_file_open_reader(
-    options: *const vx_file_open_options,
     session: *const vx_session,
+    options: *const vx_file_open_options,
     error_out: *mut *mut vx_error,
 ) -> *const vx_file {
     let session = vx_session::as_ref(session);

vortex-python/python/vortex/__init__.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: Copyright the Vortex contributors
 
-from . import _lib, arrays, dataset, expr, file, io, registry, ray, scan
+from . import _lib, arrays, dataset, expr, file, io, ray, registry, scan
 from ._lib.arrays import (  # pyright: ignore[reportMissingModuleSource]
     AlpArray,
     AlpRdArray,