From 4b3127a73d41d1e8f0bdb0a361c794ddd9b30761 Mon Sep 17 00:00:00 2001 From: Kyle Xiao Date: Wed, 31 Jul 2024 17:16:53 +0800 Subject: [PATCH] ci: rm test that relies on kitex internal pkg --- testdata/test/baseline_j2t_test.go | 146 ------------------ testdata/test/baseline_t2j_test.go | 127 +-------------- testdata/test/baseline_tg_test.go | 238 ----------------------------- testdata/test/go.mod | 13 +- testdata/test/go.sum | 72 ++------- 5 files changed, 23 insertions(+), 573 deletions(-) diff --git a/testdata/test/baseline_j2t_test.go b/testdata/test/baseline_j2t_test.go index a94b3d54..71b9d3bf 100644 --- a/testdata/test/baseline_j2t_test.go +++ b/testdata/test/baseline_j2t_test.go @@ -28,18 +28,12 @@ import ( "sync" "testing" - athrift "github.com/apache/thrift/lib/go/thrift" "github.com/bytedance/sonic" json "github.com/bytedance/sonic/ast" "github.com/cloudwego/dynamicgo/conv" "github.com/cloudwego/dynamicgo/conv/j2t" "github.com/cloudwego/dynamicgo/http" "github.com/cloudwego/dynamicgo/testdata/kitex_gen/baseline" - "github.com/cloudwego/kitex/pkg/generic" - "github.com/cloudwego/kitex/pkg/generic/descriptor" - gthrift "github.com/cloudwego/kitex/pkg/generic/thrift" - "github.com/cloudwego/kitex/pkg/remote" - bthrift "github.com/cloudwego/kitex/pkg/remote/codec/thrift" "github.com/stretchr/testify/require" ) @@ -682,58 +676,6 @@ func TestHTTP2Thrift_Nesting_Parallel(t *testing.T) { const BufferSize = 4096 -func BenchmarkJSON2Thrift_KitexGeneric(b *testing.B) { - p, err := generic.NewThriftFileProvider(idlPath) - if err != nil { - b.Fatal(err) - } - svcDsc := <-p.Provide() - - b.Run("small", func(b *testing.B) { - var _args generic.Args - _args.Method = "SimpleMethod" - _args.Request = simpleJSON - codec, err := gthrift.NewWriteJSON(svcDsc, "SimpleMethod", true) - if err != nil { - b.Fatal(err) - } - var mm = athrift.NewTMemoryBuffer() - bc := athrift.NewTBinaryProtocol(mm, false, true) - if err := codec.Write(context.Background(), bc, simpleJSON, nil); err != nil { - b.Fatal(err) - } - - b.SetBytes(int64(len(mm.Bytes()))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm.Reset() - _ = codec.Write(context.Background(), bc, simpleJSON, nil) - } - }) - - b.Run("medium", func(b *testing.B) { - var _args generic.Args - _args.Method = "NestingMethod" - _args.Request = nestingJSON - codec, err := gthrift.NewWriteJSON(svcDsc, "NestingMethod", true) - if err != nil { - b.Fatal(err) - } - var mm = athrift.NewTMemoryBuffer() - bc := athrift.NewTBinaryProtocol(mm, false, true) - if err := codec.Write(context.Background(), bc, nestingJSON, nil); err != nil { - b.Fatal(err) - } - - b.SetBytes(int64(len(mm.Bytes()))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm.Reset() - _ = codec.Write(context.Background(), bc, nestingJSON, nil) - } - }) -} - func BenchmarkJSON2Thrift_SonicAndKitex(b *testing.B) { b.Run("small", func(b *testing.B) { v := baseline.NewSimple() @@ -893,91 +835,3 @@ func BenchmarkHTTP2Thrift_DynamicGo_Raw(b *testing.B) { // req.Body["Byte"] = int8(req.Body["Byte"].(int64)) // } - -func BenchmarkHTTP2Thrift_KitexGeneric(b *testing.B) { - p, err := generic.NewThriftFileProvider(idlPath) - if err != nil { - b.Fatal(err) - } - svcDsc := <-p.Provide() - svcDsc.Functions["NestingMethod"].Request.Struct.FieldsByName["req"].Type.Struct.FieldsByName["Double"].HTTPMapping = nil - - b.Run("small", func(b *testing.B) { - codec := gthrift.NewWriteHTTPRequest(svcDsc) - req := &descriptor.HTTPRequest{} - req.Request, err = stdh.NewRequest("POST", "/simple", nil) - if err != nil { - b.Fatal(err) - } - jc := sonic.Config{ - UseInt64: true, - }.Froze() - if err := jc.UnmarshalFromString(simpleJSON, &req.Body); err != nil { - b.Fatal(err) - } - req.Body["I32Field"] = int32(req.Body["I32Field"].(int64)) - req.Body["ByteField"] = int8(req.Body["ByteField"].(int64)) - - buf := remote.NewWriterBuffer(BufferSize) - bc := bthrift.NewBinaryProtocol(buf) - if err := codec.Write(context.Background(), bc, req, gthrift.NewBase()); err != nil { - b.Fatal(err) - } - out, _ := buf.Bytes() - exp := baseline.NewSimple() - if _, err := exp.FastRead(out); err != nil { - b.Fatal(err) - } - - b.SetBytes(int64(len(out))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - buf := remote.NewWriterBuffer(BufferSize) - bc := bthrift.NewBinaryProtocol(buf) - if err = codec.Write(context.Background(), bc, req, gthrift.NewBase()); err != nil { - b.Fatal(err) - } - } - }) - - // b.Run("medium", func(b *testing.B) { - // codec := gthrift.NewWriteHTTPRequest(svcDsc) - // jc := sonic.Config{ - // UseInt64: true, - // }.Froze() - // var body map[string]interface{} - // if err := jc.UnmarshalFromString(nestingJSON, &body); err != nil { - // b.Fatal(err) - // } - // req := &descriptor.HTTPRequest{ - // Header: map[string][]string{}, - // Query: map[string][]string{}, - // Cookies: map[string]string{}, - // } - // req.Body = body - // getKitexHttpRequest(req) - // req.Method = "POST" - // req.Path = "/nesting" - - // buf := remote.NewWriterBuffer(BufferSize) - // bc := bthrift.NewBinaryProtocol(buf) - // if err := codec.Write(context.Background(), bc, req, gthrift.NewBase()); err != nil { - // b.Fatal(err) - // } - // out, _ := buf.Bytes() - // exp := baseline.NewNesting() - // if _, err := exp.FastRead(out); err != nil { - // b.Fatal(err) - // } - - // b.SetBytes(int64(len(out))) - // b.ResetTimer() - // for i := 0; i < b.N; i++ { - // buf := remote.NewWriterBuffer(BufferSize) - // bc := bthrift.NewBinaryProtocol(buf) - // if err = codec.Write(context.Background(), bc, req, gthrift.NewBase()); err != nil { - // b.Fatal(err) - // } - // } - // }) -} diff --git a/testdata/test/baseline_t2j_test.go b/testdata/test/baseline_t2j_test.go index bcaa0a67..bff332fb 100644 --- a/testdata/test/baseline_t2j_test.go +++ b/testdata/test/baseline_t2j_test.go @@ -18,7 +18,6 @@ package test import ( - "bytes" "context" "encoding/json" ejson "encoding/json" @@ -32,8 +31,6 @@ import ( "github.com/cloudwego/dynamicgo/http" "github.com/cloudwego/dynamicgo/testdata/kitex_gen/baseline" "github.com/cloudwego/dynamicgo/thrift" - "github.com/cloudwego/kitex/pkg/generic" - gthrift "github.com/cloudwego/kitex/pkg/generic/thrift" "github.com/stretchr/testify/require" ) @@ -260,7 +257,7 @@ func TestThrift2HTTP(t *testing.T) { ls, err := json.Marshal(data.ListI64) require.NoError(t, err) data.ListI64 = nil - + require.Equal(t, data, v) require.Equal(t, dstr, resp.Header.Get("String")) require.Equal(t, int(di32), resp.StatusCode) @@ -359,7 +356,7 @@ func TestThrift2HTTP_Parallel(t *testing.T) { ls, err := json.Marshal(data.ListI64) require.NoError(t, err) data.ListI64 = nil - + require.Equal(t, data, v) require.Equal(t, dstr, resp.Header.Get("String")) require.Equal(t, int(di32), resp.StatusCode) @@ -433,66 +430,6 @@ func wrapKitexGenericResponsePayload(in []byte) []byte { return p.Buf } -func BenchmarkThrift2JSON_KitexGeneric(b *testing.B) { - p, err := generic.NewThriftFileProvider(idlPath) - if err != nil { - b.Fatal(err) - } - svcDsc := <-p.Provide() - - b.Run("small", func(b *testing.B) { - codec := gthrift.NewReadJSON(svcDsc, false) - data := getSimpleValue() - in := make([]byte, data.BLength()) - if err := data.FastWriteNocopy(in, nil); err <= 0 { - b.Fatal(err) - } - in = wrapKitexGenericRequestPayload(in) - var mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - v, err := codec.Read(context.Background(), "SimpleMethod", bc) - if err != nil { - b.Fatal(err) - } - _ = v - // spew.Printf("%#+v\n", v) - - b.SetBytes(int64(len(in))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - var mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(context.Background(), "SimpleMethod", bc) - } - }) - - b.Run("medium", func(b *testing.B) { - codec := gthrift.NewReadJSON(svcDsc, false) - data := getNestingValue() - in := make([]byte, data.BLength()) - if err := data.FastWriteNocopy(in, nil); err <= 0 { - b.Fatal(err) - } - in = wrapKitexGenericRequestPayload(in) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - v, err := codec.Read(context.Background(), "NestingMethod", bc) - if err != nil { - b.Fatal(err) - } - _ = v - // spew.Printf("%#+v\n", v) - - b.SetBytes(int64(len(in))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc = athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(context.Background(), "NestingMethod", bc) - } - }) -} - func BenchmarkThrift2JSON_SonicAndKitex(b *testing.B) { b.Run("small", func(b *testing.B) { v := getSimpleValue() @@ -647,63 +584,3 @@ func BenchmarkThrift2HTTP_DynamicGo(t *testing.B) { } }) } - -func BenchmarkThrift2HTTP_KitexGeneric(b *testing.B) { - p, err := generic.NewThriftFileProvider(idlPath) - if err != nil { - b.Fatal(err) - } - svcDsc := <-p.Provide() - - b.Run("small/http+value_mapping", func(b *testing.B) { - codec := gthrift.NewReadHTTPResponse(svcDsc) - data := getSimpleValue() - in := make([]byte, data.BLength()) - if err := data.FastWriteNocopy(in, nil); err <= 0 { - b.Fatal(err) - } - in = wrapKitexGenericResponsePayload(in) - var mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - v, err := codec.Read(context.Background(), "SimpleMethod", bc) - if err != nil { - b.Fatal(err) - } - _ = v - // spew.Printf("%#+v\n", v) - - b.SetBytes(int64(len(in))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - var mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(context.Background(), "SimpleMethod", bc) - } - }) - - b.Run("medium/http+value_mapping", func(b *testing.B) { - codec := gthrift.NewReadHTTPResponse(svcDsc) - data := getNestingValue() - in := make([]byte, data.BLength()) - if err := data.FastWriteNocopy(in, nil); err <= 0 { - b.Fatal(err) - } - in = wrapKitexGenericResponsePayload(in) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - v, err := codec.Read(context.Background(), "NestingMethod", bc) - if err != nil { - b.Fatal(err) - } - _ = v - // spew.Printf("%#+v\n", v) - - b.SetBytes(int64(len(in))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm = athrift.NewStreamTransportR(bytes.NewBuffer(in)) - bc = athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(context.Background(), "NestingMethod", bc) - } - }) -} diff --git a/testdata/test/baseline_tg_test.go b/testdata/test/baseline_tg_test.go index d2cb011f..455b1ad9 100644 --- a/testdata/test/baseline_tg_test.go +++ b/testdata/test/baseline_tg_test.go @@ -17,19 +17,13 @@ package test import ( - "bytes" - "context" "testing" - athrift "github.com/apache/thrift/lib/go/thrift" "github.com/cloudwego/dynamicgo/testdata/kitex_gen/baseline" "github.com/cloudwego/dynamicgo/thrift" "github.com/cloudwego/dynamicgo/thrift/generic" kg "github.com/cloudwego/kitex/pkg/generic" kd "github.com/cloudwego/kitex/pkg/generic/descriptor" - gthrift "github.com/cloudwego/kitex/pkg/generic/thrift" - "github.com/cloudwego/kitex/pkg/remote" - bthrift "github.com/cloudwego/kitex/pkg/remote/codec/thrift" "github.com/stretchr/testify/require" ) @@ -55,238 +49,6 @@ func getKitexGenericDesc() *kd.ServiceDescriptor { return <-p.Provide() } -func BenchmarkThriftUnmarshalAll_KitexGeneric(b *testing.B) { - b.Run("small", func(b *testing.B) { - obj := getSimpleValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericResponsePayload(data) - svcDsc := getKitexGenericDesc() - codec := gthrift.NewReadStruct(svcDsc, true) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := codec.Read(ctx, "SimpleMethod", bc) - require.NoError(b, err) - _ = v - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(ctx, "SimpleMethod", bc) - } - }) - b.Run("medium", func(b *testing.B) { - obj := getNestingValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericResponsePayload(data) - svcDsc := getKitexGenericDesc() - codec := gthrift.NewReadStruct(svcDsc, true) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := codec.Read(ctx, "NestingMethod", bc) - require.NoError(b, err) - _ = v - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(ctx, "NestingMethod", bc) - } - }) -} - -func BenchmarkThriftMarshalAll_KitexGeneric(b *testing.B) { - b.Run("small", func(b *testing.B) { - obj := getSimpleValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericRequestPayload(data) - svcDsc := getKitexGenericDesc() - reader := gthrift.NewReadStruct(svcDsc, false) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - ac := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := reader.Read(ctx, "SimpleMethod", ac) - require.NoError(b, err) - - ctx = context.Background() - codec, _ := gthrift.NewWriteStruct(svcDsc, "SimpleMethod", true) - buf := remote.NewWriterBuffer(BufferSize) - bc := bthrift.NewBinaryProtocol(buf) - err = codec.Write(ctx, bc, v, gthrift.NewBase()) - require.NoError(b, err) - - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - buf.Flush() - bc := bthrift.NewBinaryProtocol(buf) - _ = codec.Write(ctx, bc, v, gthrift.NewBase()) - } - }) - b.Run("medium", func(b *testing.B) { - obj := getNestingValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericRequestPayload(data) - svcDsc := getKitexGenericDesc() - reader := gthrift.NewReadStruct(svcDsc, false) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - ac := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := reader.Read(ctx, "NestingMethod", ac) - require.NoError(b, err) - - ctx = context.Background() - codec, _ := gthrift.NewWriteStruct(svcDsc, "NestingMethod", true) - buf := remote.NewWriterBuffer(BufferSize * 10) - bc := bthrift.NewBinaryProtocol(buf) - err = codec.Write(ctx, bc, v, gthrift.NewBase()) - require.NoError(b, err) - - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - buf.Flush() - bc := bthrift.NewBinaryProtocol(buf) - _ = codec.Write(ctx, bc, v, gthrift.NewBase()) - } - }) -} - -func BenchmarkThriftUnmarshalPartial_KitexGeneric(b *testing.B) { - b.Run("small", func(b *testing.B) { - obj := getPartialSimpleValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericResponsePayload(data) - svcDsc := getKitexGenericDesc() - codec := gthrift.NewReadStruct(svcDsc, true) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := codec.Read(ctx, "PartialSimpleMethod", bc) - require.NoError(b, err) - _ = v - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(ctx, "PartialSimpleMethod", bc) - } - }) - b.Run("medium", func(b *testing.B) { - obj := getPartialNestingValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericResponsePayload(data) - svcDsc := getKitexGenericDesc() - codec := gthrift.NewReadStruct(svcDsc, true) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := codec.Read(ctx, "PartialNestingMethod", bc) - require.NoError(b, err) - _ = v - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - bc := athrift.NewTBinaryProtocol(mm, false, false) - _, _ = codec.Read(ctx, "PartialNestingMethod", bc) - } - }) -} - -func BenchmarkThriftMarshalPartial_KitexGeneric(b *testing.B) { - b.Run("small", func(b *testing.B) { - obj := getPartialSimpleValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericRequestPayload(data) - svcDsc := getKitexGenericDesc() - reader := gthrift.NewReadStruct(svcDsc, false) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - ac := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := reader.Read(ctx, "PartialSimpleMethod", ac) - require.NoError(b, err) - - ctx = context.Background() - codec, _ := gthrift.NewWriteStruct(svcDsc, "PartialSimpleMethod", true) - buf := remote.NewWriterBuffer(BufferSize) - bc := bthrift.NewBinaryProtocol(buf) - err = codec.Write(ctx, bc, v, gthrift.NewBase()) - require.NoError(b, err) - - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - buf.Flush() - bc := bthrift.NewBinaryProtocol(buf) - _ = codec.Write(ctx, bc, v, gthrift.NewBase()) - } - }) - b.Run("medium", func(b *testing.B) { - obj := getPartialNestingValue() - data := make([]byte, obj.BLength()) - ret := obj.FastWriteNocopy(data, nil) - if ret < 0 { - b.Fatal(ret) - } - data = wrapKitexGenericRequestPayload(data) - svcDsc := getKitexGenericDesc() - reader := gthrift.NewReadStruct(svcDsc, false) - mm := athrift.NewStreamTransportR(bytes.NewBuffer(data)) - ac := athrift.NewTBinaryProtocol(mm, false, false) - ctx := context.Background() - v, err := reader.Read(ctx, "PartialNestingMethod", ac) - require.NoError(b, err) - - ctx = context.Background() - codec, _ := gthrift.NewWriteStruct(svcDsc, "PartialNestingMethod", true) - buf := remote.NewWriterBuffer(BufferSize * 10) - bc := bthrift.NewBinaryProtocol(buf) - err = codec.Write(ctx, bc, v, gthrift.NewBase()) - require.NoError(b, err) - - b.SetBytes(int64(len(data))) - b.ResetTimer() - for i := 0; i < b.N; i++ { - buf.Flush() - bc := bthrift.NewBinaryProtocol(buf) - _ = codec.Write(ctx, bc, v, gthrift.NewBase()) - } - }) -} - func BenchmarkThriftMarshalAll_KitexFast(b *testing.B) { b.Run("small", func(b *testing.B) { obj := getSimpleValue() diff --git a/testdata/test/go.mod b/testdata/test/go.mod index f677b08d..dd1a6e56 100644 --- a/testdata/test/go.mod +++ b/testdata/test/go.mod @@ -5,8 +5,8 @@ go 1.19 require ( github.com/apache/thrift v0.20.0 github.com/bytedance/sonic v1.12.0 - github.com/cloudwego/dynamicgo v0.2.6 - github.com/cloudwego/kitex v0.9.3-rc2 + github.com/cloudwego/dynamicgo v0.2.9 + github.com/cloudwego/kitex v0.10.4-0.20240731031152-e2ff8eeacaed github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.9.0 @@ -15,16 +15,17 @@ require ( ) require ( - github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b // indirect + github.com/bytedance/gopkg v0.0.0-20240711085056-a03554c296f8 // indirect github.com/bytedance/sonic/loader v0.2.0 // indirect - github.com/choleraehyq/pid v0.0.18 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/configmanager v0.2.2 // indirect github.com/cloudwego/fastpb v0.0.4 // indirect github.com/cloudwego/frugal v0.1.15 // indirect + github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/cloudwego/netpoll v0.6.0 // indirect - github.com/cloudwego/thriftgo v0.3.6 // indirect + github.com/cloudwego/netpoll v0.6.3 // indirect + github.com/cloudwego/runtimex v0.1.0 // indirect + github.com/cloudwego/thriftgo v0.3.15 // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3 // indirect diff --git a/testdata/test/go.sum b/testdata/test/go.sum index 2aec8af1..c93d7f5e 100644 --- a/testdata/test/go.sum +++ b/testdata/test/go.sum @@ -12,11 +12,9 @@ github.com/apache/thrift v0.13.0 h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bytedance/gopkg v0.0.0-20220413063733-65bf48ffb3a7/go.mod h1:2ZlV9BaUH4+NXIBF0aMdKKAnHTzqH+iMU4KUjAbL23Q= -github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b h1:R6PWoQtxEMpWJPHnpci+9LgFxCS7iJCfOGBvCgZeTKI= -github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= -github.com/bytedance/mockey v1.2.7 h1:8j4yCqS5OmMe2dQCxPit4FVkwTK9nrykIgbOZN3s28o= -github.com/bytedance/mockey v1.2.7/go.mod h1:bNrUnI1u7+pAc0TYDgPATM+wF2yzHxmNH+iDXg4AOCU= +github.com/bytedance/gopkg v0.0.0-20240507064146-197ded923ae3/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= +github.com/bytedance/gopkg v0.0.0-20240711085056-a03554c296f8 h1:rDwLxYTMoKHaw4cS0bQhaTZnkXp5e6ediCggGcRD/CA= +github.com/bytedance/gopkg v0.0.0-20240711085056-a03554c296f8/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic v1.12.0 h1:YGPgxF9xzaCNvd/ZKdQ28yRovhfMFZQjuk6fKBzZ3ls= github.com/bytedance/sonic v1.12.0/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= @@ -24,11 +22,6 @@ github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4 github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/choleraehyq/pid v0.0.18 h1:O7LLxPoOyt3YtonlCC8BmNrF9P6Hc8B509UOqlPSVhw= -github.com/choleraehyq/pid v0.0.18/go.mod h1:uhzeFgxJZWQsZulelVQZwdASxQ9TIPZYL4TPkQMtL/U= -github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY= -github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic= -github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= @@ -38,22 +31,25 @@ github.com/cloudwego/fastpb v0.0.4 h1:/ROVVfoFtpfc+1pkQLzGs+azjxUbSOsAqSY4tAAx4m github.com/cloudwego/fastpb v0.0.4/go.mod h1:/V13XFTq2TUkxj2qWReV8MwfPC4NnPcy6FsrojnsSG0= github.com/cloudwego/frugal v0.1.15 h1:LC55UJKhQPMFVjDPbE+LJcF7etZjSx6uokG1tk0wPK0= github.com/cloudwego/frugal v0.1.15/go.mod h1:26kU1r18vA8vRg12c66XPDlfv1GQHDbE1RpusipXfcI= +github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40 h1:H1D2KkfXUimnvJ1KPkhYLFrJOiOz33iAwTA8Puatvfw= +github.com/cloudwego/gopkg v0.0.0-20240731030152-5e0df5ad4e40/go.mod h1:32yKw2zkpTMtuX6amJR0EMK79f0vGPr67UcArCOlZLU= github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/cloudwego/kitex v0.9.3-rc2 h1:+B1j56Mo92McGNVSxwzZ2CrF7kbPnb9lfbWlTLrFems= -github.com/cloudwego/kitex v0.9.3-rc2/go.mod h1:0EAW3Mm5mmC483T+nqoBrDT96vgWRxtLpjeF8twLsc4= -github.com/cloudwego/localsession v0.0.2/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8= -github.com/cloudwego/netpoll v0.6.0 h1:JRMkrA1o8k/4quxzg6Q1XM+zIhwZsyoWlq6ef+ht31U= -github.com/cloudwego/netpoll v0.6.0/go.mod h1:xVefXptcyheopwNDZjDPcfU6kIjZXZ4nY550k1yH9eQ= -github.com/cloudwego/thriftgo v0.3.6 h1:gHHW8Ag3cAEQ/awP4emTJiRPr5yQjbANhcsmV8/Epbw= -github.com/cloudwego/thriftgo v0.3.6/go.mod h1:29ukiySoAMd0vXMYIduAY9dph/7dmChvOS11YLotFb8= +github.com/cloudwego/kitex v0.10.4-0.20240731031152-e2ff8eeacaed h1:ayI1ge4aXb6DfKm2A36JszyHSZWUvVOZgCw6TgG6eEM= +github.com/cloudwego/kitex v0.10.4-0.20240731031152-e2ff8eeacaed/go.mod h1:DT970flaFfGIObs++ewGMVAUr9j5g9ioKUOMAYND8iw= +github.com/cloudwego/netpoll v0.6.3 h1:t+ndlwBFjQZimUj3ul31DwI45t18eOr2pcK3juZZm+E= +github.com/cloudwego/netpoll v0.6.3/go.mod h1:kaqvfZ70qd4T2WtIIpCOi5Cxyob8viEpzLhCrTrz3HM= +github.com/cloudwego/runtimex v0.1.0 h1:HG+WxWoj5/CDChDZ7D99ROwvSMkuNXAqt6hnhTTZDiI= +github.com/cloudwego/runtimex v0.1.0/go.mod h1:23vL/HGV0W8nSCHbe084AgEBdDV4rvXenEUMnUNvUd8= +github.com/cloudwego/thriftgo v0.3.15 h1:yB/DDGjeSjliyidMVBjKhGl9RgE4M8iVIz5dKpAIyUs= +github.com/cloudwego/thriftgo v0.3.15/go.mod h1:R4a+4aVDI0V9YCTfpNgmvbkq/9ThKgF7Om8Z0I36698= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= @@ -72,12 +68,10 @@ github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2C github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= @@ -103,22 +97,16 @@ github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3 h1:mpL/HvfIgIejhVwAfx github.com/google/pprof v0.0.0-20220608213341-c488b8fa1db3/go.mod h1:gSuNB+gJaOiQKLEZ+q+PK9Mq3SOzhRcw2GsGS/FhYDk= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= -github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/jhump/protoreflect v1.8.2 h1:k2xE7wcUomeqwY0LDCYA16y4WWfyTcMx5mKhk0d4ua0= github.com/jhump/protoreflect v1.8.2/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= @@ -131,7 +119,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/gls v0.0.0-20220109145502-612d0167dce5/go.mod h1:I8AX+yW//L8Hshx6+a1m3bYkwXkpsVjA2795vP4f4oQ= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= @@ -150,10 +137,6 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -165,7 +148,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/thrift-iterator/go v0.0.0-20190402154806-9b5a67519118 h1:MIx5ElxAmfKzHGb3ptBbq9YE3weh55cH1Mb7VA4Oxbg= @@ -187,10 +169,8 @@ github.com/v2pro/wombat v0.0.0-20180402055224-a56dbdcddef2/go.mod h1:wen8nMxrRrU github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/arch v0.0.0-20201008161808-52c3e6f60cff/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.2.0 h1:W1sUEHXiJTfjaFJ5SLo0N6lZn+0eO5gWD1MFeTGqQEY= golang.org/x/arch v0.2.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= @@ -199,7 +179,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -229,10 +208,8 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -244,12 +221,9 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -261,7 +235,6 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -273,34 +246,23 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220110181412-a018aaa089fe/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -309,21 +271,16 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -362,7 +319,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=