From 90df4797361e3a469ad9af43b5bb7495432f4f18 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Thu, 8 Sep 2022 13:48:43 -0600 Subject: [PATCH] improve optimizer error --- datafusion/optimizer/src/optimizer.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/datafusion/optimizer/src/optimizer.rs b/datafusion/optimizer/src/optimizer.rs index 9d76cf5e7e6e9..9170035b7d6e4 100644 --- a/datafusion/optimizer/src/optimizer.rs +++ b/datafusion/optimizer/src/optimizer.rs @@ -18,7 +18,7 @@ //! Query optimizer traits use chrono::{DateTime, Utc}; -use datafusion_common::Result; +use datafusion_common::{DataFusionError, Result}; use datafusion_expr::logical_plan::LogicalPlan; use log::{debug, trace, warn}; use std::sync::Arc; @@ -120,12 +120,16 @@ impl Optimizer { // bug in the DataFusion optimizer. Please consider filing a ticket // https://github.com/apache/arrow-datafusion warn!( - "Skipping optimizer rule {} due to unexpected error: {}", + "Skipping optimizer rule '{}' due to unexpected error: {}", rule.name(), e ); } else { - return result; + return Err(DataFusionError::Internal(format!( + "Optimizer rule '{}' failed due to unexpected error: {}", + rule.name(), + e + ))); } } } @@ -167,7 +171,9 @@ mod tests { }); let result = opt.optimize(&plan, &mut config, &observe); assert_eq!( - "Error during planning: rule failed", + "Internal error: Optimizer rule 'bad rule' failed due to unexpected error: \ + Error during planning: rule failed. This was likely caused by a bug in \ + DataFusion's code and we would welcome that you file an bug report in our issue tracker", format!("{}", result.err().unwrap()) ); Ok(())