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

Improve report counts performance (bp #1438) #1440

Merged
merged 8 commits into from
Mar 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2021

This is an automatic backport of pull request #1438 done by Mergify.

Cherry-pick of 87714c2 has failed:

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

You are currently cherry-picking commit 87714c2f6.
  (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:   src/manage_acl.c
	modified:   src/manage_acl.h
	modified:   src/manage_pg.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/manage_sql.c

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

When counting unfiltered report result severities, the WHERE access
check queries for the results are not used, so they can be omitted to
improve performance.

(cherry picked from commit 7cf717e)
The init_result_get_iterator_severity function now uses WITH clauses for
the permissions in the valid_overrides.

(cherry picked from commit 87714c2)

# Conflicts:
#	src/manage_sql.c
It should only be attempted to free the WITH clause if the output
parameter for it is not NULL.

(cherry picked from commit 49edcaf)
@mergify mergify bot requested a review from a team March 10, 2021 17:57
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Mar 10, 2021
The WITH clause code in init_result_get_iterator_severity has been moved
into an if block and the scope of some variables has changed
accordingly.
@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Mar 16, 2021
@timopollmeier timopollmeier merged commit a13791d into master Mar 17, 2021
@timopollmeier timopollmeier deleted the mergify/bp/master/pr-1438 branch March 17, 2021 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants