Fix bounded trie merge when merging on empty trie#33483
Merged
robertwb merged 1 commit intoapache:masterfrom Jan 2, 2025
Merged
Fix bounded trie merge when merging on empty trie#33483robertwb merged 1 commit intoapache:masterfrom
robertwb merged 1 commit intoapache:masterfrom
Conversation
Contributor
Author
|
R: @robertwb |
Contributor
|
Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment |
Contributor
Author
|
I believe we will need to cherry-pick this to 2.62 release branch? (Although since there is no internal use we can choose not to but we can't stop users from using it) |
robertwb
approved these changes
Jan 2, 2025
Contributor
|
LGTM once formatting is fixed (run +1 to cherry picking for correctness, even if it's not widely used yet. |
6d85b06 to
2fb01be
Compare
Contributor
Author
|
@robertwb I do not have write access to repo and hence can't merge. Can you help me merge this PR? Thanks. |
3 tasks
kennknowles
added a commit
that referenced
this pull request
Jan 4, 2025
…bounded trie merge when merging on empty trie)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When merging on empty trie calculate delta based on other.
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, commentfixes #<ISSUE NUMBER>instead.CHANGES.mdwith noteworthy changes.See the Contributor Guide for more tips on how to make review process smoother.
To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md
GitHub Actions Tests Status (on master branch)
See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.