Skip to content

Fix: Don't remove dev intervals when restating in production environment #4922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
izeigerman merged 1 commit into from
Jul 7, 2025
Merged

Fix: Don't remove dev intervals when restating in production environment #4922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions sqlmesh/core/state_sync/db/interval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,11 @@ def remove_intervals(
snapshot_ids = ", ".join(str(s.snapshot_id) for s, _ in intervals_to_remove)
logger.info("Removing interval for snapshots: %s", snapshot_ids)

for is_dev in (True, False):
self.engine_adapter.insert_append(
self.intervals_table,
_intervals_to_df(intervals_to_remove, is_dev=is_dev, is_removed=True),
columns_to_types=self._interval_columns_to_types,
)
self.engine_adapter.insert_append(
self.intervals_table,
_intervals_to_df(intervals_to_remove, is_dev=False, is_removed=True),
columns_to_types=self._interval_columns_to_types,
)

def get_snapshot_intervals(
self, snapshots: t.Collection[SnapshotNameVersionLike]
Expand Down
14 changes: 6 additions & 8 deletions tests/core/state_sync/test_state_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,7 @@ def test_remove_interval(state_sync: EngineAdapterStateSync, make_snapshot: t.Ca
remove_records_count = state_sync.engine_adapter.fetchone(
"SELECT COUNT(*) FROM sqlmesh._intervals WHERE name = '\"a\"' AND version = 'a' AND is_removed"
)[0] # type: ignore
assert (
remove_records_count == num_of_removals * 4
) # (1 dev record + 1 prod record) * 2 snapshots
assert remove_records_count == num_of_removals * 2 # 2 * snapshots

snapshots = state_sync.get_snapshots([snapshot_a, snapshot_b])

Expand Down Expand Up @@ -1634,7 +1632,7 @@ def test_delete_expired_snapshots_cleanup_intervals_shared_dev_version(
(to_timestamp("2023-01-01"), to_timestamp("2023-01-04")),
]
assert stored_new_snapshot.dev_intervals == [
(to_timestamp("2023-01-04"), to_timestamp("2023-01-10")),
(to_timestamp("2023-01-04"), to_timestamp("2023-01-11")),
]

# Check old snapshot's intervals
Expand All @@ -1643,7 +1641,7 @@ def test_delete_expired_snapshots_cleanup_intervals_shared_dev_version(
(to_timestamp("2023-01-01"), to_timestamp("2023-01-04")),
]
assert stored_snapshot.dev_intervals == [
(to_timestamp("2023-01-04"), to_timestamp("2023-01-10")),
(to_timestamp("2023-01-04"), to_timestamp("2023-01-11")),
]

# Check all intervals
Expand All @@ -1665,7 +1663,7 @@ def test_delete_expired_snapshots_cleanup_intervals_shared_dev_version(
identifier=new_snapshot.identifier,
version=snapshot.version,
dev_version=new_snapshot.dev_version,
dev_intervals=[(to_timestamp("2023-01-08"), to_timestamp("2023-01-10"))],
dev_intervals=[(to_timestamp("2023-01-08"), to_timestamp("2023-01-11"))],
),
],
key=compare_snapshot_intervals,
Expand All @@ -1681,7 +1679,7 @@ def test_delete_expired_snapshots_cleanup_intervals_shared_dev_version(
(to_timestamp("2023-01-01"), to_timestamp("2023-01-04")),
]
assert stored_new_snapshot.dev_intervals == [
(to_timestamp("2023-01-04"), to_timestamp("2023-01-10")),
(to_timestamp("2023-01-04"), to_timestamp("2023-01-11")),
]

# Check all intervals
Expand Down Expand Up @@ -1709,7 +1707,7 @@ def test_delete_expired_snapshots_cleanup_intervals_shared_dev_version(
identifier=new_snapshot.identifier,
version=snapshot.version,
dev_version=new_snapshot.dev_version,
dev_intervals=[(to_timestamp("2023-01-08"), to_timestamp("2023-01-10"))],
dev_intervals=[(to_timestamp("2023-01-08"), to_timestamp("2023-01-11"))],
),
],
key=compare_snapshot_intervals,
Expand Down