[src/lib/execution_plan.rs] Improve logic for after_each task

offscale · Aug 1, 2024 · 5f28cc4 · 5f28cc4
1 parent 2e826c0
commit 5f28cc4
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/lib/execution_plan.rs b/src/lib/execution_plan.rs
@@ -607,10 +607,14 @@ impl<'a> ExecutionPlanBuilder<'a> {
                 _steps.push(step.to_owned());
                 _steps
             }));
-            if !interspersed_steps.is_empty() && has_after_each == 1 {
-                let after_each = after_and_before_each.first().unwrap().to_owned();
-                if interspersed_steps[interspersed_steps.len() - 1].name != after_each.name {
-                    interspersed_steps.push(after_each);
+            if let Some(last_step) = interspersed_steps.last() {
+                if has_after_each == 1 {
+                    let after_each = after_and_before_each.first().unwrap().to_owned();
+                    if last_step.name != after_each.name
+                        && Some(&last_step.name) != Option::from(end_task_opt)
+                    {
+                        interspersed_steps.push(after_each);
+                    }
                 }
             }
             Ok(Cow::Owned(interspersed_steps))