Merge pull request #46 from yedf/alpha

rename lastTouch

dtmsvr/trans.go

@@ -37,7 +37,7 @@ type TransGlobal struct {
 	NextCronInterval int64
 	NextCronTime     *time.Time
 	dtmcli.TransOptions
-	processStarted time.Time // record the start time of process
+	lastTouched time.Time // record the start time of process
 }
 
 // TableName TableName
@@ -52,6 +52,7 @@ type transProcessor interface {
 
 func (t *TransGlobal) touch(db *common.DB, ctype cronType) *gorm.DB {
 	writeTransLog(t.Gid, "touch trans", "", "", "")
+	t.lastTouched = time.Now()
 	updates := t.setNextCron(ctype)
 	return db.Model(&TransGlobal{}).Where("gid=?", t.Gid).Select(updates).Updates(t)
 }
@@ -183,7 +184,7 @@ func (t *TransGlobal) processInner(db *common.DB) (rerr error) {
 	dtmcli.Logf("processing: %s status: %s", t.Gid, t.Status)
 	branches := []TransBranch{}
 	db.Must().Where("gid=?", t.Gid).Order("id asc").Find(&branches)
-	t.processStarted = time.Now()
+	t.lastTouched = time.Now()
 	rerr = t.getProcessor().ProcessOnce(db, branches)
 	return
 }
@@ -277,7 +278,7 @@ func (t *TransGlobal) execBranch(db *common.DB, branch *TransBranch) error {
 	}
 	branchMetrics(t, branch, status == dtmcli.StatusSucceed)
 	// if time pass 1500ms and NextCronInterval is not default, then reset NextCronInterval
-	if err == nil && time.Since(t.processStarted)+NowForwardDuration >= 1500*time.Millisecond ||
+	if err == nil && time.Since(t.lastTouched)+NowForwardDuration >= 1500*time.Millisecond ||
 		t.NextCronInterval > config.RetryInterval && t.NextCronInterval > t.RetryInterval {
 		t.touch(db, cronReset)
 	} else if err == dtmcli.ErrOngoing {

examples/http_tcc_barrier.go

@@ -37,7 +37,7 @@ const transInUID = 1
 const transOutUID = 2
 
 func adjustTrading(db dtmcli.DB, uid int, amount int) error {
-	affected, err := dtmcli.DBExec(db, "update dtm_busi.user_account set trading_balance=trading_balance + ? where user_id=? and trading_balance + ? + balance >= 0", amount, uid, amount)
+	affected, err := dtmcli.DBExec(db, "update dtm_busi.user_account set trading_balance=trading_balance+? where user_id=? and trading_balance + ? + balance >= 0", amount, uid, amount)
 	if err == nil && affected == 0 {
 		return fmt.Errorf("update error, maybe balance not enough")
 	}
@@ -45,7 +45,7 @@ func adjustTrading(db dtmcli.DB, uid int, amount int) error {
 }
 
 func adjustBalance(db dtmcli.DB, uid int, amount int) error {
-	affected, err := dtmcli.DBExec(db, "update dtm_busi.user_account set trading_balance = trading_balance - ?, balance=balance+? where user_id=?;", amount, amount, uid)
+	affected, err := dtmcli.DBExec(db, "update dtm_busi.user_account set trading_balance=trading_balance-?, balance=balance+? where user_id=?;", amount, amount, uid)
 	if err == nil && affected == 0 {
 		return fmt.Errorf("update user_account 0 rows")
 	}
@@ -58,22 +58,19 @@ func tccBarrierTransInTry(c *gin.Context) (interface{}, error) {
 	if req.TransInResult != "" {
 		return req.TransInResult, nil
 	}
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustTrading(db, transInUID, req.Amount)
 	})
 }
 
 func tccBarrierTransInConfirm(c *gin.Context) (interface{}, error) {
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustBalance(db, transInUID, reqFrom(c).Amount)
 	})
 }
 
 func tccBarrierTransInCancel(c *gin.Context) (interface{}, error) {
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustTrading(db, transInUID, -reqFrom(c).Amount)
 	})
 }
@@ -83,23 +80,20 @@ func tccBarrierTransOutTry(c *gin.Context) (interface{}, error) {
 	if req.TransInResult != "" {
 		return req.TransInResult, nil
 	}
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustTrading(db, transOutUID, -req.Amount)
 	})
 }
 
 func tccBarrierTransOutConfirm(c *gin.Context) (interface{}, error) {
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustBalance(db, transOutUID, -reqFrom(c).Amount)
 	})
 }
 
 // TccBarrierTransOutCancel will be use in test
 func TccBarrierTransOutCancel(c *gin.Context) (interface{}, error) {
-	barrier := MustBarrierFromGin(c)
-	return dtmcli.MapSuccess, barrier.Call(txGet(), func(db dtmcli.DB) error {
+	return dtmcli.MapSuccess, MustBarrierFromGin(c).Call(txGet(), func(db dtmcli.DB) error {
 		return adjustTrading(db, transOutUID, reqFrom(c).Amount)
 	})
 }