Fixed count of filtered issues when api request. #12275

hinoshiba · 2020-07-19T13:28:33Z

The search results for "The issues" will respond with the total number of issues in repository instead of the number of search results.
This result in pages that do not have a value in rel = last on the response HTTP header "Link".

The target API
- api/v1/repos/issues/search
- api/v1/repos/{repo}/issues/

If you create about 10 "The issues" and close 2 of them, the final link is page=10 , even if ?limit=1&page=1&state=open. In such cases, the final link should be page=8. This has been fixed.

And, there was an extra reservation for the slice the related code, so I fixed it.

6543

https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR160-R171 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR179-R191 are same

https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR336-R342 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR350-R360 are quite similar

can you dedublicate it by store the Options Struct into a variable you can pass to both functions?

hinoshiba · 2020-07-19T17:23:52Z

https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR160-R171 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR179-R191 are same

https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR336-R342 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR350-R360 are quite similar

can you dedublicate it by store the Options Struct into a variable you can pass to both functions?

Is possible. However, I don't think it makes much sense in terms of processing.
They are said to be the same, but they all differ in the content of "ListOptions", mainly "PageSize".

The "models.CountIssues" and "model.Issues" arguments are references.
I think either of these needs to be done before the reference can be used safely.

Not run in parallel.
Copy later.

I think it will probably run in parallel, so I didn't think it made much sense in terms of processing.

I think I can reuse the structure by splitting the option structure and using two arguments. However, because it reduces memory efficiency, I made redundant entries.

6543 · 2020-07-19T20:12:57Z

🤔

6543 · 2020-07-19T20:13:16Z

Will test it tomorow :)

hinoshiba · 2020-07-20T00:42:09Z

https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR160-R171 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR179-R191 are same
https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR336-R342 and https://github.com/go-gitea/gitea/pull/12275/files#diff-6a82b880ff1ae1c2e9b577046e45a6cbR350-R360 are quite similar
can you dedublicate it by store the Options Struct into a variable you can pass to both functions?

Is possible. However, I don't think it makes much sense in terms of processing.
They are said to be the same, but they all differ in the content of "ListOptions", mainly "PageSize".

The "models.CountIssues" and "model.Issues" arguments are references.
I think either of these needs to be done before the reference can be used safely.

Not run in parallel.

Copy later.

I think it will probably run in parallel, so I didn't think it made much sense in terms of processing.

I think I can reuse the structure by splitting the option structure and using two arguments. However, because it reduces memory efficiency, I made redundant entries.

I missed.
I didn't actually look back and forth. There is no parallel processing. ;-D
Sorry,

Will update it after confirming the test.

routers/api/v1/repo/issue.go

Co-authored-by: 6543 <6543@obermui.de>

6543 · 2020-07-20T12:39:51Z

routers/api/v1/repo/issue.go

+ filteredCount, err = models.CountIssues(&models.IssuesOptions{
+ ListOptions: models.ListOptions{
+ Page: ctx.QueryInt("page"),
+ PageSize: issueCount,


Suggested change

PageSize: issueCount,

PageSize: setting.UI.IssuePagingNum,

☝️ if you dedub things this is not needed anyway ...

This is for the purpose of getting the maximum value that matches the filter.
Therefore, the current maximum value is set as an option.

6543 · 2020-07-20T12:43:22Z

I would say dedub/refactor things and I'll check it again - for me it looks like there is something still missing but I'll dig deeper into it after you changed the code :)

…gitea into fixed_count_of_filteredIssues

6543 · 2020-07-20T13:00:44Z

@hinoshiba let me know if you are ready for review again :)

hinoshiba · 2020-07-20T13:02:13Z

@hinoshiba let me know if you are ready for review again :)

Ok, Just a moment.

hinoshiba · 2020-07-20T13:44:28Z

@6543 Finished update.

6543 · 2020-07-22T15:48:23Z

just format nits: hinoshiba#1

6543 · 2020-07-23T22:22:55Z

EDIT: thanks

6543 · 2020-07-23T22:23:36Z

make fmt is posible needed at this point ...

hinoshiba · 2020-07-23T22:24:59Z

make fmt is posible needed at this point ...

Ok, I'm Update.

6543 · 2020-07-23T22:27:00Z

well github code suggestions have there up and downs ;)

6543 · 2020-09-01T03:02:38Z

can you resolve the conflict?

It looks like nobody had time to look at it :/

hinoshiba · 2020-09-01T08:18:06Z

Ok, I just updated.

codecov-commenter · 2020-09-01T08:52:09Z

Codecov Report

Merging #12275 into master will decrease coverage by 0.00%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##           master   #12275      +/-   ##
==========================================
- Coverage   43.09%   43.08%   -0.01%     
==========================================
  Files         658      658              
  Lines       72455    72477      +22     
==========================================
+ Hits        31226    31230       +4     
- Misses      36175    36183       +8     
- Partials     5054     5064      +10

Impacted Files	Coverage Δ
routers/api/v1/repo/release.go	`33.60% <33.33%> (+0.54%)`	⬆️
routers/api/v1/repo/issue.go	`50.79% <40.00%> (-2.47%)`	⬇️
models/issue.go	`56.64% <73.33%> (+0.18%)`	⬆️
modules/indexer/stats/db.go	`43.47% <0.00%> (-17.40%)`	⬇️
modules/indexer/stats/queue.go	`64.70% <0.00%> (-11.77%)`	⬇️
modules/charset/charset.go	`68.53% <0.00%> (-4.50%)`	⬇️
modules/git/utils.go	`73.77% <0.00%> (-3.28%)`	⬇️
modules/process/manager.go	`72.50% <0.00%> (-2.50%)`	⬇️
modules/git/repo.go	`46.19% <0.00%> (-0.51%)`	⬇️
services/mirror/mirror.go	`19.93% <0.00%> (+1.35%)`	⬆️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b510927...630f842. Read the comment docs.

routers/api/v1/repo/issue.go

models/issue.go

Co-authored-by: zeripath <art27@cantab.net>

hinoshiba added 3 commits July 19, 2020 21:46

Improved total count of issue when filtered.

208cc08

Fixed size of slice when selected 1 repository.

19dd577

Improved function of error check.

bd69a4b

hinoshiba changed the title ~~Fixed count of filtered issues when api request.~~ [WIP] Fixed count of filtered issues when api request. Jul 19, 2020

improved comment

da583f7

hinoshiba changed the title ~~[WIP] Fixed count of filtered issues when api request.~~ Fixed count of filtered issues when api request. Jul 19, 2020

lafriks added modifies/api This PR adds API routes or modifies them type/bug labels Jul 19, 2020

lafriks added this to the 1.13.0 milestone Jul 19, 2020

6543 requested changes Jul 19, 2020

View reviewed changes

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 19, 2020

6543 reviewed Jul 20, 2020

View reviewed changes

routers/api/v1/repo/issue.go Show resolved Hide resolved

Added parameter of return header.

8d0a2de

Co-authored-by: 6543 <6543@obermui.de>

hinoshiba changed the title ~~Fixed count of filtered issues when api request.~~ [WIP]Fixed count of filtered issues when api request. Jul 20, 2020

6543 requested changes Jul 20, 2020

View reviewed changes

hinoshiba added 2 commits July 20, 2020 21:45

Updated corresponded to the current vendored of "xorm.io/xorm".

3f09965

Merge branch 'fixed_count_of_filteredIssues' of github.com:hinoshiba/…

b4e1f3a

…gitea into fixed_count_of_filteredIssues

Dedublicated it by store the Options Struct into a variable.

0211cb5

hinoshiba changed the title ~~[WIP]Fixed count of filtered issues when api request.~~ Fixed count of filtered issues when api request. Jul 20, 2020

format code

bc8cc31

6543 mentioned this pull request Jul 22, 2020

format code hinoshiba/gitea#1

Merged

make fmt

07d0225

6543 approved these changes Jul 23, 2020

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 23, 2020

Merge branch 'master' into fixed_count_of_filteredIssues

fec7657

lunny reviewed Sep 10, 2020

View reviewed changes

routers/api/v1/repo/issue.go Show resolved Hide resolved

zeripath reviewed Sep 13, 2020

View reviewed changes

models/issue.go Outdated Show resolved Hide resolved

hinoshiba and others added 7 commits September 16, 2020 21:38

Improved value of sql.

8335b42

Co-authored-by: zeripath <art27@cantab.net>

Improved value of sql.

07f1f8a

improved message

15b7cb2

improved message

dfc545e

improved message

46c61e4

fixed message

dc15e1f

Merge branch 'master' into fixed_count_of_filteredIssues

ad9cc37

6543 approved these changes Sep 17, 2020

View reviewed changes

6543 mentioned this pull request Sep 17, 2020

[API] Best way for issues and PRs and it's count #6774

Closed

zeripath approved these changes Sep 24, 2020

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Sep 24, 2020

techknowlogick added 2 commits September 24, 2020 18:37

Merge branch 'master' into fixed_count_of_filteredIssues

dcd08d0

Merge branch 'master' into fixed_count_of_filteredIssues

630f842

techknowlogick merged commit 6fa19a8 into go-gitea:master Sep 24, 2020

go-gitea locked and limited conversation to collaborators Nov 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed count of filtered issues when api request. #12275

Fixed count of filtered issues when api request. #12275

hinoshiba commented Jul 19, 2020

6543 left a comment

hinoshiba commented Jul 19, 2020 •

edited

Loading

6543 commented Jul 19, 2020

6543 commented Jul 19, 2020

hinoshiba commented Jul 20, 2020

6543 Jul 20, 2020

6543 Jul 20, 2020

hinoshiba Jul 20, 2020

6543 commented Jul 20, 2020

6543 commented Jul 20, 2020

hinoshiba commented Jul 20, 2020

hinoshiba commented Jul 20, 2020

6543 commented Jul 22, 2020

6543 commented Jul 23, 2020

6543 commented Jul 23, 2020

hinoshiba commented Jul 23, 2020

6543 commented Jul 23, 2020

6543 commented Sep 1, 2020

hinoshiba commented Sep 1, 2020

codecov-commenter commented Sep 1, 2020 •

edited

Loading

Fixed count of filtered issues when api request. #12275

Fixed count of filtered issues when api request. #12275

Conversation

hinoshiba commented Jul 19, 2020

6543 left a comment

Choose a reason for hiding this comment

hinoshiba commented Jul 19, 2020 • edited Loading

6543 commented Jul 19, 2020

6543 commented Jul 19, 2020

hinoshiba commented Jul 20, 2020

6543 Jul 20, 2020

Choose a reason for hiding this comment

6543 Jul 20, 2020

Choose a reason for hiding this comment

hinoshiba Jul 20, 2020

Choose a reason for hiding this comment

6543 commented Jul 20, 2020

6543 commented Jul 20, 2020

hinoshiba commented Jul 20, 2020

hinoshiba commented Jul 20, 2020

6543 commented Jul 22, 2020

6543 commented Jul 23, 2020

6543 commented Jul 23, 2020

hinoshiba commented Jul 23, 2020

6543 commented Jul 23, 2020

6543 commented Sep 1, 2020

hinoshiba commented Sep 1, 2020

codecov-commenter commented Sep 1, 2020 • edited Loading

Codecov Report

hinoshiba commented Jul 19, 2020 •

edited

Loading

codecov-commenter commented Sep 1, 2020 •

edited

Loading