Skip to content

Commit

Permalink
cse: catch up master (#810)
Browse files Browse the repository at this point in the history
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: disksing <i@disksing.com>
Co-authored-by: MyonKeminta <9948422+MyonKeminta@users.noreply.github.com>
Co-authored-by: Violin <6880156+violin0622@users.noreply.github.com>
Co-authored-by: Smilencer <smityz@qq.com>
Co-authored-by: you06 <you1474600@gmail.com>
Co-authored-by: Hu# <ihusharp@gmail.com>
Co-authored-by: Connor <zbk602423539@gmail.com>
Co-authored-by: zyguan <zhongyangguan@gmail.com>
fix case typo in comment. (#778)
fix goroutine leak (#784)
fix TestRURuntimeStatsCleanUp (#787)
Fix wrong resource group name for some requests (#788)
resolver: support verifying primary for check_txn_status (#777)
resolver: handle pessimistic locks in BatchResolveLocks (#794)
resolved ts  (#793)
ResolveLocks for unistore (#807)
  • Loading branch information
iosmanthus committed May 22, 2023
1 parent a2f93a3 commit 5f10ed1
Show file tree
Hide file tree
Showing 30 changed files with 2,236 additions and 181 deletions.
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
run:
timeout: 5m
linters:
disable-all: true
enable:
Expand Down
4 changes: 4 additions & 0 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ type Config struct {
TxnScope string
EnableAsyncCommit bool
Enable1PC bool
// RegionsRefreshInterval indicates the interval of loading regions info, the unit is second, if RegionsRefreshInterval == 0, it will be disabled.
RegionsRefreshInterval uint64
// EnablePreload indicates whether to preload region info when initializing the client.
EnablePreload bool
}

// DefaultConfig returns the default configuration.
Expand Down
44 changes: 25 additions & 19 deletions integration_tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,20 @@ require (
github.com/ninedraft/israce v0.0.3
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c
github.com/pingcap/kvproto v0.0.0-20230419072653-dc3cd8784a19
github.com/pingcap/tidb v1.1.0-beta.0.20230413060901-2002ca106e99
github.com/pingcap/kvproto v0.0.0-20230518070549-2a7e63366ffa
github.com/pingcap/tidb v1.1.0-beta.0.20230522033137-96cc2fdd19bc
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.3
github.com/tidwall/gjson v1.14.1
github.com/tikv/client-go/v2 v2.0.7-0.20230406064257-1ec0ff5bf443
github.com/tikv/pd/client v0.0.0-20230420042919-0e0313adef1f
github.com/tikv/client-go/v2 v2.0.8-0.20230512034316-adb48afeef3e
github.com/tikv/pd/client v0.0.0-20230518085737-f4241b0c82b0
go.uber.org/goleak v1.2.1
)

require (
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/BurntSushi/toml v1.2.1 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/errors v1.8.1 // indirect
Expand All @@ -37,6 +38,8 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/elliotchance/pie/v2 v2.1.0 // indirect
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
github.com/go-ldap/ldap/v3 v3.4.4 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.1 // indirect
Expand All @@ -45,9 +48,9 @@ require (
github.com/google/btree v1.1.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/klauspost/compress v1.15.13 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid v1.3.1 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
Expand All @@ -64,15 +67,15 @@ require (
github.com/pingcap/log v1.1.1-0.20230317032135-a0d097d16e22 // indirect
github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21 // indirect
github.com/pingcap/tidb/parser v0.0.0-20230321033041-8ba2035203f7 // indirect
github.com/pingcap/tipb v0.0.0-20230310043643-5362260ee6f7 // indirect
github.com/pingcap/tipb v0.0.0-20230427024529-aed92caf20b9 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.39.0 // indirect
github.com/prometheus/client_golang v1.15.1 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.43.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/sasha-s/go-deadlock v0.2.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.3 // indirect
github.com/shoenig/go-m1cpu v0.1.5 // indirect
Expand All @@ -91,21 +94,24 @@ require (
go.etcd.io/etcd/api/v3 v3.5.2 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
go.etcd.io/etcd/client/v3 v3.5.2 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.7.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.8.0 // indirect
golang.org/x/tools v0.9.1 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/grpc v1.55.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace github.com/tikv/client-go/v2 => ../

replace google.golang.org/grpc => google.golang.org/grpc v1.54.1

0 comments on commit 5f10ed1

Please sign in to comment.