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.

Sign up for GitHub

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

Jump to bottom

Redis cache support for enrichment transform #30307

Merged
merged 12 commits into from
Feb 20, 2024
Merged

Redis cache support for enrichment transform #30307

merged 12 commits into from
Feb 20, 2024

Conversation

riteshghorse
Copy link
Contributor

@riteshghorse riteshghorse commented Feb 13, 2024 •
edited
Loading

This PR implements Redis caching support for RequestResponseIO and integrates it with Enrichment transform. It also enables the test for RRIO and Enrichment with HTTP Mock API.

Part of #29787

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.

@riteshghorse riteshghorse marked this pull request as ready for review February 13, 2024 22:02
@riteshghorse riteshghorse mentioned this pull request Feb 13, 2024
Open
16 tasks
@github-actions GitHub Actions
Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @tvalentyn for label python.
R: @damccorm for label build.
R: @chamikaramj for label io.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@riteshghorse
Copy link
Contributor Author

Redis cache tests passed
image

Failing ones are the older RRIO tests with HTTP (although enrichment tests for HTTP are passing) due to a problem with urllib3. I'll check.
image

@riteshghorse
Copy link
Contributor Author

This passed
image

And I think found the problem with other RRIO test as well :)

damccorm
damccorm reviewed Feb 14, 2024
View reviewed changes
Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't gotten through the tests yet, but on the whole this looks pretty good to me; left some comments

sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated
Comment on lines 490 to 496
cache_request = self.source_caller.get_cache_request(element)
# check if the caller is a enrichment handler. EnrichmentHandler
# provides the request format for cache.
if cache_request:
encoded_request = self.request_coder.encode(cache_request)
else:
encoded_request = self.request_coder.encode(element)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: I think this logic is shared and can be extracted out of the if/else

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The write part is similar but it has tuples as input

sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/transforms/enrichment_handlers/bigtable.py Outdated Show resolved Hide resolved
damccorm
damccorm approved these changes Feb 15, 2024
View reviewed changes
Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had one small nit, otherwise this looks good to me once tests pass

sdks/python/apache_beam/io/requestresponse_it_test.py Show resolved Hide resolved
tvalentyn
tvalentyn reviewed Feb 15, 2024
View reviewed changes
.github/trigger_files/beam_PostCommit_Python.json Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
@riteshghorse
Copy link
Contributor Author

riteshghorse commented Feb 16, 2024 •
edited
Loading

Thank you both Danny and Valentyn for your reviews!

@riteshghorse
Copy link
Contributor Author

Thanks @tvalentyn! Made changes from some of your suggestions but kept a few of them as is. If this looks good I'll drop the postcommit file once tests pass and merge. Thanks!

@riteshghorse
Copy link
Contributor Author

I'm removing this test
image

Since this failure is not reproducible locally and fails with a different error everytime - it was throwing this earlier
image

and we already have 3 other tests passing for testing the RRIO with MockAPI.

tvalentyn
tvalentyn approved these changes Feb 17, 2024
View reviewed changes
.github/trigger_files/beam_PostCommit_Python.json Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
sdks/python/apache_beam/io/requestresponse.py Outdated Show resolved Hide resolved
@riteshghorse
Copy link
Contributor Author

@tvalentyn I ended up using the @property for setters. Thanks again for the suggestions!

All tests passed. Dropping the postcommit file

@github-actions github-actions bot added build and removed build labels Feb 20, 2024
@riteshghorse riteshghorse merged commit 801252a into apache:master Feb 20, 2024
72 checks passed
@riteshghorse riteshghorse deleted the enrichment-redis branch February 20, 2024 17:22
@riteshghorse riteshghorse mentioned this pull request Feb 23, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damccorm damccorm damccorm approved these changes

@tvalentyn tvalentyn tvalentyn approved these changes

Assignees
No one assigned
Labels
build io Next Action: Reviewers python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@riteshghorse @tvalentyn @damccorm