mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-14 06:50:25 +00:00
Continuing the pattern from #9868, fixes another deadlock discovered in synthetic testing of #9785. This modifies the `milestone` table to have the `num_issues`, `num_closed_issues`, and `completeness` statistics be calculated asynchronously. An optional `updateTimestamp` field was added to the stats queue to support the conditional updating of the milestone's modification date, retaining existing functionality. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] I do not want this change to show in the release notes. - [x] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9916 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
56 lines
1.5 KiB
Go
56 lines
1.5 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
package stats
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"forgejo.org/modules/optional"
|
|
"forgejo.org/modules/timeutil"
|
|
)
|
|
|
|
type recalcRequest struct {
|
|
RecalcType RecalcType
|
|
ObjectID int64
|
|
UpdateTimestamp optional.Option[timeutil.TimeStamp]
|
|
}
|
|
|
|
func (r *recalcRequest) string() string {
|
|
return fmt.Sprintf("recalcRequest:%d:%d:%d", r.RecalcType, r.ObjectID, r.UpdateTimestamp.ValueOrDefault(0))
|
|
}
|
|
|
|
func recalcRequestFromString(s string) (*recalcRequest, error) {
|
|
tags := strings.Split(s, ":")
|
|
if len(tags) != 4 {
|
|
return nil, errors.New("expected three tags")
|
|
} else if tags[0] != "recalcRequest" {
|
|
return nil, fmt.Errorf("expected tag `recalcRequest`, but was %s", tags[0])
|
|
}
|
|
recalcType, err := strconv.ParseInt(tags[1], 10, 0)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to parse recalc type: %w", err)
|
|
}
|
|
objectID, err := strconv.ParseInt(tags[2], 10, 64)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to parse object ID: %w", err)
|
|
}
|
|
timestamp, err := strconv.ParseInt(tags[3], 10, 64)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("unable to parse timestamp ID: %w", err)
|
|
}
|
|
var updateTimestamp optional.Option[timeutil.TimeStamp]
|
|
if timestamp == 0 {
|
|
updateTimestamp = optional.None[timeutil.TimeStamp]()
|
|
} else {
|
|
updateTimestamp = optional.Some(timeutil.TimeStamp(timestamp))
|
|
}
|
|
return &recalcRequest{
|
|
RecalcType: RecalcType(recalcType),
|
|
ObjectID: objectID,
|
|
UpdateTimestamp: updateTimestamp,
|
|
}, nil
|
|
}
|