From 57f7408b03542b7a2e54e587f45dd254384b883f Mon Sep 17 00:00:00 2001
From: yedf2 <120050102@qq.com>
Date: Thu, 10 Feb 2022 18:12:34 +0800
Subject: [PATCH] msg change to opMsg

---
 dtmcli/barrier.go       | 4 +++-
 dtmcli/barrier_mongo.go | 2 +-
 dtmcli/barrier_redis.go | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dtmcli/barrier.go b/dtmcli/barrier.go
index dc0e59e..558f9af 100644
--- a/dtmcli/barrier.go
+++ b/dtmcli/barrier.go
@@ -27,6 +27,8 @@ type BranchBarrier struct {
 	BarrierID int
 }
 
+const opMsg = "msg"
+
 func (bb *BranchBarrier) String() string {
 	return fmt.Sprintf("transInfo: %s %s %s %s", bb.TransType, bb.Gid, bb.BranchID, bb.Op)
 }
@@ -82,7 +84,7 @@ func (bb *BranchBarrier) Call(tx *sql.Tx, busiCall BarrierBusiFunc) (rerr error)
 	currentAffected, rerr := insertBarrier(tx, bb.TransType, bb.Gid, bb.BranchID, bb.Op, bid, bb.Op)
 	logger.Debugf("originAffected: %d currentAffected: %d", originAffected, currentAffected)
 
-	if rerr == nil && bb.Op == "msg" && currentAffected == 0 { // for msg's DoAndSubmit, repeated insert should be rejected.
+	if rerr == nil && bb.Op == opMsg && currentAffected == 0 { // for msg's DoAndSubmit, repeated insert should be rejected.
 		return ErrDuplicated
 	}
 
diff --git a/dtmcli/barrier_mongo.go b/dtmcli/barrier_mongo.go
index 8178b4a..98c0f67 100644
--- a/dtmcli/barrier_mongo.go
+++ b/dtmcli/barrier_mongo.go
@@ -33,7 +33,7 @@ func (bb *BranchBarrier) MongoCall(mc *mongo.Client, busiCall func(mongo.Session
 		currentAffected, rerr := mongoInsertBarrier(sc, mc, bb.TransType, bb.Gid, bb.BranchID, bb.Op, bid, bb.Op)
 		logger.Debugf("originAffected: %d currentAffected: %d", originAffected, currentAffected)
 
-		if rerr == nil && bb.Op == "msg" && currentAffected == 0 { // for msg's DoAndSubmit, repeated insert should be rejected.
+		if rerr == nil && bb.Op == opMsg && currentAffected == 0 { // for msg's DoAndSubmit, repeated insert should be rejected.
 			return ErrDuplicated
 		}
 
diff --git a/dtmcli/barrier_redis.go b/dtmcli/barrier_redis.go
index fa2ecea..6fcc0ab 100644
--- a/dtmcli/barrier_redis.go
+++ b/dtmcli/barrier_redis.go
@@ -43,7 +43,7 @@ redis.call('INCRBY', KEYS[1], ARGV[1])
 	if err == redis.Nil {
 		err = nil
 	}
-	if err == nil && bb.Op == "msg" && v == "DUPLICATE" { // msg DoAndSubmit should be rejected when duplicate
+	if err == nil && bb.Op == opMsg && v == "DUPLICATE" { // msg DoAndSubmit should be rejected when duplicate
 		return ErrDuplicated
 	}
 	if err == nil && v == ResultFailure {