cargo_fmt_rebase_main

Author: coderfender

datafusion/ffi/src/catalog_provider.rs

@@ -24,8 +24,8 @@ use datafusion_common::error::Result;
 use datafusion_proto::logical_plan::{
     DefaultLogicalExtensionCodec, LogicalExtensionCodec,
 };
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 use tokio::runtime::Handle;
 
 use crate::execution::FFI_TaskContextProvider;
@@ -38,24 +38,24 @@ use crate::{df_result, rresult_return};
 #[repr(C)]
 #[derive(Debug)]
 pub struct FFI_CatalogProvider {
-    pub schema_names: unsafe extern "C" fn(provider: &Self) -> StabbyVec<StabbyString>,
+    pub schema_names: unsafe extern "C" fn(provider: &Self) -> SVec<SString>,
 
     pub schema: unsafe extern "C" fn(
         provider: &Self,
-        name: StabbyString,
+        name: SString,
     ) -> FfiOption<FFI_SchemaProvider>,
 
     pub register_schema: unsafe extern "C" fn(
         provider: &Self,
-        name: StabbyString,
+        name: SString,
         schema: &FFI_SchemaProvider,
     )
         -> FFIResult<FfiOption<FFI_SchemaProvider>>,
 
     pub deregister_schema:
         unsafe extern "C" fn(
             provider: &Self,
-            name: StabbyString,
+            name: SString,
             cascade: bool,
         ) -> FFIResult<FfiOption<FFI_SchemaProvider>>,
 
@@ -107,7 +107,7 @@ impl FFI_CatalogProvider {
 
 unsafe extern "C" fn schema_names_fn_wrapper(
     provider: &FFI_CatalogProvider,
-) -> StabbyVec<StabbyString> {
+) -> SVec<SString> {
     unsafe {
         let names = provider.inner().schema_names();
         names.into_iter().map(|s| s.into()).collect()
@@ -116,7 +116,7 @@ unsafe extern "C" fn schema_names_fn_wrapper(
 
 unsafe extern "C" fn schema_fn_wrapper(
     provider: &FFI_CatalogProvider,
-    name: StabbyString,
+    name: SString,
 ) -> FfiOption<FFI_SchemaProvider> {
     unsafe {
         let maybe_schema = provider.inner().schema(name.as_str());
@@ -134,7 +134,7 @@ unsafe extern "C" fn schema_fn_wrapper(
 
 unsafe extern "C" fn register_schema_fn_wrapper(
     provider: &FFI_CatalogProvider,
-    name: StabbyString,
+    name: SString,
     schema: &FFI_SchemaProvider,
 ) -> FFIResult<FfiOption<FFI_SchemaProvider>> {
     unsafe {
@@ -159,7 +159,7 @@ unsafe extern "C" fn register_schema_fn_wrapper(
 
 unsafe extern "C" fn deregister_schema_fn_wrapper(
     provider: &FFI_CatalogProvider,
-    name: StabbyString,
+    name: SString,
     cascade: bool,
 ) -> FFIResult<FfiOption<FFI_SchemaProvider>> {
     unsafe {

datafusion/ffi/src/catalog_provider_list.rs

@@ -23,8 +23,8 @@ use datafusion_catalog::{CatalogProvider, CatalogProviderList};
 use datafusion_proto::logical_plan::{
     DefaultLogicalExtensionCodec, LogicalExtensionCodec,
 };
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 use tokio::runtime::Handle;
 
 use crate::catalog_provider::{FFI_CatalogProvider, ForeignCatalogProvider};
@@ -39,16 +39,16 @@ pub struct FFI_CatalogProviderList {
     /// Register a catalog
     pub register_catalog: unsafe extern "C" fn(
         &Self,
-        name: StabbyString,
+        name: SString,
         catalog: &FFI_CatalogProvider,
     ) -> FfiOption<FFI_CatalogProvider>,
 
     /// List of existing catalogs
-    pub catalog_names: unsafe extern "C" fn(&Self) -> StabbyVec<StabbyString>,
+    pub catalog_names: unsafe extern "C" fn(&Self) -> SVec<SString>,
 
     /// Access a catalog
     pub catalog:
-        unsafe extern "C" fn(&Self, name: StabbyString) -> FfiOption<FFI_CatalogProvider>,
+        unsafe extern "C" fn(&Self, name: SString) -> FfiOption<FFI_CatalogProvider>,
 
     pub logical_codec: FFI_LogicalExtensionCodec,
 
@@ -98,7 +98,7 @@ impl FFI_CatalogProviderList {
 
 unsafe extern "C" fn catalog_names_fn_wrapper(
     provider: &FFI_CatalogProviderList,
-) -> StabbyVec<StabbyString> {
+) -> SVec<SString> {
     unsafe {
         let names = provider.inner().catalog_names();
         names.into_iter().map(|s| s.into()).collect()
@@ -107,7 +107,7 @@ unsafe extern "C" fn catalog_names_fn_wrapper(
 
 unsafe extern "C" fn register_catalog_fn_wrapper(
     provider: &FFI_CatalogProviderList,
-    name: StabbyString,
+    name: SString,
     catalog: &FFI_CatalogProvider,
 ) -> FfiOption<FFI_CatalogProvider> {
     unsafe {
@@ -130,7 +130,7 @@ unsafe extern "C" fn register_catalog_fn_wrapper(
 
 unsafe extern "C" fn catalog_fn_wrapper(
     provider: &FFI_CatalogProviderList,
-    name: StabbyString,
+    name: SString,
 ) -> FfiOption<FFI_CatalogProvider> {
     unsafe {
         let runtime = provider.runtime();

datafusion/ffi/src/config/extension_options.rs

@@ -22,9 +22,9 @@ use std::ffi::c_void;
 use datafusion_common::config::{ConfigEntry, ConfigExtension, ExtensionOptions};
 use datafusion_common::{Result, exec_err};
 
-use stabby::str::Str as StabbyStr;
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::str::Str as SStr;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 
 use crate::df_result;
 use crate::util::{FFIResult, FfiResult};
@@ -49,12 +49,12 @@ pub struct FFI_ExtensionOptions {
     /// Set the given `key`, `value` pair
     pub set: unsafe extern "C" fn(
         &mut Self,
-        key: StabbyStr,
-        value: StabbyStr,
+        key: SStr,
+        value: SStr,
     ) -> FFIResult<()>,
 
     /// Returns the [`ConfigEntry`] stored in this [`ExtensionOptions`]
-    pub entries: unsafe extern "C" fn(&Self) -> StabbyVec<(StabbyString, StabbyString)>,
+    pub entries: unsafe extern "C" fn(&Self) -> SVec<(SString, SString)>,
 
     /// Release the memory of the private data when it is no longer being used.
     pub release: unsafe extern "C" fn(&mut Self),
@@ -97,8 +97,8 @@ unsafe extern "C" fn cloned_fn_wrapper(
 
 unsafe extern "C" fn set_fn_wrapper(
     options: &mut FFI_ExtensionOptions,
-    key: StabbyStr,
-    value: StabbyStr,
+    key: SStr,
+    value: SStr,
 ) -> FFIResult<()> {
     let _ = options
         .inner_mut()
@@ -108,7 +108,7 @@ unsafe extern "C" fn set_fn_wrapper(
 
 unsafe extern "C" fn entries_fn_wrapper(
     options: &FFI_ExtensionOptions,
-) -> StabbyVec<(StabbyString, StabbyString)> {
+) -> SVec<(SString, SString)> {
     options
         .inner()
         .iter()

datafusion/ffi/src/config/mod.rs

@@ -21,8 +21,8 @@ use datafusion_common::config::{
     ConfigExtension, ConfigOptions, ExtensionOptions, TableOptions,
 };
 use datafusion_common::{DataFusionError, Result};
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 
 use crate::config::extension_options::FFI_ExtensionOptions;
 
@@ -34,14 +34,14 @@ use crate::config::extension_options::FFI_ExtensionOptions;
 #[repr(C)]
 #[derive(Debug, Clone)]
 pub struct FFI_ConfigOptions {
-    base_options: StabbyVec<(StabbyString, StabbyString)>,
+    base_options: SVec<(SString, SString)>,
 
     extensions: FFI_ExtensionOptions,
 }
 
 impl From<&ConfigOptions> for FFI_ConfigOptions {
     fn from(options: &ConfigOptions) -> Self {
-        let base_options: StabbyVec<(StabbyString, StabbyString)> = options
+        let base_options: SVec<(SString, SString)> = options
             .entries()
             .into_iter()
             .filter_map(|entry| entry.value.map(|value| (entry.key, value)))
@@ -122,14 +122,14 @@ impl ExtensionOptionsFFIProvider for TableOptions {
 #[repr(C)]
 #[derive(Debug, Clone)]
 pub struct FFI_TableOptions {
-    base_options: StabbyVec<(StabbyString, StabbyString)>,
+    base_options: SVec<(SString, SString)>,
 
     extensions: FFI_ExtensionOptions,
 }
 
 impl From<&TableOptions> for FFI_TableOptions {
     fn from(options: &TableOptions) -> Self {
-        let base_options: StabbyVec<(StabbyString, StabbyString)> = options
+        let base_options: SVec<(SString, SString)> = options
             .entries()
             .into_iter()
             .filter_map(|entry| entry.value.map(|value| (entry.key, value)))

datafusion/ffi/src/execution/task_ctx.rs

@@ -25,8 +25,8 @@ use datafusion_expr::{
     AggregateUDF, AggregateUDFImpl, ScalarUDF, ScalarUDFImpl, WindowUDF, WindowUDFImpl,
 };
 
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 
 use crate::session::config::FFI_SessionConfig;
 use crate::udaf::FFI_AggregateUDF;
@@ -39,25 +39,25 @@ use crate::util::FfiOption;
 #[derive(Debug)]
 pub struct FFI_TaskContext {
     /// Return the session ID.
-    pub session_id: unsafe extern "C" fn(&Self) -> StabbyString,
+    pub session_id: unsafe extern "C" fn(&Self) -> SString,
 
     /// Return the task ID.
-    pub task_id: unsafe extern "C" fn(&Self) -> FfiOption<StabbyString>,
+    pub task_id: unsafe extern "C" fn(&Self) -> FfiOption<SString>,
 
     /// Return the session configuration.
     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) -> StabbyVec<(StabbyString, FFI_ScalarUDF)>,
+        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) -> StabbyVec<(StabbyString, FFI_AggregateUDF)>,
+        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) -> StabbyVec<(StabbyString, FFI_WindowUDF)>,
+        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),
@@ -85,7 +85,7 @@ impl FFI_TaskContext {
     }
 }
 
-unsafe extern "C" fn session_id_fn_wrapper(ctx: &FFI_TaskContext) -> StabbyString {
+unsafe extern "C" fn session_id_fn_wrapper(ctx: &FFI_TaskContext) -> SString {
     unsafe {
         let ctx = ctx.inner();
         ctx.session_id().into()
@@ -94,7 +94,7 @@ unsafe extern "C" fn session_id_fn_wrapper(ctx: &FFI_TaskContext) -> StabbyStrin
 
 unsafe extern "C" fn task_id_fn_wrapper(
     ctx: &FFI_TaskContext,
-) -> FfiOption<StabbyString> {
+) -> FfiOption<SString> {
     unsafe {
         let ctx = ctx.inner();
         ctx.task_id().map(|s| s.as_str().into()).into()
@@ -112,7 +112,7 @@ unsafe extern "C" fn session_config_fn_wrapper(
 
 unsafe extern "C" fn scalar_functions_fn_wrapper(
     ctx: &FFI_TaskContext,
-) -> StabbyVec<(StabbyString, FFI_ScalarUDF)> {
+) -> SVec<(SString, FFI_ScalarUDF)> {
     unsafe {
         let ctx = ctx.inner();
         ctx.scalar_functions()
@@ -124,7 +124,7 @@ unsafe extern "C" fn scalar_functions_fn_wrapper(
 
 unsafe extern "C" fn aggregate_functions_fn_wrapper(
     ctx: &FFI_TaskContext,
-) -> StabbyVec<(StabbyString, FFI_AggregateUDF)> {
+) -> SVec<(SString, FFI_AggregateUDF)> {
     unsafe {
         let ctx = ctx.inner();
         ctx.aggregate_functions()
@@ -141,7 +141,7 @@ unsafe extern "C" fn aggregate_functions_fn_wrapper(
 
 unsafe extern "C" fn window_functions_fn_wrapper(
     ctx: &FFI_TaskContext,
-) -> StabbyVec<(StabbyString, FFI_WindowUDF)> {
+) -> SVec<(SString, FFI_WindowUDF)> {
     unsafe {
         let ctx = ctx.inner();
         ctx.window_functions()

datafusion/ffi/src/execution_plan.rs

@@ -26,8 +26,8 @@ use datafusion_execution::{SendableRecordBatchStream, TaskContext};
 use datafusion_physical_plan::{
     DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties,
 };
-use stabby::string::String as StabbyString;
-use stabby::vec::Vec as StabbyVec;
+use stabby::string::String as SString;
+use stabby::vec::Vec as SVec;
 use tokio::runtime::Handle;
 
 use crate::config::FFI_ConfigOptions;
@@ -45,13 +45,13 @@ pub struct FFI_ExecutionPlan {
     pub properties: unsafe extern "C" fn(plan: &Self) -> FFI_PlanProperties,
 
     /// Return a vector of children plans
-    pub children: unsafe extern "C" fn(plan: &Self) -> StabbyVec<FFI_ExecutionPlan>,
+    pub children: unsafe extern "C" fn(plan: &Self) -> SVec<FFI_ExecutionPlan>,
 
     pub with_new_children:
-        unsafe extern "C" fn(plan: &Self, children: StabbyVec<Self>) -> FFIResult<Self>,
+        unsafe extern "C" fn(plan: &Self, children: SVec<Self>) -> FFIResult<Self>,
 
     /// Return the plan name.
-    pub name: unsafe extern "C" fn(plan: &Self) -> StabbyString,
+    pub name: unsafe extern "C" fn(plan: &Self) -> SString,
 
     /// Execute the plan and return a record batch stream. Errors
     /// will be returned as a string.
@@ -113,7 +113,7 @@ unsafe extern "C" fn properties_fn_wrapper(
 
 unsafe extern "C" fn children_fn_wrapper(
     plan: &FFI_ExecutionPlan,
-) -> StabbyVec<FFI_ExecutionPlan> {
+) -> SVec<FFI_ExecutionPlan> {
     unsafe {
         let private_data = plan.private_data as *const ExecutionPlanPrivateData;
         let plan = &(*private_data).plan;
@@ -128,7 +128,7 @@ unsafe extern "C" fn children_fn_wrapper(
 
 unsafe extern "C" fn with_new_children_fn_wrapper(
     plan: &FFI_ExecutionPlan,
-    children: StabbyVec<FFI_ExecutionPlan>,
+    children: SVec<FFI_ExecutionPlan>,
 ) -> FFIResult<FFI_ExecutionPlan> {
     let runtime = plan.runtime();
     let inner_plan = Arc::clone(plan.inner());
@@ -179,7 +179,7 @@ unsafe extern "C" fn repartitioned_fn_wrapper(
     )
 }
 
-unsafe extern "C" fn name_fn_wrapper(plan: &FFI_ExecutionPlan) -> StabbyString {
+unsafe extern "C" fn name_fn_wrapper(plan: &FFI_ExecutionPlan) -> SString {
     plan.inner().name().into()
 }
 
@@ -389,7 +389,7 @@ impl ExecutionPlan for ForeignExecutionPlan {
         let children = children
             .into_iter()
             .map(|child| FFI_ExecutionPlan::new(child, None))
-            .collect::<StabbyVec<_>>();
+            .collect::<SVec<_>>();
         let new_plan =
             unsafe { df_result!((self.plan.with_new_children)(&self.plan, children))? };