Skip to content
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

Jump to bottom

Fix: Heuristics that determine the default start date of the forward-only preview plan #3043

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Fix: Heuristics that determine the default start date of the forward-only preview plan #3043

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
10 changes: 5 additions & 5 deletions sqlmesh/core/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import traceback
import typing as t
import unittest.result
from datetime import timedelta
from datetime import date, timedelta
from functools import cached_property
from io import StringIO
from pathlib import Path
Expand Down Expand Up @@ -1133,6 +1133,7 @@ def plan_builder(
# If no end date is specified, use the max interval end from prod
# to prevent unintended evaluation of the entire DAG.
default_end: t.Optional[int] = None
default_start: t.Optional[date] = None
max_interval_end_per_model: t.Optional[t.Dict[str, int]] = None
if not run and not end:
models_for_interval_end: t.Optional[t.Set[str]] = None
Expand All @@ -1153,10 +1154,9 @@ def plan_builder(
)
if max_interval_end_per_model:
default_end = max(max_interval_end_per_model.values())
else:
default_end = None

default_start = to_date(default_end) - timedelta(days=1) if default_end and is_dev else None
default_start = to_date(min(max_interval_end_per_model.values())) - timedelta(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why don’t you need the else branch anymore?

Copy link
Member Author

@izeigerman izeigerman Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because we initialize this value to None at the top. No need to set None again.

days=1
)

return PlanBuilder(
context_diff=context_diff,
Expand Down
42 changes: 32 additions & 10 deletions tests/core/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,40 @@ def test_parent_cron_after_child(init_and_plan_context: t.Callable):


@freeze_time("2023-01-08 00:00:00")
def test_cron_not_aligned_with_day_boundary(init_and_plan_context: t.Callable):
@pytest.mark.parametrize(
"forward_only, expected_intervals",
[
(
False,
[
(to_timestamp("2023-01-01"), to_timestamp("2023-01-02")),
(to_timestamp("2023-01-02"), to_timestamp("2023-01-03")),
(to_timestamp("2023-01-03"), to_timestamp("2023-01-04")),
(to_timestamp("2023-01-04"), to_timestamp("2023-01-05")),
(to_timestamp("2023-01-05"), to_timestamp("2023-01-06")),
(to_timestamp("2023-01-06"), to_timestamp("2023-01-07")),
],
),
(
True,
[
(to_timestamp("2023-01-06"), to_timestamp("2023-01-07")),
],
),
],
)
def test_cron_not_aligned_with_day_boundary(
init_and_plan_context: t.Callable,
forward_only: bool,
expected_intervals: t.List[t.Tuple[int, int]],
):
context, plan = init_and_plan_context("examples/sushi")

model = context.get_model("sushi.waiter_revenue_by_day")
model = SqlModel.parse_obj(
{
**model.dict(),
"kind": model.kind.copy(update={"forward_only": forward_only}),
"cron": "0 12 * * *",
}
)
Expand All @@ -577,18 +604,13 @@ def test_cron_not_aligned_with_day_boundary(init_and_plan_context: t.Callable):
)

with freeze_time("2023-01-08 00:10:00"): # Past model's cron.
plan = context.plan("dev", select_models=[model.name], no_prompts=True, skip_tests=True)
plan = context.plan(
"dev", select_models=[model.name], no_prompts=True, skip_tests=True, enable_preview=True
)
assert plan.missing_intervals == [
SnapshotIntervals(
snapshot_id=waiter_revenue_by_day_snapshot.snapshot_id,
intervals=[
(to_timestamp("2023-01-01"), to_timestamp("2023-01-02")),
(to_timestamp("2023-01-02"), to_timestamp("2023-01-03")),
(to_timestamp("2023-01-03"), to_timestamp("2023-01-04")),
(to_timestamp("2023-01-04"), to_timestamp("2023-01-05")),
(to_timestamp("2023-01-05"), to_timestamp("2023-01-06")),
(to_timestamp("2023-01-06"), to_timestamp("2023-01-07")),
],
intervals=expected_intervals,
),
]

Expand Down