br: update IgnoreErrorCheckpoint() for G201/G202 security rules (#49637)

ref #30699
pingcap · Dec 21, 2023 · 56bf775 · 56bf775
1 parent 6a5a5e7
commit 56bf775
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/br/pkg/lightning/checkpoints/checkpoints.go b/br/pkg/lightning/checkpoints/checkpoints.go
@@ -1610,25 +1610,16 @@ func (cpdb *MySQLCheckpointsDB) IgnoreErrorCheckpoint(ctx context.Context, table
  colName = columnTableName
  }
 
- // nolint:gosec
- engineQuery := fmt.Sprintf(`
- UPDATE %s.%s SET status = %d WHERE %s = ? AND status <= %d;
- `, cpdb.schema, CheckpointTableNameEngine, CheckpointStatusLoaded, colName, CheckpointStatusMaxInvalid)
-
- // nolint:gosec
- tableQuery := fmt.Sprintf(`
- UPDATE %s.%s SET status = %d WHERE %s = ? AND status <= %d;
- `, cpdb.schema, CheckpointTableNameTable, CheckpointStatusLoaded, colName, CheckpointStatusMaxInvalid)
-
+ query := "UPDATE ?.? SET status = ? WHERE ? = ? AND status <= ?"
  s := common.SQLWithRetry{
  DB: cpdb.db,
  Logger: log.FromContext(ctx).With(zap.String("table", tableName)),
  }
  err := s.Transact(ctx, "ignore error checkpoints", func(c context.Context, tx *sql.Tx) error {
- if _, e := tx.ExecContext(c, engineQuery, tableName); e != nil {
+ if _, e := tx.ExecContext(c, query, cpdb.schema, CheckpointTableNameEngine, CheckpointStatusLoaded, colName, tableName, CheckpointStatusMaxInvalid); e != nil {
  return errors.Trace(e)
  }
- if _, e := tx.ExecContext(c, tableQuery, tableName); e != nil {
+ if _, e := tx.ExecContext(c, query, cpdb.schema, CheckpointTableNameTable, CheckpointStatusLoaded, colName, tableName, CheckpointStatusMaxInvalid); e != nil {
  return errors.Trace(e)
  }
  return nil

diff --git a/br/pkg/lightning/checkpoints/checkpoints_sql_test.go b/br/pkg/lightning/checkpoints/checkpoints_sql_test.go
@@ -395,12 +395,12 @@ func TestIgnoreAllErrorCheckpoints_SQL(t *testing.T) {
 
  s.mock.ExpectBegin()
  s.mock.
- ExpectExec("UPDATE `mock-schema`\\.engine_v\\d+ SET status = 30 WHERE 'all' = \\? AND status <= 25").
- WithArgs(sqlmock.AnyArg()).
+ ExpectExec("UPDATE \\?\\.\\? SET status = \\? WHERE \\? = \\? AND status <= \\?").
+ WithArgs("`mock-schema`", checkpoints.CheckpointTableNameEngine, checkpoints.CheckpointStatusLoaded, "'all'", sqlmock.AnyArg(), 25).
  WillReturnResult(sqlmock.NewResult(5, 3))
  s.mock.
- ExpectExec("UPDATE `mock-schema`\\.table_v\\d+ SET status = 30 WHERE 'all' = \\? AND status <= 25").
- WithArgs(sqlmock.AnyArg()).
+ ExpectExec("UPDATE \\?\\.\\? SET status = \\? WHERE \\? = \\? AND status <= \\?").
+ WithArgs("`mock-schema`", checkpoints.CheckpointTableNameTable, checkpoints.CheckpointStatusLoaded, "'all'", sqlmock.AnyArg(), 25).
  WillReturnResult(sqlmock.NewResult(6, 2))
  s.mock.ExpectCommit()
 
@@ -413,12 +413,12 @@ func TestIgnoreOneErrorCheckpoint(t *testing.T) {
 
  s.mock.ExpectBegin()
  s.mock.
- ExpectExec("UPDATE `mock-schema`\\.engine_v\\d+ SET status = 30 WHERE table_name = \\? AND status <= 25").
- WithArgs("`db1`.`t2`").
+ ExpectExec("UPDATE \\?\\.\\? SET status = \\? WHERE \\? = \\? AND status <= \\?").
+ WithArgs("`mock-schema`", checkpoints.CheckpointTableNameEngine, checkpoints.CheckpointStatusLoaded, "table_name", "`db1`.`t2`", 25).
  WillReturnResult(sqlmock.NewResult(5, 2))
  s.mock.
- ExpectExec("UPDATE `mock-schema`\\.table_v\\d+ SET status = 30 WHERE table_name = \\? AND status <= 25").
- WithArgs("`db1`.`t2`").
+ ExpectExec("UPDATE \\?\\.\\? SET status = \\? WHERE \\? = \\? AND status <= \\?").
+ WithArgs("`mock-schema`", checkpoints.CheckpointTableNameTable, checkpoints.CheckpointStatusLoaded, "table_name", "`db1`.`t2`", 25).
  WillReturnResult(sqlmock.NewResult(6, 1))
  s.mock.ExpectCommit()