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

plans: Add empty files table in information_schema

Browse Source 
Fix mysqldump error.
This commit is contained in:
shenli
2015-11-06 13:14:01 +08:00
parent 6510bc9404
commit 5eb095dee1
2 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
plan/plans/info.go
View File

@ -52,6 +52,8 @@ var (
characterSetsRecords = buildCharacterSetsRecords()
collationsFields = buildResultFieldsForCollations()
collationsRecords = buildColltionsRecords()
filesFields = buildFilesFields()
filesRecords = buildFilesRecords()
)
const (
@ -61,6 +63,7 @@ const (
tableStatistics = "STATISTICS"
tableCharacterSets = "CHARACTER_SETS"
tableCollations = "COLLATIONS"
tableFiles = "FILES"
catalogVal = "def"
)
@ -74,6 +77,7 @@ func NewInfoSchemaPlan(tableName string) (isp *InfoSchemaPlan, err error) {
case tableStatistics:
case tableCharacterSets:
case tableCollations:
case tableFiles:
default:
return nil, errors.Errorf("table INFORMATION_SCHEMA.%s does not exist", tableName)
}
@ -216,6 +220,50 @@ func buildColltionsRecords() (records [][]interface{}) {
return records
}
func buildFilesRecords() (records [][]interface{}) {
// We do not have files, so we return empty records.
return records
}
func buildFilesFields() (rfs []*field.ResultField) {
tbName := tableFiles
rfs = append(rfs, buildResultField(tbName, "FILE_ID", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "FILE_NAME", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "TABLESPACE_NAME", mysql.TypeVarchar, 20))
rfs = append(rfs, buildResultField(tbName, "TABLE_CATALOG", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "TABLE_SCHEMA", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "TABLE_NAME", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "LOGFILE_GROUP_NAME", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "LOGFILE_GROUP_NUMBER", mysql.TypeLonglong, 32))
rfs = append(rfs, buildResultField(tbName, "ENGINE", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "FULLTEXT_KEYS", mysql.TypeVarchar, 64))
rfs = append(rfs, buildResultField(tbName, "DELETED_ROWS", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "UPDATE_COUNT", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "FREE_EXTENTS", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "TOTAL_EXTENTS", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "EXTENT_SIZE", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "INITIAL_SIZE", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "MAXIMUM_SIZE", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "AUTOEXTEND_SIZE", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "CREATION_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "LAST_UPDATE_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "LAST_ACCESS_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "RECOVER_TIME", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "TRANSACTION_COUNTER", mysql.TypeLonglong, 4))
rfs = append(rfs, buildResultField(tbName, "VERSION", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "ROW_FORMAT", mysql.TypeVarchar, 21))
rfs = append(rfs, buildResultField(tbName, "TABLE_ROWS", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "AVG_ROW_LENGTH", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "DATA_FREE", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "CREATE_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "UPDATE_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "CHECK_TIME", mysql.TypeDatetime, -1))
rfs = append(rfs, buildResultField(tbName, "CHECKSUM", mysql.TypeLonglong, 21))
rfs = append(rfs, buildResultField(tbName, "STATUS", mysql.TypeVarchar, 20))
rfs = append(rfs, buildResultField(tbName, "EXTRA", mysql.TypeVarchar, 255))
return rfs
}
// Explain implements plan.Plan Explain interface.
func (isp *InfoSchemaPlan) Explain(w format.Formatter) {}
@ -239,6 +287,8 @@ func (isp *InfoSchemaPlan) GetFields() []*field.ResultField {
return characterSetsFields
case tableCollations:
return collationsFields
case tableFiles:
return filesFields
}
return nil
}
@ -301,6 +351,8 @@ func (isp *InfoSchemaPlan) fetchAll(ctx context.Context) {
isp.fetchCharacterSets()
case tableCollations:
isp.fetchCollations()
case tableFiles:
isp.fetchFiles()
}
}
@ -447,6 +499,13 @@ func (isp *InfoSchemaPlan) fetchCollations() error {
return nil
}
func (isp *InfoSchemaPlan) fetchFiles() error {
for _, record := range filesRecords {
isp.rows = append(isp.rows, &plan.Row{Data: record})
}
return nil
}
// Close implements plan.Plan Close interface.
func (isp *InfoSchemaPlan) Close() error {
isp.rows = nil

2
plan/plans/info_test.go
View File

@ -91,4 +91,6 @@ func (p *testInfoSchemaSuit) TestInfoSchema(c *C) {
c.Assert(cnt, Greater, 0)
cnt = mustQuery(c, testDB, "select * from information_schema.collations")
c.Assert(cnt, Greater, 0)
cnt = mustQuery(c, testDB, "select * from information_schema.files")
c.Assert(cnt, Equals, 0)
}