Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore: fix alter auto increment id for no-primary-key table #139

Merged
merged 3 commits into from Jan 10, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/restore/db.go
Expand Up @@ -92,6 +92,16 @@ func (db *DB) CreateTable(ctx context.Context, table *utils.Table) error {
zap.Error(err))
return errors.Trace(err)
}
alterAutoIncIDSQL := fmt.Sprintf("alter table %s auto_increment = %d", schema.Name, schema.AutoIncID)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need EncloseName?

_, err = db.se.Execute(ctx, alterAutoIncIDSQL)
if err != nil {
log.Error("alter AutoIncID failed",
zap.String("SQL", alterAutoIncIDSQL),
zap.Stringer("db", table.Db.Name),
zap.Stringer("table", table.Schema.Name),
zap.Error(err))
return errors.Trace(err)
}
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/restore/db_test.go
Expand Up @@ -44,7 +44,7 @@ func (s *testRestoreSchemaSuite) TestRestoreAutoIncID(c *C) {
tk.MustExec("drop table if exists t;")
// Test SQL Mode
tk.MustExec("create table t (" +
"a int not null auto_increment," +
"a int not null," +
"time timestamp not null default '0000-00-00 00:00:00'," +
"primary key (a));",
)
Expand Down
82 changes: 82 additions & 0 deletions tests/br_insert_after_restore/run.sh
@@ -0,0 +1,82 @@
#!/bin/sh
#
# Copyright 2019 PingCAP, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# See the License for the specific language governing permissions and
# limitations under the License.

set -eu
DB="$TEST_NAME"
TABLE="usertable"
ROW_COUNT=10
PATH="tests/$TEST_NAME:bin:$PATH"

insertRecords() {
for i in $(seq $1); do
run_sql "INSERT INTO $DB.$TABLE VALUES ('$i');"
done
}

createTable() {
run_sql "CREATE TABLE IF NOT EXISTS $DB.$TABLE (c1 CHAR(255));"
}

echo "load data..."
echo "create database"
run_sql "CREATE DATABASE IF NOT EXISTS $DB;"
echo "create table"
createTable
echo "insert records"
insertRecords $ROW_COUNT

row_count_ori=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')

# backup full
echo "backup start..."
run_br --pd $PD_ADDR backup full -s "local://$TEST_DIR/$DB" --ratelimit 5 --concurrency 4

run_sql "DROP DATABASE $DB;"

# restore full
echo "restore start..."
run_br restore full -s "local://$TEST_DIR/$DB" --pd $PD_ADDR

row_count_new=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')

fail=false
if [ "${row_count_ori}" != "${row_count_new}" ];then
fail=true
echo "TEST: [$TEST_NAME] fail on database $DB"
fi
echo "database $DB [original] row count: ${row_count_ori}, [after br] row count: ${row_count_new}"

if $fail; then
echo "TEST: [$TEST_NAME] failed!"
exit 1
fi

# insert records
insertRecords $ROW_COUNT
row_count_insert=$(run_sql "SELECT COUNT(*) FROM $DB.$TABLE;" | awk '/COUNT/{print $2}')
fail=false
if [ "${row_count_insert}" != "$(expr $row_count_new \* 2)" ];then
fail=true
echo "TEST: [$TEST_NAME] fail on inserting records to database $DB after restore: ${row_count_insert}"
fi

if $fail; then
echo "TEST: [$TEST_NAME] failed!"
exit 1
else
echo "TEST: [$TEST_NAME] successed!"
fi

run_sql "DROP DATABASE $DB;"