update DoAndSubmit

kebin6 · Jan 27, 2022 · 7b4ca28 · 7b4ca28
1 parent 7a05755
commit 7b4ca28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dtmcli/msg.go b/dtmcli/msg.go
@@ -41,14 +41,15 @@ func (s *Msg) Submit() error {
 	return dtmimp.TransCallDtm(&s.TransBase, s, "submit")
 }
 
-// DoAndSubmitDB short method for Do on db type. please see Do
+// DoAndSubmitDB short method for Do on db type. please see DoAndSubmit
 func (s *Msg) DoAndSubmitDB(queryPrepared string, db *sql.DB, busiCall BarrierBusiFunc) error {
 	return s.DoAndSubmit(queryPrepared, func(bb *BranchBarrier) error {
 		return bb.CallWithDB(db, busiCall)
 	})
 }
 
 // DoAndSubmit one method for the entire prepare->busi->submit
+// the error returned by busiCall will be returned
 // if busiCall return ErrFailure, then abort is called directly
 // if busiCall return not nil error other than ErrFailure, then DoAndSubmit will call queryPrepared to get the result
 func (s *Msg) DoAndSubmit(queryPrepared string, busiCall func(bb *BranchBarrier) error) error {

diff --git a/dtmgrpc/msg.go b/dtmgrpc/msg.go
@@ -44,14 +44,15 @@ func (s *MsgGrpc) Submit() error {
 	return dtmgimp.DtmGrpcCall(&s.TransBase, "Submit")
 }
 
-// DoAndSubmitDB short method for Do on db type. please see Do
+// DoAndSubmitDB short method for Do on db type. please see DoAndSubmit
 func (s *MsgGrpc) DoAndSubmitDB(queryPrepared string, db *sql.DB, busiCall dtmcli.BarrierBusiFunc) error {
 	return s.DoAndSubmit(queryPrepared, func(bb *dtmcli.BranchBarrier) error {
 		return bb.CallWithDB(db, busiCall)
 	})
 }
 
 // DoAndSubmit one method for the entire prepare->busi->submit
+// the error returned by busiCall will be returned
 // if busiCall return ErrFailure, then abort is called directly
 // if busiCall return not nil error other than ErrFailure, then DoAndSubmit will call queryPrepared to get the result
 func (s *MsgGrpc) DoAndSubmit(queryPrepared string, busiCall func(bb *dtmcli.BranchBarrier) error) error {
@@ -61,11 +62,11 @@ func (s *MsgGrpc) DoAndSubmit(queryPrepared string, busiCall func(bb *dtmcli.Bra
 	}
 	if err == nil {
 		errb := busiCall(bb)
-		if errb != nil && !errors.Is(err, dtmcli.ErrFailure) {
+		if errb != nil && !errors.Is(errb, dtmcli.ErrFailure) {
 			err = dtmgimp.InvokeBranch(&s.TransBase, true, nil, queryPrepared, &[]byte{}, bb.BranchID, bb.Op)
 			err = GrpcError2DtmError(err)
 		}
-		if errors.Is(err, dtmcli.ErrFailure) || errors.Is(errb, dtmcli.ErrFailure) {
+		if errors.Is(errb, dtmcli.ErrFailure) || errors.Is(err, dtmcli.ErrFailure) {
 			_ = dtmgimp.DtmGrpcCall(&s.TransBase, "Abort")
 		} else if err == nil {
 			err = s.Submit()