Skip to content

fix(snapshot): restate exactly N monthly intervals with auto restatement #6107

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

Open
breken-ai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(snapshot): restate exactly N monthly intervals with auto restatement #6107

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
9 changes: 5 additions & 4 deletions sqlmesh/core/snapshot/definition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,10 +1280,11 @@ def get_next_auto_restatement_interval(self, execution_time: TimeLike) -> t.Opti
auto_restatement_end_ts = to_timestamp(
self.node.interval_unit.cron_floor(execution_time_ts)
)
auto_restatement_start_ts = (
auto_restatement_end_ts
- num_intervals_to_restate * self.node.interval_unit.milliseconds
)
# Step back one interval at a time, since intervals like months don't have a fixed length
croniter = self.node.interval_unit.croniter(auto_restatement_end_ts)
auto_restatement_start_ts = auto_restatement_end_ts
for _ in range(num_intervals_to_restate):
auto_restatement_start_ts = to_timestamp(croniter.get_prev(estimate=True))
return (auto_restatement_start_ts, auto_restatement_end_ts)

def update_next_auto_restatement_ts(self, execution_time: TimeLike) -> t.Optional[int]:
Expand Down
44 changes: 44 additions & 0 deletions tests/core/test_snapshot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3371,6 +3371,50 @@ def test_get_next_auto_restatement_interval(
)


@pytest.mark.parametrize(
"auto_restatement_intervals,expected_auto_restatement_start",
[
(1, "2024-06-01"),
(12, "2023-07-01"),
(13, "2023-06-01"),
(24, "2022-07-01"),
],
)
def test_apply_auto_restatements_monthly(
make_snapshot,
auto_restatement_intervals: int,
expected_auto_restatement_start: str,
):
snapshot = make_snapshot(
SqlModel(
name="test_model",
kind=IncrementalByTimeRangeKind(
time_column=TimeColumn(column="ds"),
auto_restatement_cron="0 10 * * *",
auto_restatement_intervals=auto_restatement_intervals,
),
cron="@monthly",
start="2020-01-01",
query=parse_one("SELECT 1, ds FROM name"),
)
)
snapshot.categorize_as(SnapshotChangeCategory.BREAKING)
snapshot.add_interval("2020-01-01", "2024-06-30")
snapshot.next_auto_restatement_ts = to_timestamp("2024-07-02 10:00:00")

restated_intervals, _ = apply_auto_restatements(
{snapshot.snapshot_id: snapshot}, to_timestamp("2024-07-02 10:01:00")
)

# Months have different lengths, so the last N monthly intervals must be restated exactly
expected_interval = (
to_timestamp(expected_auto_restatement_start),
to_timestamp("2024-07-01"),
)
assert restated_intervals[0].pending_restatement_intervals == [expected_interval]
assert snapshot.intervals == [(to_timestamp("2020-01-01"), expected_interval[0])]


def test_apply_auto_restatements(make_snapshot):
# Hourly upstream model with auto restatement intervals set to 24
model_a = SqlModel(
Expand Down