shruti2522 commented on code in PR #17100:
URL: https://github.com/apache/datafusion/pull/17100#discussion_r2267464637
##########
datafusion/functions/src/utils.rs:
##########
@@ -156,71 +156,70 @@ pub mod test {
let field_array = data_array.into_iter().zip(nullables).enumerate()
.map(|(idx, (data_type, nullable))|
arrow::datatypes::Field::new(format!("field_{idx}"), data_type, nullable))
- .map(std::sync::Arc::new)
- .collect::<Vec<_>>();
+ .map(std::sync::Arc::new)
+ .collect::<Vec<_>>();
- let return_field =
func.return_field_from_args(datafusion_expr::ReturnFieldArgs {
- arg_fields: &field_array,
- scalar_arguments: &scalar_arguments_refs,
- });
+ let return_field =
func.return_field_from_args(datafusion_expr::ReturnFieldArgs {
+ arg_fields: &field_array,
+ scalar_arguments: &scalar_arguments_refs,
+ });
let arg_fields = $ARGS.iter()
- .enumerate()
+ .enumerate()
.map(|(idx, arg)|
arrow::datatypes::Field::new(format!("f_{idx}"), arg.data_type(), true).into())
- .collect::<Vec<_>>();
+ .collect::<Vec<_>>();
- match expected {
- Ok(expected) => {
- assert_eq!(return_field.is_ok(), true);
- let return_field = return_field.unwrap();
- let return_type = return_field.data_type();
- assert_eq!(return_type, &$EXPECTED_DATA_TYPE);
+ match expected {
+ Ok(expected) => {
+ assert_eq!(return_field.is_ok(), true);
+ let return_field = return_field.unwrap();
+ let return_type = return_field.data_type();
+ assert_eq!(return_type, &$EXPECTED_DATA_TYPE);
let result =
func.invoke_with_args(datafusion_expr::ScalarFunctionArgs{
- args: $ARGS,
- arg_fields,
- number_rows: cardinality,
- return_field,
+ args: $ARGS,
+ arg_fields,
+ number_rows: cardinality,
+ return_field,
config_options: $CONFIG_OPTIONS
- });
+ });
assert_eq!(result.is_ok(), true, "function returned an
error: {}", result.unwrap_err());
let result =
result.unwrap().to_array(cardinality).expect("Failed to convert to array");
let result =
result.as_any().downcast_ref::<$ARRAY_TYPE>().expect("Failed to convert to
type");
- assert_eq!(result.data_type(), &$EXPECTED_DATA_TYPE);
+ assert_eq!(result.data_type(), &$EXPECTED_DATA_TYPE);
- // value is correct
- match expected {
- Some(v) => assert_eq!(result.value(0), v),
- None => assert!(result.is_null(0)),
- };
- }
- Err(expected_error) => {
- if return_field.is_err() {
- match return_field {
- Ok(_) => assert!(false, "expected error"),
- Err(error) => {
datafusion_common::assert_contains!(expected_error.strip_backtrace(),
error.strip_backtrace()); }
- }
- }
- else {
- let return_field = return_field.unwrap();
-
- // invoke is expected error - cannot use .expect_err()
due to Debug not being implemented
- match
func.invoke_with_args(datafusion_expr::ScalarFunctionArgs{
- args: $ARGS,
- arg_fields,
- number_rows: cardinality,
- return_field,
- config_options: $CONFIG_OPTIONS})
- {
- Ok(_) => assert!(false, "expected error"),
- Err(error) => {
-
assert!(expected_error.strip_backtrace().starts_with(&error.strip_backtrace()));
- }
+ // value is correct
+ match expected {
+ Some(v) => assert_eq!(result.value(0), v),
+ None => assert!(result.is_null(0)),
+ };
+ }
+ Err(expected_error) => {
+ if let Ok(return_field) = return_field {
+ // invoke is expected error - cannot use .expect_err() due
to Debug not being implemented
+ match
func.invoke_with_args(datafusion_expr::ScalarFunctionArgs {
+ args: $ARGS,
+ arg_fields,
+ number_rows: cardinality,
+ return_field,
+ config_options: $CONFIG_OPTIONS,
+ }) {
+ Ok(_) => assert!(false, "expected error"),
+ Err(error) => {
+ assert!(expected_error
+ .strip_backtrace()
+ .starts_with(&error.strip_backtrace()));
}
}
+ } else if let Err(error) = return_field {
+ datafusion_common::assert_contains!(
+ expected_error.strip_backtrace(),
+ error.strip_backtrace()
+ );
}
- };
+ }
};
+ };
Review Comment:
[B] simplified `return_field.is_err() + unwrap()` to `if let
Ok(return_field) = return_field`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscr...@datafusion.apache.org
For additional commands, e-mail: github-h...@datafusion.apache.org
