ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Unify storage ID queries under one implementation

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-21 11:58:42 -07:00
parent 069474e6aa
commit abe4d7c9d5
6 changed files with 37 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/store/store.go
+3 -32
View File
@@ -706,24 +706,9 @@ func (s *Store) CancelMergeAfterReview(ctx context.Context, id, actor string) er
}
func (s *Store) FinishedMergeAfterReviews(ctx context.Context) ([]string, error) {
rows, err := s.db.QueryContext(ctx, `
return queryIDs(ctx, s.db, `
SELECT tasks.merge_after_review_id FROM tasks JOIN reviews ON reviews.id = tasks.merge_after_review_id
WHERE tasks.merge_after_review_by != '' AND reviews.state != ?`, string(api.ReviewStateRunning))
if err != nil {
return nil, err
}
defer rows.Close()
ids := []string{}
for rows.Next() {
id := ""
err = rows.Scan(&id)
if err != nil {
return nil, err
}
ids = append(ids, id)
}
return ids, rows.Err()
}
func (s *Store) TakeMergeAfterReview(ctx context.Context, id string, reviewIDs []string) (MergeAfterReview, error) {
@@ -1679,25 +1664,11 @@ func (s *Store) EndReviewRequest(ctx context.Context, taskID string) error {
func (s *Store) ClearReviewRequests(ctx context.Context) error {
return s.write(ctx, func(tx *sql.Tx, emit emitFunc) error {
rows, err := tx.QueryContext(ctx, `UPDATE tasks SET review_requests = 0 WHERE review_requests > 0 RETURNING id`)
if err != nil {
return err
}
ids := []string{}
for rows.Next() {
id := ""
err = rows.Scan(&id)
if err != nil {
rows.Close()
return err
}
ids = append(ids, id)
}
rows.Close()
err = rows.Err()
ids, err := queryIDs(ctx, tx, `UPDATE tasks SET review_requests = 0 WHERE review_requests > 0 RETURNING id`)
if err != nil {
return err
}
for _, id := range ids {
err = settleTaskState(ctx, tx, emit, id, "byre")
if err != nil {