From 250840730886343e7ec53f50f6e265c111c3e36b Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Sat, 22 Jan 2022 20:54:35 +0800
Subject: [PATCH] rename PrepareAndSubmit -> Do

---
 dtmcli/msg.go  | 8 ++++----
 dtmgrpc/msg.go | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dtmcli/msg.go b/dtmcli/msg.go
index d40f503..43f4047 100644
--- a/dtmcli/msg.go
+++ b/dtmcli/msg.go
@@ -41,15 +41,15 @@ func (s *Msg) Submit() error {
 	return dtmimp.TransCallDtm(&s.TransBase, s, "submit")
 }
 
-// PrepareAndSubmit one method for the entire busi->prepare->submit
+// PrepareAndSubmit one method for the entire prepare->busi->submit
 func (s *Msg) PrepareAndSubmit(queryPrepared string, db *sql.DB, busiCall BarrierBusiFunc) error {
-	return s.PrepareAndSubmitBarrier(queryPrepared, func(bb *BranchBarrier) error {
+	return s.Do(queryPrepared, func(bb *BranchBarrier) error {
 		return bb.CallWithDB(db, busiCall)
 	})
 }
 
-// PrepareAndSubmitBarrier one method for the entire busi->prepare->submit
-func (s *Msg) PrepareAndSubmitBarrier(queryPrepared string, busiCall func(bb *BranchBarrier) error) error {
+// Do one method for the entire prepare->busi->submit
+func (s *Msg) Do(queryPrepared string, busiCall func(bb *BranchBarrier) error) error {
 	bb, err := BarrierFrom(s.TransType, s.Gid, "00", "msg") // a special barrier for msg QueryPrepared
 	if err == nil {
 		err = s.Prepare(queryPrepared)
diff --git a/dtmgrpc/msg.go b/dtmgrpc/msg.go
index 2691aab..33ab7a3 100644
--- a/dtmgrpc/msg.go
+++ b/dtmgrpc/msg.go
@@ -44,15 +44,15 @@ func (s *MsgGrpc) Submit() error {
 	return dtmgimp.DtmGrpcCall(&s.TransBase, "Submit")
 }
 
-// PrepareAndSubmit one method for the entire busi->prepare->submit
+// PrepareAndSubmit one method for the entire prepare->busi->submit
 func (s *MsgGrpc) PrepareAndSubmit(queryPrepared string, db *sql.DB, busiCall dtmcli.BarrierBusiFunc) error {
-	return s.PrepareAndSubmitBarrier(queryPrepared, func(bb *dtmcli.BranchBarrier) error {
+	return s.Do(queryPrepared, func(bb *dtmcli.BranchBarrier) error {
 		return bb.CallWithDB(db, busiCall)
 	})
 }
 
-// PrepareAndSubmit one method for the entire busi->prepare->submit
-func (s *MsgGrpc) PrepareAndSubmitBarrier(queryPrepared string, busiCall func(bb *dtmcli.BranchBarrier) error) error {
+// Do one method for the entire prepare->busi->submit
+func (s *MsgGrpc) Do(queryPrepared string, busiCall func(bb *dtmcli.BranchBarrier) error) error {
 	bb, err := dtmcli.BarrierFrom(s.TransType, s.Gid, "00", "msg") // a special barrier for msg QueryPrepared
 	if err == nil {
 		err = s.Prepare(queryPrepared)