From 7feba3d4f0030450d4051425171d219e45459cb2 Mon Sep 17 00:00:00 2001
From: luancheng <luancheng@pingcap.com>
Date: Tue, 4 Feb 2020 21:08:20 +0800
Subject: [PATCH 1/4] validate: fix debug meta test ci

---
 tests/br_debug_meta/run.sh | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/br_debug_meta/run.sh b/tests/br_debug_meta/run.sh
index 1dcfccefe..a592b62b0 100644
--- a/tests/br_debug_meta/run.sh
+++ b/tests/br_debug_meta/run.sh
@@ -15,22 +15,27 @@
 
 set -eu
 DB="$TEST_NAME"
+TABLE="usertable1"
 
 run_sql "CREATE DATABASE $DB;"
 
-run_sql "CREATE TABLE $DB.usertable1 ( \
+run_sql "CREATE TABLE $DB.$TABLE( \
   YCSB_KEY varchar(64) NOT NULL, \
   FIELD0 varchar(1) DEFAULT NULL, \
   PRIMARY KEY (YCSB_KEY) \
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;"
 
-run_sql "INSERT INTO $DB.usertable1 VALUES (\"a\", \"b\");"
-run_sql "INSERT INTO $DB.usertable1 VALUES (\"aa\", \"b\");"
+run_sql "INSERT INTO $DB.$TABLE VALUES (\"a\", \"b\");"
+run_sql "INSERT INTO $DB.$TABLE VALUES (\"aa\", \"b\");"
+
+row_count_ori=$(run_sql "SELECT COUNT(*) FROM $DB$.$TAble;" | awk '/COUNT/{print $2}')
 
 # backup table
 echo "backup start..."
 run_br --pd $PD_ADDR backup table --db $DB --table usertable1 -s "local://$TEST_DIR/$DB" --ratelimit 5 --concurrency 4
 
+run_sql "DROP DATABASE $DB;"
+
 # Test validate decode
 run_br validate decode -s "local://$TEST_DIR/$DB"
 
@@ -49,9 +54,16 @@ if [ ! -f "$TEST_DIR/$DB/backupmeta_from_json" ]; then
     exit 1
 fi
 
-DIFF=$(diff $TEST_DIR/$DB/backupmeta_from_json $TEST_DIR/$DB/backupmeta)
-if [ "$DIFF" != "" ]
-then
+# replace backupmeta
+mv "$TEST_DIR/$DB/backupmeta_from_json" "$TEST_DIR/$DB/backupmeta"
+
+# restore table
+echo "restore start..."
+run_br --pd $PD_ADDR restore table --db $DB --table usertable1 -s "local://$TEST_DIR/$DB"
+
+row_count_new=$(run_sql "SELECT COUNT(*) FROM $DB$.$TABLE;" | awk '/COUNT/{print $2}')
+
+if [ "${row_count_ori}" != "${row_count_new}" ];then
     echo "TEST: [$TEST_NAME] failed!"
     exit 1
 fi

From f673b62e6c414a741ae4d031ba0bf3aca06aba7d Mon Sep 17 00:00:00 2001
From: luancheng <luancheng@pingcap.com>
Date: Tue, 4 Feb 2020 21:23:25 +0800
Subject: [PATCH 2/4] fix ci

---
 tests/br_debug_meta/run.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/br_debug_meta/run.sh b/tests/br_debug_meta/run.sh
index a592b62b0..10305dfd4 100644
--- a/tests/br_debug_meta/run.sh
+++ b/tests/br_debug_meta/run.sh
@@ -28,7 +28,9 @@ run_sql "CREATE TABLE $DB.$TABLE( \
 run_sql "INSERT INTO $DB.$TABLE VALUES (\"a\", \"b\");"
 run_sql "INSERT INTO $DB.$TABLE VALUES (\"aa\", \"b\");"
 
-row_count_ori=$(run_sql "SELECT COUNT(*) FROM $DB$.$TAble;" | awk '/COUNT/{print $2}')
+row_count_ori=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')
+echo $row_count_ori
+sleep 10000
 
 # backup table
 echo "backup start..."
@@ -61,7 +63,7 @@ mv "$TEST_DIR/$DB/backupmeta_from_json" "$TEST_DIR/$DB/backupmeta"
 echo "restore start..."
 run_br --pd $PD_ADDR restore table --db $DB --table usertable1 -s "local://$TEST_DIR/$DB"
 
-row_count_new=$(run_sql "SELECT COUNT(*) FROM $DB$.$TABLE;" | awk '/COUNT/{print $2}')
+row_count_new=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')
 
 if [ "${row_count_ori}" != "${row_count_new}" ];then
     echo "TEST: [$TEST_NAME] failed!"

From 7f050713ea002129c2f1f20beaabe28e23ab3950 Mon Sep 17 00:00:00 2001
From: luancheng <luancheng@pingcap.com>
Date: Tue, 4 Feb 2020 21:26:38 +0800
Subject: [PATCH 3/4] fix ci

---
 tests/br_debug_meta/run.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/br_debug_meta/run.sh b/tests/br_debug_meta/run.sh
index 10305dfd4..2d723bcca 100644
--- a/tests/br_debug_meta/run.sh
+++ b/tests/br_debug_meta/run.sh
@@ -29,8 +29,6 @@ run_sql "INSERT INTO $DB.$TABLE VALUES (\"a\", \"b\");"
 run_sql "INSERT INTO $DB.$TABLE VALUES (\"aa\", \"b\");"
 
 row_count_ori=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')
-echo $row_count_ori
-sleep 10000
 
 # backup table
 echo "backup start..."

From e27ba299517597a9a556d5262808d4d96509ab56 Mon Sep 17 00:00:00 2001
From: luancheng <luancheng@pingcap.com>
Date: Wed, 5 Feb 2020 09:00:15 +0800
Subject: [PATCH 4/4] address comment

---
 tests/br_debug_meta/run.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/br_debug_meta/run.sh b/tests/br_debug_meta/run.sh
index 2d723bcca..8dc3ef5a3 100644
--- a/tests/br_debug_meta/run.sh
+++ b/tests/br_debug_meta/run.sh
@@ -41,7 +41,7 @@ run_br validate decode -s "local://$TEST_DIR/$DB"
 
 # should generate backupmeta.json
 if [ ! -f "$TEST_DIR/$DB/backupmeta.json" ]; then
-    echo "TEST: [$TEST_NAME] failed!"
+    echo "TEST: [$TEST_NAME] decode failed!"
     exit 1
 fi
 
@@ -50,7 +50,7 @@ run_br validate encode -s "local://$TEST_DIR/$DB"
 
 # should generate backupmeta_from_json
 if [ ! -f "$TEST_DIR/$DB/backupmeta_from_json" ]; then
-    echo "TEST: [$TEST_NAME] failed!"
+    echo "TEST: [$TEST_NAME] encode failed!"
     exit 1
 fi
 
@@ -64,7 +64,7 @@ run_br --pd $PD_ADDR restore table --db $DB --table usertable1 -s "local://$TEST
 row_count_new=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')
 
 if [ "${row_count_ori}" != "${row_count_new}" ];then
-    echo "TEST: [$TEST_NAME] failed!"
+    echo "TEST: [$TEST_NAME] failed!, row count not equal after restore"
     exit 1
 fi