From b74fc1850617561e026392073c0b6560d60d3eac Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Sun, 24 Nov 2024 09:40:42 +0800 Subject: [PATCH] update min to min1 --- dtmsvr/storage/boltdb/boltdb.go | 8 ++++---- go.mod | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dtmsvr/storage/boltdb/boltdb.go b/dtmsvr/storage/boltdb/boltdb.go index bab761c..bf3fb31 100644 --- a/dtmsvr/storage/boltdb/boltdb.go +++ b/dtmsvr/storage/boltdb/boltdb.go @@ -430,11 +430,11 @@ func (s *Store) TouchCronTime(global *storage.TransGlobalStore, nextCronInterval // LockOneGlobalTrans finds GlobalTrans func (s *Store) LockOneGlobalTrans(expireIn time.Duration) *storage.TransGlobalStore { var trans *storage.TransGlobalStore - min := fmt.Sprintf("%d", time.Now().Add(expireIn).Unix()) + min1 := fmt.Sprintf("%d", time.Now().Add(expireIn).Unix()) err := s.boltDb.Update(func(t *bolt.Tx) error { cursor := t.Bucket(bucketIndex).Cursor() toDelete := [][]byte{} - for k, v := cursor.First(); k != nil && string(k) <= min && (trans == nil || trans.IsFinished()); k, v = cursor.Next() { + for k, v := cursor.First(); k != nil && string(k) <= min1 && (trans == nil || trans.IsFinished()); k, v = cursor.Next() { trans = tGetGlobal(t, string(v)) toDelete = append(toDelete, k) } @@ -460,11 +460,11 @@ func (s *Store) LockOneGlobalTrans(expireIn time.Duration) *storage.TransGlobalS func (s *Store) ResetCronTime(after time.Duration, limit int64) (succeedCount int64, hasRemaining bool, err error) { next := time.Now() var trans *storage.TransGlobalStore - min := fmt.Sprintf("%d", time.Now().Add(after).Unix()) + min1 := fmt.Sprintf("%d", time.Now().Add(after).Unix()) err = s.boltDb.Update(func(t *bolt.Tx) error { cursor := t.Bucket(bucketIndex).Cursor() succeedCount = 0 - for k, v := cursor.Seek([]byte(min)); k != nil && succeedCount <= limit; k, v = cursor.Next() { + for k, v := cursor.Seek([]byte(min1)); k != nil && succeedCount <= limit; k, v = cursor.Next() { if succeedCount == limit { hasRemaining = true break diff --git a/go.mod b/go.mod index b9476e5..a53a476 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/dtm-labs/dtm -go 1.18 +go 1.21 require ( github.com/agiledragon/gomonkey/v2 v2.2.0