@@ -8,8 +8,8 @@ use arrow::array::{Array, RecordBatch, StructArray};
88use arrow:: datatypes:: { DataType , Schema } ;
99use arrow:: ffi:: { FFI_ArrowArray , FFI_ArrowSchema } ;
1010use lance:: Dataset ;
11- use tokio:: runtime:: Runtime ;
1211
12+ mod runtime;
1313mod scanner;
1414
1515use scanner:: LanceStream ;
@@ -32,14 +32,9 @@ pub unsafe extern "C" fn lance_open_dataset(path: *const c_char) -> *mut c_void
3232 }
3333 } ;
3434
35- let runtime = match Runtime :: new ( ) {
36- Ok ( rt) => rt,
37- Err ( _) => return ptr:: null_mut ( ) ,
38- } ;
39-
40- let dataset = match runtime. block_on ( Dataset :: open ( path_str) ) {
41- Ok ( ds) => Arc :: new ( ds) ,
42- Err ( _) => return ptr:: null_mut ( ) ,
35+ let dataset = match runtime:: block_on ( Dataset :: open ( path_str) ) {
36+ Ok ( Ok ( ds) ) => Arc :: new ( ds) ,
37+ _ => return ptr:: null_mut ( ) ,
4338 } ;
4439
4540 let handle = Box :: new ( DatasetHandle { dataset } ) ;
@@ -110,13 +105,7 @@ pub unsafe extern "C" fn lance_create_stream(dataset: *mut c_void) -> *mut c_voi
110105
111106 let handle = unsafe { & * ( dataset as * const DatasetHandle ) } ;
112107
113- // Create a new runtime for this stream to avoid conflicts
114- let runtime = match Runtime :: new ( ) {
115- Ok ( rt) => rt,
116- Err ( _) => return ptr:: null_mut ( ) ,
117- } ;
118-
119- match LanceStream :: new ( & handle. dataset , runtime) {
108+ match LanceStream :: new ( & handle. dataset ) {
120109 Ok ( stream) => Box :: into_raw ( Box :: new ( stream) ) as * mut c_void ,
121110 Err ( _) => ptr:: null_mut ( ) ,
122111 }
0 commit comments