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

Fix bounded trie merge when merging on empty trie #33483

Merged
merged 1 commit into from
Jan 2, 2025

Conversation

rohitsinha54
Copy link
Contributor

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:

  • Mention the appropriate issue in your description (for example: 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, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

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)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@github-actions github-actions bot added the python label Jan 2, 2025
@rohitsinha54
Copy link
Contributor Author

R: @robertwb

Copy link
Contributor

github-actions bot commented Jan 2, 2025

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

@rohitsinha54
Copy link
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
Copy link
Contributor

robertwb commented Jan 2, 2025

LGTM once formatting is fixed (run yapf -irp [changed files])

+1 to cherry picking for correctness, even if it's not widely used yet.

@rohitsinha54
Copy link
Contributor Author

@robertwb I do not have write access to repo and hence can't merge. Can you help me merge this PR? Thanks.

@robertwb robertwb merged commit f4006fe into apache:master Jan 2, 2025
83 of 91 checks passed
kennknowles added a commit that referenced this pull request Jan 4, 2025
…bounded trie merge when merging on empty trie)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants