Merge branch 'master' into ce-trace-part1

pingcap · Nov 29, 2021 · f6fe861 · f6fe861
2 parents 56b64d2 + df113a1
commit f6fe861
Show file tree

Hide file tree

Showing 321 changed files with 18,497 additions and 11,827 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -28,9 +28,6 @@ linters-settings:
  checks: ["S1002","S1004","S1007","S1009","S1010","S1012","S1019","S1020","S1021","S1024","S1030","SA2*","SA3*","SA4009","SA5*","SA6000","SA6001","SA6005", "-SA2002"]
  stylecheck:
  checks: ["-ST1003"]
- gosec:
- excludes:
- - G601
 issues:
  exclude-rules:
  - path: _test\.go

diff --git a/bindinfo/cache.go b/bindinfo/cache.go
@@ -105,7 +105,8 @@ func (br *BindRecord) HasUsingBinding() bool {
 
 // FindBinding find bindings in BindRecord.
 func (br *BindRecord) FindBinding(hint string) *Binding {
- for _, binding := range br.Bindings {
+ for i := range br.Bindings {
+ binding := br.Bindings[i]
  if binding.ID == hint {
  return &binding
  }
@@ -160,7 +161,8 @@ func merge(lBindRecord, rBindRecord *BindRecord) *BindRecord {
  return lBindRecord
  }
  result := lBindRecord.shallowCopy()
- for _, rbind := range rBindRecord.Bindings {
+ for i := range rBindRecord.Bindings {
+ rbind := rBindRecord.Bindings[i]
  found := false
  for j, lbind := range lBindRecord.Bindings {
  if lbind.isSame(&rbind) {
@@ -184,7 +186,8 @@ func (br *BindRecord) remove(deleted *BindRecord) *BindRecord {
  return &BindRecord{OriginalSQL: br.OriginalSQL, Db: br.Db}
  }
  result := br.shallowCopy()
- for _, deletedBind := range deleted.Bindings {
+ for j := range deleted.Bindings {
+ deletedBind := deleted.Bindings[j]
  for i, bind := range result.Bindings {
  if bind.isSame(&deletedBind) {
  result.Bindings = append(result.Bindings[:i], result.Bindings[i+1:]...)