From 26fa94ba8da3b5174e9d47247dd34f1e28140784 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Wed, 16 Sep 2020 00:07:38 +0300 Subject: [PATCH] vendor: update github.com/valyala/fastjson from v1.5.4 to v1.5.5 This should properly parse `+Inf` values when importing JSON lines via `/api/v1/import` Updates https://github.com/VictoriaMetrics/vmctl/issues/25 --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/valyala/fastjson/fastfloat/parse.go | 8 ++++++-- vendor/modules.txt | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 89d8d156c6..c06451ead4 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/cespare/xxhash/v2 v2.1.1 github.com/golang/snappy v0.0.1 github.com/klauspost/compress v1.11.0 - github.com/valyala/fastjson v1.5.4 + github.com/valyala/fastjson v1.5.5 github.com/valyala/fastrand v1.0.0 github.com/valyala/fasttemplate v1.2.1 github.com/valyala/gozstd v1.8.3 diff --git a/go.sum b/go.sum index 575596bb62..1f122bcee5 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.15.1/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= -github.com/valyala/fastjson v1.5.4 h1:r8gpiVwdzDU09NrlN38OyL5dUFpdwGQR5RQEBqY+hLg= -github.com/valyala/fastjson v1.5.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= +github.com/valyala/fastjson v1.5.5 h1:4CAm2y8QWklzgJx0hELD61SYkRkFxn4wUIqb0Uzcn44= +github.com/valyala/fastjson v1.5.5/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/fastrand v1.0.0 h1:LUKT9aKer2dVQNUi3waewTbKV+7H17kvWFNKs2ObdkI= github.com/valyala/fastrand v1.0.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= diff --git a/vendor/github.com/valyala/fastjson/fastfloat/parse.go b/vendor/github.com/valyala/fastjson/fastfloat/parse.go index e01f4fe1e3..2d4c783081 100644 --- a/vendor/github.com/valyala/fastjson/fastfloat/parse.go +++ b/vendor/github.com/valyala/fastjson/fastfloat/parse.go @@ -140,13 +140,17 @@ func ParseBestEffort(s string) float64 { break } if i <= j { - if strings.EqualFold(s[i:], "inf") { + s = s[i:] + if strings.HasPrefix(s, "+") { + s = s[1:] + } + if strings.EqualFold(s, "inf") { if minus { return -inf } return inf } - if strings.EqualFold(s[i:], "nan") { + if strings.EqualFold(s, "nan") { return nan } return 0 diff --git a/vendor/modules.txt b/vendor/modules.txt index efc0da9ece..a83646bc5a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -98,7 +98,7 @@ github.com/klauspost/compress/zstd github.com/klauspost/compress/zstd/internal/xxhash # github.com/valyala/bytebufferpool v1.0.0 github.com/valyala/bytebufferpool -# github.com/valyala/fastjson v1.5.4 +# github.com/valyala/fastjson v1.5.5 github.com/valyala/fastjson github.com/valyala/fastjson/fastfloat # github.com/valyala/fastrand v1.0.0