Skip to content

fix(state/indexer): copy value (backport #4321)#4326

Merged
mergify[bot] merged 4 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-4321
Oct 24, 2024
Merged

fix(state/indexer): copy value (backport #4321)#4326
mergify[bot] merged 4 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-4321

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2024

Because, in cometbft-db v0.13+, the iterator is being reused so we need to always copy key and value if we're storing them in a map or other in-memory structure.

Closes #4295

This is an automatic backport of pull request #4321 done by [Mergify](https://mergify.com).

@melekes @mergify
fix(state/indexer): copy value (#4321)
b674402 
Because, in cometbft-db v0.13+, the iterator is being reused so we need
to always copy key and value if we're storing them in a map or other
in-memory structure.

Closes #4295

(cherry picked from commit 2fee473)

# Conflicts:
#	go.mod
#	go.sum
#	test/e2e/docker/Dockerfile
@mergify mergify bot requested a review from a team as a code owner October 24, 2024 08:13
@mergify mergify bot added the conflicts label Oct 24, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Oct 24, 2024

Cherry-pick of 2fee473 has failed:

On branch mergify/bp/v0.37.x/pr-4321
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit 2fee473e9.
  (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:   state/indexer/block/kv/kv.go
	modified:   state/txindex/kv/kv.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   test/e2e/docker/Dockerfile

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 mergify bot mentioned this pull request Oct 24, 2024
Merged
@mergify mergify bot merged commit f884c76 into v0.37.x Oct 24, 2024
@mergify mergify bot deleted the mergify/bp/v0.37.x/pr-4321 branch October 24, 2024 15:35
gartnera added a commit to gartnera/cometbft that referenced this pull request Oct 29, 2024
@gartnera
revert(state/indexer): copy value (cometbft#4326)
1b8965d
@gartnera gartnera mentioned this pull request Oct 29, 2024
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@melekes melekes melekes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@melekes