updated variable names to be more descriptive

Author: matthewgapp

datafusion/core/src/physical_optimizer/coalesce_batches.rs

@@ -67,8 +67,9 @@ impl CoalesceContext {
     /// Creates a new context for a descendent of this context.
     /// The descendent will inherit the `has_recursive_ancestor` flag from this context.
     fn new_descendent(&self, descendent_plan: Arc<dyn ExecutionPlan>) -> Self {
+        let ancestor = self;
         Self {
-            has_recursive_ancestor: self.has_recursive_ancestor
+            has_recursive_ancestor: ancestor.has_recursive_ancestor
                 || is_recursive_query(&descendent_plan),
             plan: descendent_plan,
         }

datafusion/core/src/physical_optimizer/enforce_distribution.rs

@@ -1467,16 +1467,20 @@ impl DistributionContext {
     /// Creates a new context from a descendent plan.
     /// Importantly, this function propagates the `has_recursive_ancestor` flag.
     fn new_descendent(&self, descendent_plan: Arc<dyn ExecutionPlan>) -> Self {
-        let mut ctx = Self::new(descendent_plan);
-        ctx.has_recursive_ancestor |= self.has_recursive_ancestor;
-        ctx
+        let ancestor = self;
+
+        let mut new_ctx = Self::new(descendent_plan);
+        new_ctx.has_recursive_ancestor |= ancestor.has_recursive_ancestor;
+        new_ctx
     }
 
     /// Creates a new context from a descendent context.
     /// Importantly, this function propagates the `has_recursive_ancestor` flag.
     fn new_descendent_from_ctx(&self, ctx: Self) -> Self {
+        let ancestor = self;
+
         let mut ctx = ctx;
-        ctx.has_recursive_ancestor |= self.has_recursive_ancestor;
+        ctx.has_recursive_ancestor |= ancestor.has_recursive_ancestor;
         ctx
     }