|
20 | 20 | import logging |
21 | 21 | import typing as t |
22 | 22 | from pathlib import Path |
23 | | -from datetime import datetime |
24 | 23 |
|
25 | 24 |
|
26 | 25 | from sqlmesh.core.console import Console, get_console |
|
36 | 35 | SnapshotIntervals, |
37 | 36 | SnapshotNameVersion, |
38 | 37 | SnapshotTableInfo, |
39 | | - start_date, |
| 38 | + missing_intervals_for_no_gaps, |
40 | 39 | ) |
41 | 40 | from sqlmesh.core.snapshot.definition import ( |
42 | 41 | Interval, |
|
62 | 61 | from sqlmesh.core.state_sync.db.snapshot import SnapshotState |
63 | 62 | from sqlmesh.core.state_sync.db.version import VersionState |
64 | 63 | from sqlmesh.core.state_sync.db.migrator import StateMigrator, _backup_table_name |
65 | | -from sqlmesh.utils.date import TimeLike, to_timestamp, time_like_to_str, now_timestamp |
| 64 | +from sqlmesh.utils.date import TimeLike, time_like_to_str, now_timestamp |
66 | 65 | from sqlmesh.utils.errors import ConflictingPlanError, SQLMeshError |
67 | 66 |
|
68 | 67 | logger = logging.getLogger(__name__) |
@@ -586,43 +585,25 @@ def _ensure_no_gaps( |
586 | 585 | target_environment: Environment, |
587 | 586 | snapshot_names: t.Optional[t.Set[str]], |
588 | 587 | ) -> None: |
| 588 | + target_snapshots = list(target_snapshots) |
589 | 589 | target_snapshots_by_name = {s.name: s for s in target_snapshots} |
590 | | - |
591 | | - changed_version_prev_snapshots_by_name = { |
592 | | - s.name: s |
| 590 | + changed_version_prev_snapshots = [ |
| 591 | + s |
593 | 592 | for s in target_environment.snapshots |
594 | 593 | if s.name in target_snapshots_by_name |
595 | 594 | and target_snapshots_by_name[s.name].version != s.version |
596 | | - } |
| 595 | + ] |
| 596 | + previous_snapshots = self.get_snapshots(changed_version_prev_snapshots).values() |
597 | 597 |
|
598 | | - prev_snapshots = self.get_snapshots( |
599 | | - changed_version_prev_snapshots_by_name.values() |
600 | | - ).values() |
601 | | - cache: t.Dict[str, datetime] = {} |
602 | | - |
603 | | - for prev_snapshot in prev_snapshots: |
604 | | - target_snapshot = target_snapshots_by_name[prev_snapshot.name] |
605 | | - if ( |
606 | | - (snapshot_names is None or prev_snapshot.name in snapshot_names) |
607 | | - and target_snapshot.is_incremental |
608 | | - and prev_snapshot.is_incremental |
609 | | - and prev_snapshot.intervals |
610 | | - ): |
611 | | - start = to_timestamp( |
612 | | - start_date(target_snapshot, target_snapshots_by_name.values(), cache) |
613 | | - ) |
614 | | - end = prev_snapshot.intervals[-1][1] |
615 | | - |
616 | | - if start < end: |
617 | | - missing_intervals = target_snapshot.missing_intervals( |
618 | | - start, end, end_bounded=True |
619 | | - ) |
620 | | - |
621 | | - if missing_intervals: |
622 | | - raise SQLMeshError( |
623 | | - f"Detected missing intervals for model {target_snapshot.name}, interrupting your current plan. " |
624 | | - "Please re-apply your plan to resolve this error." |
625 | | - ) |
| 598 | + missing_intervals = missing_intervals_for_no_gaps( |
| 599 | + target_snapshots, previous_snapshots, snapshot_names |
| 600 | + ) |
| 601 | + if missing_intervals: |
| 602 | + target_snapshot = next(iter(missing_intervals)) |
| 603 | + raise SQLMeshError( |
| 604 | + f"Detected missing intervals for model {target_snapshot.name}, interrupting your current plan. " |
| 605 | + "Please re-apply your plan to resolve this error." |
| 606 | + ) |
626 | 607 |
|
627 | 608 | @contextlib.contextmanager |
628 | 609 | def _transaction(self) -> t.Iterator[None]: |
|
0 commit comments