Fix rebase

Author: treysp

sqlmesh/core/scheduler.py

@@ -484,33 +484,33 @@ def run_node(node: SchedulingUnit) -> None:
             if isinstance(node, DummyNode):
                 return
 
-            with QueryExecutionTracker.track_execution(
-                f"{snapshot.name}_{batch_idx}"
-            ) as execution_context:
-                snapshot = self.snapshots_by_name[node.snapshot_name]
-
-                if isinstance(node, EvaluateNode):
-                    self.console.start_snapshot_evaluation_progress(snapshot)
-                    execution_start_ts = now_timestamp()
-                    evaluation_duration_ms: t.Optional[int] = None
-                    start, end = node.interval
-
-                    audit_results: t.List[AuditResult] = []
-                    try:
-                        assert execution_time  # mypy
-                        assert deployability_index  # mypy
-
-                        if audit_only:
-                            audit_results = self._audit_snapshot(
-                                snapshot=snapshot,
-                                environment_naming_info=environment_naming_info,
-                                deployability_index=deployability_index,
-                                snapshots=self.snapshots_by_name,
-                                start=start,
-                                end=end,
-                                execution_time=execution_time,
-                            )
-                        else:
+            snapshot = self.snapshots_by_name[node.snapshot_name]
+
+            if isinstance(node, EvaluateNode):
+                self.console.start_snapshot_evaluation_progress(snapshot)
+                execution_start_ts = now_timestamp()
+                evaluation_duration_ms: t.Optional[int] = None
+                start, end = node.interval
+
+                audit_results: t.List[AuditResult] = []
+                try:
+                    assert execution_time  # mypy
+                    assert deployability_index  # mypy
+
+                    if audit_only:
+                        audit_results = self._audit_snapshot(
+                            snapshot=snapshot,
+                            environment_naming_info=environment_naming_info,
+                            deployability_index=deployability_index,
+                            snapshots=self.snapshots_by_name,
+                            start=start,
+                            end=end,
+                            execution_time=execution_time,
+                        )
+                    else:
+                        with self.snapshot_evaluator.execution_tracker.track_execution(
+                            f"{snapshot.name}_{node.batch_index}"
+                        ) as execution_context:
                             audit_results = self.evaluate(
                                 snapshot=snapshot,
                                 environment_naming_info=environment_naming_info,
@@ -523,31 +523,31 @@ def run_node(node: SchedulingUnit) -> None:
                                 target_table_exists=snapshot.snapshot_id not in snapshots_to_create,
                             )
 
-                        evaluation_duration_ms = now_timestamp() - execution_start_ts
-                    finally:
-                        num_audits = len(audit_results)
-                        num_audits_failed = sum(1 for result in audit_results if result.count)
+                    evaluation_duration_ms = now_timestamp() - execution_start_ts
+                finally:
+                    num_audits = len(audit_results)
+                    num_audits_failed = sum(1 for result in audit_results if result.count)
 
-                        execution_stats = self.snapshot_evaluator.execution_tracker.get_execution_stats(
-                            f"{snapshot.snapshot_id}_{batch_idx}"
-                        )
+                    execution_stats = self.snapshot_evaluator.execution_tracker.get_execution_stats(
+                        f"{snapshot.snapshot_id}_{node.batch_index}"
+                    )
 
-                        self.console.update_snapshot_evaluation_progress(
-                                snapshot,
-                                batched_intervals[snapshot][node.batch_index],
-                                node.batch_index,
-                                evaluation_duration_ms,
-                                num_audits - num_audits_failed,
-                                num_audits_failed,
-                                execution_stats=execution_stats,
-                        )
-                elif isinstance(node, CreateNode):
-                    self.snapshot_evaluator.create_snapshot(
-                        snapshot=snapshot,
-                        snapshots=self.snapshots_by_name,
-                        deployability_index=deployability_index,
-                        allow_destructive_snapshots=allow_destructive_snapshots or set(),
-                        )
+                    self.console.update_snapshot_evaluation_progress(
+                        snapshot,
+                        batched_intervals[snapshot][node.batch_index],
+                        node.batch_index,
+                        evaluation_duration_ms,
+                        num_audits - num_audits_failed,
+                        num_audits_failed,
+                        execution_stats=execution_stats,
+                    )
+            elif isinstance(node, CreateNode):
+                self.snapshot_evaluator.create_snapshot(
+                    snapshot=snapshot,
+                    snapshots=self.snapshots_by_name,
+                    deployability_index=deployability_index,
+                    allow_destructive_snapshots=allow_destructive_snapshots or set(),
+                )
 
         try:
             with self.snapshot_evaluator.concurrent_context():

sqlmesh/core/snapshot/evaluator.py

@@ -59,7 +59,6 @@
     SnapshotInfoLike,
     SnapshotTableCleanupTask,
 )
-from sqlmesh.core.snapshot.definition import parent_snapshots_by_name
 from sqlmesh.core.snapshot.execution_tracker import QueryExecutionTracker
 from sqlmesh.utils import random_id, CorrelationId
 from sqlmesh.utils.concurrency import (