cleanup

findepi · Feb 18, 2025 · cd030cb · cd030cb
1 parent 042d04b
commit cd030cb
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 193 deletions.
diff --git a/datafusion/excalibur/lib/src/invoke.rs b/datafusion/excalibur/lib/src/invoke.rs
@@ -180,7 +180,6 @@ where
                     >(record)
                 };
                 invoke(position, record, out_arg)
-                // invoke(position, (head_arg, tail_args), out_arg)
             },
             builder,
         )

diff --git a/datafusion/excalibur/lib/src/option_ret.rs b/datafusion/excalibur/lib/src/option_ret.rs
@@ -15,20 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::builder::{ExArrayBuilder, ExFullResultType};
-// use crate::ret_type::ExRetType;
 use crate::__private::ExInstantiable;
+use crate::builder::{ExArrayBuilder, ExFullResultType};
 use arrow::array::ArrayRef;
 use arrow::datatypes::DataType;
 use datafusion_common::Result;
-// impl<T> ExRetType for Option<T>
-// where
-//     T: ExRetType,
-// {
-//     fn data_type() -> DataType {
-//         T::data_type()
-//     }
-// }
 
 impl<T> ExFullResultType for ((), Option<T>)
 where

diff --git a/datafusion/excalibur/lib/src/primitives.rs b/datafusion/excalibur/lib/src/primitives.rs
@@ -51,11 +51,5 @@ macro_rules! primitive_type {
                 }
             }
         }
-
-        // impl $crate::ret_type::ExRetType for $native_type {
-        //     fn data_type() -> DataType {
-        //         DataType::$dt_option_name
-        //     }
-        // }
     };
 }
diff --git a/datafusion/excalibur/lib/src/result.rs b/datafusion/excalibur/lib/src/result.rs
@@ -15,20 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::builder::{ExArrayBuilder, ExFullResultType};
-// use crate::ret_type::ExRetType;
 use crate::__private::ExInstantiable;
+use crate::builder::{ExArrayBuilder, ExFullResultType};
 use arrow::array::ArrayRef;
 use arrow::datatypes::DataType;
 use datafusion_common::Result;
-// impl<T> ExRetType for Result<T>
-// where
-//     T: ExRetType,
-// {
-//     fn data_type() -> DataType {
-//         T::data_type()
-//     }
-// }
 
 impl<T> ExFullResultType for ((), Result<T>)
 where

diff --git a/datafusion/excalibur/lib/src/ret_type.rs b/datafusion/excalibur/lib/src/ret_type.rs
@@ -15,10 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// pub trait ExRetType {
-//     fn data_type() -> DataType;
-// }
-
 pub type FindExOutArgType<T> = <T as ExFindOutImplementation>::Type;
 
 pub trait ExFindOutImplementation {

diff --git a/datafusion/excalibur/lib/src/scalar_udf.rs b/datafusion/excalibur/lib/src/scalar_udf.rs
@@ -15,12 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+use crate::__private::ExInstantiable;
 use crate::arg_type_list::ExArgTypeList;
 use crate::bridge::ExcaliburScalarUdf;
 use crate::builder::{ExArrayBuilder, ExFullResultType};
 use crate::invoke::{excalibur_invoke, ApplyList};
-// use crate::ret_type::ExRetType;
-use crate::__private::ExInstantiable;
 use crate::signature::{create_excalibur_signature, ExcaliburSignature};
 use arrow::datatypes::DataType;
 use datafusion_common::Result;
@@ -35,7 +34,6 @@ where
     T: ExcaliburScalarUdf + Send + Sync + 'static,
     T::ArgumentRustTypes: ExArgTypeList,
     T::ArgumentRustTypes: ApplyList,
-    //T::ReturnRustType: ExRetType,
     (T::OutArgRustType, T::ReturnRustType): ExFullResultType<
         BuilderType: ExArrayBuilder<
             OutArg: for<'a> ExInstantiable<

diff --git a/datafusion/excalibur/lib/src/signature.rs b/datafusion/excalibur/lib/src/signature.rs
@@ -17,7 +17,6 @@
 
 use crate::arg_type_list::ExArgTypeList;
 use crate::bridge::ExcaliburScalarUdf;
-// use crate::ret_type::ExRetType;
 use crate::builder::ExFullResultType;
 use arrow::datatypes::DataType;
 use datafusion_common::Result;
@@ -28,7 +27,6 @@ pub fn create_excalibur_signature<T>() -> ExcaliburSignature
 where
     T: ExcaliburScalarUdf,
     T::ArgumentRustTypes: ExArgTypeList,
-    // T::ReturnRustType: ExRetType,
     (T::OutArgRustType, T::ReturnRustType): ExFullResultType,
 {
     ExcaliburSignature {
@@ -46,7 +44,6 @@ where
 }
 
 pub struct ExcaliburSignature {
-    // For now just constant signature
     signature: Signature,
     return_type: DataType,
 }

diff --git a/datafusion/excalibur/lib/src/string.rs b/datafusion/excalibur/lib/src/string.rs
@@ -69,8 +69,6 @@ impl ExArgType for RefStrArgType {
     }
 }
 
-// TODO implement this in terms of GenericByteArray
-
 impl<'a> ExArrayReader<'a> for &'a StringArray {
     type ValueType = &'a str;
 

diff --git a/datafusion/excalibur/lib/tests/str_.rs b/datafusion/excalibur/lib/tests/str_.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,8 +69,6 @@ impl ExArgType for RefStrArgType { @@
         }
     }
-    // TODO implement this in terms of GenericByteArray
     impl<'a> ExArrayReader<'a> for &'a StringArray {
         type ValueType = &'a str;
@@ Expand Down @@