Skip to content

perf(state): batch save State (backport #1735)#1761

Merged
melekes merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-1735
Dec 7, 2023
Merged

perf(state): batch save State (backport #1735)#1761
melekes merged 1 commit intov1.xfrom
mergify/bp/v1.x/pr-1735

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2023

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


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

* done stateDB writes batching

* remove forgotten debug print

* remove forgotten comments

* format code

* add a changelog entry

* fix changelog

---------

Co-authored-by: werty144 <anton-paramonov2000@yandex.ru>
(cherry picked from commit 76b1cce)
@mergify mergify bot requested a review from a team as a code owner December 7, 2023 02:19
@mergify mergify bot requested a review from a team December 7, 2023 02:19
@melekes melekes merged commit 84f783c into v1.x Dec 7, 2023
@melekes melekes deleted the mergify/bp/v1.x/pr-1735 branch December 7, 2023 02:52
@lasarojc
Copy link
Contributor

lasarojc commented Dec 7, 2023

I am confused about the back port process wrt to changelogs. Should we add the entry as unreleased in all versions and only when actually releasing the lowest version one we remove the unreleased entry in the higher version?
What if we we release the higher version first?
Since these are different release lines, should we have more than one release entry?

@melekes
Copy link
Collaborator

melekes commented Dec 7, 2023

@thanethomson do you have any thoughts on ^? I've made a mistake in merging a changelog entry from another PR, but I don't think that's an issue @lasarojc is talking about.

@sergio-mena
Copy link
Collaborator

sergio-mena commented Dec 13, 2023

My understanding is the following. Let $t$ be the moment the release of minor version v0.y.0 is tagged.

  • for any time after $t$ we consider any change to the v0.y.x branch (and also the changelog) independent from main and any future release branch
  • for any time before $t$, we act as though v0.y.x and main were still the same branch.

Examples:

  • if you fix a bug on main and backport it to v0.y.x before $t$, its changelog should only appear on v0.y.x (not on main)
  • if you fix a bug on main and backport it to v0.y.x after $t$, the changelog should appear in both branches

This means that the preparation work for tagging version v0.y.0 is different from that required on v0.y.z (for z > 0), as there are some extra checks we need to do in the backlog because of cases like the first example above.

For 1.x and later we might need to adapt this... I haven't given it yet the proper thought 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants