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