lightning: fix build error and failed test (#34058)

ref #31913

Author: sleepymole

br/pkg/lightning/restore/restore_test.go

@@ -58,6 +58,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/br/pkg/version/build"
 	"github.com/pingcap/tidb/ddl"
+	"github.com/pingcap/tidb/table/tables"
 	tmock "github.com/pingcap/tidb/util/mock"
 )
 
@@ -558,8 +559,7 @@ func (s *tableRestoreSuite) TestRestoreEngineFailed(c *C) {
 	}
 	defer close(rc.saveCpCh)
 	go func() {
-		for cp := range rc.saveCpCh {
-			cp.waitCh <- nil
+		for range rc.saveCpCh {
 		}
 	}()
 
@@ -573,7 +573,7 @@ func (s *tableRestoreSuite) TestRestoreEngineFailed(c *C) {
 	c.Assert(err, IsNil)
 	_, indexUUID := backend.MakeUUID("`db`.`table`", -1)
 	_, dataUUID := backend.MakeUUID("`db`.`table`", 0)
-	realBackend := tidb.NewTiDBBackend(nil, "replace", nil)
+	realBackend := tidb.NewTiDBBackend(nil, "replace")
 	mockBackend.EXPECT().OpenEngine(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 	mockBackend.EXPECT().OpenEngine(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
 	mockBackend.EXPECT().CloseEngine(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()

br/pkg/lightning/restore/tidb.go

@@ -182,7 +182,7 @@ loopCreate:
 }
 
 func createIfNotExistsStmt(p *parser.Parser, createTable, dbName, tblName string) ([]string, error) {
-	stmts, _, err := p.ParseSQL(createTable)
+	stmts, _, err := p.Parse(createTable, "", "")
 	if err != nil {
 		return []string{}, err
 	}

br/tests/lightning_new_collation/data/nc.t-schema.sql

@@ -0,0 +1 @@
+CREATE TABLE t(i INT PRIMARY KEY, s varchar(32), j TINYINT, KEY s_j (s, i)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;

br/tests/lightning_new_collation/data/nc.t.0.sql

@@ -0,0 +1,6 @@
+INSERT INTO t (s, i, j) VALUES
+  ("this_is_test1", 1, 1),
+  ("this_is_test2", 2, 2),
+  ("this_is_test3", 3, 3),
+  ("this_is_test4", 4, 4),
+  ("this_is_test5", 5, 5);

br/tests/lightning_new_collation/data/nc.t.1.sql

@@ -0,0 +1 @@
+INSERT INTO t(s, i, j) VALUES ("another test case", 6, 6);

br/tests/lightning_new_collation/run.sh

@@ -23,27 +23,11 @@ cur=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 # restart cluster with new collation enabled
 start_services --tidb-cfg $cur/tidb-new-collation.toml
 
-# Populate the mydumper source
-DBPATH="$TEST_DIR/nc.mydump"
-mkdir -p $DBPATH
-echo 'CREATE DATABASE nc;' > "$DBPATH/nc-schema-create.sql"
-# create table with collate `utf8_general_ci`, the index key will be different between old/new collation
-echo "CREATE TABLE t(i INT PRIMARY KEY, s varchar(32), j TINYINT, KEY s_j (s, i)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;" > "$DBPATH/nc.t-schema.sql"
-cat > "$DBPATH/nc.t.0.sql" << _EOF_
-INSERT INTO t (s, i, j) VALUES
-  ("this_is_test1", 1, 1),
-  ("this_is_test2", 2, 2),
-  ("this_is_test3", 3, 3),
-  ("this_is_test4", 4, 4),
-  ("this_is_test5", 5, 5);
-_EOF_
-echo 'INSERT INTO t(s, i, j) VALUES ("another test case", 6, 6);' > "$DBPATH/nc.t.1.sql"
-
 for BACKEND in local importer tidb; do
   # Start importing the tables.
   run_sql 'DROP DATABASE IF EXISTS nc'
 
-  run_lightning -d "$DBPATH" --backend $BACKEND 2> /dev/null
+  run_lightning --backend $BACKEND 2> /dev/null
 
   run_sql 'SELECT count(*), sum(i) FROM `nc`.t'
   check_contains "count(*): 6"