lightning: fix merge conflict

Signed-off-by: kennytm <[email protected]>
pingcap · Jun 4, 2024 · 13800a2 · 13800a2
1 parent 7a25fab
commit 13800a2
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 316 deletions.
diff --git a/br/pkg/lightning/common/BUILD.bazel b/br/pkg/lightning/common/BUILD.bazel
@@ -95,11 +95,7 @@ go_test(
     ],
     embed = [":common"],
     flaky = True,
-<<<<<<< HEAD:br/pkg/lightning/common/BUILD.bazel
     shard_count = 21,
-=======
-    shard_count = 29,
->>>>>>> 555ce023522 (lightning: Don't log "received task config" in server mode (#52336)):pkg/lightning/common/BUILD.bazel
     deps = [
         "//br/pkg/errors",
         "//br/pkg/lightning/log",

diff --git a/br/pkg/lightning/common/util.go b/br/pkg/lightning/common/util.go
@@ -428,8 +428,6 @@ func GetAutoRandomColumn(tblInfo *model.TableInfo) *model.ColumnInfo {
 	}
 	return nil
 }
-<<<<<<< HEAD:br/pkg/lightning/common/util.go
-=======
 
 // GetDropIndexInfos returns the index infos that need to be dropped and the remain indexes.
 func GetDropIndexInfos(
@@ -622,4 +620,3 @@ func IsRaftKV2(ctx context.Context, db *sql.DB) (bool, error) {
 	}
 	return false, rows.Err()
 }
->>>>>>> 555ce023522 (lightning: Don't log "received task config" in server mode (#52336)):pkg/lightning/common/util.go
diff --git a/br/pkg/lightning/lightning.go b/br/pkg/lightning/lightning.go
@@ -693,12 +693,7 @@ func (l *Lightning) handlePostTask(w http.ResponseWriter, req *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "cannot read request", err)
 		return
 	}
-<<<<<<< HEAD:br/pkg/lightning/lightning.go
-	filteredData := utils.HideSensitive(string(data))
-	log.L().Info("received task config", zap.String("content", filteredData))
-=======
 	log.L().Info("received task config")
->>>>>>> 555ce023522 (lightning: Don't log "received task config" in server mode (#52336)):lightning/pkg/server/lightning.go
 
 	cfg := config.NewConfig()
 	if err = cfg.LoadFromGlobal(l.globalCfg); err != nil {

diff --git a/pkg/lightning/common/util_test.go b/pkg/lightning/common/util_test.go