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

Use jsoniter instead of easyjson #2105

Merged
merged 6 commits into from
Jan 11, 2019

Conversation

mheon
Copy link
Member

@mheon mheon commented Jan 8, 2019

Just as fast, no code generation involved. Theoretically both are fully compatible with the standard library encoding/json implementation.

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 8, 2019
@TomSweeneyRedHat
Copy link
Member

Changes LGTM, however given it's size, should it wait until after the 1.0 release?

@mheon
Copy link
Member Author

mheon commented Jan 8, 2019

MarshalIndent really hates using tabs as indents. Replaced with 5 spaces.

@TomSweeneyRedHat Sure, we should probably delay until after we branch.

@giuseppe
Copy link
Member

giuseppe commented Jan 9, 2019

all the changes are coming from vendored code. Even if the PR size is XXL, I think it is a safe change on our side. I think it should be OK to have it for 1.0

@rhatdan
Copy link
Member

rhatdan commented Jan 9, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2019
@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #2061) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2019
@mheon
Copy link
Member Author

mheon commented Jan 9, 2019

Rebased.

I'm still a little hesitant about having this in 1.0 - if there are compatibility issues with easyjson, we might have issues accessing databases created with sub-1.0 versions. My initial testing hasn't noticed anything like that, though.

I'll slap a /approve on, as this should be ready now, 1.0 questions aside

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2019
@mheon
Copy link
Member Author

mheon commented Jan 10, 2019

bot, retest this please

@mheon
Copy link
Member Author

mheon commented Jan 10, 2019

Not including this in 1.0

@mheon
Copy link
Member Author

mheon commented Jan 10, 2019

bot, retest this please

@mheon mheon force-pushed the jsoniter branch 2 times, most recently from 39a6a65 to b66f2ba Compare January 10, 2019 18:34
@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #2126) made this pull request unmergeable. Please resolve the merge conflicts.

mheon added 6 commits January 10, 2019 15:48
The jsoniter library does not require code generation, which is a
massive advantage over easyjson (it's also about the same in
performance). Begin moving over to it by removing the existing
easyjson code.

Signed-off-by: Matthew Heon <[email protected]>
We already have it vendored for a Kube package we import, but we
want a more recent version with additional bugfixes over the 1.0
release we originally had.

Signed-off-by: Matthew Heon <[email protected]>
The vndr tool isn't updating vendor.conf so do it manually.

Signed-off-by: Matthew Heon <[email protected]>
The json-iterator package will panic on attempting to use
MarshalIndent with a non-space indentation. This is sort of silly
but swapping from tabs to spaces is not a big issue for us, so
let's work around the silly panic.

Signed-off-by: Matthew Heon <[email protected]>
@mheon
Copy link
Member Author

mheon commented Jan 10, 2019

@rhatdan @baude @vrothberg This is unblocked now that 1.0 is merged, we're good to merge this

@mheon
Copy link
Member Author

mheon commented Jan 10, 2019

I think lint is a flake
/retest

@vrothberg
Copy link
Member

Let's get this merged. After that I may need to rebase the vendor-* PR.

@vrothberg
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2019
@openshift-merge-robot openshift-merge-robot merged commit 26f2b7d into containers:master Jan 11, 2019
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants