mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-10 07:05:11 +00:00
9b3d97c473
* Fixes golang/protobuf#842. Unmarshal can now parse singular or repeated message fields without the field separator. * Fixes golang/protobuf#1011. Handles negative 0 properly. * For unknown fields with fixed 32-bit and 64-bit wire types, output is now in hex format with 0x prefix similar to C++ lib output. Previous Go implementation simply outputs these as decimal numbers %d. * All parsing errors, except for unexpected EOF should now contain line and column number info. * Fixed following conformance-related features: * Parse nan,inf,-inf,infinity,-infinity as case-insensitive. * Interpret float32 overflows as inf or -inf. * Parse large int-like number as proto float. * Discard unknown map field if DiscardUnknown=true. * Allow whitespaces/comments in Any type URL and extension field names per spec. * Improves performance and memory usage. It is now as fast and efficient as protojson, if not better on most benchmarks. name old time/op new time/op delta Text/Unmarshal/google_message1_proto2-4 14.1µs ±43% 8.7µs ±12% -38.27% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 11.6µs ±18% 7.7µs ± 9% -33.69% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 6.20ms ±27% 4.10ms ± 5% -33.95% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 12.8µs ± 6% 10.3µs ±23% -19.54% (p=0.000 n=9+10) Text/Marshal/google_message1_proto3-4 11.9µs ±16% 8.6µs ±10% -27.45% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.59ms ± 5% 5.30ms ±22% ~ (p=0.356 n=9+10) JSON/Unmarshal/google_message1_proto2-4 12.3µs ±61% 13.9µs ±26% ~ (p=0.190 n=10+10) JSON/Unmarshal/google_message1_proto3-4 7.51µs ± 6% 7.86µs ± 1% +4.66% (p=0.010 n=10+9) JSON/Unmarshal/google_message2-4 3.74ms ± 2% 3.94ms ± 2% +5.32% (p=0.000 n=10+10) JSON/Marshal/google_message1_proto2-4 9.90µs ±12% 9.95µs ± 4% ~ (p=0.315 n=9+10) JSON/Marshal/google_message1_proto3-4 7.55µs ± 4% 7.93µs ± 3% +4.98% (p=0.000 n=10+10) JSON/Marshal/google_message2-4 4.29ms ± 5% 4.49ms ± 2% +4.53% (p=0.001 n=10+10) name old alloc/op new alloc/op delta Text/Unmarshal/google_message1_proto2-4 12.5kB ± 0% 2.0kB ± 0% -83.87% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 12.2kB ± 0% 1.8kB ± 0% -85.33% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 5.35MB ± 0% 0.89MB ± 0% -83.28% (p=0.000 n=10+9) Text/Marshal/google_message1_proto2-4 12.0kB ± 0% 1.4kB ± 0% -88.15% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 12.4kB ± 0% 1.9kB ± 0% -84.91% (p=0.000 n=10+10) Text/Marshal/google_message2-4 5.64MB ± 0% 1.02MB ± 0% -81.85% (p=0.000 n=10+9) JSON/Unmarshal/google_message1_proto2-4 2.29kB ± 0% 2.29kB ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 2.08kB ± 0% 2.08kB ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 899kB ± 0% 899kB ± 0% ~ (p=1.000 n=10+10) JSON/Marshal/google_message1_proto2-4 1.46kB ± 0% 1.46kB ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 1.36kB ± 0% 1.36kB ± 0% ~ (all equal) JSON/Marshal/google_message2-4 1.19MB ± 0% 1.19MB ± 0% ~ (p=0.197 n=10+10) name old allocs/op new allocs/op delta Text/Unmarshal/google_message1_proto2-4 133 ± 0% 89 ± 0% -33.08% (p=0.000 n=10+10) Text/Unmarshal/google_message1_proto3-4 108 ± 0% 67 ± 0% -37.96% (p=0.000 n=10+10) Text/Unmarshal/google_message2-4 60.0k ± 0% 38.7k ± 0% -35.52% (p=0.000 n=10+10) Text/Marshal/google_message1_proto2-4 65.0 ± 0% 25.0 ± 0% -61.54% (p=0.000 n=10+10) Text/Marshal/google_message1_proto3-4 59.0 ± 0% 22.0 ± 0% -62.71% (p=0.000 n=10+10) Text/Marshal/google_message2-4 27.4k ± 0% 7.3k ± 0% -73.39% (p=0.000 n=10+10) JSON/Unmarshal/google_message1_proto2-4 95.0 ± 0% 95.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message1_proto3-4 74.0 ± 0% 74.0 ± 0% ~ (all equal) JSON/Unmarshal/google_message2-4 36.3k ± 0% 36.3k ± 0% ~ (all equal) JSON/Marshal/google_message1_proto2-4 27.0 ± 0% 27.0 ± 0% ~ (all equal) JSON/Marshal/google_message1_proto3-4 30.0 ± 0% 30.0 ± 0% ~ (all equal) JSON/Marshal/google_message2-4 11.3k ± 0% 11.3k ± 0% ~ (p=1.000 n=10+10) Change-Id: I377925facde5535f06333b6f25e9c9b358dc062f Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/204602 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
163 lines
4.8 KiB
Go
163 lines
4.8 KiB
Go
// Copyright 2018 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package text
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
"strconv"
|
|
"strings"
|
|
"unicode"
|
|
"unicode/utf16"
|
|
"unicode/utf8"
|
|
|
|
"google.golang.org/protobuf/internal/strs"
|
|
)
|
|
|
|
// parseStringValue parses string field token.
|
|
// This differs from parseString since the text format allows
|
|
// multiple back-to-back string literals where they are semantically treated
|
|
// as a single large string with all values concatenated.
|
|
//
|
|
// E.g., `"foo" "bar" "baz"` => "foobarbaz"
|
|
func (d *Decoder) parseStringValue() (Token, error) {
|
|
// Note that the ending quote is sufficient to unambiguously mark the end
|
|
// of a string. Thus, the text grammar does not require intervening
|
|
// whitespace or control characters in-between strings.
|
|
// Thus, the following is valid:
|
|
// `"foo"'bar'"baz"` => "foobarbaz"
|
|
in0 := d.in
|
|
var ss []string
|
|
for len(d.in) > 0 && (d.in[0] == '"' || d.in[0] == '\'') {
|
|
s, err := d.parseString()
|
|
if err != nil {
|
|
return Token{}, err
|
|
}
|
|
ss = append(ss, s)
|
|
}
|
|
// d.in already points to the end of the value at this point.
|
|
return Token{
|
|
kind: Scalar,
|
|
attrs: stringValue,
|
|
pos: len(d.orig) - len(in0),
|
|
raw: in0[:len(in0)-len(d.in)],
|
|
str: strings.Join(ss, ""),
|
|
}, nil
|
|
}
|
|
|
|
// parseString parses a string value enclosed in " or '.
|
|
func (d *Decoder) parseString() (string, error) {
|
|
in := d.in
|
|
if len(in) == 0 {
|
|
return "", io.ErrUnexpectedEOF
|
|
}
|
|
quote := in[0]
|
|
in = in[1:]
|
|
i := indexNeedEscapeInBytes(in)
|
|
in, out := in[i:], in[:i:i] // set cap to prevent mutations
|
|
for len(in) > 0 {
|
|
switch r, n := utf8.DecodeRune(in); {
|
|
case r == utf8.RuneError && n == 1:
|
|
return "", d.newSyntaxError("invalid UTF-8 detected")
|
|
case r == 0 || r == '\n':
|
|
return "", d.newSyntaxError("invalid character %q in string", r)
|
|
case r == rune(quote):
|
|
in = in[1:]
|
|
d.consume(len(d.in) - len(in))
|
|
return string(out), nil
|
|
case r == '\\':
|
|
if len(in) < 2 {
|
|
return "", io.ErrUnexpectedEOF
|
|
}
|
|
switch r := in[1]; r {
|
|
case '"', '\'', '\\', '?':
|
|
in, out = in[2:], append(out, r)
|
|
case 'a':
|
|
in, out = in[2:], append(out, '\a')
|
|
case 'b':
|
|
in, out = in[2:], append(out, '\b')
|
|
case 'n':
|
|
in, out = in[2:], append(out, '\n')
|
|
case 'r':
|
|
in, out = in[2:], append(out, '\r')
|
|
case 't':
|
|
in, out = in[2:], append(out, '\t')
|
|
case 'v':
|
|
in, out = in[2:], append(out, '\v')
|
|
case 'f':
|
|
in, out = in[2:], append(out, '\f')
|
|
case '0', '1', '2', '3', '4', '5', '6', '7':
|
|
// One, two, or three octal characters.
|
|
n := len(in[1:]) - len(bytes.TrimLeft(in[1:], "01234567"))
|
|
if n > 3 {
|
|
n = 3
|
|
}
|
|
v, err := strconv.ParseUint(string(in[1:1+n]), 8, 8)
|
|
if err != nil {
|
|
return "", d.newSyntaxError("invalid octal escape code %q in string", in[:1+n])
|
|
}
|
|
in, out = in[1+n:], append(out, byte(v))
|
|
case 'x':
|
|
// One or two hexadecimal characters.
|
|
n := len(in[2:]) - len(bytes.TrimLeft(in[2:], "0123456789abcdefABCDEF"))
|
|
if n > 2 {
|
|
n = 2
|
|
}
|
|
v, err := strconv.ParseUint(string(in[2:2+n]), 16, 8)
|
|
if err != nil {
|
|
return "", d.newSyntaxError("invalid hex escape code %q in string", in[:2+n])
|
|
}
|
|
in, out = in[2+n:], append(out, byte(v))
|
|
case 'u', 'U':
|
|
// Four or eight hexadecimal characters
|
|
n := 6
|
|
if r == 'U' {
|
|
n = 10
|
|
}
|
|
if len(in) < n {
|
|
return "", io.ErrUnexpectedEOF
|
|
}
|
|
v, err := strconv.ParseUint(string(in[2:n]), 16, 32)
|
|
if utf8.MaxRune < v || err != nil {
|
|
return "", d.newSyntaxError("invalid Unicode escape code %q in string", in[:n])
|
|
}
|
|
in = in[n:]
|
|
|
|
r := rune(v)
|
|
if utf16.IsSurrogate(r) {
|
|
if len(in) < 6 {
|
|
return "", io.ErrUnexpectedEOF
|
|
}
|
|
v, err := strconv.ParseUint(string(in[2:6]), 16, 16)
|
|
r = utf16.DecodeRune(r, rune(v))
|
|
if in[0] != '\\' || in[1] != 'u' || r == unicode.ReplacementChar || err != nil {
|
|
return "", d.newSyntaxError("invalid Unicode escape code %q in string", in[:6])
|
|
}
|
|
in = in[6:]
|
|
}
|
|
out = append(out, string(r)...)
|
|
default:
|
|
return "", d.newSyntaxError("invalid escape code %q in string", in[:2])
|
|
}
|
|
default:
|
|
i := indexNeedEscapeInBytes(in[n:])
|
|
in, out = in[n+i:], append(out, in[:n+i]...)
|
|
}
|
|
}
|
|
return "", io.ErrUnexpectedEOF
|
|
}
|
|
|
|
// indexNeedEscapeInString returns the index of the character that needs
|
|
// escaping. If no characters need escaping, this returns the input length.
|
|
func indexNeedEscapeInBytes(b []byte) int { return indexNeedEscapeInString(strs.UnsafeString(b)) }
|
|
|
|
// UnmarshalString returns an unescaped string given a textproto string value.
|
|
// String value needs to contain single or double quotes. This is only used by
|
|
// internal/encoding/defval package for unmarshaling bytes.
|
|
func UnmarshalString(s string) (string, error) {
|
|
d := NewDecoder([]byte(s))
|
|
return d.parseString()
|
|
}
|