@@ -20,14 +20,15 @@ mod proto;
2020
2121use std:: sync:: { Arc , OnceLock } ;
2222
23- use datafusion:: arrow:: datatypes:: SchemaRef ;
23+ use datafusion:: arrow:: datatypes:: { Schema , SchemaRef } ;
2424use datafusion:: arrow:: ffi_stream:: FFI_ArrowArrayStream ;
25+ use datafusion:: arrow:: ipc:: reader:: StreamReader ;
2526use datafusion:: arrow:: record_batch:: RecordBatchIterator ;
2627use datafusion:: dataframe:: DataFrame ;
2728use datafusion:: error:: DataFusionError ;
2829use datafusion:: prelude:: { ParquetReadOptions , SessionContext } ;
29- use jni:: objects:: { JClass , JString } ;
30- use jni:: sys:: jlong;
30+ use jni:: objects:: { JByteArray , JClass , JString } ;
31+ use jni:: sys:: { jboolean , jlong} ;
3132use jni:: JNIEnv ;
3233use tokio:: runtime:: Runtime ;
3334
@@ -130,13 +131,61 @@ pub extern "system" fn Java_org_apache_datafusion_SessionContext_closeSessionCon
130131 } )
131132}
132133
134+ #[ allow( clippy:: too_many_arguments) ]
135+ fn with_parquet_options < R > (
136+ env : & mut JNIEnv ,
137+ file_extension : JString ,
138+ parquet_pruning_set : jboolean ,
139+ parquet_pruning_value : jboolean ,
140+ skip_metadata_set : jboolean ,
141+ skip_metadata_value : jboolean ,
142+ metadata_size_hint : jlong ,
143+ schema_ipc_bytes : JByteArray ,
144+ f : impl FnOnce ( ParquetReadOptions ) -> JniResult < R > ,
145+ ) -> JniResult < R > {
146+ let file_ext: String = env. get_string ( & file_extension) ?. into ( ) ;
147+
148+ let schema: Option < Schema > = if !schema_ipc_bytes. is_null ( ) {
149+ let bytes: Vec < u8 > = env. convert_byte_array ( & schema_ipc_bytes) ?;
150+ let reader = StreamReader :: try_new ( std:: io:: Cursor :: new ( bytes) , None ) ?;
151+ Some ( ( * reader. schema ( ) ) . clone ( ) )
152+ } else {
153+ None
154+ } ;
155+
156+ let mut opts = ParquetReadOptions :: default ( ) . file_extension ( & file_ext) ;
157+ if parquet_pruning_set != 0 {
158+ opts = opts. parquet_pruning ( parquet_pruning_value != 0 ) ;
159+ }
160+ if skip_metadata_set != 0 {
161+ opts = opts. skip_metadata ( skip_metadata_value != 0 ) ;
162+ }
163+ if metadata_size_hint >= 0 {
164+ opts = opts. metadata_size_hint ( Some ( metadata_size_hint as usize ) ) ;
165+ }
166+ if let Some ( ref s) = schema {
167+ opts = opts. schema ( s) ;
168+ }
169+
170+ f ( opts)
171+ }
172+
133173#[ no_mangle]
134- pub extern "system" fn Java_org_apache_datafusion_SessionContext_registerParquet < ' local > (
174+ pub extern "system" fn Java_org_apache_datafusion_SessionContext_registerParquetWithOptions <
175+ ' local ,
176+ > (
135177 mut env : JNIEnv < ' local > ,
136178 _class : JClass < ' local > ,
137179 handle : jlong ,
138180 name : JString < ' local > ,
139181 path : JString < ' local > ,
182+ file_extension : JString < ' local > ,
183+ parquet_pruning_set : jboolean ,
184+ parquet_pruning_value : jboolean ,
185+ skip_metadata_set : jboolean ,
186+ skip_metadata_value : jboolean ,
187+ metadata_size_hint : jlong ,
188+ schema_ipc_bytes : JByteArray < ' local > ,
140189) {
141190 try_unwrap_or_throw ( & mut env, ( ) , |env| -> JniResult < ( ) > {
142191 if handle == 0 {
@@ -145,11 +194,59 @@ pub extern "system" fn Java_org_apache_datafusion_SessionContext_registerParquet
145194 let ctx = unsafe { & * ( handle as * const SessionContext ) } ;
146195 let name: String = env. get_string ( & name) ?. into ( ) ;
147196 let path: String = env. get_string ( & path) ?. into ( ) ;
148- runtime ( ) . block_on ( async {
149- ctx. register_parquet ( & name, & path, ParquetReadOptions :: default ( ) )
150- . await ?;
151- Ok :: < ( ) , DataFusionError > ( ( ) )
152- } ) ?;
153- Ok ( ( ) )
197+ with_parquet_options (
198+ env,
199+ file_extension,
200+ parquet_pruning_set,
201+ parquet_pruning_value,
202+ skip_metadata_set,
203+ skip_metadata_value,
204+ metadata_size_hint,
205+ schema_ipc_bytes,
206+ |opts| {
207+ runtime ( ) . block_on ( async {
208+ ctx. register_parquet ( & name, & path, opts) . await ?;
209+ Ok :: < ( ) , DataFusionError > ( ( ) )
210+ } ) ?;
211+ Ok ( ( ) )
212+ } ,
213+ )
214+ } )
215+ }
216+
217+ #[ no_mangle]
218+ pub extern "system" fn Java_org_apache_datafusion_SessionContext_readParquetWithOptions < ' local > (
219+ mut env : JNIEnv < ' local > ,
220+ _class : JClass < ' local > ,
221+ handle : jlong ,
222+ path : JString < ' local > ,
223+ file_extension : JString < ' local > ,
224+ parquet_pruning_set : jboolean ,
225+ parquet_pruning_value : jboolean ,
226+ skip_metadata_set : jboolean ,
227+ skip_metadata_value : jboolean ,
228+ metadata_size_hint : jlong ,
229+ schema_ipc_bytes : JByteArray < ' local > ,
230+ ) -> jlong {
231+ try_unwrap_or_throw ( & mut env, 0 , |env| -> JniResult < jlong > {
232+ if handle == 0 {
233+ return Err ( "SessionContext handle is null" . into ( ) ) ;
234+ }
235+ let ctx = unsafe { & * ( handle as * const SessionContext ) } ;
236+ let path: String = env. get_string ( & path) ?. into ( ) ;
237+ with_parquet_options (
238+ env,
239+ file_extension,
240+ parquet_pruning_set,
241+ parquet_pruning_value,
242+ skip_metadata_set,
243+ skip_metadata_value,
244+ metadata_size_hint,
245+ schema_ipc_bytes,
246+ |opts| {
247+ let df = runtime ( ) . block_on ( ctx. read_parquet ( path, opts) ) ?;
248+ Ok ( Box :: into_raw ( Box :: new ( df) ) as jlong )
249+ } ,
250+ )
154251 } )
155252}
0 commit comments