cherry pick pingcap#420 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot · Jan 26, 2021 · 08fb9e3 · 08fb9e3
1 parent 139df44
commit 08fb9e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/backup/client.go b/pkg/backup/client.go
@@ -292,8 +292,8 @@ func BuildBackupRangeAndSchema(
  switch {
  case tableInfo.IsSequence():
  globalAutoID, err = seqAlloc.NextGlobalAutoID(tableInfo.ID)
- case tableInfo.IsView():
- // no auto ID for views.
+ case tableInfo.IsView() || !utils.NeedAutoID(tableInfo):
+ // no auto ID for views or table without either rowID nor auto_increment ID.
  default:
  globalAutoID, err = idAlloc.NextGlobalAutoID(tableInfo.ID)
  }

diff --git a/pkg/utils/schema.go b/pkg/utils/schema.go
@@ -44,7 +44,11 @@ func (tbl *Table) NoChecksum() bool {
 
 // NeedAutoID checks whether the table needs backing up with an autoid.
 func NeedAutoID(tblInfo *model.TableInfo) bool {
+<<<<<<< HEAD
  hasRowID := !tblInfo.PKIsHandle
+=======
+ hasRowID := !tblInfo.PKIsHandle && !tblInfo.IsCommonHandle
+>>>>>>> 6390453... restore: don't restore auto id if the table doesn't has it. (#420)
  hasAutoIncID := tblInfo.GetAutoIncrementColInfo() != nil
  return hasRowID || hasAutoIncID
 }