diff --git a/src/common/function/src/admin/flush_compact_region.rs b/src/common/function/src/admin/flush_compact_region.rs index 60fd19ef5a..6dcf92117a 100644 --- a/src/common/function/src/admin/flush_compact_region.rs +++ b/src/common/function/src/admin/flush_compact_region.rs @@ -128,7 +128,7 @@ mod tests { }; let result = f.invoke_async_with_args(func_args).await.unwrap_err(); assert_eq!( - "Execution error: Handler error: Missing TableMutationHandler, not expected", + "Execution error: Missing TableMutationHandler, not expected", result.to_string() ); } diff --git a/src/common/function/src/admin/flush_compact_table.rs b/src/common/function/src/admin/flush_compact_table.rs index 3298a95061..20b95e4379 100644 --- a/src/common/function/src/admin/flush_compact_table.rs +++ b/src/common/function/src/admin/flush_compact_table.rs @@ -355,7 +355,7 @@ mod tests { }; let result = f.invoke_async_with_args(func_args).await.unwrap_err(); assert_eq!( - "Execution error: Handler error: Missing TableMutationHandler, not expected", + "Execution error: Missing TableMutationHandler, not expected", result.to_string() ); } diff --git a/src/common/function/src/admin/migrate_region.rs b/src/common/function/src/admin/migrate_region.rs index 91b5540b1a..d958b3cce9 100644 --- a/src/common/function/src/admin/migrate_region.rs +++ b/src/common/function/src/admin/migrate_region.rs @@ -173,7 +173,7 @@ mod tests { }; let result = f.invoke_async_with_args(func_args).await.unwrap_err(); assert_eq!( - "Execution error: Handler error: Missing ProcedureServiceHandler, not expected", + "Execution error: Missing ProcedureServiceHandler, not expected", result.to_string() ); } diff --git a/src/common/function/src/flush_flow.rs b/src/common/function/src/flush_flow.rs index c4ea554585..35f347bcb2 100644 --- a/src/common/function/src/flush_flow.rs +++ b/src/common/function/src/flush_flow.rs @@ -149,7 +149,7 @@ mod test { let result = f.invoke_async_with_args(func_args).await.unwrap_err(); assert_eq!( - "Execution error: Handler error: Missing FlowServiceHandler, not expected", + "Execution error: Missing FlowServiceHandler, not expected", result.to_string() ); } diff --git a/src/common/macro/src/admin_fn.rs b/src/common/macro/src/admin_fn.rs index 651c083ec8..efeb77f1d1 100644 --- a/src/common/macro/src/admin_fn.rs +++ b/src/common/macro/src/admin_fn.rs @@ -316,14 +316,14 @@ fn build_struct( .#handler .as_ref() .context(#snafu_type) - .map_err(|e| datafusion_common::DataFusionError::Execution(format!("Handler error: {}", e.output_msg())))?; + .map_err(|e| datafusion_common::DataFusionError::Execution(e.output_msg()))?; let mut builder = store_api::storage::ConcreteDataType::#ret() .create_mutable_vector(rows_num); if columns_num == 0 { let result = #fn_name(handler, query_ctx, &[]).await - .map_err(|e| datafusion_common::DataFusionError::Execution(format!("Function execution error: {}", e.output_msg())))?; + .map_err(|e| datafusion_common::DataFusionError::Execution(e.output_msg()))?; builder.push_value_ref(&result.as_value_ref()); } else { @@ -333,7 +333,7 @@ fn build_struct( .collect(); let result = #fn_name(handler, query_ctx, &args).await - .map_err(|e| datafusion_common::DataFusionError::Execution(format!("Function execution error: {}", e.output_msg())))?; + .map_err(|e| datafusion_common::DataFusionError::Execution(e.output_msg()))?; builder.push_value_ref(&result.as_value_ref()); } diff --git a/src/operator/src/error.rs b/src/operator/src/error.rs index a5a3e9b0be..da65cc8c2f 100644 --- a/src/operator/src/error.rs +++ b/src/operator/src/error.rs @@ -55,7 +55,7 @@ pub enum Error { #[snafu(display("Failed to build admin function args: {msg}"))] BuildAdminFunctionArgs { msg: String }, - #[snafu(display("Failed to execute admin function: {msg}, error: {error}"))] + #[snafu(display("Failed to execute admin function {msg}"))] ExecuteAdminFunction { msg: String, #[snafu(source)] diff --git a/src/operator/src/statement/admin.rs b/src/operator/src/statement/admin.rs index e606f8a939..d51e739dc2 100644 --- a/src/operator/src/statement/admin.rs +++ b/src/operator/src/statement/admin.rs @@ -133,7 +133,7 @@ impl StatementExecutor { .invoke_async_with_args(func_args) .await .with_context(|_| ExecuteAdminFunctionSnafu { - msg: format!("Failed to execute admin function {}", fn_name), + msg: fn_name.to_string(), })?; // Convert result back to VectorRef diff --git a/tests/cases/standalone/common/flow/flow_last_non_null.result b/tests/cases/standalone/common/flow/flow_last_non_null.result index 64cc8d7eed..50cb46faa3 100644 --- a/tests/cases/standalone/common/flow/flow_last_non_null.result +++ b/tests/cases/standalone/common/flow/flow_last_non_null.result @@ -185,7 +185,7 @@ Affected Rows: 2 -- should return error ADMIN FLUSH_FLOW('find_approx_rate'); -Error: 1002(Unexpected), Failed to execute admin function: Failed to execute admin function flush_flow, error: Execution error: Function execution error: Internal error: 1003: Execution error: Function execution error: Internal error: 1003 +Error: 1002(Unexpected), Failed to execute admin function flush_flow: Execution error: Internal error: 1003 DROP FLOW find_approx_rate;