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.

Sign up for GitHub

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

executor: fix flashback table faild in uppercase database name (#17093) #17165

Merged
merged 5 commits into from
Jun 10, 2020
Merged

executor: fix flashback table faild in uppercase database name (#17093) #17165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e6c83e
cherry pick #17093 to release-3.0
crazycs520 May 13, 2020
0637d07
fix code
crazycs520 May 14, 2020
1404456
Merge branch 'release-3.0' into release-3.0-5a0787dfa915
crazycs520 May 18, 2020
23db44c
Merge branch 'release-3.0' into release-3.0-5a0787dfa915
crazycs520 Jun 4, 2020
831849a
Merge branch 'release-3.0' into release-3.0-5a0787dfa915
crazycs520 Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions executor/ddl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ func (e *DDLExec) getRecoverTableByTableName(s *ast.RecoverTableStmt, t *meta.Me
fmt.Sprintf("(Table ID %d)", job.TableID),
)
}
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

@crazycs520
Please fix the conflicts.

if table.Meta().Name.L == s.Table.Name.L {
schema, ok := dom.InfoSchema().SchemaByID(job.SchemaID)
if !ok {
Expand All @@ -433,6 +434,57 @@ func (e *DDLExec) getRecoverTableByTableName(s *ast.RecoverTableStmt, t *meta.Me
tblInfo = table.Meta()
break
}
=======
finish, err := fn(job, table.Meta())
if err != nil || finish {
return finish, err
}
}
return false, nil
}

func (e *DDLExec) getRecoverTableByTableName(tableName *ast.TableName) (*model.Job, *model.TableInfo, error) {
txn, err := e.ctx.Txn(true)
if err != nil {
return nil, nil, err
}
schemaName := tableName.Schema.L
if schemaName == "" {
schemaName = strings.ToLower(e.ctx.GetSessionVars().CurrentDB)
}
if schemaName == "" {
return nil, nil, errors.Trace(core.ErrNoDB)
}
gcSafePoint, err := gcutil.GetGCSafePoint(e.ctx)
if err != nil {
return nil, nil, err
}
var jobInfo *model.Job
var tableInfo *model.TableInfo
dom := domain.GetDomain(e.ctx)
handleJobAndTableInfo := func(job *model.Job, tblInfo *model.TableInfo) (bool, error) {
if tblInfo.Name.L != tableName.Name.L {
return false, nil
}
schema, ok := dom.InfoSchema().SchemaByID(job.SchemaID)
if !ok {
return false, nil
}
if schema.Name.L == schemaName {
tableInfo = tblInfo
jobInfo = job
return true, nil
}
return false, nil
}
fn := func(jobs []*model.Job) (bool, error) {
return GetDropOrTruncateTableInfoFromJobs(jobs, gcSafePoint, dom, handleJobAndTableInfo)
}
err = admin.IterHistoryDDLJobs(txn, fn)
if err != nil {
if terror.ErrorEqual(variable.ErrSnapshotTooOld, err) {
return nil, nil, errors.Errorf("Can't find dropped/truncated table '%s' in GC safe point %s", tableName.Name.O, model.TSConvert2Time(gcSafePoint).String())
>>>>>>> 5a0787d... executor: fix flashback table faild in uppercase database name (#17093)
}
}
if tblInfo == nil {
Expand Down
Loading