Skip to content

feat: make ChangeSet and KVPair protobuf serializable (backport #726)#734

Merged
tac0turtle merged 2 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-726
Apr 11, 2023
Merged

feat: make ChangeSet and KVPair protobuf serializable (backport #726)#734
tac0turtle merged 2 commits intorelease/v1.x.xfrom
mergify/bp/release/v1.x.x/pr-726

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 10, 2023

This is an automatic backport of pull request #726 done by Mergify.
Cherry-pick of 61be28a has failed:

On branch mergify/bp/release/v1.x.x/pr-726
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit 61be28a.
  (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:
	new file:   buf.gen.yaml
	modified:   diff.go
	modified:   diff_test.go
	modified:   nodedb.go
	new file:   proto/buf.lock
	new file:   proto/buf.md
	new file:   proto/buf.yaml
	new file:   proto/changeset.pb.go
	new file:   proto/changeset.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

(cherry picked from commit 61be28a)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team April 10, 2023 08:56
@mergify mergify bot added the conflicts label Apr 10, 2023
@cool-develope
Copy link
Contributor

@yihuang could you provide some context why need serialization on changesets?

@yihuang
Copy link

yihuang commented Apr 10, 2023

@yihuang could you provide some context why need serialization on changesets?

We store the change set to disk in memiavl design.

And in new iavl migration process, it could be handy to save the change sets to disk as well, as intermediate result.

@cool-develope
Copy link
Contributor

cool-develope commented Apr 10, 2023

@yihuang could you provide some context why need serialization on changesets?

We store the change set to disk in memiavl design.

And in new iavl migration process, it could be handy to save the change sets to disk as well, as intermediate result.

for now, just plan the transfer of changesets in memory with importing two different versions but make sense

@tac0turtle tac0turtle merged commit 5501309 into release/v1.x.x Apr 11, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v1.x.x/pr-726 branch April 11, 2023 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants