database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: Address comment

Browse Source
This commit is contained in:
shenli
2015-11-27 15:35:19 +08:00
parent 83a73341ce
commit bb5d702d57
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ddl/index.go
View File

@ -29,7 +29,7 @@ import (
"github.com/pingcap/tidb/util"
)
func (d *ddl) buildIndexInfo(tblInfo *model.TableInfo, unique bool, indexName model.CIStr, idxColNames []*coldef.IndexColName) (*model.IndexInfo, error) {
func buildIndexInfo(tblInfo *model.TableInfo, unique bool, indexName model.CIStr, indexID int64, idxColNames []*coldef.IndexColName) (*model.IndexInfo, error) {
for _, col := range tblInfo.Columns {
if col.Name.L == indexName.L {
return nil, errors.Errorf("CREATE INDEX: index name collision with existing column: %s", indexName)
@ -50,13 +50,9 @@ func (d *ddl) buildIndexInfo(tblInfo *model.TableInfo, unique bool, indexName mo
Length: ic.Length,
})
}
id, err := d.genGlobalID()
if err != nil {
return nil, errors.Trace(err)
}
// create index info
idxInfo := &model.IndexInfo{
ID: id,
ID: indexID,
Name: indexName,
Columns: idxColumns,
Unique: unique,
@ -132,7 +128,11 @@ func (d *ddl) onCreateIndex(t *meta.Meta, job *model.Job) error {
}
if indexInfo == nil {
indexInfo, err = d.buildIndexInfo(tblInfo, unique, indexName, idxColNames)
indexID, err1 := d.genGlobalID()
if err1 != nil {
return errors.Trace(err1)
}
indexInfo, err = buildIndexInfo(tblInfo, unique, indexName, indexID, idxColNames)
if err != nil {
job.State = model.JobCancelled
return errors.Trace(err)