Only do counting when count_only=true for repo dashboard (#29884) (#29905)

Ref: #29878
Backport #29884

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Lunny Xiao 2024-03-20 11:02:35 +08:00 committed by GitHub
parent 408c92938b
commit 5f7b6b55a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions

View File

@ -575,23 +575,27 @@ func SearchRepo(ctx *context.Context) {
} }
} }
var err error // To improve performance when only the count is requested
if ctx.FormBool("count_only") {
if count, err := repo_model.CountRepository(ctx, opts); err != nil {
log.Error("CountRepository: %v", err)
ctx.JSON(http.StatusInternalServerError, nil) // frontend JS doesn't handle error response (same as below)
} else {
ctx.SetTotalCountHeader(count)
ctx.JSONOK()
}
return
}
repos, count, err := repo_model.SearchRepository(ctx, opts) repos, count, err := repo_model.SearchRepository(ctx, opts)
if err != nil { if err != nil {
ctx.JSON(http.StatusInternalServerError, api.SearchError{ log.Error("SearchRepository: %v", err)
OK: false, ctx.JSON(http.StatusInternalServerError, nil)
Error: err.Error(),
})
return return
} }
ctx.SetTotalCountHeader(count) ctx.SetTotalCountHeader(count)
// To improve performance when only the count is requested
if ctx.FormBool("count_only") {
return
}
// collect the latest commit of each repo // collect the latest commit of each repo
// at most there are dozens of repos (limited by MaxResponseItems), so it's not a big problem at the moment // at most there are dozens of repos (limited by MaxResponseItems), so it's not a big problem at the moment
repoBranchNames := make(map[int64]string, len(repos)) repoBranchNames := make(map[int64]string, len(repos))

View File

@ -236,7 +236,7 @@ const sfc = {
if (!this.reposTotalCount) { if (!this.reposTotalCount) {
const totalCountSearchURL = `${this.subUrl}/repo/search?count_only=1&uid=${this.uid}&team_id=${this.teamId}&q=&page=1&mode=`; const totalCountSearchURL = `${this.subUrl}/repo/search?count_only=1&uid=${this.uid}&team_id=${this.teamId}&q=&page=1&mode=`;
response = await GET(totalCountSearchURL); response = await GET(totalCountSearchURL);
this.reposTotalCount = response.headers.get('X-Total-Count'); this.reposTotalCount = response.headers.get('X-Total-Count') ?? '?';
} }
response = await GET(searchedURL); response = await GET(searchedURL);