change br_via_sql comment to br

pingcap · Mar 4, 2021 · 9f65c01 · 9f65c01
1 parent 1c907e5
commit 9f65c01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/executor/brie.go b/executor/brie.go
@@ -51,7 +51,7 @@ import (
 const (
 	defaultCapOfCreateTable    = 512
 	defaultCapOfCreateDatabase = 64
-	brViaSQLComment            = `/*from(br_via_sql)*/`
+	brViaSQLComment            = `/*from(br)*/`
 )
 
 // brieTaskProgress tracks a task's current progress.
@@ -413,6 +413,9 @@ func (gs *tidbGlueSession) CreateSession(store kv.Storage) (glue.Session, error)
 // Execute implements glue.Session
 func (gs *tidbGlueSession) Execute(ctx context.Context, sql string) error {
 	// FIXME: br relies on a deprecated API, it may be unsafe
+	if !strings.Contains(sql, brViaSQLComment) {
+		sql = brViaSQLComment + sql
+	}
 	_, err := gs.se.(sqlexec.SQLExecutor).Execute(ctx, sql)
 	return err
 }

diff --git a/session/session_test.go b/session/session_test.go
@@ -3738,8 +3738,8 @@ func (s *testBackupRestoreSuite) TestBackupAndRestore(c *C) {
 		jsBytes, err := json.MarshalIndent(jobs, "", " ")
 		c.Assert(err, IsNil)
 		jsStr := string(jsBytes)
-		c.Assert(strings.Contains(jsStr, "/*from(br_via_sql)*/CREATE TABLE"), IsTrue)
-		c.Assert(strings.Contains(jsStr, "/*from(br_via_sql)*/CREATE DATABASE"), IsTrue)
+		c.Assert(strings.Contains(jsStr, "/*from(br)*/CREATE TABLE"), IsTrue)
+		c.Assert(strings.Contains(jsStr, "/*from(br)*/CREATE DATABASE"), IsTrue)
 	}
 }