Merge branch 'master' into tidb_batchget

pingcap · Nov 24, 2021 · ab430af · ab430af
2 parents b355839 + 3d26751
commit ab430af
Show file tree

Hide file tree

Showing 311 changed files with 19,958 additions and 13,763 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/bind_serial_test.go b/bindinfo/bind_serial_test.go
@@ -555,7 +555,7 @@ func TestHintsSetID(t *testing.T) {
 
  utilCleanBindingEnv(tk, dom)
  err := tk.ExecToErr("create global binding for select * from t using select /*+ non_exist_hint() */ * from t")
- require.True(t, terror.ErrorEqual(err, parser.ErrWarnOptimizerHintParseError))
+ require.True(t, terror.ErrorEqual(err, parser.ErrParse))
  tk.MustExec("create global binding for select * from t where a > 10 using select * from t where a > 10")
  bindData = bindHandle.GetBindRecord(hash, sql, "test")
  require.NotNil(t, bindData)

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:]...)

diff --git a/br/cmd/tidb-lightning-ctl/main.go b/br/cmd/tidb-lightning-ctl/main.go
@@ -229,8 +229,8 @@ func checkpointErrorDestroy(ctx context.Context, cfg *config.Config, tls *common
  for engineID := table.MinEngineID; engineID <= table.MaxEngineID; engineID++ {
  fmt.Fprintln(os.Stderr, "Closing and cleaning up engine:", table.TableName, engineID)
  _, eID := backend.MakeUUID(table.TableName, engineID)
- file := local.File{UUID: eID}
- err := file.Cleanup(cfg.TikvImporter.SortedKVDir)
+ engine := local.Engine{UUID: eID}
+ err := engine.Cleanup(cfg.TikvImporter.SortedKVDir)
  if err != nil {
  fmt.Fprintln(os.Stderr, "* Encountered error while cleanup engine:", err)
  lastErr = err

diff --git a/br/cmd/tidb-lightning/main.go b/br/cmd/tidb-lightning/main.go
@@ -30,7 +30,10 @@ import (
 
 func main() {
  globalCfg := config.Must(config.LoadGlobalConfig(os.Args[1:], nil))
- fmt.Fprintf(os.Stdout, "Verbose debug logs will be written to %s\n\n", globalCfg.App.Config.File)
+ logToFile := globalCfg.App.File != "" && globalCfg.App.File != "-"
+ if logToFile {
+ fmt.Fprintf(os.Stdout, "Verbose debug logs will be written to %s\n\n", globalCfg.App.Config.File)
+ }
 
  app := lightning.New(globalCfg)
 
@@ -95,7 +98,7 @@ func main() {
  }
 
  // call Sync() with log to stdout may return error in some case, so just skip it
- if globalCfg.App.File != "" {
+ if logToFile {
  syncErr := logger.Sync()
  if syncErr != nil {
  fmt.Fprintln(os.Stderr, "sync log failed", syncErr)