rename SharedError

Author: getChan

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<DataFusionError>),
+    SharedError(Arc<DataFusionError>),
 }
 
 #[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()),
         }
     }
 

datafusion/optimizer/src/eliminate_cross_join.rs

@@ -85,6 +85,7 @@ impl OptimizerRule for EliminateCrossJoin {
         plan: LogicalPlan,
         config: &dyn OptimizerConfig,
     ) -> Result<Transformed<LogicalPlan>> {
+        // todo - explicit schema recompute
         let plan_schema = Arc::clone(plan.schema());
         let mut possible_join_keys = JoinKeySet::new();
         let mut all_inputs: Vec<LogicalPlan> = vec![];
@@ -204,7 +205,7 @@ fn rewrite_children(
 
     // recompute schema if the plan was transformed
     if transformed_plan.transformed {
-        transformed_plan.map_data(|plan| plan.recompute_schema())
+        transformed_plan.map_data(|plan| plan.recompute_schema())// todo - explicit schema recompute
     } else {
         Ok(transformed_plan)
     }

datafusion/physical-plan/src/joins/utils.rs

@@ -1076,7 +1076,7 @@ impl<T: 'static> OnceFut<T> {
             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<T: 'static> OnceFut<T> {
         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))
             }
         }
     }

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();
                 }
             }