approvals: use go-cmp instead of gojsondiff #2968
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gojsondiff is unusably slow when comparing large maps with many differences. I triggered this in the profile integration tests, when the `profile.id` field changed in every single document. Use go-cmp instead, which is much faster.
Codecov Report
@@ Coverage Diff @@
## master #2968 +/- ##
=======================================
Coverage 78.74% 78.74%
=======================================
Files 84 84
Lines 4380 4380
=======================================
Hits 3449 3449
Misses 931 931 |
simitt
approved these changes
Nov 27, 2019
|
Failing tests are all unrelated, feel free to merge any time and please backport to 7.x |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While working on #2839, I found that large maps with many differences would lead to gojsondiff causing tests to churn CPU and eventually time out. This PR replaces use of gojsondiff with go-cmp, which has no such issues.
There is one functional difference: if the approval file is missing, we now compare the received JSON with
nullrather than{}. This is to cater for some uses of ApproveEvents with nil maps. Whereasgojsondiffwill produce no diff when comparing nil and empty maps, go-cmp will. This is why some approval files have been added.