Skip to content

Commit 152f757

Browse files
cfzjywxkcfzjywxk
committed
fix test
Signed-off-by: cfzjywxk <[email protected]>
1 parent ab6514d commit 152f757

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

‎examples/gcworker/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/rawkv/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/1pc_txn/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/async_commit/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/delete_range/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/pessimistic_txn/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎examples/txnkv/unsafedestoryrange/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
2222
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2323
github.com/opentracing/opentracing-go v1.2.0 // indirect
24-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect
24+
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122 // indirect
2525
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
2626
github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect
2727
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect

‎integration_tests/async_commit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ func (s *testAsyncCommitSuite) TestRollbackAsyncCommitEnforcesFallback() {
624624
s.Nil(err)
625625
status, err := resolver.GetTxnStatus(s.bo, lock.TxnID, []byte("a"), currentTS, currentTS, false, false, nil)
626626
s.Nil(err)
627-
if status.IsRolledBack() {
627+
if s.store.GetOracle().IsExpired(lock.TxnID, status.TTL(), &oracle.Option{TxnScope: oracle.GlobalTxnScope}) {
628628
break
629629
}
630630
time.Sleep(time.Millisecond * 30)

0 commit comments

Comments
 (0)