Skip to content

Experimental: Directive anchor plan index #1834

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

Draft
AaronPlave wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Experimental: Directive anchor plan index #1834

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
cac75bc
Add anchor_id index to activity_directive
AaronPlave May 29, 2026
9122b4b
Speed up anchor-dependency lookups during bulk activity_directive ins…
AaronPlave Jun 2, 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
23 changes: 23 additions & 0 deletions deployment/hasura/migrations/Aerie/35_activity_directive_anchor_index/down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
create or replace function merlin.get_dependent_activities(_activity_id int, _plan_id int)
returns table(activity_id int, total_offset interval)
stable
language plpgsql as $$
begin
return query
with recursive d_activities(activity_id, anchor_id, anchored_to_start, start_offset, total_offset) as (
select ad.id, ad.anchor_id, ad.anchored_to_start, ad.start_offset, ad.start_offset
from merlin.activity_directive ad
where (ad.anchor_id, ad.plan_id) = (_activity_id, _plan_id)
union
select ad.id, ad.anchor_id, ad.anchored_to_start, ad.start_offset, da.total_offset + ad.start_offset
from merlin.activity_directive ad, d_activities da
where (ad.anchor_id, ad.plan_id) = (da.activity_id, _plan_id)
and ad.anchored_to_start
) select da.activity_id, da.total_offset
from d_activities da;
end;
$$;

drop index if exists merlin.activity_directive_anchor_id_index;

call migrations.mark_migration_rolled_back(35);
24 changes: 24 additions & 0 deletions deployment/hasura/migrations/Aerie/35_activity_directive_anchor_index/up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
-- Used by merlin.get_dependent_activities (called per row from validate_anchors_insert_trigger).
create index activity_directive_anchor_id_index
on merlin.activity_directive (anchor_id, plan_id);

-- `language sql` (not plpgsql) so the planner can inline this into the calling
-- query and pick the index above. The plpgsql wrapper was opaque to the planner.
create or replace function merlin.get_dependent_activities(_activity_id int, _plan_id int)
returns table(activity_id int, total_offset interval)
stable
language sql as $$
with recursive d_activities(activity_id, anchor_id, anchored_to_start, start_offset, total_offset) as (
select ad.id, ad.anchor_id, ad.anchored_to_start, ad.start_offset, ad.start_offset
from merlin.activity_directive ad
where (ad.anchor_id, ad.plan_id) = (_activity_id, _plan_id)
union
select ad.id, ad.anchor_id, ad.anchored_to_start, ad.start_offset, da.total_offset + ad.start_offset
from merlin.activity_directive ad, d_activities da
where (ad.anchor_id, ad.plan_id) = (da.activity_id, _plan_id)
and ad.anchored_to_start
) select da.activity_id, da.total_offset
from d_activities da;
$$;

call migrations.mark_migration_applied(35);
4 changes: 4 additions & 0 deletions deployment/postgres-init-db/sql/tables/merlin/activity_directive/activity_directive.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ create table merlin.activity_directive (

create index activity_directive_plan_id_index on merlin.activity_directive (plan_id);

-- Used by merlin.get_dependent_activities (called per row from validate_anchors_insert_trigger).
create index activity_directive_anchor_id_index
on merlin.activity_directive (anchor_id, plan_id);


comment on table merlin.activity_directive is e''
'A single activity_directive within a plan.';
Expand Down
8 changes: 4 additions & 4 deletions ...oyment/postgres-init-db/sql/tables/merlin/activity_directive/anchor_validation_status.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ comment on column merlin.anchor_validation_status.plan_id is e''
comment on column merlin.anchor_validation_status.reason_invalid is e''
'If null, the anchor is valid. If not null, this contains a reason why the anchor is invalid.';

-- `language sql` (not plpgsql) so the planner can inline this into the calling
-- query and pick the (anchor_id, plan_id) index. The plpgsql wrapper was opaque
-- to the planner and chose a worse plan.
create function merlin.get_dependent_activities(_activity_id int, _plan_id int)
returns table(activity_id int, total_offset interval)
stable
language plpgsql as $$
begin
return query
language sql as $$
with recursive d_activities(activity_id, anchor_id, anchored_to_start, start_offset, total_offset) as (
select ad.id, ad.anchor_id, ad.anchored_to_start, ad.start_offset, ad.start_offset
from merlin.activity_directive ad
Expand All @@ -41,7 +42,6 @@ begin
and ad.anchored_to_start -- stop at next end-time anchor
) select da.activity_id, da.total_offset
from d_activities da;
end;
$$;

comment on function merlin.get_dependent_activities(_activity_id int, _plan_id int) is e''
Expand Down
Loading