Merge branch 'master' of https://github.com/pingcap/tidb into unistor…

…e-support-read-through-lock

Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>

.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

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

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)