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

[BEAM-8484] RowJsonDeserializer/ToJson cleanup #9757

Merged
merged 5 commits into from Oct 25, 2019
Merged

[BEAM-8484] RowJsonDeserializer/ToJson cleanup #9757

merged 5 commits into from Oct 25, 2019

Conversation

TheNeuralBit
Copy link
Member

@TheNeuralBit TheNeuralBit commented Oct 10, 2019 •
edited

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
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.

@TheNeuralBit
Copy link
Member Author

R: @apilloud

apilloud
apilloud approved these changes Oct 17, 2019
View reviewed changes
Copy link
Member

@apilloud apilloud left a comment

Choose a reason for hiding this comment

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

Now that I read the description, I see this is just a refactor. Oops.

LGTM

sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJson.java Outdated Show resolved Hide resolved
sdks/java/core/src/main/java/org/apache/beam/sdk/util/RowJson.java

private static Object extractJsonPrimitiveValue(FieldValue fieldValue) {
try {
return JSON_VALUE_GETTERS.get(fieldValue.typeName()).extractValue(fieldValue.jsonValue());
Copy link
Member

Choose a reason for hiding this comment

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

nit: this might be more readable as a switch statement, but it looks like you are just moving it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah agreed a switch would be better. Do you want me to change that for this PR?

Copy link
Member

Choose a reason for hiding this comment

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

It is fine as is.

@TheNeuralBit
Copy link
Member Author

Run Java PreCommit

@TheNeuralBit
Copy link
Member Author

ping @apilloud

@apilloud
Copy link
Member

Looks like you have a merge commit in your history. You should set git pull to always rebase instead of merge: git config --global pull.rebase true. Then do another git pull to fix. Ping me once you have the history cleaned up and I'll merge.

@TheNeuralBit
Copy link
Member Author

TheNeuralBit commented Oct 25, 2019 •
edited

I usually don't use git pull, I always just fetch and then merge or rebase. I've been doing merges rather than rebasing so I don't have to force push, should I always prefer rebasing instead?

@apilloud
Copy link
Member

I thought we preferred rebasing, but I see nothing requiring it in the committer guide. You do need a JIRA though. Can you add a JIRA to the title?

@TheNeuralBit TheNeuralBit changed the title RowJsonDeserializer/ToJson cleanup [BEAM-8484] RowJsonDeserializer/ToJson cleanup Oct 25, 2019
@TheNeuralBit
Copy link
Member Author

Rebased and added a JIRA

@apilloud apilloud merged commit 9f8fdd1 into apache:master Oct 25, 2019
@TheNeuralBit TheNeuralBit mentioned this pull request Oct 25, 2019
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apilloud apilloud apilloud approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TheNeuralBit @apilloud