Skip to content

Commit

Permalink
encoding/json: remove a branch in the structEncoder loop
Browse files Browse the repository at this point in the history
Encoders like map and array can use the much cheaper "i > 0" check to
see if we're not writing the first element. However, since struct fields
support omitempty, we need to keep track of that separately.

This is much more expensive - after calling the field encoder itself,
and retrieving the field via reflection, this branch was the third most
expensive piece of this field loop.

Instead, hoist the branch logic outside of the loop. The code doesn't
get much more complex, since we just delay the writing of each byte
until the next iteration. Yet the performance improvement is noticeable,
even when the struct types in CodeEncoder only have 2 and 7 fields,
respectively.

name           old time/op    new time/op    delta
CodeEncoder-4    5.39ms ± 0%    5.31ms ± 0%  -1.37%  (p=0.010 n=4+6)

name           old speed      new speed      delta
CodeEncoder-4   360MB/s ± 0%   365MB/s ± 0%  +1.39%  (p=0.010 n=4+6)

Updates #5683.

Change-Id: I2662cf459e0dfd68e56fa52bc898a417e84266c2
Reviewed-on: https://go-review.googlesource.com/131401
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
mvdan committed Aug 25, 2018
1 parent 88f4bcc commit c21ba22
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/encoding/json/encode.go
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,7 @@ type structEncoder struct {
}

func (se structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
e.WriteByte('{')
first := true
next := byte('{')
for i := range se.fields {
f := &se.fields[i]

Expand All @@ -649,11 +648,8 @@ func (se structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
if f.omitEmpty && isEmptyValue(fv) {
continue
}
if first {
first = false
} else {
e.WriteByte(',')
}
e.WriteByte(next)
next = ','
if opts.escapeHTML {
e.WriteString(f.nameEscHTML)
} else {
Expand All @@ -662,7 +658,11 @@ func (se structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
opts.quoted = f.quoted
f.encoder(e, fv, opts)
}
e.WriteByte('}')
if next == '{' {
e.WriteString("{}")
} else {
e.WriteByte('}')
}
}

func newStructEncoder(t reflect.Type) encoderFunc {
Expand Down

0 comments on commit c21ba22

Please sign in to comment.