MapObjectEncoder: Empty arrays should not be nil #614
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
|
|
Codecov Report
@@ Coverage Diff @@
## master #614 +/- ##
=======================================
Coverage 97.37% 97.37%
=======================================
Files 40 40
Lines 2095 2095
=======================================
Hits 2040 2040
Misses 47 47
Partials 8 8
Continue to review full report at Codecov.
|
mh-park
changed the title
abhinav
reviewed
Jul 30, 2018
zapcore/memory_encoder.go
Outdated
| @@ -45,6 +45,9 @@ func NewMapObjectEncoder() *MapObjectEncoder { | |||
| func (m *MapObjectEncoder) AddArray(key string, v ArrayMarshaler) error { | |||
| arr := &sliceArrayEncoder{} | |||
| err := v.MarshalLogArray(arr) | |||
| if arr.elems == nil { | |||
| arr.elems = []interface{}{} | |||
There was a problem hiding this comment.
I would make this the default value of arr.elems since it'll be appended to anyway.
arr := &sliceArrayEncoder{elems: make([]interface{})}
abhinav
approved these changes
Jul 30, 2018
| @@ -43,7 +43,7 @@ func NewMapObjectEncoder() *MapObjectEncoder { | |||
|
|
|||
| // AddArray implements ObjectEncoder. | |||
| func (m *MapObjectEncoder) AddArray(key string, v ArrayMarshaler) error { | |||
| arr := &sliceArrayEncoder{} | |||
| arr := &sliceArrayEncoder{elems: make([]interface{}, 0)} | |||
There was a problem hiding this comment.
0 unnecessary in make(..) because it's the default.
There was a problem hiding this comment.
I initially tried it without the 0 and zapcore/memory_encoder.go:46:39: missing len argument to make([]interface {}) popped up
akshayjshah
approved these changes
Jul 31, 2018
abhinav
approved these changes
Jul 31, 2018
cgxxv
pushed a commit
to cgxxv/zap
that referenced
this pull request
Mar 25, 2022
This change fixes a bug in MapObjectEncoder.AddArray where an empty slice would log nil instead of an empty array. Logging an empty array makes the MapObjectEncoder's behavior correctly reflect the JSON encoder's.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
This change fixes a bug in MapObjectEncoder.AddArray where an empty slice would log nil instead of an empty array. Logging an empty array makes the MapObjectEncoder's behavior correctly reflect the JSON encoder's.