Skip to content

fix: dag update distinct locks #2903

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
grutt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: dag update distinct locks #2903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23ee4d1
lock only distinct
grutt Jan 24, 2026
5d21996
try to fix dag statuses as well
abelanger5 Jan 24, 2026
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
21 changes: 16 additions & 5 deletions pkg/repository/sqlcv1/olap.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,8 @@ WITH tenants AS (
worker_id IS NOT NULL
GROUP BY
tenant_id, task_id, task_inserted_at, retry_count
), locked_tasks AS (
SELECT
), distinct_tasks_to_lock AS (
SELECT DISTINCT ON (t.tenant_id, t.id, t.inserted_at)
t.tenant_id,
t.id,
t.inserted_at,
Expand All @@ -801,9 +801,18 @@ WITH tenants AS (
JOIN
updatable_events e ON
(t.tenant_id, t.id, t.inserted_at) = (e.tenant_id, e.task_id, e.task_inserted_at)
WHERE t.inserted_at >= @minInsertedAt::TIMESTAMPTZ
WHERE
t.inserted_at >= @minInsertedAt::TIMESTAMPTZ
ORDER BY
t.inserted_at, t.id
t.tenant_id, t.id, t.inserted_at, t.readable_status
), locked_tasks AS (
SELECT
dt.*
FROM
v1_tasks_olap t
JOIN
distinct_tasks_to_lock dt ON
(dt.inserted_at, dt.id) = (t.inserted_at, t.id)
FOR UPDATE
), already_in_target_partition AS (
-- Check if rows already exist in the target partition (with the new readable_status)
Expand Down Expand Up @@ -1127,7 +1136,7 @@ WITH tenants AS (
(d.inserted_at, d.id, d.readable_status) = (ap.inserted_at, ap.id, ap.old_readable_status)
), dags_to_update AS (
-- DAGs that need updating and don't already exist in target partition
SELECT
SELECT DISTINCT ON (dns.tenant_id, dns.id, dns.inserted_at)
dns.tenant_id,
dns.id,
dns.inserted_at,
Expand All @@ -1141,6 +1150,8 @@ WITH tenants AS (
FROM already_in_target_partition ap
WHERE (ap.tenant_id, ap.id, ap.inserted_at) = (dns.tenant_id, dns.id, dns.inserted_at)
)
ORDER BY
dns.tenant_id, dns.id, dns.inserted_at, dns.old_readable_status
), updated_dags AS (
UPDATE
v1_dags_olap d
Expand Down
21 changes: 16 additions & 5 deletions pkg/repository/sqlcv1/olap.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading