use substrait_err macro

Signed-off-by: Ruihang Xia <[email protected]>
waynexia · Dec 14, 2023 · 9f553e7 · 9f553e7
1 parent ea2555a
commit 9f553e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/datafusion/substrait/src/logical_plan/consumer.rs b/datafusion/substrait/src/logical_plan/consumer.rs
@@ -553,16 +553,12 @@ pub async fn from_substrait_rel(
         }
         Some(RelType::Exchange(exchange)) => {
             let Some(input) = exchange.input.as_ref() else {
-                return Err(DataFusionError::Substrait(
-                    "Unexpected empty input in ExchangeRel".to_string(),
-                ));
+                return substrait_err!("Unexpected empty input in ExchangeRel");
             };
             let input = Arc::new(from_substrait_rel(ctx, input, extensions).await?);
 
             let Some(exchange_kind) = &exchange.exchange_kind else {
-                return Err(DataFusionError::Substrait(
-                    "Unexpected empty input in ExchangeRel".to_string(),
-                ));
+                return substrait_err!("Unexpected empty input in ExchangeRel");
             };
 
             // ref: https://substrait.io/relations/physical_relations/#exchange-types

diff --git a/datafusion/substrait/src/logical_plan/producer.rs b/datafusion/substrait/src/logical_plan/producer.rs
@@ -30,8 +30,8 @@ use datafusion::{
     scalar::ScalarValue,
 };
 
-use datafusion::common::DFSchemaRef;
 use datafusion::common::{exec_err, internal_err, not_impl_err};
+use datafusion::common::{substrait_err, DFSchemaRef};
 #[allow(unused_imports)]
 use datafusion::logical_expr::aggregate_function;
 use datafusion::logical_expr::expr::{
@@ -1822,9 +1822,7 @@ fn try_to_substrait_field_reference(
                 root_type: None,
             })
         }
-        _ => Err(DataFusionError::Substrait(format!(
-            "Expect a `Column` expr, but found {expr:?}"
-        ))),
+        _ => substrait_err!("Expect a `Column` expr, but found {expr:?}"),
     }
 }