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

[BEAM-8932] [BEAM-9036] Revert reverted commit to use PubsubMessage as the canonical type in beam client #10474

Merged
merged 2 commits into from
Jan 8, 2020

Conversation

dpcollins-google
Copy link
Contributor

@dpcollins-google dpcollins-google commented Dec 27, 2019

This is safe now that a null check was added on the attribute map in the json client.


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • 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.

Post-Commit Tests Status (on master branch)

Lang SDK Apex Dataflow Flink Gearpump Samza Spark
Go Build Status --- --- Build Status --- --- Build Status
Java Build Status Build Status Build Status Build Status
Build Status
Build Status
Build Status Build Status Build Status
Build Status
Build Status
Python Build Status
Build Status
Build Status
Build Status
--- Build Status
Build Status
Build Status
Build Status
--- --- Build Status
XLang --- --- --- Build Status --- --- ---

Pre-Commit Tests Status (on master branch)

--- Java Python Go Website
Non-portable Build Status Build Status
Build Status
Build Status Build Status
Portable --- Build Status --- ---

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

@dpcollins-google
Copy link
Contributor Author

+R: @boyuanzz

@boyuanzz boyuanzz changed the title [BEAM-8932] Revert reverted commit to use PubsubMessage as the canonical type in beam client [BEAM-8932] [BEAM-9036] Revert reverted commit to use PubsubMessage as the canonical type in beam client Dec 27, 2019
@boyuanzz
Copy link
Contributor

Run SQL PostCommit

@suztomo
Copy link
Contributor

suztomo commented Dec 28, 2019

Run Java PostCommit

@suztomo
Copy link
Contributor

suztomo commented Dec 29, 2019

Run Java PreCommit

@suztomo
Copy link
Contributor

suztomo commented Dec 29, 2019

Run SQL PostCommit

@suztomo
Copy link
Contributor

suztomo commented Dec 29, 2019

Run Java PostCommit

@dpcollins-google
Copy link
Contributor Author

Run Java PreCommit

@dpcollins-google
Copy link
Contributor Author

Run SQL PostCommit

@dpcollins-google
Copy link
Contributor Author

Run Java PostCommit

@dpcollins-google
Copy link
Contributor Author

Run Python PreCommit

@dpcollins-google
Copy link
Contributor Author

Run PreCommit

@dpcollins-google
Copy link
Contributor Author

Run Java PreCommit

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 7, 2020

Retest all please

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 7, 2020

Run Java PreCommit

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 7, 2020

I don't think the test failures in Java prevommit are related to current changes. Let's try it again.

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 7, 2020

Run Java PreCommit

2 similar comments
@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 7, 2020

Run Java PreCommit

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 8, 2020

Run Java PreCommit

@boyuanzz
Copy link
Contributor

boyuanzz commented Jan 8, 2020

Run SQL PostCommit

@boyuanzz boyuanzz merged commit 784d18b into apache:master Jan 8, 2020
if (pubsubMessage.getAttributes() != null) {
attributes = pubsubMessage.getAttributes();
} else {
attributes = new HashMap<>();
Copy link
Member

Choose a reason for hiding this comment

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

This would be more efficient and clear as Collections.emptyMap() which is immutable and does not involve allocation.

boyuanzz added a commit that referenced this pull request Jan 10, 2020
…essage as the canonical type in beam client (#10474)"

This reverts commit 784d18b.
vmarquez pushed a commit to vmarquez/beam that referenced this pull request Apr 1, 2020
…s the canonical type in beam client (apache#10474)

* Revert "Revert "[BEAM-8932]  Modify PubsubClient to use the proto message throughout.""

This reverts commit aeae2f4.

* Check for null attribute map in IncomingMessage before adding on PubsubMessage.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants