Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: cap max count on list views (backport #25348) #25362

Merged
merged 7 commits into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #25348 done by Mergify.
Cherry-pick of ae649aa has failed:

On branch mergify/bp/version-15-hotfix/pr-25348
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit ae649aadf0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/reportview.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of a49fafb has failed:

On branch mergify/bp/version-15-hotfix/pr-25348
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a49fafbf8e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/public/js/frappe/db.js
	modified:   frappe/public/js/frappe/list/list_view.js
	modified:   frappe/tests/test_db_query.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/reportview.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

confuses query planner in some cases

(cherry picked from commit ae649aa)

# Conflicts:
#	frappe/desk/reportview.py
In InnoDB counting is essentially O(n) operation, it can be pretty fast
on indexes but when filters don't use any index it usually means doing a
full table scan.

Adding a limit will stop the scan as soon as that many records are
matched.

(cherry picked from commit a49fafb)

# Conflicts:
#	frappe/desk/reportview.py
Only difference is element

(cherry picked from commit 698ef95)
@mergify mergify bot requested a review from a team March 12, 2024 13:27
@mergify mergify bot added the conflicts label Mar 12, 2024
@mergify mergify bot requested review from ankush and removed request for a team March 12, 2024 13:27
@mergify mergify bot assigned ankush Mar 12, 2024
Copy link
Contributor Author

mergify bot commented Mar 12, 2024

Cherry-pick of ae649aa has failed:

On branch mergify/bp/version-15-hotfix/pr-25348
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit ae649aadf0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/reportview.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of a49fafb has failed:

On branch mergify/bp/version-15-hotfix/pr-25348
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a49fafbf8e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   frappe/public/js/frappe/db.js
	modified:   frappe/public/js/frappe/list/list_view.js
	modified:   frappe/tests/test_db_query.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/desk/reportview.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ankush ankush merged commit ba0643e into version-15-hotfix Mar 12, 2024
18 of 19 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-25348 branch March 12, 2024 14:45
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.18.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants