From 5e6f606f4e7714ed912e692b0966e365d162bf93 Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Mon, 30 May 2022 16:19:51 +0100 Subject: [PATCH] TUN-6293: Update yaml v3 to latest hotfix This addresses https://security.snyk.io/vuln/SNYK-GOLANG-GOPKGINYAMLV3-2841557 by updating yaml v3 to latest version. It also stops using yaml v2 directly (we were using both v2 and v3 mixed). We still rely on yaml v2 indirectly, via urfave cli, though. Note that the security vulnerability does not affect v2. --- cmd/cloudflared/tunnel/subcommands.go | 2 +- config/configuration_test.go | 22 +- config/manager.go | 2 +- go.mod | 5 +- go.sum | 4 +- ingress/config_test.go | 2 +- ingress/ingress_test.go | 2 +- .../github.com/francoispqt/gojay/.gitignore | 5 - .../github.com/francoispqt/gojay/.travis.yml | 15 - .../github.com/francoispqt/gojay/Gopkg.lock | 163 -- .../github.com/francoispqt/gojay/Gopkg.toml | 23 - vendor/github.com/francoispqt/gojay/LICENSE | 21 - vendor/github.com/francoispqt/gojay/Makefile | 11 - vendor/github.com/francoispqt/gojay/README.md | 855 ----------- vendor/github.com/francoispqt/gojay/decode.go | 386 ----- .../francoispqt/gojay/decode_array.go | 247 --- .../francoispqt/gojay/decode_bool.go | 241 --- .../francoispqt/gojay/decode_embedded_json.go | 85 -- .../francoispqt/gojay/decode_interface.go | 130 -- .../francoispqt/gojay/decode_number.go | 118 -- .../francoispqt/gojay/decode_number_float.go | 516 ------- .../francoispqt/gojay/decode_number_int.go | 1338 ----------------- .../francoispqt/gojay/decode_number_uint.go | 715 --------- .../francoispqt/gojay/decode_object.go | 407 ----- .../francoispqt/gojay/decode_pool.go | 64 - .../francoispqt/gojay/decode_slice.go | 89 -- .../francoispqt/gojay/decode_sqlnull.go | 157 -- .../francoispqt/gojay/decode_stream.go | 115 -- .../francoispqt/gojay/decode_stream_pool.go | 59 - .../francoispqt/gojay/decode_string.go | 260 ---- .../gojay/decode_string_unicode.go | 98 -- .../francoispqt/gojay/decode_time.go | 53 - .../francoispqt/gojay/decode_unsafe.go | 120 -- vendor/github.com/francoispqt/gojay/encode.go | 202 --- .../francoispqt/gojay/encode_array.go | 212 --- .../francoispqt/gojay/encode_bool.go | 164 -- .../francoispqt/gojay/encode_builder.go | 65 - .../francoispqt/gojay/encode_embedded_json.go | 93 -- .../francoispqt/gojay/encode_interface.go | 173 --- .../francoispqt/gojay/encode_null.go | 39 - .../francoispqt/gojay/encode_number.go | 1 - .../francoispqt/gojay/encode_number_float.go | 368 ----- .../francoispqt/gojay/encode_number_int.go | 500 ------ .../francoispqt/gojay/encode_number_uint.go | 362 ----- .../francoispqt/gojay/encode_object.go | 400 ----- .../francoispqt/gojay/encode_pool.go | 50 - .../francoispqt/gojay/encode_slice.go | 113 -- .../francoispqt/gojay/encode_sqlnull.go | 377 ----- .../francoispqt/gojay/encode_stream.go | 205 --- .../francoispqt/gojay/encode_stream_pool.go | 38 - .../francoispqt/gojay/encode_string.go | 186 --- .../francoispqt/gojay/encode_time.go | 68 - vendor/github.com/francoispqt/gojay/errors.go | 88 -- vendor/github.com/francoispqt/gojay/gojay.go | 10 - vendor/github.com/francoispqt/gojay/gojay.png | Bin 44163 -> 0 bytes .../lucas-clemente/quic-go/qlog/event.go | 529 ------- .../lucas-clemente/quic-go/qlog/frame.go | 227 --- .../quic-go/qlog/packet_header.go | 119 -- .../lucas-clemente/quic-go/qlog/qlog.go | 486 ------ .../lucas-clemente/quic-go/qlog/trace.go | 66 - .../lucas-clemente/quic-go/qlog/types.go | 320 ---- vendor/gopkg.in/yaml.v3/decode.go | 78 +- vendor/gopkg.in/yaml.v3/parserc.go | 11 +- vendor/modules.txt | 6 +- 64 files changed, 93 insertions(+), 11793 deletions(-) delete mode 100644 vendor/github.com/francoispqt/gojay/.gitignore delete mode 100644 vendor/github.com/francoispqt/gojay/.travis.yml delete mode 100644 vendor/github.com/francoispqt/gojay/Gopkg.lock delete mode 100644 vendor/github.com/francoispqt/gojay/Gopkg.toml delete mode 100644 vendor/github.com/francoispqt/gojay/LICENSE delete mode 100644 vendor/github.com/francoispqt/gojay/Makefile delete mode 100644 vendor/github.com/francoispqt/gojay/README.md delete mode 100644 vendor/github.com/francoispqt/gojay/decode.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_array.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_bool.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_embedded_json.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_interface.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_number.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_number_float.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_number_int.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_number_uint.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_object.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_pool.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_slice.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_sqlnull.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_stream.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_stream_pool.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_string.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_string_unicode.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_time.go delete mode 100644 vendor/github.com/francoispqt/gojay/decode_unsafe.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_array.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_bool.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_builder.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_embedded_json.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_interface.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_null.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_number.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_number_float.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_number_int.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_number_uint.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_object.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_pool.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_slice.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_sqlnull.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_stream.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_stream_pool.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_string.go delete mode 100644 vendor/github.com/francoispqt/gojay/encode_time.go delete mode 100644 vendor/github.com/francoispqt/gojay/errors.go delete mode 100644 vendor/github.com/francoispqt/gojay/gojay.go delete mode 100644 vendor/github.com/francoispqt/gojay/gojay.png delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/event.go delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/frame.go delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/packet_header.go delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/qlog.go delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/trace.go delete mode 100644 vendor/github.com/lucas-clemente/quic-go/qlog/types.go diff --git a/cmd/cloudflared/tunnel/subcommands.go b/cmd/cloudflared/tunnel/subcommands.go index e9825654..d3549856 100644 --- a/cmd/cloudflared/tunnel/subcommands.go +++ b/cmd/cloudflared/tunnel/subcommands.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" "golang.org/x/net/idna" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "github.com/cloudflare/cloudflared/cfapi" "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" diff --git a/config/configuration_test.go b/config/configuration_test.go index d870913d..dff785c8 100644 --- a/config/configuration_test.go +++ b/config/configuration_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" ) func TestConfigFileSettings(t *testing.T) { @@ -111,7 +111,7 @@ counters: } -var rawConfig = []byte(` +var rawJsonConfig = []byte(` { "connectTimeout": 10, "tlsTimeout": 30, @@ -148,15 +148,14 @@ func TestMarshalUnmarshalOriginRequest(t *testing.T) { name string marshalFunc func(in interface{}) (out []byte, err error) unMarshalFunc func(in []byte, out interface{}) (err error) - baseUnit time.Duration }{ - {"json", json.Marshal, json.Unmarshal, time.Second}, - {"yaml", yaml.Marshal, yaml.Unmarshal, time.Nanosecond}, + {"json", json.Marshal, json.Unmarshal}, + {"yaml", yaml.Marshal, yaml.Unmarshal}, } for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - assertConfig(t, tc.marshalFunc, tc.unMarshalFunc, tc.baseUnit) + assertConfig(t, tc.marshalFunc, tc.unMarshalFunc) }) } } @@ -165,18 +164,17 @@ func assertConfig( t *testing.T, marshalFunc func(in interface{}) (out []byte, err error), unMarshalFunc func(in []byte, out interface{}) (err error), - baseUnit time.Duration, ) { var config OriginRequestConfig var config2 OriginRequestConfig - assert.NoError(t, unMarshalFunc(rawConfig, &config)) + assert.NoError(t, json.Unmarshal(rawJsonConfig, &config)) - assert.Equal(t, baseUnit*10, config.ConnectTimeout.Duration) - assert.Equal(t, baseUnit*30, config.TLSTimeout.Duration) - assert.Equal(t, baseUnit*30, config.TCPKeepAlive.Duration) + assert.Equal(t, time.Second*10, config.ConnectTimeout.Duration) + assert.Equal(t, time.Second*30, config.TLSTimeout.Duration) + assert.Equal(t, time.Second*30, config.TCPKeepAlive.Duration) assert.Equal(t, true, *config.NoHappyEyeballs) - assert.Equal(t, baseUnit*60, config.KeepAliveTimeout.Duration) + assert.Equal(t, time.Second*60, config.KeepAliveTimeout.Duration) assert.Equal(t, 10, *config.KeepAliveConnections) assert.Equal(t, "app.tunnel.com", *config.HTTPHostHeader) assert.Equal(t, "app.tunnel.com", *config.OriginServerName) diff --git a/config/manager.go b/config/manager.go index ec6f5630..e5002c30 100644 --- a/config/manager.go +++ b/config/manager.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "github.com/cloudflare/cloudflared/watcher" ) diff --git a/go.mod b/go.mod index e0d85eed..93e4945f 100644 --- a/go.mod +++ b/go.mod @@ -44,8 +44,7 @@ require ( gopkg.in/coreos/go-oidc.v2 v2.2.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.6.0 - gopkg.in/yaml.v2 v2.4.0 - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v3 v3.0.1 zombiezen.com/go/capnproto2 v2.18.0+incompatible ) @@ -64,7 +63,6 @@ require ( github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect - github.com/francoispqt/gojay v1.2.13 // indirect github.com/gdamore/encoding v1.0.0 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -102,6 +100,7 @@ require ( google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect google.golang.org/grpc v1.45.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect ) replace github.com/urfave/cli/v2 => github.com/ipostelnik/cli/v2 v2.3.1-0.20210324024421-b6ea8234fe3d diff --git a/go.sum b/go.sum index b43b527d..c0a1e0d5 100644 --- a/go.sum +++ b/go.sum @@ -184,7 +184,6 @@ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -1110,8 +1109,9 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/ingress/config_test.go b/ingress/config_test.go index 55229137..93c971fc 100644 --- a/ingress/config_test.go +++ b/ingress/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/ipaccess" diff --git a/ingress/ingress_test.go b/ingress/ingress_test.go index 7ca8965a..1ff5e11c 100644 --- a/ingress/ingress_test.go +++ b/ingress/ingress_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - yaml "gopkg.in/yaml.v2" + yaml "gopkg.in/yaml.v3" "github.com/cloudflare/cloudflared/config" "github.com/cloudflare/cloudflared/ipaccess" diff --git a/vendor/github.com/francoispqt/gojay/.gitignore b/vendor/github.com/francoispqt/gojay/.gitignore deleted file mode 100644 index 43ebdc4b..00000000 --- a/vendor/github.com/francoispqt/gojay/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -vendor -*.out -*.log -*.test -.vscode diff --git a/vendor/github.com/francoispqt/gojay/.travis.yml b/vendor/github.com/francoispqt/gojay/.travis.yml deleted file mode 100644 index df04aa24..00000000 --- a/vendor/github.com/francoispqt/gojay/.travis.yml +++ /dev/null @@ -1,15 +0,0 @@ -language: go - -go: - - "1.10.x" - - "1.11.x" - - "1.12.x" - -script: - - go get github.com/golang/dep/cmd/dep github.com/stretchr/testify - - dep ensure -v -vendor-only - - go test ./gojay/codegen/test/... -race - - go test -race -coverprofile=coverage.txt -covermode=atomic - -after_success: - - bash <(curl -s https://codecov.io/bash) diff --git a/vendor/github.com/francoispqt/gojay/Gopkg.lock b/vendor/github.com/francoispqt/gojay/Gopkg.lock deleted file mode 100644 index d642e9a7..00000000 --- a/vendor/github.com/francoispqt/gojay/Gopkg.lock +++ /dev/null @@ -1,163 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:1a37f9f2ae10d161d9688fb6008ffa14e1631e5068cc3e9698008b9e8d40d575" - name = "cloud.google.com/go" - packages = ["compute/metadata"] - pruneopts = "" - revision = "457ea5c15ccf3b87db582c450e80101989da35f7" - version = "v0.40.0" - -[[projects]] - digest = "1:968d8903d598e3fae738325d3410f33f07ea6a2b9ee5591e9c262ee37df6845a" - name = "github.com/go-errors/errors" - packages = ["."] - pruneopts = "" - revision = "a6af135bd4e28680facf08a3d206b454abc877a4" - version = "v1.0.1" - -[[projects]] - digest = "1:529d738b7976c3848cae5cf3a8036440166835e389c1f617af701eeb12a0518d" - name = "github.com/golang/protobuf" - packages = ["proto"] - pruneopts = "" - revision = "b5d812f8a3706043e23a9cd5babf2e5423744d30" - version = "v1.3.1" - -[[projects]] - branch = "master" - digest = "1:cae59d7b8243c671c9f544965522ba35c0fec48ee80adb9f1400cd2f33abbbec" - name = "github.com/mailru/easyjson" - packages = [ - ".", - "buffer", - "jlexer", - "jwriter", - ] - pruneopts = "" - revision = "1ea4449da9834f4d333f1cc461c374aea217d249" - -[[projects]] - digest = "1:1d7e1867c49a6dd9856598ef7c3123604ea3daabf5b83f303ff457bcbc410b1d" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[[projects]] - digest = "1:8d4bbd8ab012efc77ab6b97286f2aff262bcdeac9803bb57d75cf7d0a5e6a877" - name = "github.com/viant/assertly" - packages = ["."] - pruneopts = "" - revision = "04f45e0aeb6f3455884877b047a97bcc95dc9493" - version = "v0.4.8" - -[[projects]] - digest = "1:5913451bc2d274673c0716efe226a137625740cd9380641f4d8300ff4f2d82a0" - name = "github.com/viant/toolbox" - packages = [ - ".", - "cred", - "data", - "storage", - "url", - ] - pruneopts = "" - revision = "1be8e4d172138324f40d55ea61a2aeab0c5ce864" - version = "v0.24.0" - -[[projects]] - branch = "master" - digest = "1:9d150270ca2c3356f2224a0878daa1652e4d0b25b345f18b4f6e156cc4b8ec5e" - name = "golang.org/x/crypto" - packages = [ - "blowfish", - "curve25519", - "ed25519", - "ed25519/internal/edwards25519", - "internal/chacha20", - "internal/subtle", - "poly1305", - "ssh", - ] - pruneopts = "" - revision = "f99c8df09eb5bff426315721bfa5f16a99cad32c" - -[[projects]] - branch = "master" - digest = "1:5a56f211e7c12a65c5585c629457a2fb91d8719844ee8fab92727ea8adb5721c" - name = "golang.org/x/net" - packages = [ - "context", - "context/ctxhttp", - "websocket", - ] - pruneopts = "" - revision = "461777fb6f67e8cb9d70cda16573678d085a74cf" - -[[projects]] - branch = "master" - digest = "1:01bdbbc604dcd5afb6f66a717f69ad45e9643c72d5bc11678d44ffa5c50f9e42" - name = "golang.org/x/oauth2" - packages = [ - ".", - "google", - "internal", - "jws", - "jwt", - ] - pruneopts = "" - revision = "0f29369cfe4552d0e4bcddc57cc75f4d7e672a33" - -[[projects]] - branch = "master" - digest = "1:8ddb956f67d4c176abbbc42b7514aaeaf9ea30daa24e27d2cf30ad82f9334a2c" - name = "golang.org/x/sys" - packages = ["cpu"] - pruneopts = "" - revision = "1e42afee0f762ed3d76e6dd942e4181855fd1849" - -[[projects]] - digest = "1:47f391ee443f578f01168347818cb234ed819521e49e4d2c8dd2fb80d48ee41a" - name = "google.golang.org/appengine" - packages = [ - ".", - "internal", - "internal/app_identity", - "internal/base", - "internal/datastore", - "internal/log", - "internal/modules", - "internal/remote_api", - "internal/urlfetch", - "urlfetch", - ] - pruneopts = "" - revision = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880" - version = "v1.6.1" - -[[projects]] - digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - version = "v2.2.2" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/go-errors/errors", - "github.com/mailru/easyjson", - "github.com/mailru/easyjson/jlexer", - "github.com/mailru/easyjson/jwriter", - "github.com/viant/assertly", - "github.com/viant/toolbox", - "github.com/viant/toolbox/url", - "golang.org/x/net/websocket", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/vendor/github.com/francoispqt/gojay/Gopkg.toml b/vendor/github.com/francoispqt/gojay/Gopkg.toml deleted file mode 100644 index fa607923..00000000 --- a/vendor/github.com/francoispqt/gojay/Gopkg.toml +++ /dev/null @@ -1,23 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - - -ignored = ["github.com/francoispqt/benchmarks*","github.com/stretchr/testify*","github.com/stretchr/testify","github.com/json-iterator/go","github.com/buger/jsonparser"] diff --git a/vendor/github.com/francoispqt/gojay/LICENSE b/vendor/github.com/francoispqt/gojay/LICENSE deleted file mode 100644 index df215964..00000000 --- a/vendor/github.com/francoispqt/gojay/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2016 gojay - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/vendor/github.com/francoispqt/gojay/Makefile b/vendor/github.com/francoispqt/gojay/Makefile deleted file mode 100644 index ce957239..00000000 --- a/vendor/github.com/francoispqt/gojay/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -.PHONY: test -test: - go test -race -run=^Test -v - -.PHONY: cover -cover: - go test -coverprofile=coverage.out -covermode=atomic - -.PHONY: coverhtml -coverhtml: - go tool cover -html=coverage.out \ No newline at end of file diff --git a/vendor/github.com/francoispqt/gojay/README.md b/vendor/github.com/francoispqt/gojay/README.md deleted file mode 100644 index b2abd291..00000000 --- a/vendor/github.com/francoispqt/gojay/README.md +++ /dev/null @@ -1,855 +0,0 @@ -[![Build Status](https://travis-ci.org/francoispqt/gojay.svg?branch=master)](https://travis-ci.org/francoispqt/gojay) -[![codecov](https://codecov.io/gh/francoispqt/gojay/branch/master/graph/badge.svg)](https://codecov.io/gh/francoispqt/gojay) -[![Go Report Card](https://goreportcard.com/badge/github.com/francoispqt/gojay)](https://goreportcard.com/report/github.com/francoispqt/gojay) -[![Go doc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square -)](https://godoc.org/github.com/francoispqt/gojay) -![MIT License](https://img.shields.io/badge/license-mit-blue.svg?style=flat-square) -[![Sourcegraph](https://sourcegraph.com/github.com/francoispqt/gojay/-/badge.svg)](https://sourcegraph.com/github.com/francoispqt/gojay) -![stability-stable](https://img.shields.io/badge/stability-stable-green.svg) - -# GoJay - - - -GoJay is a performant JSON encoder/decoder for Golang (currently the most performant, [see benchmarks](#benchmark-results)). - -It has a simple API and doesn't use reflection. It relies on small interfaces to decode/encode structures and slices. - -Gojay also comes with powerful stream decoding features and an even faster [Unsafe](#unsafe-api) API. - -There is also a [code generation tool](https://github.com/francoispqt/gojay/tree/master/gojay) to make usage easier and faster. - -# Why another JSON parser? - -I looked at other fast decoder/encoder and realised it was mostly hardly readable static code generation or a lot of reflection, poor streaming features, and not so fast in the end. - -Also, I wanted to build a decoder that could consume an io.Reader of line or comma delimited JSON, in a JIT way. To consume a flow of JSON objects from a TCP connection for example or from a standard output. Same way I wanted to build an encoder that could encode a flow of data to a io.Writer. - -This is how GoJay aims to be a very fast, JIT stream parser with 0 reflection, low allocation with a friendly API. - -# Get started - -```bash -go get github.com/francoispqt/gojay -``` - -* [Encoder](#encoding) -* [Decoder](#decoding) -* [Stream API](#stream-api) -* [Code Generation](https://github.com/francoispqt/gojay/tree/master/gojay) - -## Decoding - -Decoding is done through two different API similar to standard `encoding/json`: -* [Unmarshal](#unmarshal-api) -* [Decode](#decode-api) - - -Example of basic stucture decoding with Unmarshal: -```go -import "github.com/francoispqt/gojay" - -type user struct { - id int - name string - email string -} -// implement gojay.UnmarshalerJSONObject -func (u *user) UnmarshalJSONObject(dec *gojay.Decoder, key string) error { - switch key { - case "id": - return dec.Int(&u.id) - case "name": - return dec.String(&u.name) - case "email": - return dec.String(&u.email) - } - return nil -} -func (u *user) NKeys() int { - return 3 -} - -func main() { - u := &user{} - d := []byte(`{"id":1,"name":"gojay","email":"gojay@email.com"}`) - err := gojay.UnmarshalJSONObject(d, u) - if err != nil { - log.Fatal(err) - } -} -``` - -with Decode: -```go -func main() { - u := &user{} - dec := gojay.NewDecoder(bytes.NewReader([]byte(`{"id":1,"name":"gojay","email":"gojay@email.com"}`))) - err := dec.DecodeObject(d, u) - if err != nil { - log.Fatal(err) - } -} -``` - -### Unmarshal API - -Unmarshal API decodes a `[]byte` to a given pointer with a single function. - -Behind the doors, Unmarshal API borrows a `*gojay.Decoder` resets its settings and decodes the data to the given pointer and releases the `*gojay.Decoder` to the pool when it finishes, whether it encounters an error or not. - -If it cannot find the right Decoding strategy for the type of the given pointer, it returns an `InvalidUnmarshalError`. You can test the error returned by doing `if ok := err.(InvalidUnmarshalError); ok {}`. - -Unmarshal API comes with three functions: -* Unmarshal -```go -func Unmarshal(data []byte, v interface{}) error -``` - -* UnmarshalJSONObject -```go -func UnmarshalJSONObject(data []byte, v gojay.UnmarshalerJSONObject) error -``` - -* UnmarshalJSONArray -```go -func UnmarshalJSONArray(data []byte, v gojay.UnmarshalerJSONArray) error -``` - - -### Decode API - -Decode API decodes a `[]byte` to a given pointer by creating or borrowing a `*gojay.Decoder` with an `io.Reader` and calling `Decode` methods. - -__Getting a *gojay.Decoder or Borrowing__ - -You can either get a fresh `*gojay.Decoder` calling `dec := gojay.NewDecoder(io.Reader)` or borrow one from the pool by calling `dec := gojay.BorrowDecoder(io.Reader)`. - -After using a decoder, you can release it by calling `dec.Release()`. Beware, if you reuse the decoder after releasing it, it will panic with an error of type `InvalidUsagePooledDecoderError`. If you want to fully benefit from the pooling, you must release your decoders after using. - -Example getting a fresh an releasing: -```go -str := "" -dec := gojay.NewDecoder(strings.NewReader(`"test"`)) -defer dec.Release() -if err := dec.Decode(&str); err != nil { - log.Fatal(err) -} -``` -Example borrowing a decoder and releasing: -```go -str := "" -dec := gojay.BorrowDecoder(strings.NewReader(`"test"`)) -defer dec.Release() -if err := dec.Decode(&str); err != nil { - log.Fatal(err) -} -``` - -`*gojay.Decoder` has multiple methods to decode to specific types: -* Decode -```go -func (dec *gojay.Decoder) Decode(v interface{}) error -``` -* DecodeObject -```go -func (dec *gojay.Decoder) DecodeObject(v gojay.UnmarshalerJSONObject) error -``` -* DecodeArray -```go -func (dec *gojay.Decoder) DecodeArray(v gojay.UnmarshalerJSONArray) error -``` -* DecodeInt -```go -func (dec *gojay.Decoder) DecodeInt(v *int) error -``` -* DecodeBool -```go -func (dec *gojay.Decoder) DecodeBool(v *bool) error -``` -* DecodeString -```go -func (dec *gojay.Decoder) DecodeString(v *string) error -``` - -All DecodeXxx methods are used to decode top level JSON values. If you are decoding keys or items of a JSON object or array, don't use the Decode methods. - -Example: -```go -reader := strings.NewReader(`"John Doe"`) -dec := NewDecoder(reader) - -var str string -err := dec.DecodeString(&str) -if err != nil { - log.Fatal(err) -} - -fmt.Println(str) // John Doe -``` - -### Structs and Maps -#### UnmarshalerJSONObject Interface - -To unmarshal a JSON object to a structure, the structure must implement the `UnmarshalerJSONObject` interface: -```go -type UnmarshalerJSONObject interface { - UnmarshalJSONObject(*gojay.Decoder, string) error - NKeys() int -} -``` -`UnmarshalJSONObject` method takes two arguments, the first one is a pointer to the Decoder (*gojay.Decoder) and the second one is the string value of the current key being parsed. If the JSON data is not an object, the UnmarshalJSONObject method will never be called. - -`NKeys` method must return the number of keys to Unmarshal in the JSON object or 0. If zero is returned, all keys will be parsed. - -Example of implementation for a struct: -```go -type user struct { - id int - name string - email string -} -// implement UnmarshalerJSONObject -func (u *user) UnmarshalJSONObject(dec *gojay.Decoder, key string) error { - switch key { - case "id": - return dec.Int(&u.id) - case "name": - return dec.String(&u.name) - case "email": - return dec.String(&u.email) - } - return nil -} -func (u *user) NKeys() int { - return 3 -} -``` - -Example of implementation for a `map[string]string`: -```go -// define our custom map type implementing UnmarshalerJSONObject -type message map[string]string - -// Implementing Unmarshaler -func (m message) UnmarshalJSONObject(dec *gojay.Decoder, k string) error { - str := "" - err := dec.String(&str) - if err != nil { - return err - } - m[k] = str - return nil -} - -// we return 0, it tells the Decoder to decode all keys -func (m message) NKeys() int { - return 0 -} -``` - -### Arrays, Slices and Channels - -To unmarshal a JSON object to a slice an array or a channel, it must implement the UnmarshalerJSONArray interface: -```go -type UnmarshalerJSONArray interface { - UnmarshalJSONArray(*gojay.Decoder) error -} -``` -UnmarshalJSONArray method takes one argument, a pointer to the Decoder (*gojay.Decoder). If the JSON data is not an array, the Unmarshal method will never be called. - -Example of implementation with a slice: -```go -type testSlice []string -// implement UnmarshalerJSONArray -func (t *testSlice) UnmarshalJSONArray(dec *gojay.Decoder) error { - str := "" - if err := dec.String(&str); err != nil { - return err - } - *t = append(*t, str) - return nil -} - -func main() { - dec := gojay.BorrowDecoder(strings.NewReader(`["Tom", "Jim"]`)) - var slice testSlice - err := dec.DecodeArray(&slice) - if err != nil { - log.Fatal(err) - } - fmt.Println(slice) // [Tom Jim] - dec.Release() -} -``` - -Example of implementation with a channel: -```go -type testChannel chan string -// implement UnmarshalerJSONArray -func (c testChannel) UnmarshalJSONArray(dec *gojay.Decoder) error { - str := "" - if err := dec.String(&str); err != nil { - return err - } - c <- str - return nil -} - -func main() { - dec := gojay.BorrowDecoder(strings.NewReader(`["Tom", "Jim"]`)) - c := make(testChannel, 2) - err := dec.DecodeArray(c) - if err != nil { - log.Fatal(err) - } - for i := 0; i < 2; i++ { - fmt.Println(<-c) - } - close(c) - dec.Release() -} -``` - -Example of implementation with an array: -```go -type testArray [3]string -// implement UnmarshalerJSONArray -func (a *testArray) UnmarshalJSONArray(dec *Decoder) error { - var str string - if err := dec.String(&str); err != nil { - return err - } - a[dec.Index()] = str - return nil -} - -func main() { - dec := gojay.BorrowDecoder(strings.NewReader(`["Tom", "Jim", "Bob"]`)) - var a testArray - err := dec.DecodeArray(&a) - fmt.Println(a) // [Tom Jim Bob] - dec.Release() -} -``` - -### Other types -To decode other types (string, int, int32, int64, uint32, uint64, float, booleans), you don't need to implement any interface. - -Example of encoding strings: -```go -func main() { - json := []byte(`"Jay"`) - var v string - err := gojay.Unmarshal(json, &v) - if err != nil { - log.Fatal(err) - } - fmt.Println(v) // Jay -} -``` - -### Decode values methods -When decoding a JSON object of a JSON array using `UnmarshalerJSONObject` or `UnmarshalerJSONArray` interface, the `gojay.Decoder` provides dozens of methods to Decode multiple types. - -Non exhaustive list of methods available (to see all methods, check the godoc): -```go -dec.Int -dec.Int8 -dec.Int16 -dec.Int32 -dec.Int64 -dec.Uint8 -dec.Uint16 -dec.Uint32 -dec.Uint64 -dec.String -dec.Time -dec.Bool -dec.SQLNullString -dec.SQLNullInt64 -``` - - -## Encoding - -Encoding is done through two different API similar to standard `encoding/json`: -* [Marshal](#marshal-api) -* [Encode](#encode-api) - -Example of basic structure encoding with Marshal: -```go -import "github.com/francoispqt/gojay" - -type user struct { - id int - name string - email string -} - -// implement MarshalerJSONObject -func (u *user) MarshalJSONObject(enc *gojay.Encoder) { - enc.IntKey("id", u.id) - enc.StringKey("name", u.name) - enc.StringKey("email", u.email) -} -func (u *user) IsNil() bool { - return u == nil -} - -func main() { - u := &user{1, "gojay", "gojay@email.com"} - b, err := gojay.MarshalJSONObject(u) - if err != nil { - log.Fatal(err) - } - fmt.Println(string(b)) // {"id":1,"name":"gojay","email":"gojay@email.com"} -} -``` - -with Encode: -```go -func main() { - u := &user{1, "gojay", "gojay@email.com"} - b := strings.Builder{} - enc := gojay.NewEncoder(&b) - if err := enc.Encode(u); err != nil { - log.Fatal(err) - } - fmt.Println(b.String()) // {"id":1,"name":"gojay","email":"gojay@email.com"} -} -``` - -### Marshal API - -Marshal API encodes a value to a JSON `[]byte` with a single function. - -Behind the doors, Marshal API borrows a `*gojay.Encoder` resets its settings and encodes the data to an internal byte buffer and releases the `*gojay.Encoder` to the pool when it finishes, whether it encounters an error or not. - -If it cannot find the right Encoding strategy for the type of the given value, it returns an `InvalidMarshalError`. You can test the error returned by doing `if ok := err.(InvalidMarshalError); ok {}`. - -Marshal API comes with three functions: -* Marshal -```go -func Marshal(v interface{}) ([]byte, error) -``` - -* MarshalJSONObject -```go -func MarshalJSONObject(v gojay.MarshalerJSONObject) ([]byte, error) -``` - -* MarshalJSONArray -```go -func MarshalJSONArray(v gojay.MarshalerJSONArray) ([]byte, error) -``` - -### Encode API - -Encode API decodes a value to JSON by creating or borrowing a `*gojay.Encoder` sending it to an `io.Writer` and calling `Encode` methods. - -__Getting a *gojay.Encoder or Borrowing__ - -You can either get a fresh `*gojay.Encoder` calling `enc := gojay.NewEncoder(io.Writer)` or borrow one from the pool by calling `enc := gojay.BorrowEncoder(io.Writer)`. - -After using an encoder, you can release it by calling `enc.Release()`. Beware, if you reuse the encoder after releasing it, it will panic with an error of type `InvalidUsagePooledEncoderError`. If you want to fully benefit from the pooling, you must release your encoders after using. - -Example getting a fresh encoder an releasing: -```go -str := "test" -b := strings.Builder{} -enc := gojay.NewEncoder(&b) -defer enc.Release() -if err := enc.Encode(str); err != nil { - log.Fatal(err) -} -``` -Example borrowing an encoder and releasing: -```go -str := "test" -b := strings.Builder{} -enc := gojay.BorrowEncoder(b) -defer enc.Release() -if err := enc.Encode(str); err != nil { - log.Fatal(err) -} -``` - -`*gojay.Encoder` has multiple methods to encoder specific types to JSON: -* Encode -```go -func (enc *gojay.Encoder) Encode(v interface{}) error -``` -* EncodeObject -```go -func (enc *gojay.Encoder) EncodeObject(v gojay.MarshalerJSONObject) error -``` -* EncodeArray -```go -func (enc *gojay.Encoder) EncodeArray(v gojay.MarshalerJSONArray) error -``` -* EncodeInt -```go -func (enc *gojay.Encoder) EncodeInt(n int) error -``` -* EncodeInt64 -```go -func (enc *gojay.Encoder) EncodeInt64(n int64) error -``` -* EncodeFloat -```go -func (enc *gojay.Encoder) EncodeFloat(n float64) error -``` -* EncodeBool -```go -func (enc *gojay.Encoder) EncodeBool(v bool) error -``` -* EncodeString -```go -func (enc *gojay.Encoder) EncodeString(s string) error -``` - -### Structs and Maps - -To encode a structure, the structure must implement the MarshalerJSONObject interface: -```go -type MarshalerJSONObject interface { - MarshalJSONObject(enc *gojay.Encoder) - IsNil() bool -} -``` -`MarshalJSONObject` method takes one argument, a pointer to the Encoder (*gojay.Encoder). The method must add all the keys in the JSON Object by calling Decoder's methods. - -IsNil method returns a boolean indicating if the interface underlying value is nil or not. It is used to safely ensure that the underlying value is not nil without using Reflection. - -Example of implementation for a struct: -```go -type user struct { - id int - name string - email string -} - -// implement MarshalerJSONObject -func (u *user) MarshalJSONObject(enc *gojay.Encoder) { - enc.IntKey("id", u.id) - enc.StringKey("name", u.name) - enc.StringKey("email", u.email) -} -func (u *user) IsNil() bool { - return u == nil -} -``` - -Example of implementation for a `map[string]string`: -```go -// define our custom map type implementing MarshalerJSONObject -type message map[string]string - -// Implementing Marshaler -func (m message) MarshalJSONObject(enc *gojay.Encoder) { - for k, v := range m { - enc.StringKey(k, v) - } -} - -func (m message) IsNil() bool { - return m == nil -} -``` - -### Arrays and Slices -To encode an array or a slice, the slice/array must implement the MarshalerJSONArray interface: -```go -type MarshalerJSONArray interface { - MarshalJSONArray(enc *gojay.Encoder) - IsNil() bool -} -``` -`MarshalJSONArray` method takes one argument, a pointer to the Encoder (*gojay.Encoder). The method must add all element in the JSON Array by calling Decoder's methods. - -`IsNil` method returns a boolean indicating if the interface underlying value is nil(empty) or not. It is used to safely ensure that the underlying value is not nil without using Reflection and also to in `OmitEmpty` feature. - -Example of implementation: -```go -type users []*user -// implement MarshalerJSONArray -func (u *users) MarshalJSONArray(enc *gojay.Encoder) { - for _, e := range u { - enc.Object(e) - } -} -func (u *users) IsNil() bool { - return len(u) == 0 -} -``` - -### Other types -To encode other types (string, int, float, booleans), you don't need to implement any interface. - -Example of encoding strings: -```go -func main() { - name := "Jay" - b, err := gojay.Marshal(name) - if err != nil { - log.Fatal(err) - } - fmt.Println(string(b)) // "Jay" -} -``` - -# Stream API - -### Stream Decoding -GoJay ships with a powerful stream decoder. - -It allows to read continuously from an io.Reader stream and do JIT decoding writing unmarshalled JSON to a channel to allow async consuming. - -When using the Stream API, the Decoder implements context.Context to provide graceful cancellation. - -To decode a stream of JSON, you must call `gojay.Stream.DecodeStream` and pass it a `UnmarshalerStream` implementation. - -```go -type UnmarshalerStream interface { - UnmarshalStream(*StreamDecoder) error -} -``` - -Example of implementation of stream reading from a WebSocket connection: -```go -// implement UnmarshalerStream -type ChannelStream chan *user - -func (c ChannelStream) UnmarshalStream(dec *gojay.StreamDecoder) error { - u := &user{} - if err := dec.Object(u); err != nil { - return err - } - c <- u - return nil -} - -func main() { - // get our websocket connection - origin := "http://localhost/" - url := "ws://localhost:12345/ws" - ws, err := websocket.Dial(url, "", origin) - if err != nil { - log.Fatal(err) - } - // create our channel which will receive our objects - streamChan := ChannelStream(make(chan *user)) - // borrow a decoder - dec := gojay.Stream.BorrowDecoder(ws) - // start decoding, it will block until a JSON message is decoded from the WebSocket - // or until Done channel is closed - go dec.DecodeStream(streamChan) - for { - select { - case v := <-streamChan: - // Got something from my websocket! - log.Println(v) - case <-dec.Done(): - log.Println("finished reading from WebSocket") - os.Exit(0) - } - } -} -``` - -### Stream Encoding -GoJay ships with a powerful stream encoder part of the Stream API. - -It allows to write continuously to an io.Writer and do JIT encoding of data fed to a channel to allow async consuming. You can set multiple consumers on the channel to be as performant as possible. Consumers are non blocking and are scheduled individually in their own go routine. - -When using the Stream API, the Encoder implements context.Context to provide graceful cancellation. - -To encode a stream of data, you must call `EncodeStream` and pass it a `MarshalerStream` implementation. - -```go -type MarshalerStream interface { - MarshalStream(enc *gojay.StreamEncoder) -} -``` - -Example of implementation of stream writing to a WebSocket: -```go -// Our structure which will be pushed to our stream -type user struct { - id int - name string - email string -} - -func (u *user) MarshalJSONObject(enc *gojay.Encoder) { - enc.IntKey("id", u.id) - enc.StringKey("name", u.name) - enc.StringKey("email", u.email) -} -func (u *user) IsNil() bool { - return u == nil -} - -// Our MarshalerStream implementation -type StreamChan chan *user - -func (s StreamChan) MarshalStream(enc *gojay.StreamEncoder) { - select { - case <-enc.Done(): - return - case o := <-s: - enc.Object(o) - } -} - -// Our main function -func main() { - // get our websocket connection - origin := "http://localhost/" - url := "ws://localhost:12345/ws" - ws, err := websocket.Dial(url, "", origin) - if err != nil { - log.Fatal(err) - } - // we borrow an encoder set stdout as the writer, - // set the number of consumer to 10 - // and tell the encoder to separate each encoded element - // added to the channel by a new line character - enc := gojay.Stream.BorrowEncoder(ws).NConsumer(10).LineDelimited() - // instantiate our MarshalerStream - s := StreamChan(make(chan *user)) - // start the stream encoder - // will block its goroutine until enc.Cancel(error) is called - // or until something is written to the channel - go enc.EncodeStream(s) - // write to our MarshalerStream - for i := 0; i < 1000; i++ { - s <- &user{i, "username", "user@email.com"} - } - // Wait - <-enc.Done() -} -``` - -# Unsafe API - -Unsafe API has the same functions than the regular API, it only has `Unmarshal API` for now. It is unsafe because it makes assumptions on the quality of the given JSON. - -If you are not sure if your JSON is valid, don't use the Unsafe API. - -Also, the `Unsafe` API does not copy the buffer when using Unmarshal API, which, in case of string decoding, can lead to data corruption if a byte buffer is reused. Using the `Decode` API makes `Unsafe` API safer as the io.Reader relies on `copy` builtin method and `Decoder` will have its own internal buffer :) - -Access the `Unsafe` API this way: -```go -gojay.Unsafe.Unmarshal(b, v) -``` - - -# Benchmarks - -Benchmarks encode and decode three different data based on size (small, medium, large). - -To run benchmark for decoder: -```bash -cd $GOPATH/src/github.com/francoispqt/gojay/benchmarks/decoder && make bench -``` - -To run benchmark for encoder: -```bash -cd $GOPATH/src/github.com/francoispqt/gojay/benchmarks/encoder && make bench -``` - -# Benchmark Results -## Decode - - - -### Small Payload -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/decoder/decoder_bench_small_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_small.go) - -| | ns/op | bytes/op | allocs/op | -|-----------------|-----------|--------------|-----------| -| Std Library | 2547 | 496 | 4 | -| JsonIter | 2046 | 312 | 12 | -| JsonParser | 1408 | 0 | 0 | -| EasyJson | 929 | 240 | 2 | -| **GoJay** | **807** | **256** | **2** | -| **GoJay-unsafe**| **712** | **112** | **1** | - -### Medium Payload -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/decoder/decoder_bench_medium_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_medium.go) - -| | ns/op | bytes/op | allocs/op | -|-----------------|-----------|----------|-----------| -| Std Library | 30148 | 2152 | 496 | -| JsonIter | 16309 | 2976 | 80 | -| JsonParser | 7793 | 0 | 0 | -| EasyJson | 7957 | 232 | 6 | -| **GoJay** | **4984** | **2448** | **8** | -| **GoJay-unsafe**| **4809** | **144** | **7** | - -### Large Payload -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/decoder/decoder_bench_large_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_large.go) - -| | ns/op | bytes/op | allocs/op | -|-----------------|-----------|-------------|-----------| -| JsonIter | 210078 | 41712 | 1136 | -| EasyJson | 106626 | 160 | 2 | -| JsonParser | 66813 | 0 | 0 | -| **GoJay** | **52153** | **31241** | **77** | -| **GoJay-unsafe**| **48277** | **2561** | **76** | - -## Encode - - - -### Small Struct -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/encoder/encoder_bench_small_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_small.go) - -| | ns/op | bytes/op | allocs/op | -|----------------|----------|--------------|-----------| -| Std Library | 1280 | 464 | 3 | -| EasyJson | 871 | 944 | 6 | -| JsonIter | 866 | 272 | 3 | -| **GoJay** | **543** | **112** | **1** | -| **GoJay-func** | **347** | **0** | **0** | - -### Medium Struct -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/encoder/encoder_bench_medium_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_medium.go) - -| | ns/op | bytes/op | allocs/op | -|-------------|----------|--------------|-----------| -| Std Library | 5006 | 1496 | 25 | -| JsonIter | 2232 | 1544 | 20 | -| EasyJson | 1997 | 1544 | 19 | -| **GoJay** | **1522** | **312** | **14** | - -### Large Struct -[benchmark code is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/encoder/encoder_bench_large_test.go) - -[benchmark data is here](https://github.com/francoispqt/gojay/blob/master/benchmarks/benchmarks_large.go) - -| | ns/op | bytes/op | allocs/op | -|-------------|-----------|--------------|-----------| -| Std Library | 66441 | 20576 | 332 | -| JsonIter | 35247 | 20255 | 328 | -| EasyJson | 32053 | 15474 | 327 | -| **GoJay** | **27847** | **9802** | **318** | - -# Contributing - -Contributions are welcome :) - -If you encounter issues please report it in Github and/or send an email at [francois@parquet.ninja](mailto:francois@parquet.ninja) - diff --git a/vendor/github.com/francoispqt/gojay/decode.go b/vendor/github.com/francoispqt/gojay/decode.go deleted file mode 100644 index fbd07f76..00000000 --- a/vendor/github.com/francoispqt/gojay/decode.go +++ /dev/null @@ -1,386 +0,0 @@ -package gojay - -import ( - "fmt" - "io" -) - -// UnmarshalJSONArray parses the JSON-encoded data and stores the result in the value pointed to by v. -// -// v must implement UnmarshalerJSONArray. -// -// If a JSON value is not appropriate for a given target type, or if a JSON number -// overflows the target type, UnmarshalJSONArray skips that field and completes the unmarshaling as best it can. -func UnmarshalJSONArray(data []byte, v UnmarshalerJSONArray) error { - dec := borrowDecoder(nil, 0) - defer dec.Release() - dec.data = make([]byte, len(data)) - copy(dec.data, data) - dec.length = len(data) - _, err := dec.decodeArray(v) - if err != nil { - return err - } - if dec.err != nil { - return dec.err - } - return nil -} - -// UnmarshalJSONObject parses the JSON-encoded data and stores the result in the value pointed to by v. -// -// v must implement UnmarshalerJSONObject. -// -// If a JSON value is not appropriate for a given target type, or if a JSON number -// overflows the target type, UnmarshalJSONObject skips that field and completes the unmarshaling as best it can. -func UnmarshalJSONObject(data []byte, v UnmarshalerJSONObject) error { - dec := borrowDecoder(nil, 0) - defer dec.Release() - dec.data = make([]byte, len(data)) - copy(dec.data, data) - dec.length = len(data) - _, err := dec.decodeObject(v) - if err != nil { - return err - } - if dec.err != nil { - return dec.err - } - return nil -} - -// Unmarshal parses the JSON-encoded data and stores the result in the value pointed to by v. -// If v is nil, not an implementation of UnmarshalerJSONObject or UnmarshalerJSONArray or not one of the following types: -// *string, **string, *int, **int, *int8, **int8, *int16, **int16, *int32, **int32, *int64, **int64, *uint8, **uint8, *uint16, **uint16, -// *uint32, **uint32, *uint64, **uint64, *float64, **float64, *float32, **float32, *bool, **bool -// Unmarshal returns an InvalidUnmarshalError. -// -// -// If a JSON value is not appropriate for a given target type, or if a JSON number -// overflows the target type, Unmarshal skips that field and completes the unmarshaling as best it can. -// If no more serious errors are encountered, Unmarshal returns an UnmarshalTypeError describing the earliest such error. -// In any case, it's not guaranteed that all the remaining fields following the problematic one will be unmarshaled into the target object. -func Unmarshal(data []byte, v interface{}) error { - var err error - var dec *Decoder - switch vt := v.(type) { - case *string: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeString(vt) - case **string: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeStringNull(vt) - case *int: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt(vt) - case **int: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeIntNull(vt) - case *int8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt8(vt) - case **int8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt8Null(vt) - case *int16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt16(vt) - case **int16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt16Null(vt) - case *int32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt32(vt) - case **int32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt32Null(vt) - case *int64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt64(vt) - case **int64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt64Null(vt) - case *uint8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint8(vt) - case **uint8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint8Null(vt) - case *uint16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint16(vt) - case **uint16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint16Null(vt) - case *uint32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint32(vt) - case **uint32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint32Null(vt) - case *uint64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint64(vt) - case **uint64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint64Null(vt) - case *float64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat64(vt) - case **float64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat64Null(vt) - case *float32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat32(vt) - case **float32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat32Null(vt) - case *bool: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeBool(vt) - case **bool: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeBoolNull(vt) - case UnmarshalerJSONObject: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = make([]byte, len(data)) - copy(dec.data, data) - _, err = dec.decodeObject(vt) - case UnmarshalerJSONArray: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = make([]byte, len(data)) - copy(dec.data, data) - _, err = dec.decodeArray(vt) - case *interface{}: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = make([]byte, len(data)) - copy(dec.data, data) - err = dec.decodeInterface(vt) - default: - return InvalidUnmarshalError(fmt.Sprintf(invalidUnmarshalErrorMsg, vt)) - } - defer dec.Release() - if err != nil { - return err - } - return dec.err -} - -// UnmarshalerJSONObject is the interface to implement to decode a JSON Object. -type UnmarshalerJSONObject interface { - UnmarshalJSONObject(*Decoder, string) error - NKeys() int -} - -// UnmarshalerJSONArray is the interface to implement to decode a JSON Array. -type UnmarshalerJSONArray interface { - UnmarshalJSONArray(*Decoder) error -} - -// A Decoder reads and decodes JSON values from an input stream. -type Decoder struct { - r io.Reader - data []byte - err error - isPooled byte - called byte - child byte - cursor int - length int - keysDone int - arrayIndex int -} - -// Decode reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the value pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -// The differences between Decode and Unmarshal are: -// - Decode reads from an io.Reader in the Decoder, whereas Unmarshal reads from a []byte -// - Decode leaves to the user the option of borrowing and releasing a Decoder, whereas Unmarshal internally always borrows a Decoder and releases it when the unmarshaling is completed -func (dec *Decoder) Decode(v interface{}) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - var err error - switch vt := v.(type) { - case *string: - err = dec.decodeString(vt) - case **string: - err = dec.decodeStringNull(vt) - case *int: - err = dec.decodeInt(vt) - case **int: - err = dec.decodeIntNull(vt) - case *int8: - err = dec.decodeInt8(vt) - case **int8: - err = dec.decodeInt8Null(vt) - case *int16: - err = dec.decodeInt16(vt) - case **int16: - err = dec.decodeInt16Null(vt) - case *int32: - err = dec.decodeInt32(vt) - case **int32: - err = dec.decodeInt32Null(vt) - case *int64: - err = dec.decodeInt64(vt) - case **int64: - err = dec.decodeInt64Null(vt) - case *uint8: - err = dec.decodeUint8(vt) - case **uint8: - err = dec.decodeUint8Null(vt) - case *uint16: - err = dec.decodeUint16(vt) - case **uint16: - err = dec.decodeUint16Null(vt) - case *uint32: - err = dec.decodeUint32(vt) - case **uint32: - err = dec.decodeUint32Null(vt) - case *uint64: - err = dec.decodeUint64(vt) - case **uint64: - err = dec.decodeUint64Null(vt) - case *float64: - err = dec.decodeFloat64(vt) - case **float64: - err = dec.decodeFloat64Null(vt) - case *float32: - err = dec.decodeFloat32(vt) - case **float32: - err = dec.decodeFloat32Null(vt) - case *bool: - err = dec.decodeBool(vt) - case **bool: - err = dec.decodeBoolNull(vt) - case UnmarshalerJSONObject: - _, err = dec.decodeObject(vt) - case UnmarshalerJSONArray: - _, err = dec.decodeArray(vt) - case *EmbeddedJSON: - err = dec.decodeEmbeddedJSON(vt) - case *interface{}: - err = dec.decodeInterface(vt) - default: - return InvalidUnmarshalError(fmt.Sprintf(invalidUnmarshalErrorMsg, vt)) - } - if err != nil { - return err - } - return dec.err -} - -// Non exported - -func isDigit(b byte) bool { - switch b { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - return true - default: - return false - } -} - -func (dec *Decoder) read() bool { - if dec.r != nil { - // if we reach the end, double the buffer to ensure there's always more space - if len(dec.data) == dec.length { - nLen := dec.length * 2 - if nLen == 0 { - nLen = 512 - } - Buf := make([]byte, nLen, nLen) - copy(Buf, dec.data) - dec.data = Buf - } - var n int - var err error - for n == 0 { - n, err = dec.r.Read(dec.data[dec.length:]) - if err != nil { - if err != io.EOF { - dec.err = err - return false - } - if n == 0 { - return false - } - dec.length = dec.length + n - return true - } - } - dec.length = dec.length + n - return true - } - return false -} - -func (dec *Decoder) nextChar() byte { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - } - d := dec.data[dec.cursor] - return d - } - return 0 -} diff --git a/vendor/github.com/francoispqt/gojay/decode_array.go b/vendor/github.com/francoispqt/gojay/decode_array.go deleted file mode 100644 index 297f2ee7..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_array.go +++ /dev/null @@ -1,247 +0,0 @@ -package gojay - -import "reflect" - -// DecodeArray reads the next JSON-encoded value from the decoder's input (io.Reader) -// and stores it in the value pointed to by v. -// -// v must implement UnmarshalerJSONArray. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeArray(v UnmarshalerJSONArray) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - _, err := dec.decodeArray(v) - return err -} -func (dec *Decoder) decodeArray(arr UnmarshalerJSONArray) (int, error) { - // remember last array index in case of nested arrays - lastArrayIndex := dec.arrayIndex - dec.arrayIndex = 0 - defer func() { - dec.arrayIndex = lastArrayIndex - }() - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - case '[': - dec.cursor = dec.cursor + 1 - // array is open, char is not space start readings - for dec.nextChar() != 0 { - // closing array - if dec.data[dec.cursor] == ']' { - dec.cursor = dec.cursor + 1 - return dec.cursor, nil - } - // calling unmarshall function for each element of the slice - err := arr.UnmarshalJSONArray(dec) - if err != nil { - return 0, err - } - dec.arrayIndex++ - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) - case 'n': - // is null - dec.cursor++ - err := dec.assertNull() - if err != nil { - return 0, err - } - return dec.cursor, nil - case '{', '"', 'f', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - // can't unmarshall to struct - // we skip array and set Error - dec.err = dec.makeInvalidUnmarshalErr(arr) - err := dec.skipData() - if err != nil { - return 0, err - } - return dec.cursor, nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeArrayNull(v interface{}) (int, error) { - // remember last array index in case of nested arrays - lastArrayIndex := dec.arrayIndex - dec.arrayIndex = 0 - defer func() { - dec.arrayIndex = lastArrayIndex - }() - vv := reflect.ValueOf(v) - vvt := vv.Type() - if vvt.Kind() != reflect.Ptr || vvt.Elem().Kind() != reflect.Ptr { - dec.err = ErrUnmarshalPtrExpected - return 0, dec.err - } - // not an array not an error, but do not know what to do - // do not check syntax - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - case '[': - dec.cursor = dec.cursor + 1 - // create our new type - elt := vv.Elem() - n := reflect.New(elt.Type().Elem()) - var arr UnmarshalerJSONArray - var ok bool - if arr, ok = n.Interface().(UnmarshalerJSONArray); !ok { - dec.err = dec.makeInvalidUnmarshalErr((UnmarshalerJSONArray)(nil)) - return 0, dec.err - } - // array is open, char is not space start readings - for dec.nextChar() != 0 { - // closing array - if dec.data[dec.cursor] == ']' { - elt.Set(n) - dec.cursor = dec.cursor + 1 - return dec.cursor, nil - } - // calling unmarshall function for each element of the slice - err := arr.UnmarshalJSONArray(dec) - if err != nil { - return 0, err - } - dec.arrayIndex++ - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) - case 'n': - // is null - dec.cursor++ - err := dec.assertNull() - if err != nil { - return 0, err - } - return dec.cursor, nil - case '{', '"', 'f', 't', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - // can't unmarshall to struct - // we skip array and set Error - dec.err = dec.makeInvalidUnmarshalErr((UnmarshalerJSONArray)(nil)) - err := dec.skipData() - if err != nil { - return 0, err - } - return dec.cursor, nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) skipArray() (int, error) { - var arraysOpen = 1 - var arraysClosed = 0 - // var stringOpen byte = 0 - for j := dec.cursor; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case ']': - arraysClosed++ - // everything is closed return - if arraysOpen == arraysClosed { - // add char to object data - return j + 1, nil - } - case '[': - arraysOpen++ - case '"': - j++ - var isInEscapeSeq bool - var isFirstQuote = true - for ; j < dec.length || dec.read(); j++ { - if dec.data[j] != '"' { - continue - } - if dec.data[j-1] != '\\' || (!isInEscapeSeq && !isFirstQuote) { - break - } else { - isInEscapeSeq = false - } - if isFirstQuote { - isFirstQuote = false - } - // loop backward and count how many anti slash found - // to see if string is effectively escaped - ct := 0 - for i := j - 1; i > 0; i-- { - if dec.data[i] != '\\' { - break - } - ct++ - } - // is pair number of slashes, quote is not escaped - if ct&1 == 0 { - break - } - isInEscapeSeq = true - } - default: - continue - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeArrayFunc is a func type implementing UnmarshalerJSONArray. -// Use it to cast a `func(*Decoder) error` to Unmarshal an array on the fly. - -type DecodeArrayFunc func(*Decoder) error - -// UnmarshalJSONArray implements UnmarshalerJSONArray. -func (f DecodeArrayFunc) UnmarshalJSONArray(dec *Decoder) error { - return f(dec) -} - -// IsNil implements UnmarshalerJSONArray. -func (f DecodeArrayFunc) IsNil() bool { - return f == nil -} - -// Add Values functions - -// AddArray decodes the JSON value within an object or an array to a UnmarshalerJSONArray. -func (dec *Decoder) AddArray(v UnmarshalerJSONArray) error { - return dec.Array(v) -} - -// AddArrayNull decodes the JSON value within an object or an array to a UnmarshalerJSONArray. -func (dec *Decoder) AddArrayNull(v interface{}) error { - return dec.ArrayNull(v) -} - -// Array decodes the JSON value within an object or an array to a UnmarshalerJSONArray. -func (dec *Decoder) Array(v UnmarshalerJSONArray) error { - newCursor, err := dec.decodeArray(v) - if err != nil { - return err - } - dec.cursor = newCursor - dec.called |= 1 - return nil -} - -// ArrayNull decodes the JSON value within an object or an array to a UnmarshalerJSONArray. -// v should be a pointer to an UnmarshalerJSONArray, -// if `null` value is encountered in JSON, it will leave the value v untouched, -// else it will create a new instance of the UnmarshalerJSONArray behind v. -func (dec *Decoder) ArrayNull(v interface{}) error { - newCursor, err := dec.decodeArrayNull(v) - if err != nil { - return err - } - dec.cursor = newCursor - dec.called |= 1 - return nil -} - -// Index returns the index of an array being decoded. -func (dec *Decoder) Index() int { - return dec.arrayIndex -} diff --git a/vendor/github.com/francoispqt/gojay/decode_bool.go b/vendor/github.com/francoispqt/gojay/decode_bool.go deleted file mode 100644 index 1dc304ba..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_bool.go +++ /dev/null @@ -1,241 +0,0 @@ -package gojay - -// DecodeBool reads the next JSON-encoded value from the decoder's input (io.Reader) -// and stores it in the boolean pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeBool(v *bool) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeBool(v) -} -func (dec *Decoder) decodeBool(v *bool) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - case 't': - dec.cursor++ - err := dec.assertTrue() - if err != nil { - return err - } - *v = true - return nil - case 'f': - dec.cursor++ - err := dec.assertFalse() - if err != nil { - return err - } - *v = false - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - *v = false - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return nil -} -func (dec *Decoder) decodeBoolNull(v **bool) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - case 't': - dec.cursor++ - err := dec.assertTrue() - if err != nil { - return err - } - if *v == nil { - *v = new(bool) - } - **v = true - return nil - case 'f': - dec.cursor++ - err := dec.assertFalse() - if err != nil { - return err - } - if *v == nil { - *v = new(bool) - } - **v = false - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return nil -} - -func (dec *Decoder) assertTrue() error { - i := 0 - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch i { - case 0: - if dec.data[dec.cursor] != 'r' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 1: - if dec.data[dec.cursor] != 'u' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 2: - if dec.data[dec.cursor] != 'e' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 3: - switch dec.data[dec.cursor] { - case ' ', '\b', '\t', '\n', ',', ']', '}': - // dec.cursor-- - return nil - default: - return dec.raiseInvalidJSONErr(dec.cursor) - } - } - i++ - } - if i == 3 { - return nil - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) assertNull() error { - i := 0 - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch i { - case 0: - if dec.data[dec.cursor] != 'u' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 1: - if dec.data[dec.cursor] != 'l' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 2: - if dec.data[dec.cursor] != 'l' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 3: - switch dec.data[dec.cursor] { - case ' ', '\t', '\n', ',', ']', '}': - // dec.cursor-- - return nil - default: - return dec.raiseInvalidJSONErr(dec.cursor) - } - } - i++ - } - if i == 3 { - return nil - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) assertFalse() error { - i := 0 - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch i { - case 0: - if dec.data[dec.cursor] != 'a' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 1: - if dec.data[dec.cursor] != 'l' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 2: - if dec.data[dec.cursor] != 's' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 3: - if dec.data[dec.cursor] != 'e' { - return dec.raiseInvalidJSONErr(dec.cursor) - } - case 4: - switch dec.data[dec.cursor] { - case ' ', '\t', '\n', ',', ']', '}': - // dec.cursor-- - return nil - default: - return dec.raiseInvalidJSONErr(dec.cursor) - } - } - i++ - } - if i == 4 { - return nil - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -// Add Values functions - -// AddBool decodes the JSON value within an object or an array to a *bool. -// If next key is neither null nor a JSON boolean, an InvalidUnmarshalError will be returned. -// If next key is null, bool will be false. -func (dec *Decoder) AddBool(v *bool) error { - return dec.Bool(v) -} - -// AddBoolNull decodes the JSON value within an object or an array to a *bool. -// If next key is neither null nor a JSON boolean, an InvalidUnmarshalError will be returned. -// If next key is null, bool will be false. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddBoolNull(v **bool) error { - return dec.BoolNull(v) -} - -// Bool decodes the JSON value within an object or an array to a *bool. -// If next key is neither null nor a JSON boolean, an InvalidUnmarshalError will be returned. -// If next key is null, bool will be false. -func (dec *Decoder) Bool(v *bool) error { - err := dec.decodeBool(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// BoolNull decodes the JSON value within an object or an array to a *bool. -// If next key is neither null nor a JSON boolean, an InvalidUnmarshalError will be returned. -// If next key is null, bool will be false. -func (dec *Decoder) BoolNull(v **bool) error { - err := dec.decodeBoolNull(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_embedded_json.go b/vendor/github.com/francoispqt/gojay/decode_embedded_json.go deleted file mode 100644 index 67fcc2ea..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_embedded_json.go +++ /dev/null @@ -1,85 +0,0 @@ -package gojay - -// EmbeddedJSON is a raw encoded JSON value. -// It can be used to delay JSON decoding or precompute a JSON encoding. -type EmbeddedJSON []byte - -func (dec *Decoder) decodeEmbeddedJSON(ej *EmbeddedJSON) error { - var err error - if ej == nil { - return InvalidUnmarshalError("Invalid nil pointer given") - } - var beginOfEmbeddedJSON int - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - // is null - case 'n': - beginOfEmbeddedJSON = dec.cursor - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - case 't': - beginOfEmbeddedJSON = dec.cursor - dec.cursor++ - err := dec.assertTrue() - if err != nil { - return err - } - // is false - case 'f': - beginOfEmbeddedJSON = dec.cursor - dec.cursor++ - err := dec.assertFalse() - if err != nil { - return err - } - // is an object - case '{': - beginOfEmbeddedJSON = dec.cursor - dec.cursor = dec.cursor + 1 - dec.cursor, err = dec.skipObject() - // is string - case '"': - beginOfEmbeddedJSON = dec.cursor - dec.cursor = dec.cursor + 1 - err = dec.skipString() // why no new dec.cursor in result? - // is array - case '[': - beginOfEmbeddedJSON = dec.cursor - dec.cursor = dec.cursor + 1 - dec.cursor, err = dec.skipArray() - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-': - beginOfEmbeddedJSON = dec.cursor - dec.cursor, err = dec.skipNumber() - } - break - } - if err == nil { - if dec.cursor-1 >= beginOfEmbeddedJSON { - *ej = append(*ej, dec.data[beginOfEmbeddedJSON:dec.cursor]...) - } - dec.called |= 1 - } - return err -} - -// AddEmbeddedJSON adds an EmbeddedsJSON to the value pointed by v. -// It can be used to delay JSON decoding or precompute a JSON encoding. -func (dec *Decoder) AddEmbeddedJSON(v *EmbeddedJSON) error { - return dec.EmbeddedJSON(v) -} - -// EmbeddedJSON adds an EmbeddedsJSON to the value pointed by v. -// It can be used to delay JSON decoding or precompute a JSON encoding. -func (dec *Decoder) EmbeddedJSON(v *EmbeddedJSON) error { - err := dec.decodeEmbeddedJSON(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_interface.go b/vendor/github.com/francoispqt/gojay/decode_interface.go deleted file mode 100644 index 015790d8..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_interface.go +++ /dev/null @@ -1,130 +0,0 @@ -package gojay - -// TODO @afiune for now we are using the standard json unmarshaling but in -// the future it would be great to implement one here inside this repo -import "encoding/json" - -// DecodeInterface reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the value pointed to by i. -// -// i must be an interface poiter -func (dec *Decoder) DecodeInterface(i *interface{}) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - err := dec.decodeInterface(i) - return err -} - -func (dec *Decoder) decodeInterface(i *interface{}) error { - start, end, err := dec.getObject() - if err != nil { - dec.cursor = start - return err - } - - // if start & end are equal the object is a null, don't unmarshal - if start == end { - return nil - } - - object := dec.data[start:end] - if err = json.Unmarshal(object, i); err != nil { - return err - } - - dec.cursor = end - return nil -} - -// @afiune Maybe return the type as well? -func (dec *Decoder) getObject() (start int, end int, err error) { - // start cursor - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - // is null - case 'n': - dec.cursor++ - err = dec.assertNull() - if err != nil { - return - } - // Set start & end to the same cursor to indicate the object - // is a null and should not be unmarshal - start = dec.cursor - end = dec.cursor - return - case 't': - start = dec.cursor - dec.cursor++ - err = dec.assertTrue() - if err != nil { - return - } - end = dec.cursor - dec.cursor++ - return - // is false - case 'f': - start = dec.cursor - dec.cursor++ - err = dec.assertFalse() - if err != nil { - return - } - end = dec.cursor - dec.cursor++ - return - // is an object - case '{': - start = dec.cursor - dec.cursor++ - end, err = dec.skipObject() - dec.cursor = end - return - // is string - case '"': - start = dec.cursor - dec.cursor++ - start, end, err = dec.getString() - start-- - dec.cursor = end - return - // is array - case '[': - start = dec.cursor - dec.cursor++ - end, err = dec.skipArray() - dec.cursor = end - return - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-': - start = dec.cursor - end, err = dec.skipNumber() - dec.cursor = end - return - default: - err = dec.raiseInvalidJSONErr(dec.cursor) - return - } - } - err = dec.raiseInvalidJSONErr(dec.cursor) - return -} - -// Add Values functions - -// AddInterface decodes the JSON value within an object or an array to a interface{}. -func (dec *Decoder) AddInterface(v *interface{}) error { - return dec.Interface(v) -} - -// Interface decodes the JSON value within an object or an array to an interface{}. -func (dec *Decoder) Interface(value *interface{}) error { - err := dec.decodeInterface(value) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_number.go b/vendor/github.com/francoispqt/gojay/decode_number.go deleted file mode 100644 index 0042b471..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_number.go +++ /dev/null @@ -1,118 +0,0 @@ -package gojay - -import ( - "math" -) - -var digits []int8 - -const maxInt64toMultiply = math.MaxInt64 / 10 -const maxInt32toMultiply = math.MaxInt32 / 10 -const maxInt16toMultiply = math.MaxInt16 / 10 -const maxInt8toMultiply = math.MaxInt8 / 10 -const maxUint8toMultiply = math.MaxUint8 / 10 -const maxUint16toMultiply = math.MaxUint16 / 10 -const maxUint32toMultiply = math.MaxUint32 / 10 -const maxUint64toMultiply = math.MaxUint64 / 10 -const maxUint32Length = 10 -const maxUint64Length = 20 -const maxUint16Length = 5 -const maxUint8Length = 3 -const maxInt32Length = 10 -const maxInt64Length = 19 -const maxInt16Length = 5 -const maxInt8Length = 3 -const invalidNumber = int8(-1) - -var pow10uint64 = [21]uint64{ - 0, - 1, - 10, - 100, - 1000, - 10000, - 100000, - 1000000, - 10000000, - 100000000, - 1000000000, - 10000000000, - 100000000000, - 1000000000000, - 10000000000000, - 100000000000000, - 1000000000000000, - 10000000000000000, - 100000000000000000, - 1000000000000000000, - 10000000000000000000, -} - -var skipNumberEndCursorIncrement [256]int - -func init() { - digits = make([]int8, 256) - for i := 0; i < len(digits); i++ { - digits[i] = invalidNumber - } - for i := int8('0'); i <= int8('9'); i++ { - digits[i] = i - int8('0') - } - - for i := 0; i < 256; i++ { - switch i { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', 'e', 'E', '+', '-': - skipNumberEndCursorIncrement[i] = 1 - } - } -} - -func (dec *Decoder) skipNumber() (int, error) { - end := dec.cursor + 1 - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - end += skipNumberEndCursorIncrement[dec.data[j]] - - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', 'e', 'E', '+', '-', ' ', '\n', '\t', '\r': - continue - case ',', '}', ']': - return end, nil - default: - // invalid json we expect numbers, dot (single one), comma, or spaces - return end, dec.raiseInvalidJSONErr(dec.cursor) - } - } - - return end, nil -} - -func (dec *Decoder) getExponent() (int64, error) { - start := dec.cursor - end := dec.cursor - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { // is positive - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = dec.cursor + 1 - case '-': - dec.cursor++ - exp, err := dec.getExponent() - return -exp, err - case '+': - dec.cursor++ - return dec.getExponent() - default: - // if nothing return 0 - // could raise error - if start == end { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi64(start, end-1), nil - } - } - if start == end { - - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi64(start, end-1), nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_number_float.go b/vendor/github.com/francoispqt/gojay/decode_number_float.go deleted file mode 100644 index f76c5861..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_number_float.go +++ /dev/null @@ -1,516 +0,0 @@ -package gojay - -// DecodeFloat64 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the float64 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeFloat64(v *float64) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeFloat64(v) -} -func (dec *Decoder) decodeFloat64(v *float64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getFloat() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getFloatNegative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeFloat64Null(v **float64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getFloat() - if err != nil { - return err - } - if *v == nil { - *v = new(float64) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getFloatNegative() - if err != nil { - return err - } - if *v == nil { - *v = new(float64) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getFloatNegative() (float64, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getFloat() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getFloat() (float64, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case '.': - // we get part before decimal as integer - beforeDecimal := dec.atoi64(start, end) - // then we get part after decimal as integer - start = j + 1 - // get number after the decimal point - for i := j + 1; i < dec.length || dec.read(); i++ { - c := dec.data[i] - if isDigit(c) { - end = i - // multiply the before decimal point portion by 10 using bitwise - // make sure it doesn't overflow - if end-start < 18 { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - continue - } else if (c == 'e' || c == 'E') && j < i-1 { - // we have an exponent, convert first the value we got before the exponent - var afterDecimal int64 - expI := end - start + 2 - // if exp is too long, it means number is too long, just truncate the number - if expI >= len(pow10uint64) || expI < 0 { - expI = len(pow10uint64) - 2 - afterDecimal = dec.atoi64(start, start+expI-2) - } else { - // then we add both integers - // then we divide the number by the power found - afterDecimal = dec.atoi64(start, end) - } - dec.cursor = i + 1 - pow := pow10uint64[expI] - floatVal := float64(beforeDecimal+afterDecimal) / float64(pow) - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // absolute exponent - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - // if exponent is negative - if exp < 0 { - return float64(floatVal) * (1 / float64(pow10uint64[pExp])), nil - } - return float64(floatVal) * float64(pow10uint64[pExp]), nil - } - dec.cursor = i - break - } - if end >= dec.length || end < start { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - var afterDecimal int64 - expI := end - start + 2 - // if exp is too long, it means number is too long, just truncate the number - if expI >= len(pow10uint64) || expI < 0 { - expI = 19 - afterDecimal = dec.atoi64(start, start+expI-2) - } else { - afterDecimal = dec.atoi64(start, end) - } - - pow := pow10uint64[expI] - // then we add both integers - // then we divide the number by the power found - return float64(beforeDecimal+afterDecimal) / float64(pow), nil - case 'e', 'E': - dec.cursor = j + 1 - // we get part before decimal as integer - beforeDecimal := uint64(dec.atoi64(start, end)) - // get exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - // if exponent is negative - if exp < 0 { - return float64(beforeDecimal) * (1 / float64(pow10uint64[pExp])), nil - } - return float64(beforeDecimal) * float64(pow10uint64[pExp]), nil - case ' ', '\n', '\t', '\r', ',', '}', ']': // does not have decimal - dec.cursor = j - return float64(dec.atoi64(start, end)), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return float64(dec.atoi64(start, end)), nil -} - -// DecodeFloat32 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the float32 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeFloat32(v *float32) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeFloat32(v) -} -func (dec *Decoder) decodeFloat32(v *float32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getFloat32() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getFloat32Negative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeFloat32Null(v **float32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getFloat32() - if err != nil { - return err - } - if *v == nil { - *v = new(float32) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getFloat32Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(float32) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getFloat32Negative() (float32, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getFloat32() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getFloat32() (float32, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case '.': - // we get part before decimal as integer - beforeDecimal := dec.atoi64(start, end) - // then we get part after decimal as integer - start = j + 1 - // get number after the decimal point - // multiple the before decimal point portion by 10 using bitwise - for i := j + 1; i < dec.length || dec.read(); i++ { - c := dec.data[i] - if isDigit(c) { - end = i - // multiply the before decimal point portion by 10 using bitwise - // make sure it desn't overflow - if end-start < 9 { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - continue - } else if (c == 'e' || c == 'E') && j < i-1 { - // we get the number before decimal - var afterDecimal int64 - expI := end - start + 2 - // if exp is too long, it means number is too long, just truncate the number - if expI >= 12 || expI < 0 { - expI = 10 - afterDecimal = dec.atoi64(start, start+expI-2) - } else { - afterDecimal = dec.atoi64(start, end) - } - dec.cursor = i + 1 - pow := pow10uint64[expI] - // then we add both integers - // then we divide the number by the power found - floatVal := float32(beforeDecimal+afterDecimal) / float32(pow) - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - // if exponent is negative - if exp < 0 { - return float32(floatVal) * (1 / float32(pow10uint64[pExp])), nil - } - return float32(floatVal) * float32(pow10uint64[pExp]), nil - } - dec.cursor = i - break - } - if end >= dec.length || end < start { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - // then we add both integers - // then we divide the number by the power found - var afterDecimal int64 - expI := end - start + 2 - // if exp is too long, it means number is too long, just truncate the number - if expI >= 12 || expI < 0 { - expI = 10 - afterDecimal = dec.atoi64(start, start+expI-2) - } else { - // then we add both integers - // then we divide the number by the power found - afterDecimal = dec.atoi64(start, end) - } - pow := pow10uint64[expI] - return float32(beforeDecimal+afterDecimal) / float32(pow), nil - case 'e', 'E': - dec.cursor = j + 1 - // we get part before decimal as integer - beforeDecimal := dec.atoi64(start, end) - // get exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - // if exponent is negative - if exp < 0 { - return float32(beforeDecimal) * (1 / float32(pow10uint64[pExp])), nil - } - return float32(beforeDecimal) * float32(pow10uint64[pExp]), nil - case ' ', '\n', '\t', '\r', ',', '}', ']': // does not have decimal - dec.cursor = j - return float32(dec.atoi64(start, end)), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return float32(dec.atoi64(start, end)), nil -} - -// Add Values functions - -// AddFloat decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddFloat(v *float64) error { - return dec.Float64(v) -} - -// AddFloatNull decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddFloatNull(v **float64) error { - return dec.Float64Null(v) -} - -// AddFloat64 decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddFloat64(v *float64) error { - return dec.Float64(v) -} - -// AddFloat64Null decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddFloat64Null(v **float64) error { - return dec.Float64Null(v) -} - -// AddFloat32 decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddFloat32(v *float32) error { - return dec.Float32(v) -} - -// AddFloat32Null decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddFloat32Null(v **float32) error { - return dec.Float32Null(v) -} - -// Float decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Float(v *float64) error { - return dec.Float64(v) -} - -// FloatNull decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) FloatNull(v **float64) error { - return dec.Float64Null(v) -} - -// Float64 decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Float64(v *float64) error { - err := dec.decodeFloat64(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Float64Null decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Float64Null(v **float64) error { - err := dec.decodeFloat64Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Float32 decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Float32(v *float32) error { - err := dec.decodeFloat32(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Float32Null decodes the JSON value within an object or an array to a *float64. -// If next key value overflows float64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Float32Null(v **float32) error { - err := dec.decodeFloat32Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_number_int.go b/vendor/github.com/francoispqt/gojay/decode_number_int.go deleted file mode 100644 index 8429049f..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_number_int.go +++ /dev/null @@ -1,1338 +0,0 @@ -package gojay - -import ( - "fmt" - "math" -) - -// DecodeInt reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the int pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeInt(v *int) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeInt(v) -} -func (dec *Decoder) decodeInt(v *int) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt64() - if err != nil { - return err - } - *v = int(val) - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt64Negative() - if err != nil { - return err - } - *v = -int(val) - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = InvalidUnmarshalError( - fmt.Sprintf( - "Cannot unmarshall to int, wrong char '%s' found at pos %d", - string(dec.data[dec.cursor]), - dec.cursor, - ), - ) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) decodeIntNull(v **int) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt64() - if err != nil { - return err - } - if *v == nil { - *v = new(int) - } - **v = int(val) - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt64Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(int) - } - **v = -int(val) - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = InvalidUnmarshalError( - fmt.Sprintf( - "Cannot unmarshall to int, wrong char '%s' found at pos %d", - string(dec.data[dec.cursor]), - dec.cursor, - ), - ) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeInt16 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the int16 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeInt16(v *int16) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeInt16(v) -} -func (dec *Decoder) decodeInt16(v *int16) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt16() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt16Negative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeInt16Null(v **int16) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt16() - if err != nil { - return err - } - if *v == nil { - *v = new(int16) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt16Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(int16) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt16Negative() (int16, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getInt16() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt16() (int16, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case '.': - // if dot is found - // look for exponent (e,E) as exponent can change the - // way number should be parsed to int. - // if no exponent found, just unmarshal the number before decimal point - j++ - startDecimal := j - endDecimal := j - 1 - for ; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - endDecimal = j - continue - case 'e', 'E': - if startDecimal > endDecimal { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - dec.cursor = j + 1 - // can try unmarshalling to int as Exponent might change decimal number to non decimal - // let's get the float value first - // we get part before decimal as integer - beforeDecimal := dec.atoi16(start, end) - // get number after the decimal point - // multiple the before decimal point portion by 10 using bitwise - for i := startDecimal; i <= endDecimal; i++ { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - // then we add both integers - // then we divide the number by the power found - afterDecimal := dec.atoi16(startDecimal, endDecimal) - expI := endDecimal - startDecimal + 2 - if expI >= len(pow10uint64) || expI < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - pow := pow10uint64[expI] - floatVal := float64(beforeDecimal+afterDecimal) / float64(pow) - // we have the floating value, now multiply by the exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - val := floatVal * float64(pow10uint64[pExp]) - return int16(val), nil - case ' ', '\t', '\n', ',', ']', '}': - dec.cursor = j - return dec.atoi16(start, end), nil - default: - dec.cursor = j - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return dec.atoi16(start, end), nil - case 'e', 'E': - // get init n - dec.cursor = j + 1 - return dec.getInt16WithExp(dec.atoi16(start, end)) - case ' ', '\n', '\t', '\r', ',', '}', ']': - dec.cursor = j - return dec.atoi16(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi16(start, end), nil -} - -func (dec *Decoder) getInt16WithExp(init int16) (int16, error) { - var exp uint16 - var sign = int16(1) - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '+': - continue - case '-': - sign = -1 - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint16(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - dec.cursor++ - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint16(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - case ' ', '\t', '\n', '}', ',', ']': - exp = exp + 1 - if exp >= uint16(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int16(pow10uint64[exp])), nil - } - return init * int16(pow10uint64[exp]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - exp = exp + 1 - if exp >= uint16(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int16(pow10uint64[exp])), nil - } - return init * int16(pow10uint64[exp]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeInt8 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the int8 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeInt8(v *int8) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeInt8(v) -} -func (dec *Decoder) decodeInt8(v *int8) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt8() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt8Negative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeInt8Null(v **int8) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - // we don't look for 0 as leading zeros are invalid per RFC - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt8() - if err != nil { - return err - } - if *v == nil { - *v = new(int8) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt8Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(int8) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt8Negative() (int8, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getInt8() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt8() (int8, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case '.': - // if dot is found - // look for exponent (e,E) as exponent can change the - // way number should be parsed to int. - // if no exponent found, just unmarshal the number before decimal point - j++ - startDecimal := j - endDecimal := j - 1 - for ; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - endDecimal = j - continue - case 'e', 'E': - if startDecimal > endDecimal { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - dec.cursor = j + 1 - // can try unmarshalling to int as Exponent might change decimal number to non decimal - // let's get the float value first - // we get part before decimal as integer - beforeDecimal := dec.atoi8(start, end) - // get number after the decimal point - // multiple the before decimal point portion by 10 using bitwise - for i := startDecimal; i <= endDecimal; i++ { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - // then we add both integers - // then we divide the number by the power found - afterDecimal := dec.atoi8(startDecimal, endDecimal) - expI := endDecimal - startDecimal + 2 - if expI >= len(pow10uint64) || expI < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - pow := pow10uint64[expI] - floatVal := float64(beforeDecimal+afterDecimal) / float64(pow) - // we have the floating value, now multiply by the exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - val := floatVal * float64(pow10uint64[pExp]) - return int8(val), nil - case ' ', '\t', '\n', ',', ']', '}': - dec.cursor = j - return dec.atoi8(start, end), nil - default: - dec.cursor = j - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return dec.atoi8(start, end), nil - case 'e', 'E': - // get init n - dec.cursor = j + 1 - return dec.getInt8WithExp(dec.atoi8(start, end)) - case ' ', '\n', '\t', '\r', ',', '}', ']': - dec.cursor = j - return dec.atoi8(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi8(start, end), nil -} - -func (dec *Decoder) getInt8WithExp(init int8) (int8, error) { - var exp uint8 - var sign = int8(1) - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '+': - continue - case '-': - sign = -1 - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint8(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - dec.cursor++ - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint8(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - case ' ', '\t', '\n', '}', ',', ']': - if exp+1 >= uint8(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int8(pow10uint64[exp+1])), nil - } - return init * int8(pow10uint64[exp+1]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - if exp+1 >= uint8(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int8(pow10uint64[exp+1])), nil - } - return init * int8(pow10uint64[exp+1]), nil - default: - dec.err = dec.raiseInvalidJSONErr(dec.cursor) - return 0, dec.err - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeInt32 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the int32 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeInt32(v *int32) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeInt32(v) -} -func (dec *Decoder) decodeInt32(v *int32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt32() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt32Negative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeInt32Null(v **int32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt32() - if err != nil { - return err - } - if *v == nil { - *v = new(int32) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt32Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(int32) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt32Negative() (int32, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getInt32() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt32() (int32, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case '.': - // if dot is found - // look for exponent (e,E) as exponent can change the - // way number should be parsed to int. - // if no exponent found, just unmarshal the number before decimal point - j++ - startDecimal := j - endDecimal := j - 1 - for ; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - endDecimal = j - continue - case 'e', 'E': - // if eg 1.E - if startDecimal > endDecimal { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - dec.cursor = j + 1 - // can try unmarshalling to int as Exponent might change decimal number to non decimal - // let's get the float value first - // we get part before decimal as integer - beforeDecimal := dec.atoi64(start, end) - // get number after the decimal point - // multiple the before decimal point portion by 10 using bitwise - for i := startDecimal; i <= endDecimal; i++ { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - // then we add both integers - // then we divide the number by the power found - afterDecimal := dec.atoi64(startDecimal, endDecimal) - expI := endDecimal - startDecimal + 2 - if expI >= len(pow10uint64) || expI < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - pow := pow10uint64[expI] - floatVal := float64(beforeDecimal+afterDecimal) / float64(pow) - // we have the floating value, now multiply by the exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - val := floatVal * float64(pow10uint64[pExp]) - return int32(val), nil - case ' ', '\t', '\n', ',', ']', '}': - dec.cursor = j - return dec.atoi32(start, end), nil - default: - dec.cursor = j - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return dec.atoi32(start, end), nil - case 'e', 'E': - // get init n - dec.cursor = j + 1 - return dec.getInt32WithExp(dec.atoi32(start, end)) - case ' ', '\n', '\t', '\r', ',', '}', ']': - dec.cursor = j - return dec.atoi32(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi32(start, end), nil -} - -func (dec *Decoder) getInt32WithExp(init int32) (int32, error) { - var exp uint32 - var sign = int32(1) - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '+': - continue - case '-': - sign = -1 - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint32(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - dec.cursor++ - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint32(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - case ' ', '\t', '\n', '}', ',', ']': - if exp+1 >= uint32(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int32(pow10uint64[exp+1])), nil - } - return init * int32(pow10uint64[exp+1]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - if exp+1 >= uint32(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int32(pow10uint64[exp+1])), nil - } - return init * int32(pow10uint64[exp+1]), nil - default: - dec.err = dec.raiseInvalidJSONErr(dec.cursor) - return 0, dec.err - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeInt64 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the int64 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeInt64(v *int64) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeInt64(v) -} - -func (dec *Decoder) decodeInt64(v *int64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt64() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt64Negative() - if err != nil { - return err - } - *v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeInt64Null(v **int64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getInt64() - if err != nil { - return err - } - if *v == nil { - *v = new(int64) - } - **v = val - return nil - case '-': - dec.cursor = dec.cursor + 1 - val, err := dec.getInt64Negative() - if err != nil { - return err - } - if *v == nil { - *v = new(int64) - } - **v = -val - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt64Negative() (int64, error) { - // look for following numbers - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '1', '2', '3', '4', '5', '6', '7', '8', '9': - return dec.getInt64() - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getInt64() (int64, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case ' ', '\t', '\n', ',', '}', ']': - dec.cursor = j - return dec.atoi64(start, end), nil - case '.': - // if dot is found - // look for exponent (e,E) as exponent can change the - // way number should be parsed to int. - // if no exponent found, just unmarshal the number before decimal point - j++ - startDecimal := j - endDecimal := j - 1 - for ; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - endDecimal = j - continue - case 'e', 'E': - // if eg 1.E - if startDecimal > endDecimal { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - dec.cursor = j + 1 - // can try unmarshalling to int as Exponent might change decimal number to non decimal - // let's get the float value first - // we get part before decimal as integer - beforeDecimal := dec.atoi64(start, end) - // get number after the decimal point - // multiple the before decimal point portion by 10 using bitwise - for i := startDecimal; i <= endDecimal; i++ { - beforeDecimal = (beforeDecimal << 3) + (beforeDecimal << 1) - } - // then we add both integers - // then we divide the number by the power found - afterDecimal := dec.atoi64(startDecimal, endDecimal) - expI := endDecimal - startDecimal + 2 - if expI >= len(pow10uint64) || expI < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - pow := pow10uint64[expI] - floatVal := float64(beforeDecimal+afterDecimal) / float64(pow) - // we have the floating value, now multiply by the exponent - exp, err := dec.getExponent() - if err != nil { - return 0, err - } - pExp := (exp + (exp >> 31)) ^ (exp >> 31) + 1 // abs - if pExp >= int64(len(pow10uint64)) || pExp < 0 { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - val := floatVal * float64(pow10uint64[pExp]) - return int64(val), nil - case ' ', '\t', '\n', ',', ']', '}': - dec.cursor = j - return dec.atoi64(start, end), nil - default: - dec.cursor = j - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return dec.atoi64(start, end), nil - case 'e', 'E': - // get init n - dec.cursor = j + 1 - return dec.getInt64WithExp(dec.atoi64(start, end)) - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoi64(start, end), nil -} - -func (dec *Decoder) getInt64WithExp(init int64) (int64, error) { - var exp uint64 - var sign = int64(1) - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '+': - continue - case '-': - sign = -1 - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint64(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - dec.cursor++ - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - uintv := uint64(digits[dec.data[dec.cursor]]) - exp = (exp << 3) + (exp << 1) + uintv - case ' ', '\t', '\n', '}', ',', ']': - if exp+1 >= uint64(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int64(pow10uint64[exp+1])), nil - } - return init * int64(pow10uint64[exp+1]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - if exp+1 >= uint64(len(pow10uint64)) { - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - if sign == -1 { - return init * (1 / int64(pow10uint64[exp+1])), nil - } - return init * int64(pow10uint64[exp+1]), nil - default: - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) atoi64(start, end int) int64 { - var ll = end + 1 - start - var val = int64(digits[dec.data[start]]) - end = end + 1 - if ll < maxInt64Length { - for i := start + 1; i < end; i++ { - intv := int64(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + intv - } - return val - } else if ll == maxInt64Length { - for i := start + 1; i < end; i++ { - intv := int64(digits[dec.data[i]]) - if val > maxInt64toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxInt64-val < intv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += intv - } - } else { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - return val -} - -func (dec *Decoder) atoi32(start, end int) int32 { - var ll = end + 1 - start - var val = int32(digits[dec.data[start]]) - end = end + 1 - - // overflowing - if ll < maxInt32Length { - for i := start + 1; i < end; i++ { - intv := int32(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + intv - } - } else if ll == maxInt32Length { - for i := start + 1; i < end; i++ { - intv := int32(digits[dec.data[i]]) - if val > maxInt32toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxInt32-val < intv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += intv - } - } else { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - return val -} - -func (dec *Decoder) atoi16(start, end int) int16 { - var ll = end + 1 - start - var val = int16(digits[dec.data[start]]) - end = end + 1 - // overflowing - if ll < maxInt16Length { - for i := start + 1; i < end; i++ { - intv := int16(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + intv - } - } else if ll == maxInt16Length { - for i := start + 1; i < end; i++ { - intv := int16(digits[dec.data[i]]) - if val > maxInt16toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxInt16-val < intv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += intv - } - } else { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - return val -} - -func (dec *Decoder) atoi8(start, end int) int8 { - var ll = end + 1 - start - var val = int8(digits[dec.data[start]]) - end = end + 1 - // overflowing - if ll < maxInt8Length { - for i := start + 1; i < end; i++ { - intv := int8(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + intv - } - } else if ll == maxInt8Length { - for i := start + 1; i < end; i++ { - intv := int8(digits[dec.data[i]]) - if val > maxInt8toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxInt8-val < intv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += intv - } - } else { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - return val -} - -// Add Values functions - -// AddInt decodes the JSON value within an object or an array to an *int. -// If next key value overflows int, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddInt(v *int) error { - return dec.Int(v) -} - -// AddIntNull decodes the JSON value within an object or an array to an *int. -// If next key value overflows int, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddIntNull(v **int) error { - return dec.IntNull(v) -} - -// AddInt8 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddInt8(v *int8) error { - return dec.Int8(v) -} - -// AddInt8Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int8, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddInt8Null(v **int8) error { - return dec.Int8Null(v) -} - -// AddInt16 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddInt16(v *int16) error { - return dec.Int16(v) -} - -// AddInt16Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int16, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddInt16Null(v **int16) error { - return dec.Int16Null(v) -} - -// AddInt32 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddInt32(v *int32) error { - return dec.Int32(v) -} - -// AddInt32Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int32, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddInt32Null(v **int32) error { - return dec.Int32Null(v) -} - -// AddInt64 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddInt64(v *int64) error { - return dec.Int64(v) -} - -// AddInt64Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int64, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddInt64Null(v **int64) error { - return dec.Int64Null(v) -} - -// Int decodes the JSON value within an object or an array to an *int. -// If next key value overflows int, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int(v *int) error { - err := dec.decodeInt(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// IntNull decodes the JSON value within an object or an array to an *int. -// If next key value overflows int, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) IntNull(v **int) error { - err := dec.decodeIntNull(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int8 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int8(v *int8) error { - err := dec.decodeInt8(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int8Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int8Null(v **int8) error { - err := dec.decodeInt8Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int16 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int16(v *int16) error { - err := dec.decodeInt16(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int16Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int16Null(v **int16) error { - err := dec.decodeInt16Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int32 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int32(v *int32) error { - err := dec.decodeInt32(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int32Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int32Null(v **int32) error { - err := dec.decodeInt32Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int64 decodes the JSON value within an object or an array to an *int. -// If next key value overflows int64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int64(v *int64) error { - err := dec.decodeInt64(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Int64Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows int64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Int64Null(v **int64) error { - err := dec.decodeInt64Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_number_uint.go b/vendor/github.com/francoispqt/gojay/decode_number_uint.go deleted file mode 100644 index b57ef7ab..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_number_uint.go +++ /dev/null @@ -1,715 +0,0 @@ -package gojay - -import ( - "math" -) - -// DecodeUint8 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the uint8 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeUint8(v *uint8) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeUint8(v) -} - -func (dec *Decoder) decodeUint8(v *uint8) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint8() - if err != nil { - return err - } - *v = val - return nil - case '-': // if negative, we just set it to 0 and set error - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeUint8Null(v **uint8) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint8() - if err != nil { - return err - } - if *v == nil { - *v = new(uint8) - } - **v = val - return nil - case '-': // if negative, we just set it to 0 and set error - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - if *v == nil { - *v = new(uint8) - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getUint8() (uint8, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case ' ', '\n', '\t', '\r': - continue - case '.', ',', '}', ']': - dec.cursor = j - return dec.atoui8(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoui8(start, end), nil -} - -// DecodeUint16 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the uint16 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeUint16(v *uint16) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeUint16(v) -} - -func (dec *Decoder) decodeUint16(v *uint16) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint16() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeUint16Null(v **uint16) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint16() - if err != nil { - return err - } - if *v == nil { - *v = new(uint16) - } - **v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - if *v == nil { - *v = new(uint16) - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getUint16() (uint16, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case ' ', '\n', '\t', '\r': - continue - case '.', ',', '}', ']': - dec.cursor = j - return dec.atoui16(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoui16(start, end), nil -} - -// DecodeUint32 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the uint32 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeUint32(v *uint32) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeUint32(v) -} - -func (dec *Decoder) decodeUint32(v *uint32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint32() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeUint32Null(v **uint32) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint32() - if err != nil { - return err - } - if *v == nil { - *v = new(uint32) - } - **v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - if *v == nil { - *v = new(uint32) - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getUint32() (uint32, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case ' ', '\n', '\t', '\r': - continue - case '.', ',', '}', ']': - dec.cursor = j - return dec.atoui32(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoui32(start, end), nil -} - -// DecodeUint64 reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the uint64 pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeUint64(v *uint64) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeUint64(v) -} -func (dec *Decoder) decodeUint64(v *uint64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint64() - if err != nil { - return err - } - *v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} -func (dec *Decoder) decodeUint64Null(v **uint64) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch c := dec.data[dec.cursor]; c { - case ' ', '\n', '\t', '\r', ',': - continue - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - val, err := dec.getUint64() - if err != nil { - return err - } - if *v == nil { - *v = new(uint64) - } - **v = val - return nil - case '-': - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - if *v == nil { - *v = new(uint64) - } - return nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) getUint64() (uint64, error) { - var end = dec.cursor - var start = dec.cursor - // look for following numbers - for j := dec.cursor + 1; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - end = j - continue - case ' ', '\n', '\t', '\r', '.', ',', '}', ']': - dec.cursor = j - return dec.atoui64(start, end), nil - } - // invalid json we expect numbers, dot (single one), comma, or spaces - return 0, dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.atoui64(start, end), nil -} - -func (dec *Decoder) atoui64(start, end int) uint64 { - var ll = end + 1 - start - var val = uint64(digits[dec.data[start]]) - end = end + 1 - if ll < maxUint64Length { - for i := start + 1; i < end; i++ { - uintv := uint64(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + uintv - } - } else if ll == maxUint64Length { - for i := start + 1; i < end; i++ { - uintv := uint64(digits[dec.data[i]]) - if val > maxUint64toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxUint64-val < uintv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += uintv - } - } else { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - return val -} - -func (dec *Decoder) atoui32(start, end int) uint32 { - var ll = end + 1 - start - var val uint32 - val = uint32(digits[dec.data[start]]) - end = end + 1 - if ll < maxUint32Length { - for i := start + 1; i < end; i++ { - uintv := uint32(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + uintv - } - } else if ll == maxUint32Length { - for i := start + 1; i < end; i++ { - uintv := uint32(digits[dec.data[i]]) - if val > maxUint32toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxUint32-val < uintv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += uintv - } - } else if ll > maxUint32Length { - dec.err = dec.makeInvalidUnmarshalErr(val) - val = 0 - } - return val -} - -func (dec *Decoder) atoui16(start, end int) uint16 { - var ll = end + 1 - start - var val uint16 - val = uint16(digits[dec.data[start]]) - end = end + 1 - if ll < maxUint16Length { - for i := start + 1; i < end; i++ { - uintv := uint16(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + uintv - } - } else if ll == maxUint16Length { - for i := start + 1; i < end; i++ { - uintv := uint16(digits[dec.data[i]]) - if val > maxUint16toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxUint16-val < uintv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += uintv - } - } else if ll > maxUint16Length { - dec.err = dec.makeInvalidUnmarshalErr(val) - val = 0 - } - return val -} - -func (dec *Decoder) atoui8(start, end int) uint8 { - var ll = end + 1 - start - var val uint8 - val = uint8(digits[dec.data[start]]) - end = end + 1 - if ll < maxUint8Length { - for i := start + 1; i < end; i++ { - uintv := uint8(digits[dec.data[i]]) - val = (val << 3) + (val << 1) + uintv - } - } else if ll == maxUint8Length { - for i := start + 1; i < end; i++ { - uintv := uint8(digits[dec.data[i]]) - if val > maxUint8toMultiply { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val = (val << 3) + (val << 1) - if math.MaxUint8-val < uintv { - dec.err = dec.makeInvalidUnmarshalErr(val) - return 0 - } - val += uintv - } - } else if ll > maxUint8Length { - dec.err = dec.makeInvalidUnmarshalErr(val) - val = 0 - } - return val -} - -// Add Values functions - -// AddUint8 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddUint8(v *uint8) error { - return dec.Uint8(v) -} - -// AddUint8Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint8, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddUint8Null(v **uint8) error { - return dec.Uint8Null(v) -} - -// AddUint16 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddUint16(v *uint16) error { - return dec.Uint16(v) -} - -// AddUint16Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint16, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddUint16Null(v **uint16) error { - return dec.Uint16Null(v) -} - -// AddUint32 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddUint32(v *uint32) error { - return dec.Uint32(v) -} - -// AddUint32Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint32, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddUint32Null(v **uint32) error { - return dec.Uint32Null(v) -} - -// AddUint64 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) AddUint64(v *uint64) error { - return dec.Uint64(v) -} - -// AddUint64Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint64, an InvalidUnmarshalError error will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddUint64Null(v **uint64) error { - return dec.Uint64Null(v) -} - -// Uint8 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint8(v *uint8) error { - err := dec.decodeUint8(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint8Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint8, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint8Null(v **uint8) error { - err := dec.decodeUint8Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint16 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint16(v *uint16) error { - err := dec.decodeUint16(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint16Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint16, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint16Null(v **uint16) error { - err := dec.decodeUint16Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint32 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint32(v *uint32) error { - err := dec.decodeUint32(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint32Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint32, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint32Null(v **uint32) error { - err := dec.decodeUint32Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint64 decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint64(v *uint64) error { - err := dec.decodeUint64(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// Uint64Null decodes the JSON value within an object or an array to an *int. -// If next key value overflows uint64, an InvalidUnmarshalError error will be returned. -func (dec *Decoder) Uint64Null(v **uint64) error { - err := dec.decodeUint64Null(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_object.go b/vendor/github.com/francoispqt/gojay/decode_object.go deleted file mode 100644 index 0fec9d24..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_object.go +++ /dev/null @@ -1,407 +0,0 @@ -package gojay - -import ( - "reflect" - "unsafe" -) - -// DecodeObject reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the value pointed to by v. -// -// v must implement UnmarshalerJSONObject. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeObject(j UnmarshalerJSONObject) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - _, err := dec.decodeObject(j) - return err -} -func (dec *Decoder) decodeObject(j UnmarshalerJSONObject) (int, error) { - keys := j.NKeys() - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - case '{': - dec.cursor = dec.cursor + 1 - // if keys is zero we will parse all keys - // we run two loops for micro optimization - if keys == 0 { - for dec.cursor < dec.length || dec.read() { - k, done, err := dec.nextKey() - if err != nil { - return 0, err - } else if done { - return dec.cursor, nil - } - err = j.UnmarshalJSONObject(dec, k) - if err != nil { - dec.err = err - return 0, err - } else if dec.called&1 == 0 { - err := dec.skipData() - if err != nil { - return 0, err - } - } else { - dec.keysDone++ - } - dec.called &= 0 - } - } else { - for (dec.cursor < dec.length || dec.read()) && dec.keysDone < keys { - k, done, err := dec.nextKey() - if err != nil { - return 0, err - } else if done { - return dec.cursor, nil - } - err = j.UnmarshalJSONObject(dec, k) - if err != nil { - dec.err = err - return 0, err - } else if dec.called&1 == 0 { - err := dec.skipData() - if err != nil { - return 0, err - } - } else { - dec.keysDone++ - } - dec.called &= 0 - } - } - // will get to that point when keysDone is not lower than keys anymore - // in that case, we make sure cursor goes to the end of object, but we skip - // unmarshalling - if dec.child&1 != 0 { - end, err := dec.skipObject() - dec.cursor = end - return dec.cursor, err - } - return dec.cursor, nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return 0, err - } - return dec.cursor, nil - default: - // can't unmarshal to struct - dec.err = dec.makeInvalidUnmarshalErr(j) - err := dec.skipData() - if err != nil { - return 0, err - } - return dec.cursor, nil - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) decodeObjectNull(v interface{}) (int, error) { - // make sure the value is a pointer - vv := reflect.ValueOf(v) - vvt := vv.Type() - if vvt.Kind() != reflect.Ptr || vvt.Elem().Kind() != reflect.Ptr { - dec.err = ErrUnmarshalPtrExpected - return 0, dec.err - } - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - case '{': - elt := vv.Elem() - n := reflect.New(elt.Type().Elem()) - elt.Set(n) - var j UnmarshalerJSONObject - var ok bool - if j, ok = n.Interface().(UnmarshalerJSONObject); !ok { - dec.err = dec.makeInvalidUnmarshalErr((UnmarshalerJSONObject)(nil)) - return 0, dec.err - } - keys := j.NKeys() - dec.cursor = dec.cursor + 1 - // if keys is zero we will parse all keys - // we run two loops for micro optimization - if keys == 0 { - for dec.cursor < dec.length || dec.read() { - k, done, err := dec.nextKey() - if err != nil { - return 0, err - } else if done { - return dec.cursor, nil - } - err = j.UnmarshalJSONObject(dec, k) - if err != nil { - dec.err = err - return 0, err - } else if dec.called&1 == 0 { - err := dec.skipData() - if err != nil { - return 0, err - } - } else { - dec.keysDone++ - } - dec.called &= 0 - } - } else { - for (dec.cursor < dec.length || dec.read()) && dec.keysDone < keys { - k, done, err := dec.nextKey() - if err != nil { - return 0, err - } else if done { - return dec.cursor, nil - } - err = j.UnmarshalJSONObject(dec, k) - if err != nil { - dec.err = err - return 0, err - } else if dec.called&1 == 0 { - err := dec.skipData() - if err != nil { - return 0, err - } - } else { - dec.keysDone++ - } - dec.called &= 0 - } - } - // will get to that point when keysDone is not lower than keys anymore - // in that case, we make sure cursor goes to the end of object, but we skip - // unmarshalling - if dec.child&1 != 0 { - end, err := dec.skipObject() - dec.cursor = end - return dec.cursor, err - } - return dec.cursor, nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return 0, err - } - return dec.cursor, nil - default: - // can't unmarshal to struct - dec.err = dec.makeInvalidUnmarshalErr((UnmarshalerJSONObject)(nil)) - err := dec.skipData() - if err != nil { - return 0, err - } - return dec.cursor, nil - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) skipObject() (int, error) { - var objectsOpen = 1 - var objectsClosed = 0 - for j := dec.cursor; j < dec.length || dec.read(); j++ { - switch dec.data[j] { - case '}': - objectsClosed++ - // everything is closed return - if objectsOpen == objectsClosed { - // add char to object data - return j + 1, nil - } - case '{': - objectsOpen++ - case '"': - j++ - var isInEscapeSeq bool - var isFirstQuote = true - for ; j < dec.length || dec.read(); j++ { - if dec.data[j] != '"' { - continue - } - if dec.data[j-1] != '\\' || (!isInEscapeSeq && !isFirstQuote) { - break - } else { - isInEscapeSeq = false - } - if isFirstQuote { - isFirstQuote = false - } - // loop backward and count how many anti slash found - // to see if string is effectively escaped - ct := 0 - for i := j - 1; i > 0; i-- { - if dec.data[i] != '\\' { - break - } - ct++ - } - // is pair number of slashes, quote is not escaped - if ct&1 == 0 { - break - } - isInEscapeSeq = true - } - default: - continue - } - } - return 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) nextKey() (string, bool, error) { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - case '"': - dec.cursor = dec.cursor + 1 - start, end, err := dec.getString() - if err != nil { - return "", false, err - } - var found byte - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - if dec.data[dec.cursor] == ':' { - found |= 1 - break - } - } - if found&1 != 0 { - dec.cursor++ - d := dec.data[start : end-1] - return *(*string)(unsafe.Pointer(&d)), false, nil - } - return "", false, dec.raiseInvalidJSONErr(dec.cursor) - case '}': - dec.cursor = dec.cursor + 1 - return "", true, nil - default: - // can't unmarshall to struct - return "", false, dec.raiseInvalidJSONErr(dec.cursor) - } - } - return "", false, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) skipData() error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - // is null - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - case 't': - dec.cursor++ - err := dec.assertTrue() - if err != nil { - return err - } - return nil - // is false - case 'f': - dec.cursor++ - err := dec.assertFalse() - if err != nil { - return err - } - return nil - // is an object - case '{': - dec.cursor = dec.cursor + 1 - end, err := dec.skipObject() - dec.cursor = end - return err - // is string - case '"': - dec.cursor = dec.cursor + 1 - err := dec.skipString() - return err - // is array - case '[': - dec.cursor = dec.cursor + 1 - end, err := dec.skipArray() - dec.cursor = end - return err - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-': - end, err := dec.skipNumber() - dec.cursor = end - return err - } - return dec.raiseInvalidJSONErr(dec.cursor) - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -// DecodeObjectFunc is a func type implementing UnmarshalerJSONObject. -// Use it to cast a `func(*Decoder, k string) error` to Unmarshal an object on the fly. -type DecodeObjectFunc func(*Decoder, string) error - -// UnmarshalJSONObject implements UnmarshalerJSONObject. -func (f DecodeObjectFunc) UnmarshalJSONObject(dec *Decoder, k string) error { - return f(dec, k) -} - -// NKeys implements UnmarshalerJSONObject. -func (f DecodeObjectFunc) NKeys() int { - return 0 -} - -// Add Values functions - -// AddObject decodes the JSON value within an object or an array to a UnmarshalerJSONObject. -func (dec *Decoder) AddObject(v UnmarshalerJSONObject) error { - return dec.Object(v) -} - -// AddObjectNull decodes the JSON value within an object or an array to a UnmarshalerJSONObject. -func (dec *Decoder) AddObjectNull(v interface{}) error { - return dec.ObjectNull(v) -} - -// Object decodes the JSON value within an object or an array to a UnmarshalerJSONObject. -func (dec *Decoder) Object(value UnmarshalerJSONObject) error { - initialKeysDone := dec.keysDone - initialChild := dec.child - dec.keysDone = 0 - dec.called = 0 - dec.child |= 1 - newCursor, err := dec.decodeObject(value) - if err != nil { - return err - } - dec.cursor = newCursor - dec.keysDone = initialKeysDone - dec.child = initialChild - dec.called |= 1 - return nil -} - -// ObjectNull decodes the JSON value within an object or an array to a UnmarshalerJSONObject. -// v should be a pointer to an UnmarshalerJSONObject, -// if `null` value is encountered in JSON, it will leave the value v untouched, -// else it will create a new instance of the UnmarshalerJSONObject behind v. -func (dec *Decoder) ObjectNull(v interface{}) error { - initialKeysDone := dec.keysDone - initialChild := dec.child - dec.keysDone = 0 - dec.called = 0 - dec.child |= 1 - newCursor, err := dec.decodeObjectNull(v) - if err != nil { - return err - } - dec.cursor = newCursor - dec.keysDone = initialKeysDone - dec.child = initialChild - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_pool.go b/vendor/github.com/francoispqt/gojay/decode_pool.go deleted file mode 100644 index 68c57138..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_pool.go +++ /dev/null @@ -1,64 +0,0 @@ -package gojay - -import ( - "io" - "sync" -) - -var decPool = sync.Pool{ - New: newDecoderPool, -} - -func init() { - for i := 0; i < 32; i++ { - decPool.Put(NewDecoder(nil)) - } -} - -// NewDecoder returns a new decoder. -// It takes an io.Reader implementation as data input. -func NewDecoder(r io.Reader) *Decoder { - return &Decoder{ - called: 0, - cursor: 0, - keysDone: 0, - err: nil, - r: r, - data: make([]byte, 512), - length: 0, - isPooled: 0, - } -} -func newDecoderPool() interface{} { - return NewDecoder(nil) -} - -// BorrowDecoder borrows a Decoder from the pool. -// It takes an io.Reader implementation as data input. -// -// In order to benefit from the pool, a borrowed decoder must be released after usage. -func BorrowDecoder(r io.Reader) *Decoder { - return borrowDecoder(r, 512) -} -func borrowDecoder(r io.Reader, bufSize int) *Decoder { - dec := decPool.Get().(*Decoder) - dec.called = 0 - dec.keysDone = 0 - dec.cursor = 0 - dec.err = nil - dec.r = r - dec.length = 0 - dec.isPooled = 0 - if bufSize > 0 { - dec.data = make([]byte, bufSize) - } - return dec -} - -// Release sends back a Decoder to the pool. -// If a decoder is used after calling Release -// a panic will be raised with an InvalidUsagePooledDecoderError error. -func (dec *Decoder) Release() { - dec.isPooled = 1 - decPool.Put(dec) -} diff --git a/vendor/github.com/francoispqt/gojay/decode_slice.go b/vendor/github.com/francoispqt/gojay/decode_slice.go deleted file mode 100644 index dbbb4bf3..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_slice.go +++ /dev/null @@ -1,89 +0,0 @@ -package gojay - -// AddSliceString unmarshals the next JSON array of strings to the given *[]string s -func (dec *Decoder) AddSliceString(s *[]string) error { - return dec.SliceString(s) -} - -// SliceString unmarshals the next JSON array of strings to the given *[]string s -func (dec *Decoder) SliceString(s *[]string) error { - err := dec.Array(DecodeArrayFunc(func(dec *Decoder) error { - var str string - if err := dec.String(&str); err != nil { - return err - } - *s = append(*s, str) - return nil - })) - - if err != nil { - return err - } - return nil -} - -// AddSliceInt unmarshals the next JSON array of integers to the given *[]int s -func (dec *Decoder) AddSliceInt(s *[]int) error { - return dec.SliceInt(s) -} - -// SliceInt unmarshals the next JSON array of integers to the given *[]int s -func (dec *Decoder) SliceInt(s *[]int) error { - err := dec.Array(DecodeArrayFunc(func(dec *Decoder) error { - var i int - if err := dec.Int(&i); err != nil { - return err - } - *s = append(*s, i) - return nil - })) - - if err != nil { - return err - } - return nil -} - -// AddFloat64 unmarshals the next JSON array of floats to the given *[]float64 s -func (dec *Decoder) AddSliceFloat64(s *[]float64) error { - return dec.SliceFloat64(s) -} - -// SliceFloat64 unmarshals the next JSON array of floats to the given *[]float64 s -func (dec *Decoder) SliceFloat64(s *[]float64) error { - err := dec.Array(DecodeArrayFunc(func(dec *Decoder) error { - var i float64 - if err := dec.Float64(&i); err != nil { - return err - } - *s = append(*s, i) - return nil - })) - - if err != nil { - return err - } - return nil -} - -// AddBool unmarshals the next JSON array of boolegers to the given *[]bool s -func (dec *Decoder) AddSliceBool(s *[]bool) error { - return dec.SliceBool(s) -} - -// SliceBool unmarshals the next JSON array of boolegers to the given *[]bool s -func (dec *Decoder) SliceBool(s *[]bool) error { - err := dec.Array(DecodeArrayFunc(func(dec *Decoder) error { - var b bool - if err := dec.Bool(&b); err != nil { - return err - } - *s = append(*s, b) - return nil - })) - - if err != nil { - return err - } - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_sqlnull.go b/vendor/github.com/francoispqt/gojay/decode_sqlnull.go deleted file mode 100644 index c25549f5..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_sqlnull.go +++ /dev/null @@ -1,157 +0,0 @@ -package gojay - -import "database/sql" - -// DecodeSQLNullString decodes a sql.NullString -func (dec *Decoder) DecodeSQLNullString(v *sql.NullString) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeSQLNullString(v) -} - -func (dec *Decoder) decodeSQLNullString(v *sql.NullString) error { - var str string - if err := dec.decodeString(&str); err != nil { - return err - } - v.String = str - v.Valid = true - return nil -} - -// DecodeSQLNullInt64 decodes a sql.NullInt64 -func (dec *Decoder) DecodeSQLNullInt64(v *sql.NullInt64) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeSQLNullInt64(v) -} - -func (dec *Decoder) decodeSQLNullInt64(v *sql.NullInt64) error { - var i int64 - if err := dec.decodeInt64(&i); err != nil { - return err - } - v.Int64 = i - v.Valid = true - return nil -} - -// DecodeSQLNullFloat64 decodes a sql.NullString with the given format -func (dec *Decoder) DecodeSQLNullFloat64(v *sql.NullFloat64) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeSQLNullFloat64(v) -} - -func (dec *Decoder) decodeSQLNullFloat64(v *sql.NullFloat64) error { - var i float64 - if err := dec.decodeFloat64(&i); err != nil { - return err - } - v.Float64 = i - v.Valid = true - return nil -} - -// DecodeSQLNullBool decodes a sql.NullString with the given format -func (dec *Decoder) DecodeSQLNullBool(v *sql.NullBool) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeSQLNullBool(v) -} - -func (dec *Decoder) decodeSQLNullBool(v *sql.NullBool) error { - var b bool - if err := dec.decodeBool(&b); err != nil { - return err - } - v.Bool = b - v.Valid = true - return nil -} - -// Add Values functions - -// AddSQLNullString decodes the JSON value within an object or an array to qn *sql.NullString -func (dec *Decoder) AddSQLNullString(v *sql.NullString) error { - return dec.SQLNullString(v) -} - -// SQLNullString decodes the JSON value within an object or an array to an *sql.NullString -func (dec *Decoder) SQLNullString(v *sql.NullString) error { - var b *string - if err := dec.StringNull(&b); err != nil { - return err - } - if b == nil { - v.Valid = false - } else { - v.String = *b - v.Valid = true - } - return nil -} - -// AddSQLNullInt64 decodes the JSON value within an object or an array to qn *sql.NullInt64 -func (dec *Decoder) AddSQLNullInt64(v *sql.NullInt64) error { - return dec.SQLNullInt64(v) -} - -// SQLNullInt64 decodes the JSON value within an object or an array to an *sql.NullInt64 -func (dec *Decoder) SQLNullInt64(v *sql.NullInt64) error { - var b *int64 - if err := dec.Int64Null(&b); err != nil { - return err - } - if b == nil { - v.Valid = false - } else { - v.Int64 = *b - v.Valid = true - } - return nil -} - -// AddSQLNullFloat64 decodes the JSON value within an object or an array to qn *sql.NullFloat64 -func (dec *Decoder) AddSQLNullFloat64(v *sql.NullFloat64) error { - return dec.SQLNullFloat64(v) -} - -// SQLNullFloat64 decodes the JSON value within an object or an array to an *sql.NullFloat64 -func (dec *Decoder) SQLNullFloat64(v *sql.NullFloat64) error { - var b *float64 - if err := dec.Float64Null(&b); err != nil { - return err - } - if b == nil { - v.Valid = false - } else { - v.Float64 = *b - v.Valid = true - } - return nil -} - -// AddSQLNullBool decodes the JSON value within an object or an array to an *sql.NullBool -func (dec *Decoder) AddSQLNullBool(v *sql.NullBool) error { - return dec.SQLNullBool(v) -} - -// SQLNullBool decodes the JSON value within an object or an array to an *sql.NullBool -func (dec *Decoder) SQLNullBool(v *sql.NullBool) error { - var b *bool - if err := dec.BoolNull(&b); err != nil { - return err - } - if b == nil { - v.Valid = false - } else { - v.Bool = *b - v.Valid = true - } - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_stream.go b/vendor/github.com/francoispqt/gojay/decode_stream.go deleted file mode 100644 index 74beee4d..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_stream.go +++ /dev/null @@ -1,115 +0,0 @@ -package gojay - -import ( - "sync" - "time" -) - -// UnmarshalerStream is the interface to implement for a slice, an array or a slice -// to decode a line delimited JSON to. -type UnmarshalerStream interface { - UnmarshalStream(*StreamDecoder) error -} - -// Stream is a struct holding the Stream api -var Stream = stream{} - -type stream struct{} - -// A StreamDecoder reads and decodes JSON values from an input stream. -// -// It implements conext.Context and provide a channel to notify interruption. -type StreamDecoder struct { - mux sync.RWMutex - *Decoder - done chan struct{} - deadline *time.Time -} - -// DecodeStream reads the next line delimited JSON-encoded value from the decoder's input (io.Reader) and stores it in the value pointed to by c. -// -// c must implement UnmarshalerStream. Ideally c is a channel. See example for implementation. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *StreamDecoder) DecodeStream(c UnmarshalerStream) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - if dec.r == nil { - dec.err = NoReaderError("No reader given to decode stream") - close(dec.done) - return dec.err - } - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - continue - default: - // char is not space start reading - for dec.nextChar() != 0 { - // calling unmarshal stream - err := c.UnmarshalStream(dec) - if err != nil { - dec.err = err - close(dec.done) - return err - } - // garbage collects buffer - // we don't want the buffer to grow extensively - dec.data = dec.data[dec.cursor:] - dec.length = dec.length - dec.cursor - dec.cursor = 0 - } - // close the done channel to signal the end of the job - close(dec.done) - return nil - } - } - close(dec.done) - dec.mux.Lock() - err := dec.raiseInvalidJSONErr(dec.cursor) - dec.mux.Unlock() - return err -} - -// context.Context implementation - -// Done returns a channel that's closed when work is done. -// It implements context.Context -func (dec *StreamDecoder) Done() <-chan struct{} { - return dec.done -} - -// Deadline returns the time when work done on behalf of this context -// should be canceled. Deadline returns ok==false when no deadline is -// set. Successive calls to Deadline return the same results. -func (dec *StreamDecoder) Deadline() (time.Time, bool) { - if dec.deadline != nil { - return *dec.deadline, true - } - return time.Time{}, false -} - -// SetDeadline sets the deadline -func (dec *StreamDecoder) SetDeadline(t time.Time) { - dec.deadline = &t -} - -// Err returns nil if Done is not yet closed. -// If Done is closed, Err returns a non-nil error explaining why. -// It implements context.Context -func (dec *StreamDecoder) Err() error { - select { - case <-dec.done: - dec.mux.RLock() - defer dec.mux.RUnlock() - return dec.err - default: - return nil - } -} - -// Value implements context.Context -func (dec *StreamDecoder) Value(key interface{}) interface{} { - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_stream_pool.go b/vendor/github.com/francoispqt/gojay/decode_stream_pool.go deleted file mode 100644 index 8e1863b9..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_stream_pool.go +++ /dev/null @@ -1,59 +0,0 @@ -package gojay - -import ( - "io" - "sync" -) - -var streamDecPool = sync.Pool{ - New: newStreamDecoderPool, -} - -// NewDecoder returns a new StreamDecoder. -// It takes an io.Reader implementation as data input. -// It initiates the done channel returned by Done(). -func (s stream) NewDecoder(r io.Reader) *StreamDecoder { - dec := NewDecoder(r) - streamDec := &StreamDecoder{ - Decoder: dec, - done: make(chan struct{}, 1), - mux: sync.RWMutex{}, - } - return streamDec -} -func newStreamDecoderPool() interface{} { - return Stream.NewDecoder(nil) -} - -// BorrowDecoder borrows a StreamDecoder from the pool. -// It takes an io.Reader implementation as data input. -// It initiates the done channel returned by Done(). -// -// If no StreamEncoder is available in the pool, it returns a fresh one -func (s stream) BorrowDecoder(r io.Reader) *StreamDecoder { - return s.borrowDecoder(r, 512) -} - -func (s stream) borrowDecoder(r io.Reader, bufSize int) *StreamDecoder { - streamDec := streamDecPool.Get().(*StreamDecoder) - streamDec.called = 0 - streamDec.keysDone = 0 - streamDec.cursor = 0 - streamDec.err = nil - streamDec.r = r - streamDec.length = 0 - streamDec.isPooled = 0 - streamDec.done = make(chan struct{}, 1) - if bufSize > 0 { - streamDec.data = make([]byte, bufSize) - } - return streamDec -} - -// Release sends back a Decoder to the pool. -// If a decoder is used after calling Release -// a panic will be raised with an InvalidUsagePooledDecoderError error. -func (dec *StreamDecoder) Release() { - dec.isPooled = 1 - streamDecPool.Put(dec) -} diff --git a/vendor/github.com/francoispqt/gojay/decode_string.go b/vendor/github.com/francoispqt/gojay/decode_string.go deleted file mode 100644 index 694359c7..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_string.go +++ /dev/null @@ -1,260 +0,0 @@ -package gojay - -import ( - "unsafe" -) - -// DecodeString reads the next JSON-encoded value from the decoder's input (io.Reader) and stores it in the string pointed to by v. -// -// See the documentation for Unmarshal for details about the conversion of JSON into a Go value. -func (dec *Decoder) DecodeString(v *string) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeString(v) -} -func (dec *Decoder) decodeString(v *string) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - // is string - continue - case '"': - dec.cursor++ - start, end, err := dec.getString() - if err != nil { - return err - } - // we do minus one to remove the last quote - d := dec.data[start : end-1] - *v = *(*string)(unsafe.Pointer(&d)) - dec.cursor = end - return nil - // is nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return nil -} - -func (dec *Decoder) decodeStringNull(v **string) error { - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - switch dec.data[dec.cursor] { - case ' ', '\n', '\t', '\r', ',': - // is string - continue - case '"': - dec.cursor++ - start, end, err := dec.getString() - - if err != nil { - return err - } - if *v == nil { - *v = new(string) - } - // we do minus one to remove the last quote - d := dec.data[start : end-1] - **v = *(*string)(unsafe.Pointer(&d)) - dec.cursor = end - return nil - // is nil - case 'n': - dec.cursor++ - err := dec.assertNull() - if err != nil { - return err - } - return nil - default: - dec.err = dec.makeInvalidUnmarshalErr(v) - err := dec.skipData() - if err != nil { - return err - } - return nil - } - } - return nil -} - -func (dec *Decoder) parseEscapedString() error { - if dec.cursor >= dec.length && !dec.read() { - return dec.raiseInvalidJSONErr(dec.cursor) - } - switch dec.data[dec.cursor] { - case '"': - dec.data[dec.cursor] = '"' - case '\\': - dec.data[dec.cursor] = '\\' - case '/': - dec.data[dec.cursor] = '/' - case 'b': - dec.data[dec.cursor] = '\b' - case 'f': - dec.data[dec.cursor] = '\f' - case 'n': - dec.data[dec.cursor] = '\n' - case 'r': - dec.data[dec.cursor] = '\r' - case 't': - dec.data[dec.cursor] = '\t' - case 'u': - start := dec.cursor - dec.cursor++ - str, err := dec.parseUnicode() - if err != nil { - return err - } - diff := dec.cursor - start - dec.data = append(append(dec.data[:start-1], str...), dec.data[dec.cursor:]...) - dec.length = len(dec.data) - dec.cursor += len(str) - diff - 1 - - return nil - default: - return dec.raiseInvalidJSONErr(dec.cursor) - } - - dec.data = append(dec.data[:dec.cursor-1], dec.data[dec.cursor:]...) - dec.length-- - - // Since we've lost a character, our dec.cursor offset is now - // 1 past the escaped character which is precisely where we - // want it. - - return nil -} - -func (dec *Decoder) getString() (int, int, error) { - // extract key - var keyStart = dec.cursor - // var str *Builder - for dec.cursor < dec.length || dec.read() { - switch dec.data[dec.cursor] { - // string found - case '"': - dec.cursor = dec.cursor + 1 - return keyStart, dec.cursor, nil - // slash found - case '\\': - dec.cursor = dec.cursor + 1 - err := dec.parseEscapedString() - if err != nil { - return 0, 0, err - } - default: - dec.cursor = dec.cursor + 1 - continue - } - } - return 0, 0, dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) skipEscapedString() error { - start := dec.cursor - for ; dec.cursor < dec.length || dec.read(); dec.cursor++ { - if dec.data[dec.cursor] != '\\' { - d := dec.data[dec.cursor] - dec.cursor = dec.cursor + 1 - nSlash := dec.cursor - start - switch d { - case '"': - // nSlash must be odd - if nSlash&1 != 1 { - return dec.raiseInvalidJSONErr(dec.cursor) - } - return nil - case 'u': // is unicode, we skip the following characters and place the cursor one one byte backward to avoid it breaking when returning to skipString - if err := dec.skipString(); err != nil { - return err - } - dec.cursor-- - return nil - case 'n', 'r', 't', '/', 'f', 'b': - return nil - default: - // nSlash must be even - if nSlash&1 == 1 { - return dec.raiseInvalidJSONErr(dec.cursor) - } - return nil - } - } - } - return dec.raiseInvalidJSONErr(dec.cursor) -} - -func (dec *Decoder) skipString() error { - for dec.cursor < dec.length || dec.read() { - switch dec.data[dec.cursor] { - // found the closing quote - // let's return - case '"': - dec.cursor = dec.cursor + 1 - return nil - // solidus found start parsing an escaped string - case '\\': - dec.cursor = dec.cursor + 1 - err := dec.skipEscapedString() - if err != nil { - return err - } - default: - dec.cursor = dec.cursor + 1 - continue - } - } - return dec.raiseInvalidJSONErr(len(dec.data) - 1) -} - -// Add Values functions - -// AddString decodes the JSON value within an object or an array to a *string. -// If next key is not a JSON string nor null, InvalidUnmarshalError will be returned. -func (dec *Decoder) AddString(v *string) error { - return dec.String(v) -} - -// AddStringNull decodes the JSON value within an object or an array to a *string. -// If next key is not a JSON string nor null, InvalidUnmarshalError will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) AddStringNull(v **string) error { - return dec.StringNull(v) -} - -// String decodes the JSON value within an object or an array to a *string. -// If next key is not a JSON string nor null, InvalidUnmarshalError will be returned. -func (dec *Decoder) String(v *string) error { - err := dec.decodeString(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} - -// StringNull decodes the JSON value within an object or an array to a **string. -// If next key is not a JSON string nor null, InvalidUnmarshalError will be returned. -// If a `null` is encountered, gojay does not change the value of the pointer. -func (dec *Decoder) StringNull(v **string) error { - err := dec.decodeStringNull(v) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_string_unicode.go b/vendor/github.com/francoispqt/gojay/decode_string_unicode.go deleted file mode 100644 index 9e14d52b..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_string_unicode.go +++ /dev/null @@ -1,98 +0,0 @@ -package gojay - -import ( - "unicode/utf16" - "unicode/utf8" -) - -func (dec *Decoder) getUnicode() (rune, error) { - i := 0 - r := rune(0) - for ; (dec.cursor < dec.length || dec.read()) && i < 4; dec.cursor++ { - c := dec.data[dec.cursor] - if c >= '0' && c <= '9' { - r = r*16 + rune(c-'0') - } else if c >= 'a' && c <= 'f' { - r = r*16 + rune(c-'a'+10) - } else if c >= 'A' && c <= 'F' { - r = r*16 + rune(c-'A'+10) - } else { - return 0, InvalidJSONError("Invalid unicode code point") - } - i++ - } - return r, nil -} - -func (dec *Decoder) appendEscapeChar(str []byte, c byte) ([]byte, error) { - switch c { - case 't': - str = append(str, '\t') - case 'n': - str = append(str, '\n') - case 'r': - str = append(str, '\r') - case 'b': - str = append(str, '\b') - case 'f': - str = append(str, '\f') - case '\\': - str = append(str, '\\') - default: - return nil, InvalidJSONError("Invalid JSON") - } - return str, nil -} - -func (dec *Decoder) parseUnicode() ([]byte, error) { - // get unicode after u - r, err := dec.getUnicode() - if err != nil { - return nil, err - } - // no error start making new string - str := make([]byte, 16, 16) - i := 0 - // check if code can be a surrogate utf16 - if utf16.IsSurrogate(r) { - if dec.cursor >= dec.length && !dec.read() { - return nil, dec.raiseInvalidJSONErr(dec.cursor) - } - c := dec.data[dec.cursor] - if c != '\\' { - i += utf8.EncodeRune(str, r) - return str[:i], nil - } - dec.cursor++ - if dec.cursor >= dec.length && !dec.read() { - return nil, dec.raiseInvalidJSONErr(dec.cursor) - } - c = dec.data[dec.cursor] - if c != 'u' { - i += utf8.EncodeRune(str, r) - str, err = dec.appendEscapeChar(str[:i], c) - if err != nil { - dec.err = err - return nil, err - } - i++ - dec.cursor++ - return str[:i], nil - } - dec.cursor++ - r2, err := dec.getUnicode() - if err != nil { - return nil, err - } - combined := utf16.DecodeRune(r, r2) - if combined == '\uFFFD' { - i += utf8.EncodeRune(str, r) - i += utf8.EncodeRune(str, r2) - } else { - i += utf8.EncodeRune(str, combined) - } - return str[:i], nil - } - i += utf8.EncodeRune(str, r) - return str[:i], nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_time.go b/vendor/github.com/francoispqt/gojay/decode_time.go deleted file mode 100644 index 68f906d7..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_time.go +++ /dev/null @@ -1,53 +0,0 @@ -package gojay - -import ( - "time" -) - -// DecodeTime decodes time with the given format -func (dec *Decoder) DecodeTime(v *time.Time, format string) error { - if dec.isPooled == 1 { - panic(InvalidUsagePooledDecoderError("Invalid usage of pooled decoder")) - } - return dec.decodeTime(v, format) -} - -func (dec *Decoder) decodeTime(v *time.Time, format string) error { - if format == time.RFC3339 { - var ej = make(EmbeddedJSON, 0, 20) - if err := dec.decodeEmbeddedJSON(&ej); err != nil { - return err - } - if err := v.UnmarshalJSON(ej); err != nil { - return err - } - return nil - } - var str string - if err := dec.decodeString(&str); err != nil { - return err - } - tt, err := time.Parse(format, str) - if err != nil { - return err - } - *v = tt - return nil -} - -// Add Values functions - -// AddTime decodes the JSON value within an object or an array to a *time.Time with the given format -func (dec *Decoder) AddTime(v *time.Time, format string) error { - return dec.Time(v, format) -} - -// Time decodes the JSON value within an object or an array to a *time.Time with the given format -func (dec *Decoder) Time(v *time.Time, format string) error { - err := dec.decodeTime(v, format) - if err != nil { - return err - } - dec.called |= 1 - return nil -} diff --git a/vendor/github.com/francoispqt/gojay/decode_unsafe.go b/vendor/github.com/francoispqt/gojay/decode_unsafe.go deleted file mode 100644 index 54448fba..00000000 --- a/vendor/github.com/francoispqt/gojay/decode_unsafe.go +++ /dev/null @@ -1,120 +0,0 @@ -package gojay - -import ( - "fmt" -) - -// Unsafe is the structure holding the unsafe version of the API. -// The difference between unsafe api and regular api is that the regular API -// copies the buffer passed to Unmarshal functions to a new internal buffer. -// Making it safer because internally GoJay uses unsafe.Pointer to transform slice of bytes into a string. -var Unsafe = decUnsafe{} - -type decUnsafe struct{} - -func (u decUnsafe) UnmarshalJSONArray(data []byte, v UnmarshalerJSONArray) error { - dec := borrowDecoder(nil, 0) - defer dec.Release() - dec.data = data - dec.length = len(data) - _, err := dec.decodeArray(v) - return err -} - -func (u decUnsafe) UnmarshalJSONObject(data []byte, v UnmarshalerJSONObject) error { - dec := borrowDecoder(nil, 0) - defer dec.Release() - dec.data = data - dec.length = len(data) - _, err := dec.decodeObject(v) - return err -} - -func (u decUnsafe) Unmarshal(data []byte, v interface{}) error { - var err error - var dec *Decoder - switch vt := v.(type) { - case *string: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeString(vt) - case *int: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt(vt) - case *int8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt8(vt) - case *int16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt16(vt) - case *int32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt32(vt) - case *int64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeInt64(vt) - case *uint8: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint8(vt) - case *uint16: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint16(vt) - case *uint32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint32(vt) - case *uint64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeUint64(vt) - case *float64: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat64(vt) - case *float32: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeFloat32(vt) - case *bool: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - err = dec.decodeBool(vt) - case UnmarshalerJSONObject: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - _, err = dec.decodeObject(vt) - case UnmarshalerJSONArray: - dec = borrowDecoder(nil, 0) - dec.length = len(data) - dec.data = data - _, err = dec.decodeArray(vt) - default: - return InvalidUnmarshalError(fmt.Sprintf(invalidUnmarshalErrorMsg, vt)) - } - defer dec.Release() - if err != nil { - return err - } - return dec.err -} diff --git a/vendor/github.com/francoispqt/gojay/encode.go b/vendor/github.com/francoispqt/gojay/encode.go deleted file mode 100644 index 92edaafa..00000000 --- a/vendor/github.com/francoispqt/gojay/encode.go +++ /dev/null @@ -1,202 +0,0 @@ -package gojay - -import ( - "encoding/json" - "fmt" - "io" -) - -var nullBytes = []byte("null") - -// MarshalJSONArray returns the JSON encoding of v, an implementation of MarshalerJSONArray. -// -// -// Example: -// type TestSlice []*TestStruct -// -// func (t TestSlice) MarshalJSONArray(enc *Encoder) { -// for _, e := range t { -// enc.AddObject(e) -// } -// } -// -// func main() { -// test := &TestSlice{ -// &TestStruct{123456}, -// &TestStruct{7890}, -// } -// b, _ := Marshal(test) -// fmt.Println(b) // [{"id":123456},{"id":7890}] -// } -func MarshalJSONArray(v MarshalerJSONArray) ([]byte, error) { - enc := BorrowEncoder(nil) - enc.grow(512) - enc.writeByte('[') - v.(MarshalerJSONArray).MarshalJSONArray(enc) - enc.writeByte(']') - - defer func() { - enc.buf = make([]byte, 0, 512) - enc.Release() - }() - - return enc.buf, nil -} - -// MarshalJSONObject returns the JSON encoding of v, an implementation of MarshalerJSONObject. -// -// Example: -// type Object struct { -// id int -// } -// func (s *Object) MarshalJSONObject(enc *gojay.Encoder) { -// enc.IntKey("id", s.id) -// } -// func (s *Object) IsNil() bool { -// return s == nil -// } -// -// func main() { -// test := &Object{ -// id: 123456, -// } -// b, _ := gojay.Marshal(test) -// fmt.Println(b) // {"id":123456} -// } -func MarshalJSONObject(v MarshalerJSONObject) ([]byte, error) { - enc := BorrowEncoder(nil) - enc.grow(512) - - defer func() { - enc.buf = make([]byte, 0, 512) - enc.Release() - }() - - return enc.encodeObject(v) -} - -// Marshal returns the JSON encoding of v. -// -// If v is nil, not an implementation MarshalerJSONObject or MarshalerJSONArray or not one of the following types: -// string, int, int8, int16, int32, int64, uint8, uint16, uint32, uint64, float64, float32, bool -// Marshal returns an InvalidMarshalError. -func Marshal(v interface{}) ([]byte, error) { - return marshal(v, false) -} - -// MarshalAny returns the JSON encoding of v. -// -// If v is nil, not an implementation MarshalerJSONObject or MarshalerJSONArray or not one of the following types: -// string, int, int8, int16, int32, int64, uint8, uint16, uint32, uint64, float64, float32, bool -// MarshalAny falls back to "json/encoding" package to marshal the value. -func MarshalAny(v interface{}) ([]byte, error) { - return marshal(v, true) -} - -func marshal(v interface{}, any bool) ([]byte, error) { - var ( - enc = BorrowEncoder(nil) - - buf []byte - err error - ) - - defer func() { - enc.buf = make([]byte, 0, 512) - enc.Release() - }() - - buf, err = func() ([]byte, error) { - switch vt := v.(type) { - case MarshalerJSONObject: - return enc.encodeObject(vt) - case MarshalerJSONArray: - return enc.encodeArray(vt) - case string: - return enc.encodeString(vt) - case bool: - return enc.encodeBool(vt) - case int: - return enc.encodeInt(vt) - case int64: - return enc.encodeInt64(vt) - case int32: - return enc.encodeInt(int(vt)) - case int16: - return enc.encodeInt(int(vt)) - case int8: - return enc.encodeInt(int(vt)) - case uint64: - return enc.encodeInt(int(vt)) - case uint32: - return enc.encodeInt(int(vt)) - case uint16: - return enc.encodeInt(int(vt)) - case uint8: - return enc.encodeInt(int(vt)) - case float64: - return enc.encodeFloat(vt) - case float32: - return enc.encodeFloat32(vt) - case *EmbeddedJSON: - return enc.encodeEmbeddedJSON(vt) - default: - if any { - return json.Marshal(vt) - } - - return nil, InvalidMarshalError(fmt.Sprintf(invalidMarshalErrorMsg, vt)) - } - }() - return buf, err -} - -// MarshalerJSONObject is the interface to implement for struct to be encoded -type MarshalerJSONObject interface { - MarshalJSONObject(enc *Encoder) - IsNil() bool -} - -// MarshalerJSONArray is the interface to implement -// for a slice or an array to be encoded -type MarshalerJSONArray interface { - MarshalJSONArray(enc *Encoder) - IsNil() bool -} - -// An Encoder writes JSON values to an output stream. -type Encoder struct { - buf []byte - isPooled byte - w io.Writer - err error - hasKeys bool - keys []string -} - -// AppendBytes allows a modular usage by appending bytes manually to the current state of the buffer. -func (enc *Encoder) AppendBytes(b []byte) { - enc.writeBytes(b) -} - -// AppendByte allows a modular usage by appending a single byte manually to the current state of the buffer. -func (enc *Encoder) AppendByte(b byte) { - enc.writeByte(b) -} - -// Buf returns the Encoder's buffer. -func (enc *Encoder) Buf() []byte { - return enc.buf -} - -// Write writes to the io.Writer and resets the buffer. -func (enc *Encoder) Write() (int, error) { - i, err := enc.w.Write(enc.buf) - enc.buf = enc.buf[:0] - return i, err -} - -func (enc *Encoder) getPreviousRune() byte { - last := len(enc.buf) - 1 - return enc.buf[last] -} diff --git a/vendor/github.com/francoispqt/gojay/encode_array.go b/vendor/github.com/francoispqt/gojay/encode_array.go deleted file mode 100644 index 5e9d49e8..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_array.go +++ /dev/null @@ -1,212 +0,0 @@ -package gojay - -// EncodeArray encodes an implementation of MarshalerJSONArray to JSON -func (enc *Encoder) EncodeArray(v MarshalerJSONArray) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeArray(v) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} -func (enc *Encoder) encodeArray(v MarshalerJSONArray) ([]byte, error) { - enc.grow(200) - enc.writeByte('[') - v.MarshalJSONArray(enc) - enc.writeByte(']') - return enc.buf, enc.err -} - -// AddArray adds an implementation of MarshalerJSONArray to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement Marshaler -func (enc *Encoder) AddArray(v MarshalerJSONArray) { - enc.Array(v) -} - -// AddArrayOmitEmpty adds an array or slice to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerAddArrayOmitEmpty -func (enc *Encoder) AddArrayOmitEmpty(v MarshalerJSONArray) { - enc.ArrayOmitEmpty(v) -} - -// AddArrayNullEmpty adds an array or slice to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement Marshaler, if v is empty, `null` will be encoded` -func (enc *Encoder) AddArrayNullEmpty(v MarshalerJSONArray) { - enc.ArrayNullEmpty(v) -} - -// AddArrayKey adds an array or slice to be encoded, must be used inside an object as it will encode a key -// value must implement Marshaler -func (enc *Encoder) AddArrayKey(key string, v MarshalerJSONArray) { - enc.ArrayKey(key, v) -} - -// AddArrayKeyOmitEmpty adds an array or slice to be encoded and skips it if it is nil. -// Must be called inside an object as it will encode a key. -func (enc *Encoder) AddArrayKeyOmitEmpty(key string, v MarshalerJSONArray) { - enc.ArrayKeyOmitEmpty(key, v) -} - -// AddArrayKeyNullEmpty adds an array or slice to be encoded and skips it if it is nil. -// Must be called inside an object as it will encode a key. `null` will be encoded` -func (enc *Encoder) AddArrayKeyNullEmpty(key string, v MarshalerJSONArray) { - enc.ArrayKeyNullEmpty(key, v) -} - -// Array adds an implementation of MarshalerJSONArray to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement Marshaler -func (enc *Encoder) Array(v MarshalerJSONArray) { - if v.IsNil() { - enc.grow(3) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('[') - enc.writeByte(']') - return - } - enc.grow(100) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('[') - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// ArrayOmitEmpty adds an array or slice to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement Marshaler -func (enc *Encoder) ArrayOmitEmpty(v MarshalerJSONArray) { - if v.IsNil() { - return - } - enc.grow(4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('[') - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// ArrayNullEmpty adds an array or slice to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement Marshaler -func (enc *Encoder) ArrayNullEmpty(v MarshalerJSONArray) { - enc.grow(4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v.IsNil() { - enc.writeBytes(nullBytes) - return - } - enc.writeByte('[') - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// ArrayKey adds an array or slice to be encoded, must be used inside an object as it will encode a key -// value must implement Marshaler -func (enc *Encoder) ArrayKey(key string, v MarshalerJSONArray) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v.IsNil() { - enc.grow(2 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyArr) - enc.writeByte(']') - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyArr) - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// ArrayKeyOmitEmpty adds an array or slice to be encoded and skips if it is nil. -// Must be called inside an object as it will encode a key. -func (enc *Encoder) ArrayKeyOmitEmpty(key string, v MarshalerJSONArray) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v.IsNil() { - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyArr) - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// ArrayKeyNullEmpty adds an array or slice to be encoded and encodes `null`` if it is nil. -// Must be called inside an object as it will encode a key. -func (enc *Encoder) ArrayKeyNullEmpty(key string, v MarshalerJSONArray) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - if v.IsNil() { - enc.writeBytes(nullBytes) - return - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyArr) - v.MarshalJSONArray(enc) - enc.writeByte(']') -} - -// EncodeArrayFunc is a custom func type implementing MarshaleArray. -// Use it to cast a func(*Encoder) to Marshal an object. -// -// enc := gojay.NewEncoder(io.Writer) -// enc.EncodeArray(gojay.EncodeArrayFunc(func(enc *gojay.Encoder) { -// enc.AddStringKey("hello", "world") -// })) -type EncodeArrayFunc func(*Encoder) - -// MarshalJSONArray implements MarshalerJSONArray. -func (f EncodeArrayFunc) MarshalJSONArray(enc *Encoder) { - f(enc) -} - -// IsNil implements MarshalerJSONArray. -func (f EncodeArrayFunc) IsNil() bool { - return f == nil -} diff --git a/vendor/github.com/francoispqt/gojay/encode_bool.go b/vendor/github.com/francoispqt/gojay/encode_bool.go deleted file mode 100644 index 253e0378..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_bool.go +++ /dev/null @@ -1,164 +0,0 @@ -package gojay - -import "strconv" - -// EncodeBool encodes a bool to JSON -func (enc *Encoder) EncodeBool(v bool) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeBool(v) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// encodeBool encodes a bool to JSON -func (enc *Encoder) encodeBool(v bool) ([]byte, error) { - enc.grow(5) - if v { - enc.writeString("true") - } else { - enc.writeString("false") - } - return enc.buf, enc.err -} - -// AddBool adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddBool(v bool) { - enc.Bool(v) -} - -// AddBoolOmitEmpty adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddBoolOmitEmpty(v bool) { - enc.BoolOmitEmpty(v) -} - -// AddBoolNullEmpty adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddBoolNullEmpty(v bool) { - enc.BoolNullEmpty(v) -} - -// AddBoolKey adds a bool to be encoded, must be used inside an object as it will encode a key. -func (enc *Encoder) AddBoolKey(key string, v bool) { - enc.BoolKey(key, v) -} - -// AddBoolKeyOmitEmpty adds a bool to be encoded and skips if it is zero value. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddBoolKeyOmitEmpty(key string, v bool) { - enc.BoolKeyOmitEmpty(key, v) -} - -// AddBoolKeyNullEmpty adds a bool to be encoded and encodes `null` if it is zero value. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddBoolKeyNullEmpty(key string, v bool) { - enc.BoolKeyNullEmpty(key, v) -} - -// Bool adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Bool(v bool) { - enc.grow(5) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v { - enc.writeString("true") - } else { - enc.writeString("false") - } -} - -// BoolOmitEmpty adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) BoolOmitEmpty(v bool) { - if v == false { - return - } - enc.grow(5) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeString("true") -} - -// BoolNullEmpty adds a bool to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) BoolNullEmpty(v bool) { - enc.grow(5) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == false { - enc.writeBytes(nullBytes) - return - } - enc.writeString("true") -} - -// BoolKey adds a bool to be encoded, must be used inside an object as it will encode a key. -func (enc *Encoder) BoolKey(key string, value bool) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendBool(enc.buf, value) -} - -// BoolKeyOmitEmpty adds a bool to be encoded and skips it if it is zero value. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) BoolKeyOmitEmpty(key string, v bool) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == false { - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendBool(enc.buf, v) -} - -// BoolKeyNullEmpty adds a bool to be encoded and skips it if it is zero value. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) BoolKeyNullEmpty(key string, v bool) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == false { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendBool(enc.buf, v) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_builder.go b/vendor/github.com/francoispqt/gojay/encode_builder.go deleted file mode 100644 index 2895ba34..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_builder.go +++ /dev/null @@ -1,65 +0,0 @@ -package gojay - -const hex = "0123456789abcdef" - -// grow grows b's capacity, if necessary, to guarantee space for -// another n bytes. After grow(n), at least n bytes can be written to b -// without another allocation. If n is negative, grow panics. -func (enc *Encoder) grow(n int) { - if cap(enc.buf)-len(enc.buf) < n { - Buf := make([]byte, len(enc.buf), 2*cap(enc.buf)+n) - copy(Buf, enc.buf) - enc.buf = Buf - } -} - -// Write appends the contents of p to b's Buffer. -// Write always returns len(p), nil. -func (enc *Encoder) writeBytes(p []byte) { - enc.buf = append(enc.buf, p...) -} - -func (enc *Encoder) writeTwoBytes(b1 byte, b2 byte) { - enc.buf = append(enc.buf, b1, b2) -} - -// WriteByte appends the byte c to b's Buffer. -// The returned error is always nil. -func (enc *Encoder) writeByte(c byte) { - enc.buf = append(enc.buf, c) -} - -// WriteString appends the contents of s to b's Buffer. -// It returns the length of s and a nil error. -func (enc *Encoder) writeString(s string) { - enc.buf = append(enc.buf, s...) -} - -func (enc *Encoder) writeStringEscape(s string) { - l := len(s) - for i := 0; i < l; i++ { - c := s[i] - if c >= 0x20 && c != '\\' && c != '"' { - enc.writeByte(c) - continue - } - switch c { - case '\\', '"': - enc.writeTwoBytes('\\', c) - case '\n': - enc.writeTwoBytes('\\', 'n') - case '\f': - enc.writeTwoBytes('\\', 'f') - case '\b': - enc.writeTwoBytes('\\', 'b') - case '\r': - enc.writeTwoBytes('\\', 'r') - case '\t': - enc.writeTwoBytes('\\', 't') - default: - enc.writeString(`\u00`) - enc.writeTwoBytes(hex[c>>4], hex[c&0xF]) - } - continue - } -} diff --git a/vendor/github.com/francoispqt/gojay/encode_embedded_json.go b/vendor/github.com/francoispqt/gojay/encode_embedded_json.go deleted file mode 100644 index 4c99a057..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_embedded_json.go +++ /dev/null @@ -1,93 +0,0 @@ -package gojay - -// EncodeEmbeddedJSON encodes an embedded JSON. -// is basically sets the internal buf as the value pointed by v and calls the io.Writer.Write() -func (enc *Encoder) EncodeEmbeddedJSON(v *EmbeddedJSON) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - enc.buf = *v - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -func (enc *Encoder) encodeEmbeddedJSON(v *EmbeddedJSON) ([]byte, error) { - enc.writeBytes(*v) - return enc.buf, nil -} - -// AddEmbeddedJSON adds an EmbeddedJSON to be encoded. -// -// It basically blindly writes the bytes to the final buffer. Therefore, -// it expects the JSON to be of proper format. -func (enc *Encoder) AddEmbeddedJSON(v *EmbeddedJSON) { - enc.grow(len(*v) + 4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeBytes(*v) -} - -// AddEmbeddedJSONOmitEmpty adds an EmbeddedJSON to be encoded or skips it if nil pointer or empty. -// -// It basically blindly writes the bytes to the final buffer. Therefore, -// it expects the JSON to be of proper format. -func (enc *Encoder) AddEmbeddedJSONOmitEmpty(v *EmbeddedJSON) { - if v == nil || len(*v) == 0 { - return - } - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeBytes(*v) -} - -// AddEmbeddedJSONKey adds an EmbeddedJSON and a key to be encoded. -// -// It basically blindly writes the bytes to the final buffer. Therefore, -// it expects the JSON to be of proper format. -func (enc *Encoder) AddEmbeddedJSONKey(key string, v *EmbeddedJSON) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(len(key) + len(*v) + 5) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.writeBytes(*v) -} - -// AddEmbeddedJSONKeyOmitEmpty adds an EmbeddedJSON and a key to be encoded or skips it if nil pointer or empty. -// -// It basically blindly writes the bytes to the final buffer. Therefore, -// it expects the JSON to be of proper format. -func (enc *Encoder) AddEmbeddedJSONKeyOmitEmpty(key string, v *EmbeddedJSON) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == nil || len(*v) == 0 { - return - } - enc.grow(len(key) + len(*v) + 5) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.writeBytes(*v) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_interface.go b/vendor/github.com/francoispqt/gojay/encode_interface.go deleted file mode 100644 index c4692e5f..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_interface.go +++ /dev/null @@ -1,173 +0,0 @@ -package gojay - -import ( - "fmt" -) - -// Encode encodes a value to JSON. -// -// If Encode cannot find a way to encode the type to JSON -// it will return an InvalidMarshalError. -func (enc *Encoder) Encode(v interface{}) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - switch vt := v.(type) { - case string: - return enc.EncodeString(vt) - case bool: - return enc.EncodeBool(vt) - case MarshalerJSONArray: - return enc.EncodeArray(vt) - case MarshalerJSONObject: - return enc.EncodeObject(vt) - case int: - return enc.EncodeInt(vt) - case int64: - return enc.EncodeInt64(vt) - case int32: - return enc.EncodeInt(int(vt)) - case int8: - return enc.EncodeInt(int(vt)) - case uint64: - return enc.EncodeUint64(vt) - case uint32: - return enc.EncodeInt(int(vt)) - case uint16: - return enc.EncodeInt(int(vt)) - case uint8: - return enc.EncodeInt(int(vt)) - case float64: - return enc.EncodeFloat(vt) - case float32: - return enc.EncodeFloat32(vt) - case *EmbeddedJSON: - return enc.EncodeEmbeddedJSON(vt) - default: - return InvalidMarshalError(fmt.Sprintf(invalidMarshalErrorMsg, vt)) - } -} - -// AddInterface adds an interface{} to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInterface(value interface{}) { - switch vt := value.(type) { - case string: - enc.AddString(vt) - case bool: - enc.AddBool(vt) - case MarshalerJSONArray: - enc.AddArray(vt) - case MarshalerJSONObject: - enc.AddObject(vt) - case int: - enc.AddInt(vt) - case int64: - enc.AddInt(int(vt)) - case int32: - enc.AddInt(int(vt)) - case int8: - enc.AddInt(int(vt)) - case uint64: - enc.AddUint64(vt) - case uint32: - enc.AddInt(int(vt)) - case uint16: - enc.AddInt(int(vt)) - case uint8: - enc.AddInt(int(vt)) - case float64: - enc.AddFloat(vt) - case float32: - enc.AddFloat32(vt) - default: - if vt != nil { - enc.err = InvalidMarshalError(fmt.Sprintf(invalidMarshalErrorMsg, vt)) - return - } - return - } -} - -// AddInterfaceKey adds an interface{} to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInterfaceKey(key string, value interface{}) { - switch vt := value.(type) { - case string: - enc.AddStringKey(key, vt) - case bool: - enc.AddBoolKey(key, vt) - case MarshalerJSONArray: - enc.AddArrayKey(key, vt) - case MarshalerJSONObject: - enc.AddObjectKey(key, vt) - case int: - enc.AddIntKey(key, vt) - case int64: - enc.AddIntKey(key, int(vt)) - case int32: - enc.AddIntKey(key, int(vt)) - case int16: - enc.AddIntKey(key, int(vt)) - case int8: - enc.AddIntKey(key, int(vt)) - case uint64: - enc.AddIntKey(key, int(vt)) - case uint32: - enc.AddIntKey(key, int(vt)) - case uint16: - enc.AddIntKey(key, int(vt)) - case uint8: - enc.AddIntKey(key, int(vt)) - case float64: - enc.AddFloatKey(key, vt) - case float32: - enc.AddFloat32Key(key, vt) - default: - if vt != nil { - enc.err = InvalidMarshalError(fmt.Sprintf(invalidMarshalErrorMsg, vt)) - return - } - return - } -} - -// AddInterfaceKeyOmitEmpty adds an interface{} to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInterfaceKeyOmitEmpty(key string, v interface{}) { - switch vt := v.(type) { - case string: - enc.AddStringKeyOmitEmpty(key, vt) - case bool: - enc.AddBoolKeyOmitEmpty(key, vt) - case MarshalerJSONArray: - enc.AddArrayKeyOmitEmpty(key, vt) - case MarshalerJSONObject: - enc.AddObjectKeyOmitEmpty(key, vt) - case int: - enc.AddIntKeyOmitEmpty(key, vt) - case int64: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case int32: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case int16: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case int8: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case uint64: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case uint32: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case uint16: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case uint8: - enc.AddIntKeyOmitEmpty(key, int(vt)) - case float64: - enc.AddFloatKeyOmitEmpty(key, vt) - case float32: - enc.AddFloat32KeyOmitEmpty(key, vt) - default: - if vt != nil { - enc.err = InvalidMarshalError(fmt.Sprintf(invalidMarshalErrorMsg, vt)) - return - } - return - } -} diff --git a/vendor/github.com/francoispqt/gojay/encode_null.go b/vendor/github.com/francoispqt/gojay/encode_null.go deleted file mode 100644 index cec4e639..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_null.go +++ /dev/null @@ -1,39 +0,0 @@ -package gojay - -// AddNull adds a `null` to be encoded. Must be used while encoding an array.` -func (enc *Encoder) AddNull() { - enc.Null() -} - -// Null adds a `null` to be encoded. Must be used while encoding an array.` -func (enc *Encoder) Null() { - enc.grow(5) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeBytes(nullBytes) -} - -// AddNullKey adds a `null` to be encoded. Must be used while encoding an array.` -func (enc *Encoder) AddNullKey(key string) { - enc.NullKey(key) -} - -// NullKey adds a `null` to be encoded. Must be used while encoding an array.` -func (enc *Encoder) NullKey(key string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.writeBytes(nullBytes) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_number.go b/vendor/github.com/francoispqt/gojay/encode_number.go deleted file mode 100644 index 53affb90..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_number.go +++ /dev/null @@ -1 +0,0 @@ -package gojay diff --git a/vendor/github.com/francoispqt/gojay/encode_number_float.go b/vendor/github.com/francoispqt/gojay/encode_number_float.go deleted file mode 100644 index b45f8442..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_number_float.go +++ /dev/null @@ -1,368 +0,0 @@ -package gojay - -import "strconv" - -// EncodeFloat encodes a float64 to JSON -func (enc *Encoder) EncodeFloat(n float64) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeFloat(n) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -// encodeFloat encodes a float64 to JSON -func (enc *Encoder) encodeFloat(n float64) ([]byte, error) { - enc.buf = strconv.AppendFloat(enc.buf, n, 'f', -1, 64) - return enc.buf, nil -} - -// EncodeFloat32 encodes a float32 to JSON -func (enc *Encoder) EncodeFloat32(n float32) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeFloat32(n) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -func (enc *Encoder) encodeFloat32(n float32) ([]byte, error) { - enc.buf = strconv.AppendFloat(enc.buf, float64(n), 'f', -1, 32) - return enc.buf, nil -} - -// AddFloat adds a float64 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddFloat(v float64) { - enc.Float64(v) -} - -// AddFloatOmitEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddFloatOmitEmpty(v float64) { - enc.Float64OmitEmpty(v) -} - -// AddFloatNullEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddFloatNullEmpty(v float64) { - enc.Float64NullEmpty(v) -} - -// Float adds a float64 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Float(v float64) { - enc.Float64(v) -} - -// FloatOmitEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) FloatOmitEmpty(v float64) { - enc.Float64OmitEmpty(v) -} - -// FloatNullEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) FloatNullEmpty(v float64) { - enc.Float64NullEmpty(v) -} - -// AddFloatKey adds a float64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddFloatKey(key string, v float64) { - enc.Float64Key(key, v) -} - -// AddFloatKeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddFloatKeyOmitEmpty(key string, v float64) { - enc.Float64KeyOmitEmpty(key, v) -} - -// AddFloatKeyNullEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddFloatKeyNullEmpty(key string, v float64) { - enc.Float64KeyNullEmpty(key, v) -} - -// FloatKey adds a float64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) FloatKey(key string, v float64) { - enc.Float64Key(key, v) -} - -// FloatKeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) FloatKeyOmitEmpty(key string, v float64) { - enc.Float64KeyOmitEmpty(key, v) -} - -// FloatKeyNullEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) FloatKeyNullEmpty(key string, v float64) { - enc.Float64KeyNullEmpty(key, v) -} - -// AddFloat64 adds a float64 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddFloat64(v float64) { - enc.Float(v) -} - -// AddFloat64OmitEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddFloat64OmitEmpty(v float64) { - enc.FloatOmitEmpty(v) -} - -// Float64 adds a float64 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Float64(v float64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendFloat(enc.buf, v, 'f', -1, 64) -} - -// Float64OmitEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Float64OmitEmpty(v float64) { - if v == 0 { - return - } - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendFloat(enc.buf, v, 'f', -1, 64) -} - -// Float64NullEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Float64NullEmpty(v float64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendFloat(enc.buf, v, 'f', -1, 64) -} - -// AddFloat64Key adds a float64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddFloat64Key(key string, v float64) { - enc.FloatKey(key, v) -} - -// AddFloat64KeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddFloat64KeyOmitEmpty(key string, v float64) { - enc.FloatKeyOmitEmpty(key, v) -} - -// Float64Key adds a float64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Float64Key(key string, value float64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.grow(10) - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendFloat(enc.buf, value, 'f', -1, 64) -} - -// Float64KeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) Float64KeyOmitEmpty(key string, v float64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == 0 { - return - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendFloat(enc.buf, v, 'f', -1, 64) -} - -// Float64KeyNullEmpty adds a float64 to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Float64KeyNullEmpty(key string, v float64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendFloat(enc.buf, v, 'f', -1, 64) -} - -// AddFloat32 adds a float32 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddFloat32(v float32) { - enc.Float32(v) -} - -// AddFloat32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddFloat32OmitEmpty(v float32) { - enc.Float32OmitEmpty(v) -} - -// AddFloat32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddFloat32NullEmpty(v float32) { - enc.Float32NullEmpty(v) -} - -// Float32 adds a float32 to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Float32(v float32) { - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} - -// Float32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Float32OmitEmpty(v float32) { - if v == 0 { - return - } - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} - -// Float32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Float32NullEmpty(v float32) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} - -// AddFloat32Key adds a float32 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddFloat32Key(key string, v float32) { - enc.Float32Key(key, v) -} - -// AddFloat32KeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddFloat32KeyOmitEmpty(key string, v float32) { - enc.Float32KeyOmitEmpty(key, v) -} - -// AddFloat32KeyNullEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddFloat32KeyNullEmpty(key string, v float32) { - enc.Float32KeyNullEmpty(key, v) -} - -// Float32Key adds a float32 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Float32Key(key string, v float32) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeByte('"') - enc.writeByte(':') - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} - -// Float32KeyOmitEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) Float32KeyOmitEmpty(key string, v float32) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == 0 { - return - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} - -// Float32KeyNullEmpty adds a float64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key -func (enc *Encoder) Float32KeyNullEmpty(key string, v float32) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendFloat(enc.buf, float64(v), 'f', -1, 32) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_number_int.go b/vendor/github.com/francoispqt/gojay/encode_number_int.go deleted file mode 100644 index 2c4bbe34..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_number_int.go +++ /dev/null @@ -1,500 +0,0 @@ -package gojay - -import "strconv" - -// EncodeInt encodes an int to JSON -func (enc *Encoder) EncodeInt(n int) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeInt(n) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -// encodeInt encodes an int to JSON -func (enc *Encoder) encodeInt(n int) ([]byte, error) { - enc.buf = strconv.AppendInt(enc.buf, int64(n), 10) - return enc.buf, nil -} - -// EncodeInt64 encodes an int64 to JSON -func (enc *Encoder) EncodeInt64(n int64) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeInt64(n) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -// encodeInt64 encodes an int to JSON -func (enc *Encoder) encodeInt64(n int64) ([]byte, error) { - enc.buf = strconv.AppendInt(enc.buf, n, 10) - return enc.buf, nil -} - -// AddInt adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInt(v int) { - enc.Int(v) -} - -// AddIntOmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddIntOmitEmpty(v int) { - enc.IntOmitEmpty(v) -} - -// AddIntNullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddIntNullEmpty(v int) { - enc.IntNullEmpty(v) -} - -// Int adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Int(v int) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// IntOmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) IntOmitEmpty(v int) { - if v == 0 { - return - } - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// IntNullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) IntNullEmpty(v int) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// AddIntKey adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddIntKey(key string, v int) { - enc.IntKey(key, v) -} - -// AddIntKeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddIntKeyOmitEmpty(key string, v int) { - enc.IntKeyOmitEmpty(key, v) -} - -// AddIntKeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddIntKeyNullEmpty(key string, v int) { - enc.IntKeyNullEmpty(key, v) -} - -// IntKey adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) IntKey(key string, v int) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// IntKeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) IntKeyOmitEmpty(key string, v int) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == 0 { - return - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// IntKeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) IntKeyNullEmpty(key string, v int) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendInt(enc.buf, int64(v), 10) -} - -// AddInt64 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInt64(v int64) { - enc.Int64(v) -} - -// AddInt64OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt64OmitEmpty(v int64) { - enc.Int64OmitEmpty(v) -} - -// AddInt64NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt64NullEmpty(v int64) { - enc.Int64NullEmpty(v) -} - -// Int64 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Int64(v int64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// Int64OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int64OmitEmpty(v int64) { - if v == 0 { - return - } - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// Int64NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int64NullEmpty(v int64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// AddInt64Key adds an int64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInt64Key(key string, v int64) { - enc.Int64Key(key, v) -} - -// AddInt64KeyOmitEmpty adds an int64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt64KeyOmitEmpty(key string, v int64) { - enc.Int64KeyOmitEmpty(key, v) -} - -// AddInt64KeyNullEmpty adds an int64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt64KeyNullEmpty(key string, v int64) { - enc.Int64KeyNullEmpty(key, v) -} - -// Int64Key adds an int64 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Int64Key(key string, v int64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// Int64KeyOmitEmpty adds an int64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int64KeyOmitEmpty(key string, v int64) { - if v == 0 { - return - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// Int64KeyNullEmpty adds an int64 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int64KeyNullEmpty(key string, v int64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendInt(enc.buf, v, 10) -} - -// AddInt32 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInt32(v int32) { - enc.Int64(int64(v)) -} - -// AddInt32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt32OmitEmpty(v int32) { - enc.Int64OmitEmpty(int64(v)) -} - -// AddInt32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt32NullEmpty(v int32) { - enc.Int64NullEmpty(int64(v)) -} - -// Int32 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Int32(v int32) { - enc.Int64(int64(v)) -} - -// Int32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int32OmitEmpty(v int32) { - enc.Int64OmitEmpty(int64(v)) -} - -// Int32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int32NullEmpty(v int32) { - enc.Int64NullEmpty(int64(v)) -} - -// AddInt32Key adds an int32 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInt32Key(key string, v int32) { - enc.Int64Key(key, int64(v)) -} - -// AddInt32KeyOmitEmpty adds an int32 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt32KeyOmitEmpty(key string, v int32) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// Int32Key adds an int32 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Int32Key(key string, v int32) { - enc.Int64Key(key, int64(v)) -} - -// Int32KeyOmitEmpty adds an int32 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int32KeyOmitEmpty(key string, v int32) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// Int32KeyNullEmpty adds an int32 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int32KeyNullEmpty(key string, v int32) { - enc.Int64KeyNullEmpty(key, int64(v)) -} - -// AddInt16 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInt16(v int16) { - enc.Int64(int64(v)) -} - -// AddInt16OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt16OmitEmpty(v int16) { - enc.Int64OmitEmpty(int64(v)) -} - -// Int16 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Int16(v int16) { - enc.Int64(int64(v)) -} - -// Int16OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int16OmitEmpty(v int16) { - enc.Int64OmitEmpty(int64(v)) -} - -// Int16NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int16NullEmpty(v int16) { - enc.Int64NullEmpty(int64(v)) -} - -// AddInt16Key adds an int16 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInt16Key(key string, v int16) { - enc.Int64Key(key, int64(v)) -} - -// AddInt16KeyOmitEmpty adds an int16 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt16KeyOmitEmpty(key string, v int16) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// AddInt16KeyNullEmpty adds an int16 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt16KeyNullEmpty(key string, v int16) { - enc.Int64KeyNullEmpty(key, int64(v)) -} - -// Int16Key adds an int16 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Int16Key(key string, v int16) { - enc.Int64Key(key, int64(v)) -} - -// Int16KeyOmitEmpty adds an int16 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int16KeyOmitEmpty(key string, v int16) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// Int16KeyNullEmpty adds an int16 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int16KeyNullEmpty(key string, v int16) { - enc.Int64KeyNullEmpty(key, int64(v)) -} - -// AddInt8 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddInt8(v int8) { - enc.Int64(int64(v)) -} - -// AddInt8OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt8OmitEmpty(v int8) { - enc.Int64OmitEmpty(int64(v)) -} - -// AddInt8NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddInt8NullEmpty(v int8) { - enc.Int64NullEmpty(int64(v)) -} - -// Int8 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Int8(v int8) { - enc.Int64(int64(v)) -} - -// Int8OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int8OmitEmpty(v int8) { - enc.Int64OmitEmpty(int64(v)) -} - -// Int8NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Int8NullEmpty(v int8) { - enc.Int64NullEmpty(int64(v)) -} - -// AddInt8Key adds an int8 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddInt8Key(key string, v int8) { - enc.Int64Key(key, int64(v)) -} - -// AddInt8KeyOmitEmpty adds an int8 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt8KeyOmitEmpty(key string, v int8) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// AddInt8KeyNullEmpty adds an int8 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddInt8KeyNullEmpty(key string, v int8) { - enc.Int64KeyNullEmpty(key, int64(v)) -} - -// Int8Key adds an int8 to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Int8Key(key string, v int8) { - enc.Int64Key(key, int64(v)) -} - -// Int8KeyOmitEmpty adds an int8 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int8KeyOmitEmpty(key string, v int8) { - enc.Int64KeyOmitEmpty(key, int64(v)) -} - -// Int8KeyNullEmpty adds an int8 to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Int8KeyNullEmpty(key string, v int8) { - enc.Int64KeyNullEmpty(key, int64(v)) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_number_uint.go b/vendor/github.com/francoispqt/gojay/encode_number_uint.go deleted file mode 100644 index cd69b13f..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_number_uint.go +++ /dev/null @@ -1,362 +0,0 @@ -package gojay - -import "strconv" - -// EncodeUint64 encodes an int64 to JSON -func (enc *Encoder) EncodeUint64(n uint64) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeUint64(n) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -// encodeUint64 encodes an int to JSON -func (enc *Encoder) encodeUint64(n uint64) ([]byte, error) { - enc.buf = strconv.AppendUint(enc.buf, n, 10) - return enc.buf, nil -} - -// AddUint64 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddUint64(v uint64) { - enc.Uint64(v) -} - -// AddUint64OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint64OmitEmpty(v uint64) { - enc.Uint64OmitEmpty(v) -} - -// AddUint64NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint64NullEmpty(v uint64) { - enc.Uint64NullEmpty(v) -} - -// Uint64 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Uint64(v uint64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// Uint64OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint64OmitEmpty(v uint64) { - if v == 0 { - return - } - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// Uint64NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint64NullEmpty(v uint64) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// AddUint64Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddUint64Key(key string, v uint64) { - enc.Uint64Key(key, v) -} - -// AddUint64KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint64KeyOmitEmpty(key string, v uint64) { - enc.Uint64KeyOmitEmpty(key, v) -} - -// AddUint64KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint64KeyNullEmpty(key string, v uint64) { - enc.Uint64KeyNullEmpty(key, v) -} - -// Uint64Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Uint64Key(key string, v uint64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// Uint64KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint64KeyOmitEmpty(key string, v uint64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == 0 { - return - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// Uint64KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint64KeyNullEmpty(key string, v uint64) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == 0 { - enc.writeBytes(nullBytes) - return - } - enc.buf = strconv.AppendUint(enc.buf, v, 10) -} - -// AddUint32 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddUint32(v uint32) { - enc.Uint64(uint64(v)) -} - -// AddUint32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint32OmitEmpty(v uint32) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// AddUint32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint32NullEmpty(v uint32) { - enc.Uint64NullEmpty(uint64(v)) -} - -// Uint32 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Uint32(v uint32) { - enc.Uint64(uint64(v)) -} - -// Uint32OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint32OmitEmpty(v uint32) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// Uint32NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint32NullEmpty(v uint32) { - enc.Uint64NullEmpty(uint64(v)) -} - -// AddUint32Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddUint32Key(key string, v uint32) { - enc.Uint64Key(key, uint64(v)) -} - -// AddUint32KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint32KeyOmitEmpty(key string, v uint32) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// AddUint32KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint32KeyNullEmpty(key string, v uint32) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} - -// Uint32Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Uint32Key(key string, v uint32) { - enc.Uint64Key(key, uint64(v)) -} - -// Uint32KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint32KeyOmitEmpty(key string, v uint32) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// Uint32KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint32KeyNullEmpty(key string, v uint32) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} - -// AddUint16 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddUint16(v uint16) { - enc.Uint64(uint64(v)) -} - -// AddUint16OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint16OmitEmpty(v uint16) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// AddUint16NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint16NullEmpty(v uint16) { - enc.Uint64NullEmpty(uint64(v)) -} - -// Uint16 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Uint16(v uint16) { - enc.Uint64(uint64(v)) -} - -// Uint16OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint16OmitEmpty(v uint16) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// Uint16NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint16NullEmpty(v uint16) { - enc.Uint64NullEmpty(uint64(v)) -} - -// AddUint16Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddUint16Key(key string, v uint16) { - enc.Uint64Key(key, uint64(v)) -} - -// AddUint16KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint16KeyOmitEmpty(key string, v uint16) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// AddUint16KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint16KeyNullEmpty(key string, v uint16) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} - -// Uint16Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Uint16Key(key string, v uint16) { - enc.Uint64Key(key, uint64(v)) -} - -// Uint16KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint16KeyOmitEmpty(key string, v uint16) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// Uint16KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint16KeyNullEmpty(key string, v uint16) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} - -// AddUint8 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddUint8(v uint8) { - enc.Uint64(uint64(v)) -} - -// AddUint8OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint8OmitEmpty(v uint8) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// AddUint8NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) AddUint8NullEmpty(v uint8) { - enc.Uint64NullEmpty(uint64(v)) -} - -// Uint8 adds an int to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Uint8(v uint8) { - enc.Uint64(uint64(v)) -} - -// Uint8OmitEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint8OmitEmpty(v uint8) { - enc.Uint64OmitEmpty(uint64(v)) -} - -// Uint8NullEmpty adds an int to be encoded and skips it if its value is 0, -// must be used inside a slice or array encoding (does not encode a key). -func (enc *Encoder) Uint8NullEmpty(v uint8) { - enc.Uint64NullEmpty(uint64(v)) -} - -// AddUint8Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddUint8Key(key string, v uint8) { - enc.Uint64Key(key, uint64(v)) -} - -// AddUint8KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint8KeyOmitEmpty(key string, v uint8) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// AddUint8KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) AddUint8KeyNullEmpty(key string, v uint8) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} - -// Uint8Key adds an int to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) Uint8Key(key string, v uint8) { - enc.Uint64Key(key, uint64(v)) -} - -// Uint8KeyOmitEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint8KeyOmitEmpty(key string, v uint8) { - enc.Uint64KeyOmitEmpty(key, uint64(v)) -} - -// Uint8KeyNullEmpty adds an int to be encoded and skips it if its value is 0. -// Must be used inside an object as it will encode a key. -func (enc *Encoder) Uint8KeyNullEmpty(key string, v uint8) { - enc.Uint64KeyNullEmpty(key, uint64(v)) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_object.go b/vendor/github.com/francoispqt/gojay/encode_object.go deleted file mode 100644 index 5f2c8cf3..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_object.go +++ /dev/null @@ -1,400 +0,0 @@ -package gojay - -var objKeyStr = []byte(`":"`) -var objKeyObj = []byte(`":{`) -var objKeyArr = []byte(`":[`) -var objKey = []byte(`":`) - -// EncodeObject encodes an object to JSON -func (enc *Encoder) EncodeObject(v MarshalerJSONObject) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, err := enc.encodeObject(v) - if err != nil { - enc.err = err - return err - } - _, err = enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// EncodeObjectKeys encodes an object to JSON -func (enc *Encoder) EncodeObjectKeys(v MarshalerJSONObject, keys []string) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - enc.hasKeys = true - enc.keys = keys - _, err := enc.encodeObject(v) - if err != nil { - enc.err = err - return err - } - _, err = enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -func (enc *Encoder) encodeObject(v MarshalerJSONObject) ([]byte, error) { - enc.grow(512) - enc.writeByte('{') - if !v.IsNil() { - v.MarshalJSONObject(enc) - } - if enc.hasKeys { - enc.hasKeys = false - enc.keys = nil - } - enc.writeByte('}') - return enc.buf, enc.err -} - -// AddObject adds an object to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObject(v MarshalerJSONObject) { - enc.Object(v) -} - -// AddObjectOmitEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObjectOmitEmpty(v MarshalerJSONObject) { - enc.ObjectOmitEmpty(v) -} - -// AddObjectNullEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObjectNullEmpty(v MarshalerJSONObject) { - enc.ObjectNullEmpty(v) -} - -// AddObjectKey adds a struct to be encoded, must be used inside an object as it will encode a key -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObjectKey(key string, v MarshalerJSONObject) { - enc.ObjectKey(key, v) -} - -// AddObjectKeyOmitEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObjectKeyOmitEmpty(key string, v MarshalerJSONObject) { - enc.ObjectKeyOmitEmpty(key, v) -} - -// AddObjectKeyNullEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) AddObjectKeyNullEmpty(key string, v MarshalerJSONObject) { - enc.ObjectKeyNullEmpty(key, v) -} - -// Object adds an object to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) Object(v MarshalerJSONObject) { - if v.IsNil() { - enc.grow(2) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('{') - enc.writeByte('}') - return - } - enc.grow(4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('{') - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectWithKeys adds an object to be encoded, must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject. It will only encode the keys in keys. -func (enc *Encoder) ObjectWithKeys(v MarshalerJSONObject, keys []string) { - if v.IsNil() { - enc.grow(2) - r := enc.getPreviousRune() - if r != '{' && r != '[' { - enc.writeByte(',') - } - enc.writeByte('{') - enc.writeByte('}') - return - } - enc.grow(4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('{') - - var origKeys = enc.keys - var origHasKeys = enc.hasKeys - enc.hasKeys = true - enc.keys = keys - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectOmitEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) ObjectOmitEmpty(v MarshalerJSONObject) { - if v.IsNil() { - return - } - enc.grow(2) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('{') - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectNullEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) ObjectNullEmpty(v MarshalerJSONObject) { - enc.grow(2) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - if v.IsNil() { - enc.writeBytes(nullBytes) - return - } - enc.writeByte('{') - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectKey adds a struct to be encoded, must be used inside an object as it will encode a key -// value must implement MarshalerJSONObject -func (enc *Encoder) ObjectKey(key string, v MarshalerJSONObject) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v.IsNil() { - enc.grow(2 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyObj) - enc.writeByte('}') - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyObj) - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectKeyWithKeys adds a struct to be encoded, must be used inside an object as it will encode a key. -// Value must implement MarshalerJSONObject. It will only encode the keys in keys. -func (enc *Encoder) ObjectKeyWithKeys(key string, value MarshalerJSONObject, keys []string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if value.IsNil() { - enc.grow(2 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyObj) - enc.writeByte('}') - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyObj) - var origKeys = enc.keys - var origHasKeys = enc.hasKeys - enc.hasKeys = true - enc.keys = keys - value.MarshalJSONObject(enc) - enc.hasKeys = origHasKeys - enc.keys = origKeys - enc.writeByte('}') -} - -// ObjectKeyOmitEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) ObjectKeyOmitEmpty(key string, v MarshalerJSONObject) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v.IsNil() { - return - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKeyObj) - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// ObjectKeyNullEmpty adds an object to be encoded or skips it if IsNil returns true. -// Must be used inside a slice or array encoding (does not encode a key) -// value must implement MarshalerJSONObject -func (enc *Encoder) ObjectKeyNullEmpty(key string, v MarshalerJSONObject) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(5 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v.IsNil() { - enc.writeBytes(nullBytes) - return - } - enc.writeByte('{') - - var origHasKeys = enc.hasKeys - var origKeys = enc.keys - enc.hasKeys = false - enc.keys = nil - - v.MarshalJSONObject(enc) - - enc.hasKeys = origHasKeys - enc.keys = origKeys - - enc.writeByte('}') -} - -// EncodeObjectFunc is a custom func type implementing MarshaleObject. -// Use it to cast a func(*Encoder) to Marshal an object. -// -// enc := gojay.NewEncoder(io.Writer) -// enc.EncodeObject(gojay.EncodeObjectFunc(func(enc *gojay.Encoder) { -// enc.AddStringKey("hello", "world") -// })) -type EncodeObjectFunc func(*Encoder) - -// MarshalJSONObject implements MarshalerJSONObject. -func (f EncodeObjectFunc) MarshalJSONObject(enc *Encoder) { - f(enc) -} - -// IsNil implements MarshalerJSONObject. -func (f EncodeObjectFunc) IsNil() bool { - return f == nil -} - -func (enc *Encoder) keyExists(k string) bool { - if enc.keys == nil { - return false - } - for _, key := range enc.keys { - if key == k { - return true - } - } - return false -} diff --git a/vendor/github.com/francoispqt/gojay/encode_pool.go b/vendor/github.com/francoispqt/gojay/encode_pool.go deleted file mode 100644 index 3b263225..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_pool.go +++ /dev/null @@ -1,50 +0,0 @@ -package gojay - -import ( - "io" - "sync" -) - -var encPool = sync.Pool{ - New: func() interface{} { - return NewEncoder(nil) - }, -} - -var streamEncPool = sync.Pool{ - New: func() interface{} { - return Stream.NewEncoder(nil) - }, -} - -func init() { - for i := 0; i < 32; i++ { - encPool.Put(NewEncoder(nil)) - } - for i := 0; i < 32; i++ { - streamEncPool.Put(Stream.NewEncoder(nil)) - } -} - -// NewEncoder returns a new encoder or borrows one from the pool -func NewEncoder(w io.Writer) *Encoder { - return &Encoder{w: w} -} - -// BorrowEncoder borrows an Encoder from the pool. -func BorrowEncoder(w io.Writer) *Encoder { - enc := encPool.Get().(*Encoder) - enc.w = w - enc.buf = enc.buf[:0] - enc.isPooled = 0 - enc.err = nil - enc.hasKeys = false - enc.keys = nil - return enc -} - -// Release sends back a Encoder to the pool. -func (enc *Encoder) Release() { - enc.isPooled = 1 - encPool.Put(enc) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_slice.go b/vendor/github.com/francoispqt/gojay/encode_slice.go deleted file mode 100644 index 7d964df9..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_slice.go +++ /dev/null @@ -1,113 +0,0 @@ -package gojay - -// AddSliceString marshals the given []string s -func (enc *Encoder) AddSliceString(s []string) { - enc.SliceString(s) -} - -// SliceString marshals the given []string s -func (enc *Encoder) SliceString(s []string) { - enc.Array(EncodeArrayFunc(func(enc *Encoder) { - for _, str := range s { - enc.String(str) - } - })) -} - -// AddSliceStringKey marshals the given []string s -func (enc *Encoder) AddSliceStringKey(k string, s []string) { - enc.SliceStringKey(k, s) -} - -// SliceStringKey marshals the given []string s -func (enc *Encoder) SliceStringKey(k string, s []string) { - enc.ArrayKey(k, EncodeArrayFunc(func(enc *Encoder) { - for _, str := range s { - enc.String(str) - } - })) -} - -// AddSliceInt marshals the given []int s -func (enc *Encoder) AddSliceInt(s []int) { - enc.SliceInt(s) -} - -// SliceInt marshals the given []int s -func (enc *Encoder) SliceInt(s []int) { - enc.Array(EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Int(i) - } - })) -} - -// AddSliceIntKey marshals the given []int s -func (enc *Encoder) AddSliceIntKey(k string, s []int) { - enc.SliceIntKey(k, s) -} - -// SliceIntKey marshals the given []int s -func (enc *Encoder) SliceIntKey(k string, s []int) { - enc.ArrayKey(k, EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Int(i) - } - })) -} - -// AddSliceFloat64 marshals the given []float64 s -func (enc *Encoder) AddSliceFloat64(s []float64) { - enc.SliceFloat64(s) -} - -// SliceFloat64 marshals the given []float64 s -func (enc *Encoder) SliceFloat64(s []float64) { - enc.Array(EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Float64(i) - } - })) -} - -// AddSliceFloat64Key marshals the given []float64 s -func (enc *Encoder) AddSliceFloat64Key(k string, s []float64) { - enc.SliceFloat64Key(k, s) -} - -// SliceFloat64Key marshals the given []float64 s -func (enc *Encoder) SliceFloat64Key(k string, s []float64) { - enc.ArrayKey(k, EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Float64(i) - } - })) -} - -// AddSliceBool marshals the given []bool s -func (enc *Encoder) AddSliceBool(s []bool) { - enc.SliceBool(s) -} - -// SliceBool marshals the given []bool s -func (enc *Encoder) SliceBool(s []bool) { - enc.Array(EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Bool(i) - } - })) -} - -// AddSliceBoolKey marshals the given []bool s -func (enc *Encoder) AddSliceBoolKey(k string, s []bool) { - enc.SliceBoolKey(k, s) -} - -// SliceBoolKey marshals the given []bool s -func (enc *Encoder) SliceBoolKey(k string, s []bool) { - enc.ArrayKey(k, EncodeArrayFunc(func(enc *Encoder) { - for _, i := range s { - enc.Bool(i) - } - })) -} diff --git a/vendor/github.com/francoispqt/gojay/encode_sqlnull.go b/vendor/github.com/francoispqt/gojay/encode_sqlnull.go deleted file mode 100644 index 04ff5962..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_sqlnull.go +++ /dev/null @@ -1,377 +0,0 @@ -package gojay - -import "database/sql" - -// EncodeSQLNullString encodes a string to -func (enc *Encoder) EncodeSQLNullString(v *sql.NullString) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeString(v.String) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// AddSQLNullString adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullString(v *sql.NullString) { - enc.String(v.String) -} - -// AddSQLNullStringOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullStringOmitEmpty(v *sql.NullString) { - if v != nil && v.Valid && v.String != "" { - enc.StringOmitEmpty(v.String) - } -} - -// AddSQLNullStringNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullStringNullEmpty(v *sql.NullString) { - if v != nil && v.Valid { - enc.StringNullEmpty(v.String) - } -} - -// AddSQLNullStringKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullStringKey(key string, v *sql.NullString) { - enc.StringKey(key, v.String) -} - -// AddSQLNullStringKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullStringKeyOmitEmpty(key string, v *sql.NullString) { - if v != nil && v.Valid && v.String != "" { - enc.StringKeyOmitEmpty(key, v.String) - } -} - -// SQLNullString adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullString(v *sql.NullString) { - enc.String(v.String) -} - -// SQLNullStringOmitEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullStringOmitEmpty(v *sql.NullString) { - if v != nil && v.Valid && v.String != "" { - enc.String(v.String) - } -} - -// SQLNullStringNullEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullStringNullEmpty(v *sql.NullString) { - if v != nil && v.Valid { - enc.StringNullEmpty(v.String) - } -} - -// SQLNullStringKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullStringKey(key string, v *sql.NullString) { - enc.StringKey(key, v.String) -} - -// SQLNullStringKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullStringKeyOmitEmpty(key string, v *sql.NullString) { - if v != nil && v.Valid && v.String != "" { - enc.StringKeyOmitEmpty(key, v.String) - } -} - -// SQLNullStringKeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullStringKeyNullEmpty(key string, v *sql.NullString) { - if v != nil && v.Valid { - enc.StringKeyNullEmpty(key, v.String) - } -} - -// NullInt64 - -// EncodeSQLNullInt64 encodes a string to -func (enc *Encoder) EncodeSQLNullInt64(v *sql.NullInt64) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeInt64(v.Int64) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// AddSQLNullInt64 adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullInt64(v *sql.NullInt64) { - enc.Int64(v.Int64) -} - -// AddSQLNullInt64OmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullInt64OmitEmpty(v *sql.NullInt64) { - if v != nil && v.Valid && v.Int64 != 0 { - enc.Int64OmitEmpty(v.Int64) - } -} - -// AddSQLNullInt64NullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullInt64NullEmpty(v *sql.NullInt64) { - if v != nil && v.Valid { - enc.Int64NullEmpty(v.Int64) - } -} - -// AddSQLNullInt64Key adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullInt64Key(key string, v *sql.NullInt64) { - enc.Int64Key(key, v.Int64) -} - -// AddSQLNullInt64KeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullInt64KeyOmitEmpty(key string, v *sql.NullInt64) { - if v != nil && v.Valid && v.Int64 != 0 { - enc.Int64KeyOmitEmpty(key, v.Int64) - } -} - -// AddSQLNullInt64KeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullInt64KeyNullEmpty(key string, v *sql.NullInt64) { - if v != nil && v.Valid { - enc.Int64KeyNullEmpty(key, v.Int64) - } -} - -// SQLNullInt64 adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64(v *sql.NullInt64) { - enc.Int64(v.Int64) -} - -// SQLNullInt64OmitEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64OmitEmpty(v *sql.NullInt64) { - if v != nil && v.Valid && v.Int64 != 0 { - enc.Int64(v.Int64) - } -} - -// SQLNullInt64NullEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64NullEmpty(v *sql.NullInt64) { - if v != nil && v.Valid { - enc.Int64NullEmpty(v.Int64) - } -} - -// SQLNullInt64Key adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64Key(key string, v *sql.NullInt64) { - enc.Int64Key(key, v.Int64) -} - -// SQLNullInt64KeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64KeyOmitEmpty(key string, v *sql.NullInt64) { - if v != nil && v.Valid && v.Int64 != 0 { - enc.Int64KeyOmitEmpty(key, v.Int64) - } -} - -// SQLNullInt64KeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullInt64KeyNullEmpty(key string, v *sql.NullInt64) { - if v != nil && v.Valid { - enc.Int64KeyNullEmpty(key, v.Int64) - } -} - -// NullFloat64 - -// EncodeSQLNullFloat64 encodes a string to -func (enc *Encoder) EncodeSQLNullFloat64(v *sql.NullFloat64) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeFloat(v.Float64) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// AddSQLNullFloat64 adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullFloat64(v *sql.NullFloat64) { - enc.Float64(v.Float64) -} - -// AddSQLNullFloat64OmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullFloat64OmitEmpty(v *sql.NullFloat64) { - if v != nil && v.Valid && v.Float64 != 0 { - enc.Float64OmitEmpty(v.Float64) - } -} - -// AddSQLNullFloat64NullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullFloat64NullEmpty(v *sql.NullFloat64) { - if v != nil && v.Valid { - enc.Float64NullEmpty(v.Float64) - } -} - -// AddSQLNullFloat64Key adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullFloat64Key(key string, v *sql.NullFloat64) { - enc.Float64Key(key, v.Float64) -} - -// AddSQLNullFloat64KeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullFloat64KeyOmitEmpty(key string, v *sql.NullFloat64) { - if v != nil && v.Valid && v.Float64 != 0 { - enc.Float64KeyOmitEmpty(key, v.Float64) - } -} - -// AddSQLNullFloat64KeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullFloat64KeyNullEmpty(key string, v *sql.NullFloat64) { - if v != nil && v.Valid { - enc.Float64KeyNullEmpty(key, v.Float64) - } -} - -// SQLNullFloat64 adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64(v *sql.NullFloat64) { - enc.Float64(v.Float64) -} - -// SQLNullFloat64OmitEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64OmitEmpty(v *sql.NullFloat64) { - if v != nil && v.Valid && v.Float64 != 0 { - enc.Float64(v.Float64) - } -} - -// SQLNullFloat64NullEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64NullEmpty(v *sql.NullFloat64) { - if v != nil && v.Valid { - enc.Float64NullEmpty(v.Float64) - } -} - -// SQLNullFloat64Key adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64Key(key string, v *sql.NullFloat64) { - enc.Float64Key(key, v.Float64) -} - -// SQLNullFloat64KeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64KeyOmitEmpty(key string, v *sql.NullFloat64) { - if v != nil && v.Valid && v.Float64 != 0 { - enc.Float64KeyOmitEmpty(key, v.Float64) - } -} - -// SQLNullFloat64KeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullFloat64KeyNullEmpty(key string, v *sql.NullFloat64) { - if v != nil && v.Valid { - enc.Float64KeyNullEmpty(key, v.Float64) - } -} - -// NullBool - -// EncodeSQLNullBool encodes a string to -func (enc *Encoder) EncodeSQLNullBool(v *sql.NullBool) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeBool(v.Bool) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// AddSQLNullBool adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullBool(v *sql.NullBool) { - enc.Bool(v.Bool) -} - -// AddSQLNullBoolOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddSQLNullBoolOmitEmpty(v *sql.NullBool) { - if v != nil && v.Valid && v.Bool != false { - enc.BoolOmitEmpty(v.Bool) - } -} - -// AddSQLNullBoolKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullBoolKey(key string, v *sql.NullBool) { - enc.BoolKey(key, v.Bool) -} - -// AddSQLNullBoolKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullBoolKeyOmitEmpty(key string, v *sql.NullBool) { - if v != nil && v.Valid && v.Bool != false { - enc.BoolKeyOmitEmpty(key, v.Bool) - } -} - -// AddSQLNullBoolKeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddSQLNullBoolKeyNullEmpty(key string, v *sql.NullBool) { - if v != nil && v.Valid { - enc.BoolKeyNullEmpty(key, v.Bool) - } -} - -// SQLNullBool adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBool(v *sql.NullBool) { - enc.Bool(v.Bool) -} - -// SQLNullBoolOmitEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBoolOmitEmpty(v *sql.NullBool) { - if v != nil && v.Valid && v.Bool != false { - enc.Bool(v.Bool) - } -} - -// SQLNullBoolNullEmpty adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBoolNullEmpty(v *sql.NullBool) { - if v != nil && v.Valid { - enc.BoolNullEmpty(v.Bool) - } -} - -// SQLNullBoolKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBoolKey(key string, v *sql.NullBool) { - enc.BoolKey(key, v.Bool) -} - -// SQLNullBoolKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBoolKeyOmitEmpty(key string, v *sql.NullBool) { - if v != nil && v.Valid && v.Bool != false { - enc.BoolKeyOmitEmpty(key, v.Bool) - } -} - -// SQLNullBoolKeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) SQLNullBoolKeyNullEmpty(key string, v *sql.NullBool) { - if v != nil && v.Valid { - enc.BoolKeyNullEmpty(key, v.Bool) - } -} diff --git a/vendor/github.com/francoispqt/gojay/encode_stream.go b/vendor/github.com/francoispqt/gojay/encode_stream.go deleted file mode 100644 index fae8a17c..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_stream.go +++ /dev/null @@ -1,205 +0,0 @@ -package gojay - -import ( - "strconv" - "sync" - "time" -) - -// MarshalerStream is the interface to implement -// to continuously encode of stream of data. -type MarshalerStream interface { - MarshalStream(enc *StreamEncoder) -} - -// A StreamEncoder reads and encodes values to JSON from an input stream. -// -// It implements conext.Context and provide a channel to notify interruption. -type StreamEncoder struct { - mux *sync.RWMutex - *Encoder - nConsumer int - delimiter byte - deadline *time.Time - done chan struct{} -} - -// EncodeStream spins up a defined number of non blocking consumers of the MarshalerStream m. -// -// m must implement MarshalerStream. Ideally m is a channel. See example for implementation. -// -// See the documentation for Marshal for details about the conversion of Go value to JSON. -func (s *StreamEncoder) EncodeStream(m MarshalerStream) { - // if a single consumer, just use this encoder - if s.nConsumer == 1 { - go consume(s, s, m) - return - } - // else use this Encoder only for first consumer - // and use new encoders for other consumers - // this is to avoid concurrent writing to same buffer - // resulting in a weird JSON - go consume(s, s, m) - for i := 1; i < s.nConsumer; i++ { - s.mux.RLock() - select { - case <-s.done: - default: - ss := Stream.borrowEncoder(s.w) - ss.mux.Lock() - ss.done = s.done - ss.buf = make([]byte, 0, 512) - ss.delimiter = s.delimiter - go consume(s, ss, m) - ss.mux.Unlock() - } - s.mux.RUnlock() - } - return -} - -// LineDelimited sets the delimiter to a new line character. -// -// It will add a new line after each JSON marshaled by the MarshalerStream -func (s *StreamEncoder) LineDelimited() *StreamEncoder { - s.delimiter = '\n' - return s -} - -// CommaDelimited sets the delimiter to a comma. -// -// It will add a new line after each JSON marshaled by the MarshalerStream -func (s *StreamEncoder) CommaDelimited() *StreamEncoder { - s.delimiter = ',' - return s -} - -// NConsumer sets the number of non blocking go routine to consume the stream. -func (s *StreamEncoder) NConsumer(n int) *StreamEncoder { - s.nConsumer = n - return s -} - -// Release sends back a Decoder to the pool. -// If a decoder is used after calling Release -// a panic will be raised with an InvalidUsagePooledDecoderError error. -func (s *StreamEncoder) Release() { - s.isPooled = 1 - streamEncPool.Put(s) -} - -// Done returns a channel that's closed when work is done. -// It implements context.Context -func (s *StreamEncoder) Done() <-chan struct{} { - return s.done -} - -// Err returns nil if Done is not yet closed. -// If Done is closed, Err returns a non-nil error explaining why. -// It implements context.Context -func (s *StreamEncoder) Err() error { - return s.err -} - -// Deadline returns the time when work done on behalf of this context -// should be canceled. Deadline returns ok==false when no deadline is -// set. Successive calls to Deadline return the same results. -func (s *StreamEncoder) Deadline() (time.Time, bool) { - if s.deadline != nil { - return *s.deadline, true - } - return time.Time{}, false -} - -// SetDeadline sets the deadline -func (s *StreamEncoder) SetDeadline(t time.Time) { - s.deadline = &t -} - -// Value implements context.Context -func (s *StreamEncoder) Value(key interface{}) interface{} { - return nil -} - -// Cancel cancels the consumers of the stream, interrupting the stream encoding. -// -// After calling cancel, Done() will return a closed channel. -func (s *StreamEncoder) Cancel(err error) { - s.mux.Lock() - defer s.mux.Unlock() - - select { - case <-s.done: - default: - s.err = err - close(s.done) - } -} - -// AddObject adds an object to be encoded. -// value must implement MarshalerJSONObject. -func (s *StreamEncoder) AddObject(v MarshalerJSONObject) { - if v.IsNil() { - return - } - s.Encoder.writeByte('{') - v.MarshalJSONObject(s.Encoder) - s.Encoder.writeByte('}') - s.Encoder.writeByte(s.delimiter) -} - -// AddString adds a string to be encoded. -func (s *StreamEncoder) AddString(v string) { - s.Encoder.writeByte('"') - s.Encoder.writeString(v) - s.Encoder.writeByte('"') - s.Encoder.writeByte(s.delimiter) -} - -// AddArray adds an implementation of MarshalerJSONArray to be encoded. -func (s *StreamEncoder) AddArray(v MarshalerJSONArray) { - s.Encoder.writeByte('[') - v.MarshalJSONArray(s.Encoder) - s.Encoder.writeByte(']') - s.Encoder.writeByte(s.delimiter) -} - -// AddInt adds an int to be encoded. -func (s *StreamEncoder) AddInt(value int) { - s.buf = strconv.AppendInt(s.buf, int64(value), 10) - s.Encoder.writeByte(s.delimiter) -} - -// AddFloat64 adds a float64 to be encoded. -func (s *StreamEncoder) AddFloat64(value float64) { - s.buf = strconv.AppendFloat(s.buf, value, 'f', -1, 64) - s.Encoder.writeByte(s.delimiter) -} - -// AddFloat adds a float64 to be encoded. -func (s *StreamEncoder) AddFloat(value float64) { - s.AddFloat64(value) -} - -// Non exposed - -func consume(init *StreamEncoder, s *StreamEncoder, m MarshalerStream) { - defer s.Release() - for { - select { - case <-init.Done(): - return - default: - m.MarshalStream(s) - if s.Encoder.err != nil { - init.Cancel(s.Encoder.err) - return - } - i, err := s.Encoder.Write() - if err != nil || i == 0 { - init.Cancel(err) - return - } - } - } -} diff --git a/vendor/github.com/francoispqt/gojay/encode_stream_pool.go b/vendor/github.com/francoispqt/gojay/encode_stream_pool.go deleted file mode 100644 index 3bb8b1af..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_stream_pool.go +++ /dev/null @@ -1,38 +0,0 @@ -package gojay - -import ( - "io" - "sync" -) - -// NewEncoder returns a new StreamEncoder. -// It takes an io.Writer implementation to output data. -// It initiates the done channel returned by Done(). -func (s stream) NewEncoder(w io.Writer) *StreamEncoder { - enc := BorrowEncoder(w) - return &StreamEncoder{Encoder: enc, nConsumer: 1, done: make(chan struct{}, 1), mux: &sync.RWMutex{}} -} - -// BorrowEncoder borrows a StreamEncoder from the pool. -// It takes an io.Writer implementation to output data. -// It initiates the done channel returned by Done(). -// -// If no StreamEncoder is available in the pool, it returns a fresh one -func (s stream) BorrowEncoder(w io.Writer) *StreamEncoder { - streamEnc := streamEncPool.Get().(*StreamEncoder) - streamEnc.w = w - streamEnc.Encoder.err = nil - streamEnc.done = make(chan struct{}, 1) - streamEnc.Encoder.buf = streamEnc.buf[:0] - streamEnc.nConsumer = 1 - streamEnc.isPooled = 0 - return streamEnc -} - -func (s stream) borrowEncoder(w io.Writer) *StreamEncoder { - streamEnc := streamEncPool.Get().(*StreamEncoder) - streamEnc.isPooled = 0 - streamEnc.w = w - streamEnc.Encoder.err = nil - return streamEnc -} diff --git a/vendor/github.com/francoispqt/gojay/encode_string.go b/vendor/github.com/francoispqt/gojay/encode_string.go deleted file mode 100644 index 438c773f..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_string.go +++ /dev/null @@ -1,186 +0,0 @@ -package gojay - -// EncodeString encodes a string to -func (enc *Encoder) EncodeString(s string) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeString(s) - _, err := enc.Write() - if err != nil { - enc.err = err - return err - } - return nil -} - -// encodeString encodes a string to -func (enc *Encoder) encodeString(v string) ([]byte, error) { - enc.writeByte('"') - enc.writeStringEscape(v) - enc.writeByte('"') - return enc.buf, nil -} - -// AppendString appends a string to the buffer -func (enc *Encoder) AppendString(v string) { - enc.grow(len(v) + 2) - enc.writeByte('"') - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// AddString adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddString(v string) { - enc.String(v) -} - -// AddStringOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddStringOmitEmpty(v string) { - enc.StringOmitEmpty(v) -} - -// AddStringNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddStringNullEmpty(v string) { - enc.StringNullEmpty(v) -} - -// AddStringKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) AddStringKey(key, v string) { - enc.StringKey(key, v) -} - -// AddStringKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddStringKeyOmitEmpty(key, v string) { - enc.StringKeyOmitEmpty(key, v) -} - -// AddStringKeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) AddStringKeyNullEmpty(key, v string) { - enc.StringKeyNullEmpty(key, v) -} - -// String adds a string to be encoded, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) String(v string) { - enc.grow(len(v) + 4) - r := enc.getPreviousRune() - if r != '[' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// StringOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) StringOmitEmpty(v string) { - if v == "" { - return - } - r := enc.getPreviousRune() - if r != '[' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// StringNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) StringNullEmpty(v string) { - r := enc.getPreviousRune() - if v == "" { - if r != '[' { - enc.writeByte(',') - enc.writeBytes(nullBytes) - } else { - enc.writeBytes(nullBytes) - } - return - } - if r != '[' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// StringKey adds a string to be encoded, must be used inside an object as it will encode a key -func (enc *Encoder) StringKey(key, v string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(len(key) + len(v) + 5) - r := enc.getPreviousRune() - if r != '{' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(key) - enc.writeBytes(objKeyStr) - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// StringKeyOmitEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) StringKeyOmitEmpty(key, v string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - if v == "" { - return - } - enc.grow(len(key) + len(v) + 5) - r := enc.getPreviousRune() - if r != '{' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(key) - enc.writeBytes(objKeyStr) - enc.writeStringEscape(v) - enc.writeByte('"') -} - -// StringKeyNullEmpty adds a string to be encoded or skips it if it is zero value. -// Must be used inside an object as it will encode a key -func (enc *Encoder) StringKeyNullEmpty(key, v string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(len(key) + len(v) + 5) - r := enc.getPreviousRune() - if r != '{' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(key) - enc.writeBytes(objKey) - if v == "" { - enc.writeBytes(nullBytes) - return - } - enc.writeByte('"') - enc.writeStringEscape(v) - enc.writeByte('"') -} diff --git a/vendor/github.com/francoispqt/gojay/encode_time.go b/vendor/github.com/francoispqt/gojay/encode_time.go deleted file mode 100644 index 6f99e342..00000000 --- a/vendor/github.com/francoispqt/gojay/encode_time.go +++ /dev/null @@ -1,68 +0,0 @@ -package gojay - -import ( - "time" -) - -// EncodeTime encodes a *time.Time to JSON with the given format -func (enc *Encoder) EncodeTime(t *time.Time, format string) error { - if enc.isPooled == 1 { - panic(InvalidUsagePooledEncoderError("Invalid usage of pooled encoder")) - } - _, _ = enc.encodeTime(t, format) - _, err := enc.Write() - if err != nil { - return err - } - return nil -} - -// encodeInt encodes an int to JSON -func (enc *Encoder) encodeTime(t *time.Time, format string) ([]byte, error) { - enc.writeByte('"') - enc.buf = t.AppendFormat(enc.buf, format) - enc.writeByte('"') - return enc.buf, nil -} - -// AddTimeKey adds an *time.Time to be encoded with the given format, must be used inside an object as it will encode a key -func (enc *Encoder) AddTimeKey(key string, t *time.Time, format string) { - enc.TimeKey(key, t, format) -} - -// TimeKey adds an *time.Time to be encoded with the given format, must be used inside an object as it will encode a key -func (enc *Encoder) TimeKey(key string, t *time.Time, format string) { - if enc.hasKeys { - if !enc.keyExists(key) { - return - } - } - enc.grow(10 + len(key)) - r := enc.getPreviousRune() - if r != '{' { - enc.writeTwoBytes(',', '"') - } else { - enc.writeByte('"') - } - enc.writeStringEscape(key) - enc.writeBytes(objKeyStr) - enc.buf = t.AppendFormat(enc.buf, format) - enc.writeByte('"') -} - -// AddTime adds an *time.Time to be encoded with the given format, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) AddTime(t *time.Time, format string) { - enc.Time(t, format) -} - -// Time adds an *time.Time to be encoded with the given format, must be used inside a slice or array encoding (does not encode a key) -func (enc *Encoder) Time(t *time.Time, format string) { - enc.grow(10) - r := enc.getPreviousRune() - if r != '[' { - enc.writeByte(',') - } - enc.writeByte('"') - enc.buf = t.AppendFormat(enc.buf, format) - enc.writeByte('"') -} diff --git a/vendor/github.com/francoispqt/gojay/errors.go b/vendor/github.com/francoispqt/gojay/errors.go deleted file mode 100644 index 0fd52e66..00000000 --- a/vendor/github.com/francoispqt/gojay/errors.go +++ /dev/null @@ -1,88 +0,0 @@ -package gojay - -import ( - "errors" - "fmt" -) - -const invalidJSONCharErrorMsg = "Invalid JSON, wrong char '%c' found at position %d" - -// InvalidJSONError is a type representing an error returned when -// Decoding encounters invalid JSON. -type InvalidJSONError string - -func (err InvalidJSONError) Error() string { - return string(err) -} - -func (dec *Decoder) raiseInvalidJSONErr(pos int) error { - var c byte - if len(dec.data) > pos { - c = dec.data[pos] - } - dec.err = InvalidJSONError( - fmt.Sprintf( - invalidJSONCharErrorMsg, - c, - pos, - ), - ) - return dec.err -} - -const invalidUnmarshalErrorMsg = "Cannot unmarshal JSON to type '%T'" - -// InvalidUnmarshalError is a type representing an error returned when -// Decoding cannot unmarshal JSON to the receiver type for various reasons. -type InvalidUnmarshalError string - -func (err InvalidUnmarshalError) Error() string { - return string(err) -} - -func (dec *Decoder) makeInvalidUnmarshalErr(v interface{}) error { - return InvalidUnmarshalError( - fmt.Sprintf( - invalidUnmarshalErrorMsg, - v, - ), - ) -} - -const invalidMarshalErrorMsg = "Invalid type %T provided to Marshal" - -// InvalidMarshalError is a type representing an error returned when -// Encoding did not find the proper way to encode -type InvalidMarshalError string - -func (err InvalidMarshalError) Error() string { - return string(err) -} - -// NoReaderError is a type representing an error returned when -// decoding requires a reader and none was given -type NoReaderError string - -func (err NoReaderError) Error() string { - return string(err) -} - -// InvalidUsagePooledDecoderError is a type representing an error returned -// when decoding is called on a still pooled Decoder -type InvalidUsagePooledDecoderError string - -func (err InvalidUsagePooledDecoderError) Error() string { - return string(err) -} - -// InvalidUsagePooledEncoderError is a type representing an error returned -// when decoding is called on a still pooled Encoder -type InvalidUsagePooledEncoderError string - -func (err InvalidUsagePooledEncoderError) Error() string { - return string(err) -} - -// ErrUnmarshalPtrExpected is the error returned when unmarshal expects a pointer value, -// When using `dec.ObjectNull` or `dec.ArrayNull` for example. -var ErrUnmarshalPtrExpected = errors.New("Cannot unmarshal to given value, a pointer is expected") diff --git a/vendor/github.com/francoispqt/gojay/gojay.go b/vendor/github.com/francoispqt/gojay/gojay.go deleted file mode 100644 index d0c542f6..00000000 --- a/vendor/github.com/francoispqt/gojay/gojay.go +++ /dev/null @@ -1,10 +0,0 @@ -// Package gojay implements encoding and decoding of JSON as defined in RFC 7159. -// The mapping between JSON and Go values is described -// in the documentation for the Marshal and Unmarshal functions. -// -// It aims at performance and usability by relying on simple interfaces -// to decode and encode structures, slices, arrays and even channels. -// -// On top of the simple interfaces to implement, gojay provides lots of helpers to decode and encode -// multiple of different types natively such as bit.Int, sql.NullString or time.Time -package gojay diff --git a/vendor/github.com/francoispqt/gojay/gojay.png b/vendor/github.com/francoispqt/gojay/gojay.png deleted file mode 100644 index 21090bdd20877f745003b24a4e8667f57b67a1a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 44163 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
  • @ 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 diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/event.go b/vendor/github.com/lucas-clemente/quic-go/qlog/event.go deleted file mode 100644 index 8427b6e2..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/event.go +++ /dev/null @@ -1,529 +0,0 @@ -package qlog - -import ( - "errors" - "fmt" - "net" - "time" - - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/internal/protocol" - "github.com/lucas-clemente/quic-go/internal/utils" - "github.com/lucas-clemente/quic-go/logging" - - "github.com/francoispqt/gojay" -) - -func milliseconds(dur time.Duration) float64 { return float64(dur.Nanoseconds()) / 1e6 } - -type eventDetails interface { - Category() category - Name() string - gojay.MarshalerJSONObject -} - -type event struct { - RelativeTime time.Duration - eventDetails -} - -var _ gojay.MarshalerJSONObject = event{} - -func (e event) IsNil() bool { return false } -func (e event) MarshalJSONObject(enc *gojay.Encoder) { - enc.Float64Key("time", milliseconds(e.RelativeTime)) - enc.StringKey("name", e.Category().String()+":"+e.Name()) - enc.ObjectKey("data", e.eventDetails) -} - -type versions []versionNumber - -func (v versions) IsNil() bool { return false } -func (v versions) MarshalJSONArray(enc *gojay.Encoder) { - for _, e := range v { - enc.AddString(e.String()) - } -} - -type rawInfo struct { - Length logging.ByteCount // full packet length, including header and AEAD authentication tag - PayloadLength logging.ByteCount // length of the packet payload, excluding AEAD tag -} - -func (i rawInfo) IsNil() bool { return false } -func (i rawInfo) MarshalJSONObject(enc *gojay.Encoder) { - enc.Uint64Key("length", uint64(i.Length)) - enc.Uint64KeyOmitEmpty("payload_length", uint64(i.PayloadLength)) -} - -type eventConnectionStarted struct { - SrcAddr *net.UDPAddr - DestAddr *net.UDPAddr - - SrcConnectionID protocol.ConnectionID - DestConnectionID protocol.ConnectionID -} - -var _ eventDetails = &eventConnectionStarted{} - -func (e eventConnectionStarted) Category() category { return categoryTransport } -func (e eventConnectionStarted) Name() string { return "connection_started" } -func (e eventConnectionStarted) IsNil() bool { return false } - -func (e eventConnectionStarted) MarshalJSONObject(enc *gojay.Encoder) { - if utils.IsIPv4(e.SrcAddr.IP) { - enc.StringKey("ip_version", "ipv4") - } else { - enc.StringKey("ip_version", "ipv6") - } - enc.StringKey("src_ip", e.SrcAddr.IP.String()) - enc.IntKey("src_port", e.SrcAddr.Port) - enc.StringKey("dst_ip", e.DestAddr.IP.String()) - enc.IntKey("dst_port", e.DestAddr.Port) - enc.StringKey("src_cid", connectionID(e.SrcConnectionID).String()) - enc.StringKey("dst_cid", connectionID(e.DestConnectionID).String()) -} - -type eventVersionNegotiated struct { - clientVersions, serverVersions []versionNumber - chosenVersion versionNumber -} - -func (e eventVersionNegotiated) Category() category { return categoryTransport } -func (e eventVersionNegotiated) Name() string { return "version_information" } -func (e eventVersionNegotiated) IsNil() bool { return false } - -func (e eventVersionNegotiated) MarshalJSONObject(enc *gojay.Encoder) { - if len(e.clientVersions) > 0 { - enc.ArrayKey("client_versions", versions(e.clientVersions)) - } - if len(e.serverVersions) > 0 { - enc.ArrayKey("server_versions", versions(e.serverVersions)) - } - enc.StringKey("chosen_version", e.chosenVersion.String()) -} - -type eventConnectionClosed struct { - e error -} - -func (e eventConnectionClosed) Category() category { return categoryTransport } -func (e eventConnectionClosed) Name() string { return "connection_closed" } -func (e eventConnectionClosed) IsNil() bool { return false } - -func (e eventConnectionClosed) MarshalJSONObject(enc *gojay.Encoder) { - var ( - statelessResetErr *quic.StatelessResetError - handshakeTimeoutErr *quic.HandshakeTimeoutError - idleTimeoutErr *quic.IdleTimeoutError - applicationErr *quic.ApplicationError - transportErr *quic.TransportError - versionNegotiationErr *quic.VersionNegotiationError - ) - switch { - case errors.As(e.e, &statelessResetErr): - enc.StringKey("owner", ownerRemote.String()) - enc.StringKey("trigger", "stateless_reset") - enc.StringKey("stateless_reset_token", fmt.Sprintf("%x", statelessResetErr.Token)) - case errors.As(e.e, &handshakeTimeoutErr): - enc.StringKey("owner", ownerLocal.String()) - enc.StringKey("trigger", "handshake_timeout") - case errors.As(e.e, &idleTimeoutErr): - enc.StringKey("owner", ownerLocal.String()) - enc.StringKey("trigger", "idle_timeout") - case errors.As(e.e, &applicationErr): - owner := ownerLocal - if applicationErr.Remote { - owner = ownerRemote - } - enc.StringKey("owner", owner.String()) - enc.Uint64Key("application_code", uint64(applicationErr.ErrorCode)) - enc.StringKey("reason", applicationErr.ErrorMessage) - case errors.As(e.e, &transportErr): - owner := ownerLocal - if transportErr.Remote { - owner = ownerRemote - } - enc.StringKey("owner", owner.String()) - enc.StringKey("connection_code", transportError(transportErr.ErrorCode).String()) - enc.StringKey("reason", transportErr.ErrorMessage) - case errors.As(e.e, &versionNegotiationErr): - enc.StringKey("owner", ownerRemote.String()) - enc.StringKey("trigger", "version_negotiation") - } -} - -type eventPacketSent struct { - Header packetHeader - Length logging.ByteCount - PayloadLength logging.ByteCount - Frames frames - IsCoalesced bool - Trigger string -} - -var _ eventDetails = eventPacketSent{} - -func (e eventPacketSent) Category() category { return categoryTransport } -func (e eventPacketSent) Name() string { return "packet_sent" } -func (e eventPacketSent) IsNil() bool { return false } - -func (e eventPacketSent) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", e.Header) - enc.ObjectKey("raw", rawInfo{Length: e.Length, PayloadLength: e.PayloadLength}) - enc.ArrayKeyOmitEmpty("frames", e.Frames) - enc.BoolKeyOmitEmpty("is_coalesced", e.IsCoalesced) - enc.StringKeyOmitEmpty("trigger", e.Trigger) -} - -type eventPacketReceived struct { - Header packetHeader - Length logging.ByteCount - PayloadLength logging.ByteCount - Frames frames - IsCoalesced bool - Trigger string -} - -var _ eventDetails = eventPacketReceived{} - -func (e eventPacketReceived) Category() category { return categoryTransport } -func (e eventPacketReceived) Name() string { return "packet_received" } -func (e eventPacketReceived) IsNil() bool { return false } - -func (e eventPacketReceived) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", e.Header) - enc.ObjectKey("raw", rawInfo{Length: e.Length, PayloadLength: e.PayloadLength}) - enc.ArrayKeyOmitEmpty("frames", e.Frames) - enc.BoolKeyOmitEmpty("is_coalesced", e.IsCoalesced) - enc.StringKeyOmitEmpty("trigger", e.Trigger) -} - -type eventRetryReceived struct { - Header packetHeader -} - -func (e eventRetryReceived) Category() category { return categoryTransport } -func (e eventRetryReceived) Name() string { return "packet_received" } -func (e eventRetryReceived) IsNil() bool { return false } - -func (e eventRetryReceived) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", e.Header) -} - -type eventVersionNegotiationReceived struct { - Header packetHeader - SupportedVersions []versionNumber -} - -func (e eventVersionNegotiationReceived) Category() category { return categoryTransport } -func (e eventVersionNegotiationReceived) Name() string { return "packet_received" } -func (e eventVersionNegotiationReceived) IsNil() bool { return false } - -func (e eventVersionNegotiationReceived) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", e.Header) - enc.ArrayKey("supported_versions", versions(e.SupportedVersions)) -} - -type eventPacketBuffered struct { - PacketType logging.PacketType -} - -func (e eventPacketBuffered) Category() category { return categoryTransport } -func (e eventPacketBuffered) Name() string { return "packet_buffered" } -func (e eventPacketBuffered) IsNil() bool { return false } - -func (e eventPacketBuffered) MarshalJSONObject(enc *gojay.Encoder) { - //nolint:gosimple - enc.ObjectKey("header", packetHeaderWithType{PacketType: e.PacketType}) - enc.StringKey("trigger", "keys_unavailable") -} - -type eventPacketDropped struct { - PacketType logging.PacketType - PacketSize protocol.ByteCount - Trigger packetDropReason -} - -func (e eventPacketDropped) Category() category { return categoryTransport } -func (e eventPacketDropped) Name() string { return "packet_dropped" } -func (e eventPacketDropped) IsNil() bool { return false } - -func (e eventPacketDropped) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", packetHeaderWithType{PacketType: e.PacketType}) - enc.ObjectKey("raw", rawInfo{Length: e.PacketSize}) - enc.StringKey("trigger", e.Trigger.String()) -} - -type metrics struct { - MinRTT time.Duration - SmoothedRTT time.Duration - LatestRTT time.Duration - RTTVariance time.Duration - - CongestionWindow protocol.ByteCount - BytesInFlight protocol.ByteCount - PacketsInFlight int -} - -type eventMetricsUpdated struct { - Last *metrics - Current *metrics -} - -func (e eventMetricsUpdated) Category() category { return categoryRecovery } -func (e eventMetricsUpdated) Name() string { return "metrics_updated" } -func (e eventMetricsUpdated) IsNil() bool { return false } - -func (e eventMetricsUpdated) MarshalJSONObject(enc *gojay.Encoder) { - if e.Last == nil || e.Last.MinRTT != e.Current.MinRTT { - enc.FloatKey("min_rtt", milliseconds(e.Current.MinRTT)) - } - if e.Last == nil || e.Last.SmoothedRTT != e.Current.SmoothedRTT { - enc.FloatKey("smoothed_rtt", milliseconds(e.Current.SmoothedRTT)) - } - if e.Last == nil || e.Last.LatestRTT != e.Current.LatestRTT { - enc.FloatKey("latest_rtt", milliseconds(e.Current.LatestRTT)) - } - if e.Last == nil || e.Last.RTTVariance != e.Current.RTTVariance { - enc.FloatKey("rtt_variance", milliseconds(e.Current.RTTVariance)) - } - - if e.Last == nil || e.Last.CongestionWindow != e.Current.CongestionWindow { - enc.Uint64Key("congestion_window", uint64(e.Current.CongestionWindow)) - } - if e.Last == nil || e.Last.BytesInFlight != e.Current.BytesInFlight { - enc.Uint64Key("bytes_in_flight", uint64(e.Current.BytesInFlight)) - } - if e.Last == nil || e.Last.PacketsInFlight != e.Current.PacketsInFlight { - enc.Uint64KeyOmitEmpty("packets_in_flight", uint64(e.Current.PacketsInFlight)) - } -} - -type eventUpdatedPTO struct { - Value uint32 -} - -func (e eventUpdatedPTO) Category() category { return categoryRecovery } -func (e eventUpdatedPTO) Name() string { return "metrics_updated" } -func (e eventUpdatedPTO) IsNil() bool { return false } - -func (e eventUpdatedPTO) MarshalJSONObject(enc *gojay.Encoder) { - enc.Uint32Key("pto_count", e.Value) -} - -type eventPacketLost struct { - PacketType logging.PacketType - PacketNumber protocol.PacketNumber - Trigger packetLossReason -} - -func (e eventPacketLost) Category() category { return categoryRecovery } -func (e eventPacketLost) Name() string { return "packet_lost" } -func (e eventPacketLost) IsNil() bool { return false } - -func (e eventPacketLost) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("header", packetHeaderWithTypeAndPacketNumber{ - PacketType: e.PacketType, - PacketNumber: e.PacketNumber, - }) - enc.StringKey("trigger", e.Trigger.String()) -} - -type eventKeyUpdated struct { - Trigger keyUpdateTrigger - KeyType keyType - Generation protocol.KeyPhase - // we don't log the keys here, so we don't need `old` and `new`. -} - -func (e eventKeyUpdated) Category() category { return categorySecurity } -func (e eventKeyUpdated) Name() string { return "key_updated" } -func (e eventKeyUpdated) IsNil() bool { return false } - -func (e eventKeyUpdated) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("trigger", e.Trigger.String()) - enc.StringKey("key_type", e.KeyType.String()) - if e.KeyType == keyTypeClient1RTT || e.KeyType == keyTypeServer1RTT { - enc.Uint64Key("generation", uint64(e.Generation)) - } -} - -type eventKeyRetired struct { - KeyType keyType - Generation protocol.KeyPhase -} - -func (e eventKeyRetired) Category() category { return categorySecurity } -func (e eventKeyRetired) Name() string { return "key_retired" } -func (e eventKeyRetired) IsNil() bool { return false } - -func (e eventKeyRetired) MarshalJSONObject(enc *gojay.Encoder) { - if e.KeyType != keyTypeClient1RTT && e.KeyType != keyTypeServer1RTT { - enc.StringKey("trigger", "tls") - } - enc.StringKey("key_type", e.KeyType.String()) - if e.KeyType == keyTypeClient1RTT || e.KeyType == keyTypeServer1RTT { - enc.Uint64Key("generation", uint64(e.Generation)) - } -} - -type eventTransportParameters struct { - Restore bool - Owner owner - SentBy protocol.Perspective - - OriginalDestinationConnectionID protocol.ConnectionID - InitialSourceConnectionID protocol.ConnectionID - RetrySourceConnectionID *protocol.ConnectionID - - StatelessResetToken *protocol.StatelessResetToken - DisableActiveMigration bool - MaxIdleTimeout time.Duration - MaxUDPPayloadSize protocol.ByteCount - AckDelayExponent uint8 - MaxAckDelay time.Duration - ActiveConnectionIDLimit uint64 - - InitialMaxData protocol.ByteCount - InitialMaxStreamDataBidiLocal protocol.ByteCount - InitialMaxStreamDataBidiRemote protocol.ByteCount - InitialMaxStreamDataUni protocol.ByteCount - InitialMaxStreamsBidi int64 - InitialMaxStreamsUni int64 - - PreferredAddress *preferredAddress - - MaxDatagramFrameSize protocol.ByteCount -} - -func (e eventTransportParameters) Category() category { return categoryTransport } -func (e eventTransportParameters) Name() string { - if e.Restore { - return "parameters_restored" - } - return "parameters_set" -} -func (e eventTransportParameters) IsNil() bool { return false } - -func (e eventTransportParameters) MarshalJSONObject(enc *gojay.Encoder) { - if !e.Restore { - enc.StringKey("owner", e.Owner.String()) - if e.SentBy == protocol.PerspectiveServer { - enc.StringKey("original_destination_connection_id", connectionID(e.OriginalDestinationConnectionID).String()) - if e.StatelessResetToken != nil { - enc.StringKey("stateless_reset_token", fmt.Sprintf("%x", e.StatelessResetToken[:])) - } - if e.RetrySourceConnectionID != nil { - enc.StringKey("retry_source_connection_id", connectionID(*e.RetrySourceConnectionID).String()) - } - } - enc.StringKey("initial_source_connection_id", connectionID(e.InitialSourceConnectionID).String()) - } - enc.BoolKey("disable_active_migration", e.DisableActiveMigration) - enc.FloatKeyOmitEmpty("max_idle_timeout", milliseconds(e.MaxIdleTimeout)) - enc.Int64KeyNullEmpty("max_udp_payload_size", int64(e.MaxUDPPayloadSize)) - enc.Uint8KeyOmitEmpty("ack_delay_exponent", e.AckDelayExponent) - enc.FloatKeyOmitEmpty("max_ack_delay", milliseconds(e.MaxAckDelay)) - enc.Uint64KeyOmitEmpty("active_connection_id_limit", e.ActiveConnectionIDLimit) - - enc.Int64KeyOmitEmpty("initial_max_data", int64(e.InitialMaxData)) - enc.Int64KeyOmitEmpty("initial_max_stream_data_bidi_local", int64(e.InitialMaxStreamDataBidiLocal)) - enc.Int64KeyOmitEmpty("initial_max_stream_data_bidi_remote", int64(e.InitialMaxStreamDataBidiRemote)) - enc.Int64KeyOmitEmpty("initial_max_stream_data_uni", int64(e.InitialMaxStreamDataUni)) - enc.Int64KeyOmitEmpty("initial_max_streams_bidi", e.InitialMaxStreamsBidi) - enc.Int64KeyOmitEmpty("initial_max_streams_uni", e.InitialMaxStreamsUni) - - if e.PreferredAddress != nil { - enc.ObjectKey("preferred_address", e.PreferredAddress) - } - if e.MaxDatagramFrameSize != protocol.InvalidByteCount { - enc.Int64Key("max_datagram_frame_size", int64(e.MaxDatagramFrameSize)) - } -} - -type preferredAddress struct { - IPv4, IPv6 net.IP - PortV4, PortV6 uint16 - ConnectionID protocol.ConnectionID - StatelessResetToken protocol.StatelessResetToken -} - -var _ gojay.MarshalerJSONObject = &preferredAddress{} - -func (a preferredAddress) IsNil() bool { return false } -func (a preferredAddress) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("ip_v4", a.IPv4.String()) - enc.Uint16Key("port_v4", a.PortV4) - enc.StringKey("ip_v6", a.IPv6.String()) - enc.Uint16Key("port_v6", a.PortV6) - enc.StringKey("connection_id", connectionID(a.ConnectionID).String()) - enc.StringKey("stateless_reset_token", fmt.Sprintf("%x", a.StatelessResetToken)) -} - -type eventLossTimerSet struct { - TimerType timerType - EncLevel protocol.EncryptionLevel - Delta time.Duration -} - -func (e eventLossTimerSet) Category() category { return categoryRecovery } -func (e eventLossTimerSet) Name() string { return "loss_timer_updated" } -func (e eventLossTimerSet) IsNil() bool { return false } - -func (e eventLossTimerSet) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("event_type", "set") - enc.StringKey("timer_type", e.TimerType.String()) - enc.StringKey("packet_number_space", encLevelToPacketNumberSpace(e.EncLevel)) - enc.Float64Key("delta", milliseconds(e.Delta)) -} - -type eventLossTimerExpired struct { - TimerType timerType - EncLevel protocol.EncryptionLevel -} - -func (e eventLossTimerExpired) Category() category { return categoryRecovery } -func (e eventLossTimerExpired) Name() string { return "loss_timer_updated" } -func (e eventLossTimerExpired) IsNil() bool { return false } - -func (e eventLossTimerExpired) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("event_type", "expired") - enc.StringKey("timer_type", e.TimerType.String()) - enc.StringKey("packet_number_space", encLevelToPacketNumberSpace(e.EncLevel)) -} - -type eventLossTimerCanceled struct{} - -func (e eventLossTimerCanceled) Category() category { return categoryRecovery } -func (e eventLossTimerCanceled) Name() string { return "loss_timer_updated" } -func (e eventLossTimerCanceled) IsNil() bool { return false } - -func (e eventLossTimerCanceled) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("event_type", "cancelled") -} - -type eventCongestionStateUpdated struct { - state congestionState -} - -func (e eventCongestionStateUpdated) Category() category { return categoryRecovery } -func (e eventCongestionStateUpdated) Name() string { return "congestion_state_updated" } -func (e eventCongestionStateUpdated) IsNil() bool { return false } - -func (e eventCongestionStateUpdated) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("new", e.state.String()) -} - -type eventGeneric struct { - name string - msg string -} - -func (e eventGeneric) Category() category { return categoryTransport } -func (e eventGeneric) Name() string { return e.name } -func (e eventGeneric) IsNil() bool { return false } - -func (e eventGeneric) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("details", e.msg) -} diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/frame.go b/vendor/github.com/lucas-clemente/quic-go/qlog/frame.go deleted file mode 100644 index 4530f0fb..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/frame.go +++ /dev/null @@ -1,227 +0,0 @@ -package qlog - -import ( - "fmt" - - "github.com/lucas-clemente/quic-go/internal/wire" - "github.com/lucas-clemente/quic-go/logging" - - "github.com/francoispqt/gojay" -) - -type frame struct { - Frame logging.Frame -} - -var _ gojay.MarshalerJSONObject = frame{} - -var _ gojay.MarshalerJSONArray = frames{} - -func (f frame) MarshalJSONObject(enc *gojay.Encoder) { - switch frame := f.Frame.(type) { - case *logging.PingFrame: - marshalPingFrame(enc, frame) - case *logging.AckFrame: - marshalAckFrame(enc, frame) - case *logging.ResetStreamFrame: - marshalResetStreamFrame(enc, frame) - case *logging.StopSendingFrame: - marshalStopSendingFrame(enc, frame) - case *logging.CryptoFrame: - marshalCryptoFrame(enc, frame) - case *logging.NewTokenFrame: - marshalNewTokenFrame(enc, frame) - case *logging.StreamFrame: - marshalStreamFrame(enc, frame) - case *logging.MaxDataFrame: - marshalMaxDataFrame(enc, frame) - case *logging.MaxStreamDataFrame: - marshalMaxStreamDataFrame(enc, frame) - case *logging.MaxStreamsFrame: - marshalMaxStreamsFrame(enc, frame) - case *logging.DataBlockedFrame: - marshalDataBlockedFrame(enc, frame) - case *logging.StreamDataBlockedFrame: - marshalStreamDataBlockedFrame(enc, frame) - case *logging.StreamsBlockedFrame: - marshalStreamsBlockedFrame(enc, frame) - case *logging.NewConnectionIDFrame: - marshalNewConnectionIDFrame(enc, frame) - case *logging.RetireConnectionIDFrame: - marshalRetireConnectionIDFrame(enc, frame) - case *logging.PathChallengeFrame: - marshalPathChallengeFrame(enc, frame) - case *logging.PathResponseFrame: - marshalPathResponseFrame(enc, frame) - case *logging.ConnectionCloseFrame: - marshalConnectionCloseFrame(enc, frame) - case *logging.HandshakeDoneFrame: - marshalHandshakeDoneFrame(enc, frame) - case *logging.DatagramFrame: - marshalDatagramFrame(enc, frame) - default: - panic("unknown frame type") - } -} - -func (f frame) IsNil() bool { return false } - -type frames []frame - -func (fs frames) IsNil() bool { return fs == nil } -func (fs frames) MarshalJSONArray(enc *gojay.Encoder) { - for _, f := range fs { - enc.Object(f) - } -} - -func marshalPingFrame(enc *gojay.Encoder, _ *wire.PingFrame) { - enc.StringKey("frame_type", "ping") -} - -type ackRanges []wire.AckRange - -func (ars ackRanges) MarshalJSONArray(enc *gojay.Encoder) { - for _, r := range ars { - enc.Array(ackRange(r)) - } -} - -func (ars ackRanges) IsNil() bool { return false } - -type ackRange wire.AckRange - -func (ar ackRange) MarshalJSONArray(enc *gojay.Encoder) { - enc.AddInt64(int64(ar.Smallest)) - if ar.Smallest != ar.Largest { - enc.AddInt64(int64(ar.Largest)) - } -} - -func (ar ackRange) IsNil() bool { return false } - -func marshalAckFrame(enc *gojay.Encoder, f *logging.AckFrame) { - enc.StringKey("frame_type", "ack") - enc.FloatKeyOmitEmpty("ack_delay", milliseconds(f.DelayTime)) - enc.ArrayKey("acked_ranges", ackRanges(f.AckRanges)) - if hasECN := f.ECT0 > 0 || f.ECT1 > 0 || f.ECNCE > 0; hasECN { - enc.Uint64Key("ect0", f.ECT0) - enc.Uint64Key("ect1", f.ECT1) - enc.Uint64Key("ce", f.ECNCE) - } -} - -func marshalResetStreamFrame(enc *gojay.Encoder, f *logging.ResetStreamFrame) { - enc.StringKey("frame_type", "reset_stream") - enc.Int64Key("stream_id", int64(f.StreamID)) - enc.Int64Key("error_code", int64(f.ErrorCode)) - enc.Int64Key("final_size", int64(f.FinalSize)) -} - -func marshalStopSendingFrame(enc *gojay.Encoder, f *logging.StopSendingFrame) { - enc.StringKey("frame_type", "stop_sending") - enc.Int64Key("stream_id", int64(f.StreamID)) - enc.Int64Key("error_code", int64(f.ErrorCode)) -} - -func marshalCryptoFrame(enc *gojay.Encoder, f *logging.CryptoFrame) { - enc.StringKey("frame_type", "crypto") - enc.Int64Key("offset", int64(f.Offset)) - enc.Int64Key("length", int64(f.Length)) -} - -func marshalNewTokenFrame(enc *gojay.Encoder, f *logging.NewTokenFrame) { - enc.StringKey("frame_type", "new_token") - enc.ObjectKey("token", &token{Raw: f.Token}) -} - -func marshalStreamFrame(enc *gojay.Encoder, f *logging.StreamFrame) { - enc.StringKey("frame_type", "stream") - enc.Int64Key("stream_id", int64(f.StreamID)) - enc.Int64Key("offset", int64(f.Offset)) - enc.IntKey("length", int(f.Length)) - enc.BoolKeyOmitEmpty("fin", f.Fin) -} - -func marshalMaxDataFrame(enc *gojay.Encoder, f *logging.MaxDataFrame) { - enc.StringKey("frame_type", "max_data") - enc.Int64Key("maximum", int64(f.MaximumData)) -} - -func marshalMaxStreamDataFrame(enc *gojay.Encoder, f *logging.MaxStreamDataFrame) { - enc.StringKey("frame_type", "max_stream_data") - enc.Int64Key("stream_id", int64(f.StreamID)) - enc.Int64Key("maximum", int64(f.MaximumStreamData)) -} - -func marshalMaxStreamsFrame(enc *gojay.Encoder, f *logging.MaxStreamsFrame) { - enc.StringKey("frame_type", "max_streams") - enc.StringKey("stream_type", streamType(f.Type).String()) - enc.Int64Key("maximum", int64(f.MaxStreamNum)) -} - -func marshalDataBlockedFrame(enc *gojay.Encoder, f *logging.DataBlockedFrame) { - enc.StringKey("frame_type", "data_blocked") - enc.Int64Key("limit", int64(f.MaximumData)) -} - -func marshalStreamDataBlockedFrame(enc *gojay.Encoder, f *logging.StreamDataBlockedFrame) { - enc.StringKey("frame_type", "stream_data_blocked") - enc.Int64Key("stream_id", int64(f.StreamID)) - enc.Int64Key("limit", int64(f.MaximumStreamData)) -} - -func marshalStreamsBlockedFrame(enc *gojay.Encoder, f *logging.StreamsBlockedFrame) { - enc.StringKey("frame_type", "streams_blocked") - enc.StringKey("stream_type", streamType(f.Type).String()) - enc.Int64Key("limit", int64(f.StreamLimit)) -} - -func marshalNewConnectionIDFrame(enc *gojay.Encoder, f *logging.NewConnectionIDFrame) { - enc.StringKey("frame_type", "new_connection_id") - enc.Int64Key("sequence_number", int64(f.SequenceNumber)) - enc.Int64Key("retire_prior_to", int64(f.RetirePriorTo)) - enc.IntKey("length", f.ConnectionID.Len()) - enc.StringKey("connection_id", connectionID(f.ConnectionID).String()) - enc.StringKey("stateless_reset_token", fmt.Sprintf("%x", f.StatelessResetToken)) -} - -func marshalRetireConnectionIDFrame(enc *gojay.Encoder, f *logging.RetireConnectionIDFrame) { - enc.StringKey("frame_type", "retire_connection_id") - enc.Int64Key("sequence_number", int64(f.SequenceNumber)) -} - -func marshalPathChallengeFrame(enc *gojay.Encoder, f *logging.PathChallengeFrame) { - enc.StringKey("frame_type", "path_challenge") - enc.StringKey("data", fmt.Sprintf("%x", f.Data[:])) -} - -func marshalPathResponseFrame(enc *gojay.Encoder, f *logging.PathResponseFrame) { - enc.StringKey("frame_type", "path_response") - enc.StringKey("data", fmt.Sprintf("%x", f.Data[:])) -} - -func marshalConnectionCloseFrame(enc *gojay.Encoder, f *logging.ConnectionCloseFrame) { - errorSpace := "transport" - if f.IsApplicationError { - errorSpace = "application" - } - enc.StringKey("frame_type", "connection_close") - enc.StringKey("error_space", errorSpace) - if errName := transportError(f.ErrorCode).String(); len(errName) > 0 { - enc.StringKey("error_code", errName) - } else { - enc.Uint64Key("error_code", f.ErrorCode) - } - enc.Uint64Key("raw_error_code", f.ErrorCode) - enc.StringKey("reason", f.ReasonPhrase) -} - -func marshalHandshakeDoneFrame(enc *gojay.Encoder, _ *logging.HandshakeDoneFrame) { - enc.StringKey("frame_type", "handshake_done") -} - -func marshalDatagramFrame(enc *gojay.Encoder, f *logging.DatagramFrame) { - enc.StringKey("frame_type", "datagram") - enc.Int64Key("length", int64(f.Length)) -} diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/packet_header.go b/vendor/github.com/lucas-clemente/quic-go/qlog/packet_header.go deleted file mode 100644 index cc270f2f..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/packet_header.go +++ /dev/null @@ -1,119 +0,0 @@ -package qlog - -import ( - "fmt" - - "github.com/lucas-clemente/quic-go/internal/protocol" - "github.com/lucas-clemente/quic-go/internal/wire" - "github.com/lucas-clemente/quic-go/logging" - - "github.com/francoispqt/gojay" -) - -func getPacketTypeFromEncryptionLevel(encLevel protocol.EncryptionLevel) logging.PacketType { - switch encLevel { - case protocol.EncryptionInitial: - return logging.PacketTypeInitial - case protocol.EncryptionHandshake: - return logging.PacketTypeHandshake - case protocol.Encryption0RTT: - return logging.PacketType0RTT - case protocol.Encryption1RTT: - return logging.PacketType1RTT - default: - panic("unknown encryption level") - } -} - -type token struct { - Raw []byte -} - -var _ gojay.MarshalerJSONObject = &token{} - -func (t token) IsNil() bool { return false } -func (t token) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("data", fmt.Sprintf("%x", t.Raw)) -} - -// PacketHeader is a QUIC packet header. -type packetHeader struct { - PacketType logging.PacketType - - KeyPhaseBit logging.KeyPhaseBit - PacketNumber logging.PacketNumber - - Version logging.VersionNumber - SrcConnectionID logging.ConnectionID - DestConnectionID logging.ConnectionID - - Token *token -} - -func transformHeader(hdr *wire.Header) *packetHeader { - h := &packetHeader{ - PacketType: logging.PacketTypeFromHeader(hdr), - SrcConnectionID: hdr.SrcConnectionID, - DestConnectionID: hdr.DestConnectionID, - Version: hdr.Version, - } - if len(hdr.Token) > 0 { - h.Token = &token{Raw: hdr.Token} - } - return h -} - -func transformExtendedHeader(hdr *wire.ExtendedHeader) *packetHeader { - h := transformHeader(&hdr.Header) - h.PacketNumber = hdr.PacketNumber - h.KeyPhaseBit = hdr.KeyPhase - return h -} - -func (h packetHeader) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("packet_type", packetType(h.PacketType).String()) - if h.PacketType != logging.PacketTypeRetry && h.PacketType != logging.PacketTypeVersionNegotiation { - enc.Int64Key("packet_number", int64(h.PacketNumber)) - } - if h.Version != 0 { - enc.StringKey("version", versionNumber(h.Version).String()) - } - if h.PacketType != logging.PacketType1RTT { - enc.IntKey("scil", h.SrcConnectionID.Len()) - if h.SrcConnectionID.Len() > 0 { - enc.StringKey("scid", connectionID(h.SrcConnectionID).String()) - } - } - enc.IntKey("dcil", h.DestConnectionID.Len()) - if h.DestConnectionID.Len() > 0 { - enc.StringKey("dcid", connectionID(h.DestConnectionID).String()) - } - if h.KeyPhaseBit == logging.KeyPhaseZero || h.KeyPhaseBit == logging.KeyPhaseOne { - enc.StringKey("key_phase_bit", h.KeyPhaseBit.String()) - } - if h.Token != nil { - enc.ObjectKey("token", h.Token) - } -} - -// a minimal header that only outputs the packet type -type packetHeaderWithType struct { - PacketType logging.PacketType -} - -func (h packetHeaderWithType) IsNil() bool { return false } -func (h packetHeaderWithType) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("packet_type", packetType(h.PacketType).String()) -} - -// a minimal header that only outputs the packet type -type packetHeaderWithTypeAndPacketNumber struct { - PacketType logging.PacketType - PacketNumber logging.PacketNumber -} - -func (h packetHeaderWithTypeAndPacketNumber) IsNil() bool { return false } -func (h packetHeaderWithTypeAndPacketNumber) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("packet_type", packetType(h.PacketType).String()) - enc.Int64Key("packet_number", int64(h.PacketNumber)) -} diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/qlog.go b/vendor/github.com/lucas-clemente/quic-go/qlog/qlog.go deleted file mode 100644 index 5b411742..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/qlog.go +++ /dev/null @@ -1,486 +0,0 @@ -package qlog - -import ( - "bytes" - "context" - "fmt" - "io" - "log" - "net" - "runtime/debug" - "sync" - "time" - - "github.com/lucas-clemente/quic-go/internal/protocol" - "github.com/lucas-clemente/quic-go/internal/utils" - "github.com/lucas-clemente/quic-go/internal/wire" - "github.com/lucas-clemente/quic-go/logging" - - "github.com/francoispqt/gojay" -) - -// Setting of this only works when quic-go is used as a library. -// When building a binary from this repository, the version can be set using the following go build flag: -// -ldflags="-X github.com/lucas-clemente/quic-go/qlog.quicGoVersion=foobar" -var quicGoVersion = "(devel)" - -func init() { - if quicGoVersion != "(devel)" { // variable set by ldflags - return - } - info, ok := debug.ReadBuildInfo() - if !ok { // no build info available. This happens when quic-go is not used as a library. - return - } - for _, d := range info.Deps { - if d.Path == "github.com/lucas-clemente/quic-go" { - quicGoVersion = d.Version - if d.Replace != nil { - if len(d.Replace.Version) > 0 { - quicGoVersion = d.Version - } else { - quicGoVersion += " (replaced)" - } - } - break - } - } -} - -const eventChanSize = 50 - -type tracer struct { - getLogWriter func(p logging.Perspective, connectionID []byte) io.WriteCloser -} - -var _ logging.Tracer = &tracer{} - -// NewTracer creates a new qlog tracer. -func NewTracer(getLogWriter func(p logging.Perspective, connectionID []byte) io.WriteCloser) logging.Tracer { - return &tracer{getLogWriter: getLogWriter} -} - -func (t *tracer) TracerForConnection(_ context.Context, p logging.Perspective, odcid protocol.ConnectionID) logging.ConnectionTracer { - if w := t.getLogWriter(p, odcid.Bytes()); w != nil { - return NewConnectionTracer(w, p, odcid) - } - return nil -} - -func (t *tracer) SentPacket(net.Addr, *logging.Header, protocol.ByteCount, []logging.Frame) {} -func (t *tracer) DroppedPacket(net.Addr, logging.PacketType, protocol.ByteCount, logging.PacketDropReason) { -} - -type connectionTracer struct { - mutex sync.Mutex - - w io.WriteCloser - odcid protocol.ConnectionID - perspective protocol.Perspective - referenceTime time.Time - - events chan event - encodeErr error - runStopped chan struct{} - - lastMetrics *metrics -} - -var _ logging.ConnectionTracer = &connectionTracer{} - -// NewConnectionTracer creates a new tracer to record a qlog for a connection. -func NewConnectionTracer(w io.WriteCloser, p protocol.Perspective, odcid protocol.ConnectionID) logging.ConnectionTracer { - t := &connectionTracer{ - w: w, - perspective: p, - odcid: odcid, - runStopped: make(chan struct{}), - events: make(chan event, eventChanSize), - referenceTime: time.Now(), - } - go t.run() - return t -} - -func (t *connectionTracer) run() { - defer close(t.runStopped) - buf := &bytes.Buffer{} - enc := gojay.NewEncoder(buf) - tl := &topLevel{ - trace: trace{ - VantagePoint: vantagePoint{Type: t.perspective}, - CommonFields: commonFields{ - ODCID: connectionID(t.odcid), - GroupID: connectionID(t.odcid), - ReferenceTime: t.referenceTime, - }, - }, - } - if err := enc.Encode(tl); err != nil { - panic(fmt.Sprintf("qlog encoding into a bytes.Buffer failed: %s", err)) - } - if err := buf.WriteByte('\n'); err != nil { - panic(fmt.Sprintf("qlog encoding into a bytes.Buffer failed: %s", err)) - } - if _, err := t.w.Write(buf.Bytes()); err != nil { - t.encodeErr = err - } - enc = gojay.NewEncoder(t.w) - for ev := range t.events { - if t.encodeErr != nil { // if encoding failed, just continue draining the event channel - continue - } - if err := enc.Encode(ev); err != nil { - t.encodeErr = err - continue - } - if _, err := t.w.Write([]byte{'\n'}); err != nil { - t.encodeErr = err - } - } -} - -func (t *connectionTracer) Close() { - if err := t.export(); err != nil { - log.Printf("exporting qlog failed: %s\n", err) - } -} - -// export writes a qlog. -func (t *connectionTracer) export() error { - close(t.events) - <-t.runStopped - if t.encodeErr != nil { - return t.encodeErr - } - return t.w.Close() -} - -func (t *connectionTracer) recordEvent(eventTime time.Time, details eventDetails) { - t.events <- event{ - RelativeTime: eventTime.Sub(t.referenceTime), - eventDetails: details, - } -} - -func (t *connectionTracer) StartedConnection(local, remote net.Addr, srcConnID, destConnID protocol.ConnectionID) { - // ignore this event if we're not dealing with UDP addresses here - localAddr, ok := local.(*net.UDPAddr) - if !ok { - return - } - remoteAddr, ok := remote.(*net.UDPAddr) - if !ok { - return - } - t.mutex.Lock() - t.recordEvent(time.Now(), &eventConnectionStarted{ - SrcAddr: localAddr, - DestAddr: remoteAddr, - SrcConnectionID: srcConnID, - DestConnectionID: destConnID, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) NegotiatedVersion(chosen logging.VersionNumber, client, server []logging.VersionNumber) { - var clientVersions, serverVersions []versionNumber - if len(client) > 0 { - clientVersions = make([]versionNumber, len(client)) - for i, v := range client { - clientVersions[i] = versionNumber(v) - } - } - if len(server) > 0 { - serverVersions = make([]versionNumber, len(server)) - for i, v := range server { - serverVersions[i] = versionNumber(v) - } - } - t.mutex.Lock() - t.recordEvent(time.Now(), &eventVersionNegotiated{ - clientVersions: clientVersions, - serverVersions: serverVersions, - chosenVersion: versionNumber(chosen), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) ClosedConnection(e error) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventConnectionClosed{e: e}) - t.mutex.Unlock() -} - -func (t *connectionTracer) SentTransportParameters(tp *wire.TransportParameters) { - t.recordTransportParameters(t.perspective, tp) -} - -func (t *connectionTracer) ReceivedTransportParameters(tp *wire.TransportParameters) { - t.recordTransportParameters(t.perspective.Opposite(), tp) -} - -func (t *connectionTracer) RestoredTransportParameters(tp *wire.TransportParameters) { - ev := t.toTransportParameters(tp) - ev.Restore = true - - t.mutex.Lock() - t.recordEvent(time.Now(), ev) - t.mutex.Unlock() -} - -func (t *connectionTracer) recordTransportParameters(sentBy protocol.Perspective, tp *wire.TransportParameters) { - ev := t.toTransportParameters(tp) - ev.Owner = ownerLocal - if sentBy != t.perspective { - ev.Owner = ownerRemote - } - ev.SentBy = sentBy - - t.mutex.Lock() - t.recordEvent(time.Now(), ev) - t.mutex.Unlock() -} - -func (t *connectionTracer) toTransportParameters(tp *wire.TransportParameters) *eventTransportParameters { - var pa *preferredAddress - if tp.PreferredAddress != nil { - pa = &preferredAddress{ - IPv4: tp.PreferredAddress.IPv4, - PortV4: tp.PreferredAddress.IPv4Port, - IPv6: tp.PreferredAddress.IPv6, - PortV6: tp.PreferredAddress.IPv6Port, - ConnectionID: tp.PreferredAddress.ConnectionID, - StatelessResetToken: tp.PreferredAddress.StatelessResetToken, - } - } - return &eventTransportParameters{ - OriginalDestinationConnectionID: tp.OriginalDestinationConnectionID, - InitialSourceConnectionID: tp.InitialSourceConnectionID, - RetrySourceConnectionID: tp.RetrySourceConnectionID, - StatelessResetToken: tp.StatelessResetToken, - DisableActiveMigration: tp.DisableActiveMigration, - MaxIdleTimeout: tp.MaxIdleTimeout, - MaxUDPPayloadSize: tp.MaxUDPPayloadSize, - AckDelayExponent: tp.AckDelayExponent, - MaxAckDelay: tp.MaxAckDelay, - ActiveConnectionIDLimit: tp.ActiveConnectionIDLimit, - InitialMaxData: tp.InitialMaxData, - InitialMaxStreamDataBidiLocal: tp.InitialMaxStreamDataBidiLocal, - InitialMaxStreamDataBidiRemote: tp.InitialMaxStreamDataBidiRemote, - InitialMaxStreamDataUni: tp.InitialMaxStreamDataUni, - InitialMaxStreamsBidi: int64(tp.MaxBidiStreamNum), - InitialMaxStreamsUni: int64(tp.MaxUniStreamNum), - PreferredAddress: pa, - MaxDatagramFrameSize: tp.MaxDatagramFrameSize, - } -} - -func (t *connectionTracer) SentPacket(hdr *wire.ExtendedHeader, packetSize logging.ByteCount, ack *logging.AckFrame, frames []logging.Frame) { - numFrames := len(frames) - if ack != nil { - numFrames++ - } - fs := make([]frame, 0, numFrames) - if ack != nil { - fs = append(fs, frame{Frame: ack}) - } - for _, f := range frames { - fs = append(fs, frame{Frame: f}) - } - header := *transformExtendedHeader(hdr) - t.mutex.Lock() - t.recordEvent(time.Now(), &eventPacketSent{ - Header: header, - Length: packetSize, - PayloadLength: hdr.Length, - Frames: fs, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) ReceivedPacket(hdr *wire.ExtendedHeader, packetSize logging.ByteCount, frames []logging.Frame) { - fs := make([]frame, len(frames)) - for i, f := range frames { - fs[i] = frame{Frame: f} - } - header := *transformExtendedHeader(hdr) - t.mutex.Lock() - t.recordEvent(time.Now(), &eventPacketReceived{ - Header: header, - Length: packetSize, - PayloadLength: hdr.Length, - Frames: fs, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) ReceivedRetry(hdr *wire.Header) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventRetryReceived{ - Header: *transformHeader(hdr), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) ReceivedVersionNegotiationPacket(hdr *wire.Header, versions []logging.VersionNumber) { - ver := make([]versionNumber, len(versions)) - for i, v := range versions { - ver[i] = versionNumber(v) - } - t.mutex.Lock() - t.recordEvent(time.Now(), &eventVersionNegotiationReceived{ - Header: *transformHeader(hdr), - SupportedVersions: ver, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) BufferedPacket(pt logging.PacketType) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventPacketBuffered{PacketType: pt}) - t.mutex.Unlock() -} - -func (t *connectionTracer) DroppedPacket(pt logging.PacketType, size protocol.ByteCount, reason logging.PacketDropReason) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventPacketDropped{ - PacketType: pt, - PacketSize: size, - Trigger: packetDropReason(reason), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) UpdatedMetrics(rttStats *utils.RTTStats, cwnd, bytesInFlight protocol.ByteCount, packetsInFlight int) { - m := &metrics{ - MinRTT: rttStats.MinRTT(), - SmoothedRTT: rttStats.SmoothedRTT(), - LatestRTT: rttStats.LatestRTT(), - RTTVariance: rttStats.MeanDeviation(), - CongestionWindow: cwnd, - BytesInFlight: bytesInFlight, - PacketsInFlight: packetsInFlight, - } - t.mutex.Lock() - t.recordEvent(time.Now(), &eventMetricsUpdated{ - Last: t.lastMetrics, - Current: m, - }) - t.lastMetrics = m - t.mutex.Unlock() -} - -func (t *connectionTracer) AcknowledgedPacket(protocol.EncryptionLevel, protocol.PacketNumber) {} - -func (t *connectionTracer) LostPacket(encLevel protocol.EncryptionLevel, pn protocol.PacketNumber, lossReason logging.PacketLossReason) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventPacketLost{ - PacketType: getPacketTypeFromEncryptionLevel(encLevel), - PacketNumber: pn, - Trigger: packetLossReason(lossReason), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) UpdatedCongestionState(state logging.CongestionState) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventCongestionStateUpdated{state: congestionState(state)}) - t.mutex.Unlock() -} - -func (t *connectionTracer) UpdatedPTOCount(value uint32) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventUpdatedPTO{Value: value}) - t.mutex.Unlock() -} - -func (t *connectionTracer) UpdatedKeyFromTLS(encLevel protocol.EncryptionLevel, pers protocol.Perspective) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventKeyUpdated{ - Trigger: keyUpdateTLS, - KeyType: encLevelToKeyType(encLevel, pers), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) UpdatedKey(generation protocol.KeyPhase, remote bool) { - trigger := keyUpdateLocal - if remote { - trigger = keyUpdateRemote - } - t.mutex.Lock() - now := time.Now() - t.recordEvent(now, &eventKeyUpdated{ - Trigger: trigger, - KeyType: keyTypeClient1RTT, - Generation: generation, - }) - t.recordEvent(now, &eventKeyUpdated{ - Trigger: trigger, - KeyType: keyTypeServer1RTT, - Generation: generation, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) DroppedEncryptionLevel(encLevel protocol.EncryptionLevel) { - t.mutex.Lock() - now := time.Now() - if encLevel == protocol.Encryption0RTT { - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, t.perspective)}) - } else { - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveServer)}) - t.recordEvent(now, &eventKeyRetired{KeyType: encLevelToKeyType(encLevel, protocol.PerspectiveClient)}) - } - t.mutex.Unlock() -} - -func (t *connectionTracer) DroppedKey(generation protocol.KeyPhase) { - t.mutex.Lock() - now := time.Now() - t.recordEvent(now, &eventKeyRetired{ - KeyType: encLevelToKeyType(protocol.Encryption1RTT, protocol.PerspectiveServer), - Generation: generation, - }) - t.recordEvent(now, &eventKeyRetired{ - KeyType: encLevelToKeyType(protocol.Encryption1RTT, protocol.PerspectiveClient), - Generation: generation, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) SetLossTimer(tt logging.TimerType, encLevel protocol.EncryptionLevel, timeout time.Time) { - t.mutex.Lock() - now := time.Now() - t.recordEvent(now, &eventLossTimerSet{ - TimerType: timerType(tt), - EncLevel: encLevel, - Delta: timeout.Sub(now), - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) LossTimerExpired(tt logging.TimerType, encLevel protocol.EncryptionLevel) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventLossTimerExpired{ - TimerType: timerType(tt), - EncLevel: encLevel, - }) - t.mutex.Unlock() -} - -func (t *connectionTracer) LossTimerCanceled() { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventLossTimerCanceled{}) - t.mutex.Unlock() -} - -func (t *connectionTracer) Debug(name, msg string) { - t.mutex.Lock() - t.recordEvent(time.Now(), &eventGeneric{ - name: name, - msg: msg, - }) - t.mutex.Unlock() -} diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/trace.go b/vendor/github.com/lucas-clemente/quic-go/qlog/trace.go deleted file mode 100644 index 4f0b5e64..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/trace.go +++ /dev/null @@ -1,66 +0,0 @@ -package qlog - -import ( - "time" - - "github.com/francoispqt/gojay" - - "github.com/lucas-clemente/quic-go/internal/protocol" -) - -type topLevel struct { - trace trace -} - -func (topLevel) IsNil() bool { return false } -func (l topLevel) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("qlog_format", "NDJSON") - enc.StringKey("qlog_version", "draft-02") - enc.StringKeyOmitEmpty("title", "quic-go qlog") - enc.StringKey("code_version", quicGoVersion) - enc.ObjectKey("trace", l.trace) -} - -type vantagePoint struct { - Name string - Type protocol.Perspective -} - -func (p vantagePoint) IsNil() bool { return false } -func (p vantagePoint) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKeyOmitEmpty("name", p.Name) - switch p.Type { - case protocol.PerspectiveClient: - enc.StringKey("type", "client") - case protocol.PerspectiveServer: - enc.StringKey("type", "server") - } -} - -type commonFields struct { - ODCID connectionID - GroupID connectionID - ProtocolType string - ReferenceTime time.Time -} - -func (f commonFields) MarshalJSONObject(enc *gojay.Encoder) { - enc.StringKey("ODCID", f.ODCID.String()) - enc.StringKey("group_id", f.ODCID.String()) - enc.StringKeyOmitEmpty("protocol_type", f.ProtocolType) - enc.Float64Key("reference_time", float64(f.ReferenceTime.UnixNano())/1e6) - enc.StringKey("time_format", "relative") -} - -func (f commonFields) IsNil() bool { return false } - -type trace struct { - VantagePoint vantagePoint - CommonFields commonFields -} - -func (trace) IsNil() bool { return false } -func (t trace) MarshalJSONObject(enc *gojay.Encoder) { - enc.ObjectKey("vantage_point", t.VantagePoint) - enc.ObjectKey("common_fields", t.CommonFields) -} diff --git a/vendor/github.com/lucas-clemente/quic-go/qlog/types.go b/vendor/github.com/lucas-clemente/quic-go/qlog/types.go deleted file mode 100644 index b485e17d..00000000 --- a/vendor/github.com/lucas-clemente/quic-go/qlog/types.go +++ /dev/null @@ -1,320 +0,0 @@ -package qlog - -import ( - "fmt" - - "github.com/lucas-clemente/quic-go/internal/protocol" - "github.com/lucas-clemente/quic-go/internal/qerr" - "github.com/lucas-clemente/quic-go/logging" -) - -type owner uint8 - -const ( - ownerLocal owner = iota - ownerRemote -) - -func (o owner) String() string { - switch o { - case ownerLocal: - return "local" - case ownerRemote: - return "remote" - default: - return "unknown owner" - } -} - -type streamType protocol.StreamType - -func (s streamType) String() string { - switch protocol.StreamType(s) { - case protocol.StreamTypeUni: - return "unidirectional" - case protocol.StreamTypeBidi: - return "bidirectional" - default: - return "unknown stream type" - } -} - -type connectionID protocol.ConnectionID - -func (c connectionID) String() string { - return fmt.Sprintf("%x", []byte(c)) -} - -// category is the qlog event category. -type category uint8 - -const ( - categoryConnectivity category = iota - categoryTransport - categorySecurity - categoryRecovery -) - -func (c category) String() string { - switch c { - case categoryConnectivity: - return "connectivity" - case categoryTransport: - return "transport" - case categorySecurity: - return "security" - case categoryRecovery: - return "recovery" - default: - return "unknown category" - } -} - -type versionNumber protocol.VersionNumber - -func (v versionNumber) String() string { - return fmt.Sprintf("%x", uint32(v)) -} - -func (packetHeader) IsNil() bool { return false } - -func encLevelToPacketNumberSpace(encLevel protocol.EncryptionLevel) string { - switch encLevel { - case protocol.EncryptionInitial: - return "initial" - case protocol.EncryptionHandshake: - return "handshake" - case protocol.Encryption0RTT, protocol.Encryption1RTT: - return "application_data" - default: - return "unknown encryption level" - } -} - -type keyType uint8 - -const ( - keyTypeServerInitial keyType = 1 + iota - keyTypeClientInitial - keyTypeServerHandshake - keyTypeClientHandshake - keyTypeServer0RTT - keyTypeClient0RTT - keyTypeServer1RTT - keyTypeClient1RTT -) - -func encLevelToKeyType(encLevel protocol.EncryptionLevel, pers protocol.Perspective) keyType { - if pers == protocol.PerspectiveServer { - switch encLevel { - case protocol.EncryptionInitial: - return keyTypeServerInitial - case protocol.EncryptionHandshake: - return keyTypeServerHandshake - case protocol.Encryption0RTT: - return keyTypeServer0RTT - case protocol.Encryption1RTT: - return keyTypeServer1RTT - default: - return 0 - } - } - switch encLevel { - case protocol.EncryptionInitial: - return keyTypeClientInitial - case protocol.EncryptionHandshake: - return keyTypeClientHandshake - case protocol.Encryption0RTT: - return keyTypeClient0RTT - case protocol.Encryption1RTT: - return keyTypeClient1RTT - default: - return 0 - } -} - -func (t keyType) String() string { - switch t { - case keyTypeServerInitial: - return "server_initial_secret" - case keyTypeClientInitial: - return "client_initial_secret" - case keyTypeServerHandshake: - return "server_handshake_secret" - case keyTypeClientHandshake: - return "client_handshake_secret" - case keyTypeServer0RTT: - return "server_0rtt_secret" - case keyTypeClient0RTT: - return "client_0rtt_secret" - case keyTypeServer1RTT: - return "server_1rtt_secret" - case keyTypeClient1RTT: - return "client_1rtt_secret" - default: - return "unknown key type" - } -} - -type keyUpdateTrigger uint8 - -const ( - keyUpdateTLS keyUpdateTrigger = iota - keyUpdateRemote - keyUpdateLocal -) - -func (t keyUpdateTrigger) String() string { - switch t { - case keyUpdateTLS: - return "tls" - case keyUpdateRemote: - return "remote_update" - case keyUpdateLocal: - return "local_update" - default: - return "unknown key update trigger" - } -} - -type transportError uint64 - -func (e transportError) String() string { - switch qerr.TransportErrorCode(e) { - case qerr.NoError: - return "no_error" - case qerr.InternalError: - return "internal_error" - case qerr.ConnectionRefused: - return "connection_refused" - case qerr.FlowControlError: - return "flow_control_error" - case qerr.StreamLimitError: - return "stream_limit_error" - case qerr.StreamStateError: - return "stream_state_error" - case qerr.FinalSizeError: - return "final_size_error" - case qerr.FrameEncodingError: - return "frame_encoding_error" - case qerr.TransportParameterError: - return "transport_parameter_error" - case qerr.ConnectionIDLimitError: - return "connection_id_limit_error" - case qerr.ProtocolViolation: - return "protocol_violation" - case qerr.InvalidToken: - return "invalid_token" - case qerr.ApplicationErrorErrorCode: - return "application_error" - case qerr.CryptoBufferExceeded: - return "crypto_buffer_exceeded" - case qerr.KeyUpdateError: - return "key_update_error" - case qerr.AEADLimitReached: - return "aead_limit_reached" - case qerr.NoViablePathError: - return "no_viable_path" - default: - return "" - } -} - -type packetType logging.PacketType - -func (t packetType) String() string { - switch logging.PacketType(t) { - case logging.PacketTypeInitial: - return "initial" - case logging.PacketTypeHandshake: - return "handshake" - case logging.PacketTypeRetry: - return "retry" - case logging.PacketType0RTT: - return "0RTT" - case logging.PacketTypeVersionNegotiation: - return "version_negotiation" - case logging.PacketTypeStatelessReset: - return "stateless_reset" - case logging.PacketType1RTT: - return "1RTT" - case logging.PacketTypeNotDetermined: - return "" - default: - return "unknown packet type" - } -} - -type packetLossReason logging.PacketLossReason - -func (r packetLossReason) String() string { - switch logging.PacketLossReason(r) { - case logging.PacketLossReorderingThreshold: - return "reordering_threshold" - case logging.PacketLossTimeThreshold: - return "time_threshold" - default: - return "unknown loss reason" - } -} - -type packetDropReason logging.PacketDropReason - -func (r packetDropReason) String() string { - switch logging.PacketDropReason(r) { - case logging.PacketDropKeyUnavailable: - return "key_unavailable" - case logging.PacketDropUnknownConnectionID: - return "unknown_connection_id" - case logging.PacketDropHeaderParseError: - return "header_parse_error" - case logging.PacketDropPayloadDecryptError: - return "payload_decrypt_error" - case logging.PacketDropProtocolViolation: - return "protocol_violation" - case logging.PacketDropDOSPrevention: - return "dos_prevention" - case logging.PacketDropUnsupportedVersion: - return "unsupported_version" - case logging.PacketDropUnexpectedPacket: - return "unexpected_packet" - case logging.PacketDropUnexpectedSourceConnectionID: - return "unexpected_source_connection_id" - case logging.PacketDropUnexpectedVersion: - return "unexpected_version" - case logging.PacketDropDuplicate: - return "duplicate" - default: - return "unknown packet drop reason" - } -} - -type timerType logging.TimerType - -func (t timerType) String() string { - switch logging.TimerType(t) { - case logging.TimerTypeACK: - return "ack" - case logging.TimerTypePTO: - return "pto" - default: - return "unknown timer type" - } -} - -type congestionState logging.CongestionState - -func (s congestionState) String() string { - switch logging.CongestionState(s) { - case logging.CongestionStateSlowStart: - return "slow_start" - case logging.CongestionStateCongestionAvoidance: - return "congestion_avoidance" - case logging.CongestionStateRecovery: - return "recovery" - case logging.CongestionStateApplicationLimited: - return "application_limited" - default: - return "unknown congestion state" - } -} diff --git a/vendor/gopkg.in/yaml.v3/decode.go b/vendor/gopkg.in/yaml.v3/decode.go index df36e3a3..0173b698 100644 --- a/vendor/gopkg.in/yaml.v3/decode.go +++ b/vendor/gopkg.in/yaml.v3/decode.go @@ -100,7 +100,10 @@ func (p *parser) peek() yaml_event_type_t { if p.event.typ != yaml_NO_EVENT { return p.event.typ } - if !yaml_parser_parse(&p.parser, &p.event) { + // It's curious choice from the underlying API to generally return a + // positive result on success, but on this case return true in an error + // scenario. This was the source of bugs in the past (issue #666). + if !yaml_parser_parse(&p.parser, &p.event) || p.parser.error != yaml_NO_ERROR { p.fail() } return p.event.typ @@ -320,6 +323,8 @@ type decoder struct { decodeCount int aliasCount int aliasDepth int + + mergedFields map[interface{}]bool } var ( @@ -808,6 +813,11 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) { } } + mergedFields := d.mergedFields + d.mergedFields = nil + + var mergeNode *Node + mapIsNew := false if out.IsNil() { out.Set(reflect.MakeMap(outt)) @@ -815,11 +825,18 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) { } for i := 0; i < l; i += 2 { if isMerge(n.Content[i]) { - d.merge(n.Content[i+1], out) + mergeNode = n.Content[i+1] continue } k := reflect.New(kt).Elem() if d.unmarshal(n.Content[i], k) { + if mergedFields != nil { + ki := k.Interface() + if mergedFields[ki] { + continue + } + mergedFields[ki] = true + } kkind := k.Kind() if kkind == reflect.Interface { kkind = k.Elem().Kind() @@ -833,6 +850,12 @@ func (d *decoder) mapping(n *Node, out reflect.Value) (good bool) { } } } + + d.mergedFields = mergedFields + if mergeNode != nil { + d.merge(n, mergeNode, out) + } + d.stringMapType = stringMapType d.generalMapType = generalMapType return true @@ -844,7 +867,8 @@ func isStringMap(n *Node) bool { } l := len(n.Content) for i := 0; i < l; i += 2 { - if n.Content[i].ShortTag() != strTag { + shortTag := n.Content[i].ShortTag() + if shortTag != strTag && shortTag != mergeTag { return false } } @@ -861,7 +885,6 @@ func (d *decoder) mappingStruct(n *Node, out reflect.Value) (good bool) { var elemType reflect.Type if sinfo.InlineMap != -1 { inlineMap = out.Field(sinfo.InlineMap) - inlineMap.Set(reflect.New(inlineMap.Type()).Elem()) elemType = inlineMap.Type().Elem() } @@ -870,6 +893,9 @@ func (d *decoder) mappingStruct(n *Node, out reflect.Value) (good bool) { d.prepare(n, field) } + mergedFields := d.mergedFields + d.mergedFields = nil + var mergeNode *Node var doneFields []bool if d.uniqueKeys { doneFields = make([]bool, len(sinfo.FieldsList)) @@ -879,13 +905,20 @@ func (d *decoder) mappingStruct(n *Node, out reflect.Value) (good bool) { for i := 0; i < l; i += 2 { ni := n.Content[i] if isMerge(ni) { - d.merge(n.Content[i+1], out) + mergeNode = n.Content[i+1] continue } if !d.unmarshal(ni, name) { continue } - if info, ok := sinfo.FieldsMap[name.String()]; ok { + sname := name.String() + if mergedFields != nil { + if mergedFields[sname] { + continue + } + mergedFields[sname] = true + } + if info, ok := sinfo.FieldsMap[sname]; ok { if d.uniqueKeys { if doneFields[info.Id] { d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s already set in type %s", ni.Line, name.String(), out.Type())) @@ -911,6 +944,11 @@ func (d *decoder) mappingStruct(n *Node, out reflect.Value) (good bool) { d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in type %s", ni.Line, name.String(), out.Type())) } } + + d.mergedFields = mergedFields + if mergeNode != nil { + d.merge(n, mergeNode, out) + } return true } @@ -918,19 +956,29 @@ func failWantMap() { failf("map merge requires map or sequence of maps as the value") } -func (d *decoder) merge(n *Node, out reflect.Value) { - switch n.Kind { +func (d *decoder) merge(parent *Node, merge *Node, out reflect.Value) { + mergedFields := d.mergedFields + if mergedFields == nil { + d.mergedFields = make(map[interface{}]bool) + for i := 0; i < len(parent.Content); i += 2 { + k := reflect.New(ifaceType).Elem() + if d.unmarshal(parent.Content[i], k) { + d.mergedFields[k.Interface()] = true + } + } + } + + switch merge.Kind { case MappingNode: - d.unmarshal(n, out) + d.unmarshal(merge, out) case AliasNode: - if n.Alias != nil && n.Alias.Kind != MappingNode { + if merge.Alias != nil && merge.Alias.Kind != MappingNode { failWantMap() } - d.unmarshal(n, out) + d.unmarshal(merge, out) case SequenceNode: - // Step backwards as earlier nodes take precedence. - for i := len(n.Content) - 1; i >= 0; i-- { - ni := n.Content[i] + for i := 0; i < len(merge.Content); i++ { + ni := merge.Content[i] if ni.Kind == AliasNode { if ni.Alias != nil && ni.Alias.Kind != MappingNode { failWantMap() @@ -943,6 +991,8 @@ func (d *decoder) merge(n *Node, out reflect.Value) { default: failWantMap() } + + d.mergedFields = mergedFields } func isMerge(n *Node) bool { diff --git a/vendor/gopkg.in/yaml.v3/parserc.go b/vendor/gopkg.in/yaml.v3/parserc.go index ac66fccc..268558a0 100644 --- a/vendor/gopkg.in/yaml.v3/parserc.go +++ b/vendor/gopkg.in/yaml.v3/parserc.go @@ -687,6 +687,9 @@ func yaml_parser_parse_node(parser *yaml_parser_t, event *yaml_event_t, block, i func yaml_parser_parse_block_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { if first { token := peek_token(parser) + if token == nil { + return false + } parser.marks = append(parser.marks, token.start_mark) skip_token(parser) } @@ -786,7 +789,7 @@ func yaml_parser_split_stem_comment(parser *yaml_parser_t, stem_len int) { } token := peek_token(parser) - if token.typ != yaml_BLOCK_SEQUENCE_START_TOKEN && token.typ != yaml_BLOCK_MAPPING_START_TOKEN { + if token == nil || token.typ != yaml_BLOCK_SEQUENCE_START_TOKEN && token.typ != yaml_BLOCK_MAPPING_START_TOKEN { return } @@ -813,6 +816,9 @@ func yaml_parser_split_stem_comment(parser *yaml_parser_t, stem_len int) { func yaml_parser_parse_block_mapping_key(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { if first { token := peek_token(parser) + if token == nil { + return false + } parser.marks = append(parser.marks, token.start_mark) skip_token(parser) } @@ -922,6 +928,9 @@ func yaml_parser_parse_block_mapping_value(parser *yaml_parser_t, event *yaml_ev func yaml_parser_parse_flow_sequence_entry(parser *yaml_parser_t, event *yaml_event_t, first bool) bool { if first { token := peek_token(parser) + if token == nil { + return false + } parser.marks = append(parser.marks, token.start_mark) skip_token(parser) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 5951bced..cc9abba7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -85,9 +85,6 @@ github.com/facebookgo/grace/gracenet # github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 ## explicit github.com/flynn/go-shlex -# github.com/francoispqt/gojay v1.2.13 -## explicit; go 1.12 -github.com/francoispqt/gojay # github.com/fsnotify/fsnotify v1.4.9 ## explicit; go 1.13 github.com/fsnotify/fsnotify @@ -218,7 +215,6 @@ github.com/lucas-clemente/quic-go/internal/qtls github.com/lucas-clemente/quic-go/internal/utils github.com/lucas-clemente/quic-go/internal/wire github.com/lucas-clemente/quic-go/logging -github.com/lucas-clemente/quic-go/qlog github.com/lucas-clemente/quic-go/quicvarint # github.com/lucasb-eyer/go-colorful v1.0.3 ## explicit; go 1.12 @@ -596,7 +592,7 @@ gopkg.in/tomb.v1 # gopkg.in/yaml.v2 v2.4.0 ## explicit; go 1.15 gopkg.in/yaml.v2 -# gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b +# gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 # zombiezen.com/go/capnproto2 v2.18.0+incompatible