Merge pull request #1037 from cloudwego/hotfix/generic_dead_loop

hotfix(generic): generic bugs

Author: AsterDY

pkg/generic/json_test/idl/self_ref.thrift

@@ -3,4 +3,8 @@ namespace go kitex.test.server
 struct A {
     1: A self
     2: string extra
+}
+
+service Mock {
+    string Test(1:A req)
 }

pkg/generic/jsonthrift_codec_test.go

@@ -57,6 +57,36 @@ func TestJsonThriftCodec(t *testing.T) {
 	test.Assert(t, err == nil)
 }
 
+func TestJsonThriftCodec_SelfRef(t *testing.T) {
+	p, err := NewThriftFileProvider("./json_test/idl/mock.thrift")
+	test.Assert(t, err == nil)
+	jtc, err := newJsonThriftCodec(p, thriftCodec)
+	test.Assert(t, err == nil)
+	defer jtc.Close()
+	test.Assert(t, jtc.Name() == "JSONThrift")
+
+	method, err := jtc.getMethod(nil, "Test")
+	test.Assert(t, err == nil)
+	test.Assert(t, method.Name == "Test")
+
+	ctx := context.Background()
+	sendMsg := initJsonSendMsg(transport.TTHeader)
+
+	// Marshal side
+	out := remote.NewWriterBuffer(256)
+	err = jtc.Marshal(ctx, sendMsg, out)
+	test.Assert(t, err == nil, err)
+
+	// Unmarshal side
+	recvMsg := initJsonRecvMsg()
+	buf, err := out.Bytes()
+	test.Assert(t, err == nil)
+	recvMsg.SetPayloadLen(len(buf))
+	in := remote.NewReaderBuffer(buf)
+	err = jtc.Unmarshal(ctx, recvMsg, in)
+	test.Assert(t, err == nil, err)
+}
+
 func TestJsonExceptionError(t *testing.T) {
 	p, err := NewThriftFileProvider("./json_test/idl/mock.thrift")
 	test.Assert(t, err == nil)

pkg/generic/map_test/idl/self_ref.thrift

@@ -3,4 +3,8 @@ namespace go kitex.test.server
 struct A {
     1: A self
     2: string extra
+}
+
+service Mock {
+    string Test(1:A req)
 }

pkg/generic/mapthrift_codec_test.go

@@ -18,6 +18,7 @@ package generic
 
 import (
 	"context"
+	"reflect"
 	"testing"
 
 	"github.com/cloudwego/kitex/internal/mocks"
@@ -58,6 +59,42 @@ func TestMapThriftCodec(t *testing.T) {
 	test.Assert(t, err == nil)
 }
 
+func TestMapThriftCodecSelfRef(t *testing.T) {
+	p, err := NewThriftFileProvider("./map_test/idl/self_ref.thrift")
+	test.Assert(t, err == nil)
+	mtc, err := newMapThriftCodec(p, thriftCodec)
+	test.Assert(t, err == nil)
+	defer mtc.Close()
+	test.Assert(t, mtc.Name() == "MapThrift")
+
+	method, err := mtc.getMethod(nil, "Test")
+	test.Assert(t, err == nil)
+	test.Assert(t, method.Name == "Test")
+
+	ctx := context.Background()
+	sendMsg := initNilMapSendMsg(transport.TTHeader)
+
+	// Marshal side
+	out := remote.NewWriterBuffer(0)
+	err = mtc.Marshal(ctx, sendMsg, out)
+	test.Assert(t, err == nil)
+
+	// UnMarshal side
+	recvMsg := initMapRecvMsg()
+	buf, err := out.Bytes()
+	test.Assert(t, err == nil)
+	recvMsg.SetPayloadLen(len(buf))
+	in := remote.NewReaderBuffer(buf)
+	err = mtc.Unmarshal(ctx, recvMsg, in)
+	test.Assert(t, err == nil)
+	exp := map[string]interface{}{
+		"self":  map[string]interface{}{},
+		"extra": "",
+	}
+	act := recvMsg.Data().(*Args).Request
+	test.Assert(t, reflect.DeepEqual(exp, act))
+}
+
 func TestMapThriftCodecForJSON(t *testing.T) {
 	p, err := NewThriftFileProvider("./map_test/idl/mock.thrift")
 	test.Assert(t, err == nil)
@@ -127,7 +164,23 @@ func initMapSendMsg(tp transport.Protocol) remote.Message {
 					"Test1": "Test2",
 				},
 			},
-			Method: "Test",
+		},
+		Method: "Test",
+	}
+	svcInfo := mocks.ServiceInfo()
+	ink := rpcinfo.NewInvocation("", "Test")
+	ri := rpcinfo.NewRPCInfo(nil, nil, ink, nil, rpcinfo.NewRPCStats())
+	msg := remote.NewMessage(req, svcInfo, ri, remote.Call, remote.Client)
+	msg.SetProtocolInfo(remote.NewProtocolInfo(tp, svcInfo.PayloadCodec))
+	return msg
+}
+
+func initNilMapSendMsg(tp transport.Protocol) remote.Message {
+	req := &Args{
+		Request: &descriptor.HTTPRequest{
+			Body: map[string]interface{}{
+				"self": nil,
+			},
 		},
 		Method: "Test",
 	}

pkg/generic/thrift/read_test.go

@@ -431,6 +431,14 @@ func Test_readMap(t *testing.T) {
 			return "world", nil
 		},
 	}
+	mockTTransportWithInt16Key := &mocks.MockThriftTTransport{
+		ReadMapBeginFunc: func() (keyType, valueType thrift.TType, size int, err error) {
+			return thrift.I16, thrift.BOOL, 1, nil
+		},
+		ReadI16Func: func() (int16, error) {
+			return 16, nil
+		},
+	}
 	tests := []struct {
 		name    string
 		args    args
@@ -450,6 +458,12 @@ func Test_readMap(t *testing.T) {
 			map[string]interface{}{"hello": "world"},
 			false,
 		},
+		{
+			"readJsonMapWithInt16Key",
+			args{in: mockTTransportWithInt16Key, t: &descriptor.TypeDescriptor{Type: descriptor.MAP, Key: &descriptor.TypeDescriptor{Type: descriptor.I16}, Elem: &descriptor.TypeDescriptor{Type: descriptor.BOOL}}, opt: &readerOption{forJSON: true}},
+			map[string]interface{}{"16": false},
+			false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/generic/thrift/util.go

@@ -129,6 +129,8 @@ func buildinTypeIntoString(val interface{}) string {
 		return strconv.FormatBool(v)
 	case int8:
 		return strconv.FormatInt(int64(v), 10)
+	case int16:
+		return strconv.FormatInt(int64(v), 10)
 	case int32:
 		return strconv.FormatInt(int64(v), 10)
 	case int64: