Skip to content

Commit f6c8262

Browse files
DMwangnimaYangruiEmma
DMwangnima
and
YangruiEmma
authored
chore: update dependencies and add ErrRPCFinish back for compatibility (#1953)
Co-authored-by: YangruiEmma <yangrui.emma@bytedance.com>
1 parent e4e1622 commit f6c8262

6 files changed

Lines changed: 25 additions & 12 deletions

File tree

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ module github.com/cloudwego/kitex
33
go 1.20
44

55
require (
6-
github.com/bytedance/gopkg v0.1.3
6+
github.com/bytedance/gopkg v0.1.4
77
github.com/bytedance/sonic v1.15.0
88
github.com/cloudwego/configmanager v0.2.3
99
github.com/cloudwego/dynamicgo v0.8.0
10-
github.com/cloudwego/fastpb v0.0.5
10+
github.com/cloudwego/fastpb v0.0.6
1111
github.com/cloudwego/frugal v0.3.1
12-
github.com/cloudwego/gopkg v0.1.8
12+
github.com/cloudwego/gopkg v0.2.0
1313
github.com/cloudwego/localsession v0.2.1
1414
github.com/cloudwego/netpoll v0.7.2
1515
github.com/cloudwego/prutal v0.1.3
@@ -21,7 +21,7 @@ require (
2121
github.com/json-iterator/go v1.1.12
2222
github.com/tidwall/gjson v1.17.3
2323
golang.org/x/net v0.24.0
24-
golang.org/x/sync v0.8.0
24+
golang.org/x/sync v0.11.0
2525
golang.org/x/sys v0.30.0
2626
golang.org/x/tools v0.6.0
2727
google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
33
github.com/bytedance/gopkg v0.1.1/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
4-
github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M=
5-
github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM=
4+
github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM=
5+
github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4=
66
github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uSE=
77
github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k=
88
github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE=
@@ -15,13 +15,13 @@ github.com/cloudwego/configmanager v0.2.3 h1:P0YTBgqDBnKeI/VARvut/Dc9Rfxt9Bw1Nv7
1515
github.com/cloudwego/configmanager v0.2.3/go.mod h1:4GeSKjH6JLvKx4/Hrbh5dse8fDqj1n/Up8HfU4wHJ+w=
1616
github.com/cloudwego/dynamicgo v0.8.0 h1:G5rjZlmXGgORR6jGe6MXQ6JjlGSI+e3eo9a4aCJGjsQ=
1717
github.com/cloudwego/dynamicgo v0.8.0/go.mod h1:otlgzHhn68GH0vlmCGE0EAwcLEV8+n4yrbpocJ8hk+s=
18-
github.com/cloudwego/fastpb v0.0.5 h1:vYnBPsfbAtU5TVz5+f9UTlmSCixG9F9vRwaqE0mZPZU=
19-
github.com/cloudwego/fastpb v0.0.5/go.mod h1:Bho7aAKBUtT9RPD2cNVkTdx4yQumfSv3If7wYnm1izk=
18+
github.com/cloudwego/fastpb v0.0.6 h1:i/RlQhtQHe7IevZCO82SHH0+hMp0OEJM5s9shQT5S20=
19+
github.com/cloudwego/fastpb v0.0.6/go.mod h1:Bho7aAKBUtT9RPD2cNVkTdx4yQumfSv3If7wYnm1izk=
2020
github.com/cloudwego/frugal v0.3.1 h1:dx+jacEWSChinpzpaaJnsdT9ANlMsw6+sNkajeOzh1U=
2121
github.com/cloudwego/frugal v0.3.1/go.mod h1:pMk46fFyAwUbW7q7lfdK7c6HsD6bWtu6/3Vhz63CgsY=
2222
github.com/cloudwego/gopkg v0.1.4/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI=
23-
github.com/cloudwego/gopkg v0.1.8 h1:ma9oACsY3v6xJwQ8NUc/h19GLV2ZCIjx0P6hqaSIlt4=
24-
github.com/cloudwego/gopkg v0.1.8/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI=
23+
github.com/cloudwego/gopkg v0.2.0 h1:EU8Ahrj0rCfKZQdah50zKnlrQ1o2AdPYM87UclIqLME=
24+
github.com/cloudwego/gopkg v0.2.0/go.mod h1:WjQPYI8PesfQalIVcLzVJBb1EAopioZ+D+3UGJ+dNBs=
2525
github.com/cloudwego/localsession v0.2.1 h1:obiuwSP2MQX+fFot3HjOQjvR5o7FlSc8Z4e5EM+NqRY=
2626
github.com/cloudwego/localsession v0.2.1/go.mod h1:J4uams2YT/2d4t7OI6A7NF7EcG8OlHJsOX2LdPbqoyc=
2727
github.com/cloudwego/netpoll v0.7.2 h1:4qDBGQ6CG2SvEXhZSDxMdtqt/NLDxjAVk0PC/biKiJo=
@@ -172,8 +172,9 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
172172
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
173173
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
174174
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
175-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
176175
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
176+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
177+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
177178
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
178179
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
179180
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎pkg/generic/thrift/raw_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func TestRawWriter_Write(t *testing.T) {
6363

6464
// normal message
6565
buf = buf[:0]
66+
out = bufiox.NewBytesWriter(&buf)
6667
err = w.Write(context.Background(), out, []byte("hello world"), "method", true, nil)
6768
test.Assert(t, err == nil)
6869
err = out.Flush()

‎pkg/kerrors/kerrors.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ var (
4242
ErrBiz = &basicError{"biz error"}
4343

4444
ErrRetry = &basicError{"retry error"}
45+
// Deprecated: ErrRPCFinish was used to indicate that the result of this retry
46+
// call should be discarded because another attempt has already received and
47+
// started decoding the response.
48+
// No longer needed since v0.15.0, but kept for backward compatibility.
49+
ErrRPCFinish = &basicError{"rpc call finished"}
4550
// ErrRoute happens when router fail to route this call
4651
ErrRoute = &basicError{"rpc route failed"}
4752
// ErrPayloadValidation happens when payload validation failed

‎pkg/remote/codec/thrift/codec_apache_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func TestGetSkippedStructBuffer(t *testing.T) {
5050
_, err = skipThriftStruct(trans)
5151
test.Assert(t, err != nil, err)
5252
test.Assert(t, strings.Contains(err.Error(), "skipThriftStruct"))
53-
test.Assert(t, strings.Contains(err.Error(), "EOF"))
53+
test.Assert(t, strings.Contains(err.Error(), "EOF") || strings.Contains(err.Error(), "no remaining data"))
5454
}
5555

5656
func TestApacheMarshalUnmarshal(t *testing.T) {

‎pkg/remote/trans/gonet/trans_server_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,12 @@ func TestServeConn(t *testing.T) {
215215

216216
// OnRead Error
217217
expectedErr = fmt.Errorf("OnReadError")
218+
// ReadFunc must return data so that Peek(1) in serveConn succeeds,
219+
// otherwise bufiox.DefaultReader returns "multiple Read calls return no data or error".
220+
mockConn.ReadFunc = func(b []byte) (n int, err error) {
221+
b[0] = 0
222+
return 1, nil
223+
}
218224
transSvr.transHdlr = &mocks.MockSvrTransHandler{
219225
OnActiveFunc: svrTransHdlr.OnActive,
220226
OnReadFunc: func(ctx context.Context, conn net.Conn) error {

0 commit comments

Comments
 (0)