opensource/dtm
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some e2p renamed

Browse Source
This commit is contained in:
yedf2 2021-08-11 19:12:05 +08:00
parent bad6977de8
commit 693d6d56ea
14 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/base_grpc.go
View File

@ -124,8 +124,8 @@ func (s *busiServer) TransInTccNested(ctx context.Context, in *dtmgrpc.BusiReque
req := TransReq{}
dtmcli.MustUnmarshal(in.BusiData, &req)
tcc, err := dtmgrpc.TccFromRequest(in)
e2p(err)
dtmcli.FatalIfError(err)
_, err = tcc.CallBranch(dtmcli.MustMarshal(req), BusiGrpc+"/examples.Busi/TransIn", BusiGrpc+"/examples.Busi/TransInConfirm", BusiGrpc+"/examples.Busi/TransInRevert")
e2p(err)
dtmcli.FatalIfError(err)
return &emptypb.Empty{}, handleGrpcBusiness(in, MainSwitch.TransInResult.Fetch(), req.TransInResult, dtmcli.GetFuncName())
}

8
examples/base_types.go
View File

@ -9,8 +9,6 @@ import (
"github.com/yedf/dtm/dtmcli"
)
var e2p = dtmcli.E2P
// M alias
type M = map[string]interface{}
@ -45,7 +43,7 @@ func reqFrom(c *gin.Context) *TransReq {
if !ok {
req := TransReq{}
err := c.BindJSON(&req)
e2p(err)
dtmcli.FatalIfError(err)
c.Set("trans_req", &req)
v = &req
}
@ -68,13 +66,13 @@ func dbGet() *common.DB {
func sdbGet() *sql.DB {
db, err := dtmcli.SdbGet(config.DB)
e2p(err)
dtmcli.FatalIfError(err)
return db
}
// MustGetTrans construct transaction info from request
func MustGetTrans(c *gin.Context) *dtmcli.BranchBarrier {
ti, err := dtmcli.BarrierFromQuery(c.Request.URL.Query())
e2p(err)
dtmcli.FatalIfError(err)
return ti
}

6
examples/data.go
View File

@ -14,10 +14,10 @@ var config = common.DtmConfig
// RunSQLScript 1
func RunSQLScript(conf map[string]string, script string, skipDrop bool) {
con, err := dtmcli.SdbAlone(conf)
e2p(err)
dtmcli.FatalIfError(err)
defer func() { con.Close() }()
content, err := ioutil.ReadFile(script)
e2p(err)
dtmcli.FatalIfError(err)
sqls := strings.Split(string(content), ";")
for _, sql := range sqls {
s := strings.TrimSpace(sql)
@ -25,7 +25,7 @@ func RunSQLScript(conf map[string]string, script string, skipDrop bool) {
continue
}
_, err = dtmcli.SdbExec(con, s)
e2p(err)
dtmcli.FatalIfError(err)
}
}

2
examples/grpc_msg.go
View File

@ -12,6 +12,6 @@ func MsgGrpcFireRequest() string {
Add(BusiGrpc+"/examples.Busi/TransOut", req).
Add(BusiGrpc+"/examples.Busi/TransIn", req)
err := msg.Submit()
e2p(err)
dtmcli.FatalIfError(err)
return msg.Gid
}

2
examples/grpc_xa.go
View File

@ -35,6 +35,6 @@ func XaGrpcFireRequest() string {
_, err = xa.CallBranch(busiData, BusiGrpc+"/examples.Busi/TransInXa")
return err
})
e2p(err)
dtmcli.FatalIfError(err)
return gid
}

4
examples/msg.go
View File

@ -12,9 +12,9 @@ func MsgFireRequest() string {
Add(Busi+"/TransOut", req).
Add(Busi+"/TransIn", req)
err := msg.Prepare(Busi + "/TransQuery")
e2p(err)
dtmcli.FatalIfError(err)
dtmcli.Logf("busi trans submit")
err = msg.Submit()
e2p(err)
dtmcli.FatalIfError(err)
return msg.Gid
}

2
examples/quick_start.go
View File

@ -37,7 +37,7 @@ func QsFireRequest() string {
Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req)
// 提交saga事务，dtm会完成所有的子事务/回滚所有的子事务
err := saga.Submit()
e2p(err)
dtmcli.FatalIfError(err)
return saga.Gid
}

2
examples/saga.go
View File

@ -18,6 +18,6 @@ func SagaFireRequest() string {
dtmcli.Logf("saga busi trans submit")
err := saga.Submit()
dtmcli.Logf("result gid is: %s", saga.Gid)
e2p(err)
dtmcli.FatalIfError(err)
return saga.Gid
}

2
examples/saga_barrier.go
View File

@ -17,7 +17,7 @@ func SagaBarrierFireRequest() string {
Add(Busi+"/SagaBTransIn", Busi+"/SagaBTransInCompensate", req)
dtmcli.Logf("busi trans submit")
err := saga.Submit()
e2p(err)
dtmcli.FatalIfError(err)
return saga.Gid
}

2
examples/saga_wait.go
View File

@ -18,6 +18,6 @@ func SagaWaitFireRequest() string {
saga.WaitResult = true // 设置为等待结果模式，后面的submit调用，会等待服务器处理这个事务。如果Submit正常返回，那么整个全局事务已成功完成
err := saga.Submit()
dtmcli.Logf("result gid is: %s", saga.Gid)
e2p(err)
dtmcli.FatalIfError(err)
return saga.Gid
}

6
examples/tcc.go
View File

@ -11,7 +11,7 @@ func init() {
setupFuncs["TccSetupSetup"] = func(app *gin.Engine) {
app.POST(BusiAPI+"/TransInTccParent", common.WrapHandler(func(c *gin.Context) (interface{}, error) {
tcc, err := dtmcli.TccFromQuery(c.Request.URL.Query())
e2p(err)
dtmcli.FatalIfError(err)
dtmcli.Logf("TransInTccParent ")
return tcc.CallBranch(&TransReq{Amount: reqFrom(c).Amount}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
}))
@ -28,7 +28,7 @@ func TccFireRequestNested() string {
}
return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TransInTccParent", Busi+"/TransInConfirm", Busi+"/TransInRevert")
})
e2p(err)
dtmcli.FatalIfError(err)
return gid
}
@ -43,6 +43,6 @@ func TccFireRequest() string {
}
return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TransIn", Busi+"/TransInConfirm", Busi+"/TransInRevert")
})
e2p(err)
dtmcli.FatalIfError(err)
return gid
}

14
examples/tcc_barrier.go
View File

@ -21,7 +21,7 @@ func TccBarrierFireRequest() string {
}
return tcc.CallBranch(&TransReq{Amount: 30}, Busi+"/TccBTransInTry", Busi+"/TccBTransInConfirm", Busi+"/TccBTransInCancel")
})
e2p(err)
dtmcli.FatalIfError(err)
return gid
}
@ -66,21 +66,21 @@ func tccBarrierTransInTry(c *gin.Context) (interface{}, error) {
return req.TransInResult, nil
}
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustTrading(sdb, transInUID, req.Amount)
})
}
func tccBarrierTransInConfirm(c *gin.Context) (interface{}, error) {
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustBalance(sdb, transInUID, reqFrom(c).Amount)
})
}
func tccBarrierTransInCancel(c *gin.Context) (interface{}, error) {
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustTrading(sdb, transInUID, -reqFrom(c).Amount)
})
}
@ -91,14 +91,14 @@ func tccBarrierTransOutTry(c *gin.Context) (interface{}, error) {
return req.TransInResult, nil
}
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustTrading(sdb, transOutUID, -req.Amount)
})
}
func tccBarrierTransOutConfirm(c *gin.Context) (interface{}, error) {
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustBalance(sdb, transOutUID, -reqFrom(c).Amount)
})
}
@ -106,7 +106,7 @@ func tccBarrierTransOutConfirm(c *gin.Context) (interface{}, error) {
// TccBarrierTransOutCancel will be use in test
func TccBarrierTransOutCancel(c *gin.Context) (interface{}, error) {
barrier := MustGetTrans(c)
return barrier.Call(dbGet().ToSQLDB(), func(sdb *sql.Tx) (interface{}, error) {
return barrier.Call(sdbGet(), func(sdb *sql.Tx) (interface{}, error) {
return adjustTrading(sdb, transOutUID, reqFrom(c).Amount)
})
}

4
examples/xa.go
View File

@ -18,7 +18,7 @@ func init() {
return xa.HandleCallback(c.Query("gid"), c.Query("branch_id"), c.Query("branch_type"))
}))
})
e2p(err)
dtmcli.FatalIfError(err)
}
}
@ -32,6 +32,6 @@ func XaFireRequest() string {
}
return xa.CallBranch(&TransReq{Amount: 30}, Busi+"/TransInXa")
})
e2p(err)
dtmcli.FatalIfError(err)
return gid
}

1
test/examples_test.go
View File

@ -19,4 +19,5 @@ func TestExamples(t *testing.T) {
assertSucceed(t, examples.TccFireRequestNested())
assertSucceed(t, examples.XaFireRequest())
assertSucceed(t, examples.MsgGrpcFireRequest())
assertSucceed(t, examples.GrpcSagaFireRequest())
}