From d4e860f0e9e5bfb4111a274450d622fb5457551a Mon Sep 17 00:00:00 2001 From: Namgung Chan <9511chn@gmail.com> Date: Mon, 3 Feb 2025 09:46:05 +0900 Subject: [PATCH] rename SharedError --- datafusion/common/src/error.rs | 8 ++++---- datafusion/physical-plan/src/joins/utils.rs | 4 ++-- datafusion/physical-plan/src/repartition/mod.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/datafusion/common/src/error.rs b/datafusion/common/src/error.rs index 0b68cc38fe77..524791e9149e 100644 --- a/datafusion/common/src/error.rs +++ b/datafusion/common/src/error.rs @@ -139,7 +139,7 @@ pub enum DataFusionError { /// Errors for wrapping other errors. /// This is useful when we need to share DatafusionError. - WrappedError(Arc), + SharedError(Arc), } #[macro_export] @@ -347,7 +347,7 @@ impl Error for DataFusionError { DataFusionError::Context(_, e) => Some(e.as_ref()), DataFusionError::Substrait(_) => None, DataFusionError::Diagnostic(_, e) => Some(e.as_ref()), - DataFusionError::WrappedError(e) => Some(e.as_ref()), + DataFusionError::SharedError(e) => Some(e.as_ref()), } } } @@ -462,7 +462,7 @@ impl DataFusionError { DataFusionError::Context(_, _) => "", DataFusionError::Substrait(_) => "Substrait error: ", DataFusionError::Diagnostic(_, _) => "", - DataFusionError::WrappedError(_) => "", + DataFusionError::SharedError(_) => "", } } @@ -504,7 +504,7 @@ impl DataFusionError { } DataFusionError::Substrait(ref desc) => Cow::Owned(desc.to_string()), DataFusionError::Diagnostic(_, ref err) => Cow::Owned(err.to_string()), - DataFusionError::WrappedError(ref desc) => Cow::Owned(desc.to_string()), + DataFusionError::SharedError(ref desc) => Cow::Owned(desc.to_string()), } } diff --git a/datafusion/physical-plan/src/joins/utils.rs b/datafusion/physical-plan/src/joins/utils.rs index e31def2eb2b4..ddfc6349d82f 100644 --- a/datafusion/physical-plan/src/joins/utils.rs +++ b/datafusion/physical-plan/src/joins/utils.rs @@ -1076,7 +1076,7 @@ impl OnceFut { OnceFutState::Ready(r) => Poll::Ready( r.as_ref() .map(|r| r.as_ref()) - .map_err(|e| DataFusionError::WrappedError(Arc::clone(e))), + .map_err(|e| DataFusionError::SharedError(Arc::clone(e))), ), } } @@ -1091,7 +1091,7 @@ impl OnceFut { match &self.state { OnceFutState::Pending(_) => unreachable!(), OnceFutState::Ready(r) => { - Poll::Ready(r.clone().map_err(DataFusionError::WrappedError)) + Poll::Ready(r.clone().map_err(DataFusionError::SharedError)) } } } diff --git a/datafusion/physical-plan/src/repartition/mod.rs b/datafusion/physical-plan/src/repartition/mod.rs index dc15ed44393e..79bc4b1bdc17 100644 --- a/datafusion/physical-plan/src/repartition/mod.rs +++ b/datafusion/physical-plan/src/repartition/mod.rs @@ -916,7 +916,7 @@ impl RepartitionExec { for (_, tx) in txs { // wrap it because need to send error to all output partitions - let err = Err(DataFusionError::WrappedError(Arc::clone(&e))); + let err = Err(DataFusionError::SharedError(Arc::clone(&e))); tx.send(Some(err)).await.ok(); } }