Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
perf: optimize ListRollouts to fix N+1 query for task loading (#18670)
Danny Xuf0a73eba1fb4
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.goindex 6d4481613f..4cc1de3c5e 100644--- a/backend/api/v1/rollout_service.go+++ b/backend/api/v1/rollout_service.go@@ -144,13 +144,30 @@ func (s *RolloutService) ListRollouts(ctx context.Context, req *connect.Request[plans = plans[:offset.limit]}- rollouts := []*v1pb.Rollout{}- for _, plan := range plans {- tasks, err := s.store.ListTasks(ctx, &store.TaskFind{PlanID: &plan.UID})+ // Batch load all tasks for all plans to avoid N+1 queries+ planIDs := make([]int64, len(plans))+ for i, plan := range plans {+ planIDs[i] = plan.UID+ }+ var allTasks []*store.TaskMessage+ if len(planIDs) > 0 {+ var err error+ allTasks, err = s.store.ListTasks(ctx, &store.TaskFind{PlanIDs: &planIDs})if err != nil {- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list tasks for plan %d, error: %v", plan.UID, err))+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list tasks, error: %v", err))}+ }+ // Group tasks by plan ID+ tasksByPlanID := make(map[int64][]*store.TaskMessage)+ for _, task := range allTasks {+ tasksByPlanID[task.PlanID] = append(tasksByPlanID[task.PlanID], task)+ }++ // Convert plans and their tasks to rollouts+ rollouts := []*v1pb.Rollout{}+ for _, plan := range plans {+ tasks := tasksByPlanID[plan.UID]rollout, err := convertToRollout(ctx, s.store, project, plan, tasks)if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert to rollout, error: %v", err))diff --git a/backend/store/task.go b/backend/store/task.goindex 0ff215f0f0..94dd418a64 100644--- a/backend/store/task.go+++ b/backend/store/task.go@@ -56,6 +56,7 @@ type TaskFind struct {// Related fieldsPlanID *int64+ PlanIDs *[]int64Environment *stringInstanceID *stringDatabaseName *string@@ -291,6 +292,9 @@ func (*Store) listTasksTx(ctx context.Context, txn *sql.Tx, find *TaskFind) ([]*if v := find.PlanID; v != nil {q.Space("AND task.plan_id = ?", *v)}+ if v := find.PlanIDs; v != nil {+ q.Space("AND task.plan_id = ANY(?)", *v)+ }if v := find.Environment; v != nil {q.Space("AND task.environment = ?", *v)}