From 6961366eebb8d2b1808595739ef127b14531bf2d Mon Sep 17 00:00:00 2001 From: Andrew Gazelka Date: Thu, 19 Dec 2024 13:39:22 -0800 Subject: [PATCH] update --- .../translation/expr/unresolved_function.rs | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/src/daft-connect/src/translation/expr/unresolved_function.rs b/src/daft-connect/src/translation/expr/unresolved_function.rs index b6b5d99292..ee435fcb1f 100644 --- a/src/daft-connect/src/translation/expr/unresolved_function.rs +++ b/src/daft-connect/src/translation/expr/unresolved_function.rs @@ -23,25 +23,19 @@ pub fn unresolved_to_daft_expr(f: &UnresolvedFunction) -> eyre::Result handle_count(arguments).wrap_err("Failed to handle count function"), - "<" => handle_binary_op(arguments, daft_dsl::Operator::Lt) - .wrap_err("Failed to handle < function"), - ">" => handle_binary_op(arguments, daft_dsl::Operator::Gt) - .wrap_err("Failed to handle > function"), - "<=" => handle_binary_op(arguments, daft_dsl::Operator::LtEq) - .wrap_err("Failed to handle <= function"), - ">=" => handle_binary_op(arguments, daft_dsl::Operator::GtEq) - .wrap_err("Failed to handle >= function"), - "%" => handle_binary_op(arguments, daft_dsl::Operator::Modulus) - .wrap_err("Failed to handle % function"), - "==" => handle_binary_op(arguments, daft_dsl::Operator::Eq) - .wrap_err("Failed to handle == function"), - "not" => not(arguments).wrap_err("Failed to handle not function"), - "sum" => handle_sum(arguments).wrap_err("Failed to handle sum function"), - "isnotnull" => handle_isnotnull(arguments).wrap_err("Failed to handle isnotnull function"), - "isnull" => handle_isnull(arguments).wrap_err("Failed to handle isnull function"), + "<" => handle_binary_op(arguments, daft_dsl::Operator::Lt), + ">" => handle_binary_op(arguments, daft_dsl::Operator::Gt), + "<=" => handle_binary_op(arguments, daft_dsl::Operator::LtEq), + ">=" => handle_binary_op(arguments, daft_dsl::Operator::GtEq), + "%" => handle_binary_op(arguments, daft_dsl::Operator::Modulus), + "==" => handle_binary_op(arguments, daft_dsl::Operator::Eq), + "not" => not(arguments), + "sum" => handle_sum(arguments), + "isnotnull" => handle_isnotnull(arguments), + "isnull" => handle_isnull(arguments), n => bail!("Unresolved function {n:?} not yet supported"), } + .wrap_err_with(|| format!("Failed to handle function {function_name:?}")) } pub fn handle_sum(arguments: Vec) -> eyre::Result {