Skip to content

Commit

Permalink
ci: rm test that relies on kitex internal pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaost
xiaost committed Jul 31, 2024
1 parent f05c71b commit 4b3127a
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 573 deletions.
146 changes: 0 additions & 146 deletions testdata/test/baseline_j2t_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
// }
// }
// })
}
127 changes: 2 additions & 125 deletions testdata/test/baseline_t2j_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package test

import (
"bytes"
"context"
"encoding/json"
ejson "encoding/json"
Expand All @@ -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"
)

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)
}
})
}
Loading

0 comments on commit 4b3127a

Please sign in to comment.