cargo_fmt_fix_test_accessor_method

Author: coderfender

datafusion/ffi/src/config/extension_options.rs

@@ -47,11 +47,7 @@ pub struct FFI_ExtensionOptions {
     pub cloned: unsafe extern "C" fn(&Self) -> FFI_ExtensionOptions,
 
     /// Set the given `key`, `value` pair
-    pub set: unsafe extern "C" fn(
-        &mut Self,
-        key: SStr,
-        value: SStr,
-    ) -> FFIResult<()>,
+    pub set: unsafe extern "C" fn(&mut Self, key: SStr, value: SStr) -> FFIResult<()>,
 
     /// Returns the [`ConfigEntry`] stored in this [`ExtensionOptions`]
     pub entries: unsafe extern "C" fn(&Self) -> SVec<(SString, SString)>,

datafusion/ffi/src/execution/task_ctx.rs

@@ -48,16 +48,14 @@ pub struct FFI_TaskContext {
     pub session_config: unsafe extern "C" fn(&Self) -> FFI_SessionConfig,
 
     /// Returns a vec of name-function pairs for scalar functions.
-    pub scalar_functions:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_ScalarUDF)>,
+    pub scalar_functions: unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_ScalarUDF)>,
 
     /// Returns a vec of name-function pairs for aggregate functions.
     pub aggregate_functions:
         unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_AggregateUDF)>,
 
     /// Returns a vec of name-function pairs for window functions.
-    pub window_functions:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_WindowUDF)>,
+    pub window_functions: unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_WindowUDF)>,
 
     /// Release the memory of the private data when it is no longer being used.
     pub release: unsafe extern "C" fn(arg: &mut Self),
@@ -92,9 +90,7 @@ unsafe extern "C" fn session_id_fn_wrapper(ctx: &FFI_TaskContext) -> SString {
     }
 }
 
-unsafe extern "C" fn task_id_fn_wrapper(
-    ctx: &FFI_TaskContext,
-) -> FfiOption<SString> {
+unsafe extern "C" fn task_id_fn_wrapper(ctx: &FFI_TaskContext) -> FfiOption<SString> {
     unsafe {
         let ctx = ctx.inner();
         ctx.task_id().map(|s| s.as_str().into()).into()

datafusion/ffi/src/physical_expr/mod.rs

@@ -77,10 +77,8 @@ pub struct FFI_PhysicalExpr {
 
     pub children: unsafe extern "C" fn(&Self) -> SVec<FFI_PhysicalExpr>,
 
-    pub new_with_children: unsafe extern "C" fn(
-        &Self,
-        children: &SVec<FFI_PhysicalExpr>,
-    ) -> FFIResult<Self>,
+    pub new_with_children:
+        unsafe extern "C" fn(&Self, children: &SVec<FFI_PhysicalExpr>) -> FFIResult<Self>,
 
     pub evaluate_bounds: unsafe extern "C" fn(
         &Self,
@@ -99,13 +97,12 @@ pub struct FFI_PhysicalExpr {
         children: SVec<FFI_Distribution>,
     ) -> FFIResult<FFI_Distribution>,
 
-    pub propagate_statistics: unsafe extern "C" fn(
-        &Self,
-        parent: FFI_Distribution,
-        children: SVec<FFI_Distribution>,
-    ) -> FFIResult<
-        FfiOption<SVec<FFI_Distribution>>,
-    >,
+    pub propagate_statistics:
+        unsafe extern "C" fn(
+            &Self,
+            parent: FFI_Distribution,
+            children: SVec<FFI_Distribution>,
+        ) -> FFIResult<FfiOption<SVec<FFI_Distribution>>>,
 
     pub get_properties: unsafe extern "C" fn(
         &Self,
@@ -360,9 +357,7 @@ unsafe extern "C" fn get_properties_fn_wrapper(
     )
 }
 
-unsafe extern "C" fn fmt_sql_fn_wrapper(
-    expr: &FFI_PhysicalExpr,
-) -> FFIResult<SString> {
+unsafe extern "C" fn fmt_sql_fn_wrapper(expr: &FFI_PhysicalExpr) -> FFIResult<SString> {
     let expr = expr.inner();
     let result = fmt_sql(expr.as_ref()).to_string();
     FfiResult::Ok(result.into())

datafusion/ffi/src/session/mod.rs

@@ -94,19 +94,15 @@ pub(crate) struct FFI_SessionRef {
         schema: WrappedSchema,
     ) -> FFIResult<FFI_PhysicalExpr>,
 
-    scalar_functions:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_ScalarUDF)>,
+    scalar_functions: unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_ScalarUDF)>,
 
-    aggregate_functions:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_AggregateUDF)>,
+    aggregate_functions: unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_AggregateUDF)>,
 
-    window_functions:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_WindowUDF)>,
+    window_functions: unsafe extern "C" fn(&Self) -> SVec<(SString, FFI_WindowUDF)>,
 
     table_options: unsafe extern "C" fn(&Self) -> SVec<(SString, SString)>,
 
-    default_table_options:
-        unsafe extern "C" fn(&Self) -> SVec<(SString, SString)>,
+    default_table_options: unsafe extern "C" fn(&Self) -> SVec<(SString, SString)>,
 
     task_ctx: unsafe extern "C" fn(&Self) -> FFI_TaskContext,
 
@@ -245,9 +241,7 @@ unsafe extern "C" fn window_functions_fn_wrapper(
         .collect()
 }
 
-fn table_options_to_rhash(
-    mut options: TableOptions,
-) -> SVec<(SString, SString)> {
+fn table_options_to_rhash(mut options: TableOptions) -> SVec<(SString, SString)> {
     // It is important that we mutate options here and set current format
     // to None so that when we call `entries()` we get ALL format entries.
     // We will pass current_format as a special case and strip it on the
@@ -466,9 +460,7 @@ impl Clone for FFI_SessionRef {
     }
 }
 
-fn table_options_from_rhashmap(
-    options: SVec<(SString, SString)>,
-) -> TableOptions {
+fn table_options_from_rhashmap(options: SVec<(SString, SString)>) -> TableOptions {
     let mut options: HashMap<String, String> = options
         .into_iter()
         .map(|kv_pair| (kv_pair.0.to_string(), kv_pair.1.to_string()))

datafusion/ffi/src/table_provider.rs

@@ -123,8 +123,7 @@ pub struct FFI_TableProvider {
         unsafe extern "C" fn(
             provider: &FFI_TableProvider,
             filters_serialized: SVec<u8>,
-        )
-            -> FFIResult<SVec<FfiTableProviderFilterPushDown>>,
+        ) -> FFIResult<SVec<FfiTableProviderFilterPushDown>>,
     >,
 
     insert_into: unsafe extern "C" fn(

datafusion/ffi/src/udaf/accumulator.rs

@@ -45,14 +45,11 @@ pub struct FFI_Accumulator {
     ) -> FFIResult<()>,
 
     // Evaluate and return a ScalarValues as protobuf bytes
-    pub evaluate:
-        unsafe extern "C" fn(accumulator: &mut Self) -> FFIResult<SVec<u8>>,
+    pub evaluate: unsafe extern "C" fn(accumulator: &mut Self) -> FFIResult<SVec<u8>>,
 
     pub size: unsafe extern "C" fn(accumulator: &Self) -> usize,
 
-    pub state: unsafe extern "C" fn(
-        accumulator: &mut Self,
-    ) -> FFIResult<SVec<SVec<u8>>>,
+    pub state: unsafe extern "C" fn(accumulator: &mut Self) -> FFIResult<SVec<SVec<u8>>>,
 
     pub merge_batch: unsafe extern "C" fn(
         accumulator: &mut Self,

datafusion/ffi/src/udtf.rs

@@ -46,10 +46,8 @@ use crate::{df_result, rresult_return};
 pub struct FFI_TableFunction {
     /// Equivalent to the `call` function of the TableFunctionImpl.
     /// The arguments are Expr passed as protobuf encoded bytes.
-    pub call: unsafe extern "C" fn(
-        udtf: &Self,
-        args: SVec<u8>,
-    ) -> FFIResult<FFI_TableProvider>,
+    pub call:
+        unsafe extern "C" fn(udtf: &Self, args: SVec<u8>) -> FFIResult<FFI_TableProvider>,
 
     pub logical_codec: FFI_LogicalExtensionCodec,
 

datafusion/ffi/src/util.rs

@@ -160,10 +160,8 @@ pub(crate) mod tests {
         const VALID_VALUE: &str = "valid_value";
         const ERROR_VALUE: &str = "error_value";
 
-        let ok_r_result: FFIResult<SString> =
-            FfiResult::Ok(SString::from(VALID_VALUE));
-        let err_r_result: FFIResult<SString> =
-            FfiResult::Err(SString::from(ERROR_VALUE));
+        let ok_r_result: FFIResult<SString> = FfiResult::Ok(SString::from(VALID_VALUE));
+        let err_r_result: FFIResult<SString> = FfiResult::Err(SString::from(ERROR_VALUE));
 
         let returned_ok_result = df_result!(ok_r_result);
         assert!(returned_ok_result.is_ok());

datafusion/ffi/tests/ffi_integration.rs

@@ -26,7 +26,7 @@ mod tests {
 
     use arrow::datatypes::Schema;
     use datafusion::catalog::{TableProvider, TableProviderFactory};
-    use datafusion::error::{DataFusionError, Result};
+    use datafusion::error::Result;
     use datafusion_common::TableReference;
     use datafusion_common::ToDFSchema;
     use datafusion_expr::CreateExternalTable;
@@ -42,11 +42,7 @@ mod tests {
 
         // By calling the code below, the table provided will be created within
         // the module's code.
-        let ffi_table_provider = table_provider_module.create_table().ok_or(
-            DataFusionError::NotImplemented(
-                "External table provider failed to implement create_table".to_string(),
-            ),
-        )?(synchronous, codec);
+        let ffi_table_provider = (table_provider_module.create_table)(synchronous, codec);
 
         // In order to access the table provider within this executable, we need to
         // turn it into a `TableProvider`.
@@ -80,11 +76,8 @@ mod tests {
         let table_provider_module = get_module()?;
         let (ctx, codec) = super::utils::ctx_and_codec();
 
-        let ffi_table_provider_factory = table_provider_module
-            .create_table_factory()
-            .ok_or(DataFusionError::NotImplemented(
-                "External table provider factory failed to implement create".to_string(),
-            ))?(codec);
+        let ffi_table_provider_factory =
+            (table_provider_module.create_table_factory)(codec);
 
         let foreign_table_provider_factory: Arc<dyn TableProviderFactory> =
             (&ffi_table_provider_factory).into();

datafusion/ffi/tests/ffi_udwf.rs

@@ -22,7 +22,7 @@ mod tests {
     use std::sync::Arc;
 
     use arrow::array::{ArrayRef, create_array};
-    use datafusion::error::{DataFusionError, Result};
+    use datafusion::error::Result;
     use datafusion::logical_expr::expr::Sort;
     use datafusion::logical_expr::{ExprFunctionExt, WindowUDF, WindowUDFImpl, col};
     use datafusion::prelude::SessionContext;
@@ -33,13 +33,7 @@ mod tests {
     async fn test_rank_udwf() -> Result<()> {
         let module = get_module()?;
 
-        let ffi_rank_func =
-            module
-                .create_rank_udwf()
-                .ok_or(DataFusionError::NotImplemented(
-                    "External table provider failed to implement create_scalar_udf"
-                        .to_string(),
-                ))?();
+        let ffi_rank_func = (module.create_rank_udwf)();
         let foreign_rank_func: Arc<dyn WindowUDFImpl> = (&ffi_rank_func).into();
 
         let udwf = WindowUDF::new_from_shared_impl(foreign_rank_func);