Merge branch 'renovate/github.com-olivere-elastic-v7-7.x' into 'master'
Update module olivere/elastic/v7 to v7.0.22 See merge request !3
| ... | ... | @@ -4,4 +4,4 @@ go 1.11 |
| // go: no requirements found in vendor/vendor.json | ||
| require github.com/olivere/elastic/v7 v7.0.19 | ||
| require github.com/olivere/elastic/v7 v7.0.22 |
| ... | ... | @@ -5,6 +5,7 @@ |
| package jlexer | ||
| import ( | ||
| "bytes" | ||
| "encoding/base64" | ||
| "encoding/json" | ||
| "errors" | ||
| ... | ... | @@ -14,6 +15,8 @@ import ( |
| "unicode" | ||
| "unicode/utf16" | ||
| "unicode/utf8" | ||
| "github.com/josharian/intern" | ||
| ) | ||
| // tokenKind determines type of a token. | ||
| ... | ... | @@ -32,9 +35,10 @@ const ( |
| type token struct { | ||
| kind tokenKind // Type of a token. | ||
| boolValue bool // Value if a boolean literal token. | ||
| byteValue []byte // Raw value of a token. | ||
| delimValue byte | ||
| boolValue bool // Value if a boolean literal token. | ||
| byteValueCloned bool // true if byteValue was allocated and does not refer to original json body | ||
| byteValue []byte // Raw value of a token. | ||
| delimValue byte | ||
| } | ||
| // Lexer is a JSON lexer: it iterates over JSON tokens in a byte slice. | ||
| ... | ... | @@ -240,23 +244,65 @@ func (r *Lexer) fetchNumber() { |
| // findStringLen tries to scan into the string literal for ending quote char to determine required size. | ||
| // The size will be exact if no escapes are present and may be inexact if there are escaped chars. | ||
| func findStringLen(data []byte) (isValid, hasEscapes bool, length int) { | ||
| delta := 0 | ||
| for i := 0; i < len(data); i++ { | ||
| switch data[i] { | ||
| case '\\': | ||
| i++ | ||
| delta++ | ||
| if i < len(data) && data[i] == 'u' { | ||
| delta++ | ||
| } | ||
| case '"': | ||
| return true, (delta > 0), (i - delta) | ||
| func findStringLen(data []byte) (isValid bool, length int) { | ||
| for { | ||
| idx := bytes.IndexByte(data, '"') | ||
| if idx == -1 { | ||
| return false, len(data) | ||
| } | ||
| if idx == 0 || (idx > 0 && data[idx-1] != '\\') { | ||
| return true, length + idx | ||
| } | ||
| // count \\\\\\\ sequences. even number of slashes means quote is not really escaped | ||
| cnt := 1 | ||
| for idx-cnt-1 >= 0 && data[idx-cnt-1] == '\\' { | ||
| cnt++ | ||
| } | ||
| if cnt%2 == 0 { | ||
| return true, length + idx | ||
| } | ||
| length += idx + 1 | ||
| data = data[idx+1:] | ||
| } | ||
| } | ||
| // unescapeStringToken performs unescaping of string token. | ||
| // if no escaping is needed, original string is returned, otherwise - a new one allocated | ||
| func (r *Lexer) unescapeStringToken() (err error) { | ||
| data := r.token.byteValue | ||
| var unescapedData []byte | ||
| for { | ||
| i := bytes.IndexByte(data, '\\') | ||
| </ |