Skip to content

Apache DataFusion SQL Query Engine

minor: refactor with `assert_or_internal_err!()` in `datafusion/datasource` (#18697)

Kumar Ujjawal0850cecc6ee1
diff --git a/datafusion/datasource/src/memory.rs b/datafusion/datasource/src/memory.rs
index 7d5c8c4834..9bdbf433bd 100644
--- a/datafusion/datasource/src/memory.rs
+++ b/datafusion/datasource/src/memory.rs
@@ -29,7 +29,10 @@ use crate::source::{DataSource, DataSourceExec};
use arrow::array::{RecordBatch, RecordBatchOptions};
use arrow::datatypes::{Schema, SchemaRef};
-use datafusion_common::{internal_err, plan_err, project_schema, Result, ScalarValue};
+use datafusion_common::{
+ assert_or_internal_err, plan_err, project_schema, DataFusionError, Result,
+ ScalarValue,
+};
use datafusion_execution::TaskContext;
use datafusion_physical_expr::equivalence::project_orderings;
use datafusion_physical_expr::utils::collect_columns;
@@ -438,12 +441,11 @@ impl MemorySourceConfig {
.map(|field| field.name() != col.name())
.unwrap_or(true)
});
- if let Some(col) = ambiguous_column {
- return internal_err!(
- "Column {:?} is not found in the original schema of the MemorySourceConfig",
- col
- );
- }
+ assert_or_internal_err!(
+ ambiguous_column.is_none(),
+ "Column {:?} is not found in the original schema of the MemorySourceConfig",
+ ambiguous_column.as_ref().unwrap()
+ );
// If there is a projection on the source, we also need to project orderings
if self.projection.is_some() {
diff --git a/datafusion/datasource/src/sink.rs b/datafusion/datasource/src/sink.rs
index a8adb46b96..a4ab78d078 100644
--- a/datafusion/datasource/src/sink.rs
+++ b/datafusion/datasource/src/sink.rs
@@ -24,7 +24,7 @@ use std::sync::Arc;
use arrow::array::{ArrayRef, RecordBatch, UInt64Array};
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-use datafusion_common::{internal_err, Result};
+use datafusion_common::{assert_eq_or_internal_err, DataFusionError, Result};
use datafusion_execution::TaskContext;
use datafusion_physical_expr::{Distribution, EquivalenceProperties};
use datafusion_physical_expr_common::sort_expr::{LexRequirement, OrderingRequirements};
@@ -226,9 +226,11 @@ impl ExecutionPlan for DataSinkExec {
partition: usize,
context: Arc<TaskContext>,
) -> Result<SendableRecordBatchStream> {
- if partition != 0 {
- return internal_err!("DataSinkExec can only be called on partition 0!");
- }
+ assert_eq_or_internal_err!(
+ partition,
+ 0,
+ "DataSinkExec can only be called on partition 0!"
+ );
let data = execute_input_stream(
Arc::clone(&self.input),
Arc::clone(self.sink.schema()),