Skip to content

Commit 1503f5f

Browse files
Code-FightCode-Fight
authored
Saga end-to-end verification (#897)
* saga support * fix bug
1 parent fe13663 commit 1503f5f

File tree

80 files changed

+2547
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2547
-332
lines changed

‎README_ZH.md‎

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/google/cel-go v0.18.0
3737
github.com/mattn/go-sqlite3 v1.14.19
3838
github.com/robertkrimen/otto v0.4.0
39-
golang.org/x/sync v0.16.0
39+
golang.org/x/sync v0.11.0
4040
google.golang.org/protobuf v1.33.0
4141
gopkg.in/yaml.v3 v3.0.1
4242
)
@@ -91,7 +91,7 @@ require (
9191
github.com/yusufpapurcu/wmi v1.2.2 // indirect
9292
go.uber.org/multierr v1.8.0 // indirect
9393
golang.org/x/arch v0.3.0 // indirect
94-
golang.org/x/text v0.27.0 // indirect
94+
golang.org/x/text v0.14.0 // indirect
9595
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
9696
gopkg.in/sourcemap.v1 v1.0.5 // indirect
9797
)
@@ -108,7 +108,7 @@ require (
108108
golang.org/x/crypto v0.17.0 // indirect
109109
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
110110
golang.org/x/net v0.10.0 // indirect
111-
golang.org/x/sys v0.32.0 // indirect
111+
golang.org/x/sys v0.25.0 // indirect
112112
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
113113
google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
114114
vimagination.zapto.org/memio v0.0.0-20200222190306-588ebc67b97d // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -954,8 +954,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
954954
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
955955
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
956956
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
957-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
958-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
957+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
958+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
959959
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
960960
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
961961
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1033,8 +1033,8 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc
10331033
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10341034
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10351035
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1036-
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
1037-
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1036+
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
1037+
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
10381038
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
10391039
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
10401040
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1047,8 +1047,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10471047
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10481048
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
10491049
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1050-
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
1051-
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
1050+
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
1051+
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
10521052
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10531053
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10541054
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎goimports.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
#
1717

1818
# format go imports style
19-
go install golang.org/x/tools/cmd/goimports
19+
go install golang.org/x/tools/cmd/goimports@v0.24.1
2020
goimports -local github.com/seata/seata-go -w .
2121

2222
# format licence style
23-
go install github.com/apache/skywalking-eyes/cmd/license-eye@latest
23+
go install github.com/apache/skywalking-eyes/cmd/license-eye@v0.6.0
2424
license-eye header fix
2525
# check dependency licence is valid
2626
license-eye dependency check

‎pkg/client/config.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,20 @@ package client
2020
import (
2121
"flag"
2222
"fmt"
23-
"github.com/seata/seata-go/pkg/saga"
2423
"io/ioutil"
2524
"os"
2625
"path/filepath"
2726
"runtime"
2827
"strings"
2928

29+
"github.com/seata/seata-go/pkg/saga"
30+
3031
"github.com/knadh/koanf"
3132
"github.com/knadh/koanf/parsers/json"
3233
"github.com/knadh/koanf/parsers/toml"
3334
"github.com/knadh/koanf/parsers/yaml"
3435
"github.com/knadh/koanf/providers/rawbytes"
36+
3537
"github.com/seata/seata-go/pkg/discovery"
3638

3739
"github.com/seata/seata-go/pkg/datasource/sql"

‎pkg/protocol/codec/codec.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ func (c *CodecManager) Encode(codecType CodecType, in interface{}) []byte {
114114

115115
func Init() {
116116
// Global
117+
GetCodecManager().RegisterCodec(CodecTypeSeata, &GlobalReportRequestCodec{})
117118
GetCodecManager().RegisterCodec(CodecTypeSeata, &GlobalReportResponseCodec{})
118119
GetCodecManager().RegisterCodec(CodecTypeSeata, &GlobalBeginRequestCodec{})
119120
GetCodecManager().RegisterCodec(CodecTypeSeata, &GlobalBeginResponseCodec{})

‎pkg/protocol/codec/global_report_request_codec.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@ func (g *GlobalReportRequestCodec) Encode(in interface{}) []byte {
5252

5353
// GetMessageType get global report request's message type
5454
func (g *GlobalReportRequestCodec) GetMessageType() message.MessageType {
55-
return message.MessageTypeGlobalReportResult
55+
// must be the request type, not the result type
56+
return message.MessageTypeGlobalReport
5657
}

‎pkg/remoting/getty/rpc_client.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
getty "github.com/apache/dubbo-getty"
2727
gxsync "github.com/dubbogo/gost/sync"
28+
2829
"github.com/seata/seata-go/pkg/discovery"
2930
"github.com/seata/seata-go/pkg/protocol/codec"
3031
"github.com/seata/seata-go/pkg/remoting/config"

‎pkg/remoting/loadbalance/random_loadbalance_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ import (
2323
"testing"
2424

2525
"github.com/golang/mock/gomock"
26-
"github.com/seata/seata-go/pkg/remoting/mock"
2726
"github.com/stretchr/testify/assert"
27+
28+
"github.com/seata/seata-go/pkg/remoting/mock"
2829
)
2930

3031
func TestRandomLoadBalance_Normal(t *testing.T) {

‎pkg/remoting/loadbalance/xid_loadbalance_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import (
2222
"testing"
2323

2424
"github.com/golang/mock/gomock"
25-
"github.com/seata/seata-go/pkg/remoting/mock"
2625
"github.com/stretchr/testify/assert"
26+
27+
"github.com/seata/seata-go/pkg/remoting/mock"
2728
)
2829

2930
func TestXidLoadBalance(t *testing.T) {

0 commit comments

Comments
 (0)