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

Jump to bottom

ucp: migrate dataForTiKVRegionStatus from package infoschema to executor #15552

Merged
merged 4 commits into from
Mar 30, 2020
Merged

ucp: migrate dataForTiKVRegionStatus from package infoschema to executor #15552

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe4165b
ucp: migrate dataForTiKVRegionStatus
krzysztofpioro Mar 21, 2020
f92216e
Merge branch 'master' into migrateDataForTiKVRegionStatus
krzysztofpioro Mar 25, 2020
671dca3
Merge branch 'master' into migrateDataForTiKVRegionStatus
sre-bot Mar 30, 2020
a566134
Merge branch 'master' into migrateDataForTiKVRegionStatus
sre-bot Mar 30, 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
1 change: 1 addition & 0 deletions executor/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,7 @@ func (b *executorBuilder) buildMemTable(v *plannercore.PhysicalMemTable) Executo
strings.ToLower(infoschema.TableCollationCharacterSetApplicability),
strings.ToLower(infoschema.TableProcesslist),
strings.ToLower(infoschema.ClusterTableProcesslist),
strings.ToLower(infoschema.TableTiKVRegionStatus),
strings.ToLower(infoschema.TableTiKVRegionPeers),
strings.ToLower(infoschema.TableTiDBHotRegions),
strings.ToLower(infoschema.TableSessionVar),
Expand Down
55 changes: 55 additions & 0 deletions executor/infoschema_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ func (e *memtableRetriever) retrieve(ctx context.Context, sctx sessionctx.Contex
err = e.setDataForClusterProcessList(sctx)
case infoschema.TableUserPrivileges:
e.setDataFromUserPrivileges(sctx)
case infoschema.TableTiKVRegionStatus:
err = e.setDataForTiKVRegionStatus(sctx)
case infoschema.TableTiKVRegionPeers:
err = e.setDataForTikVRegionPeers(sctx)
case infoschema.TableTiDBHotRegions:
Expand Down Expand Up @@ -1142,6 +1144,59 @@ func keyColumnUsageInTable(schema *model.DBInfo, table *model.TableInfo) [][]typ
return rows
}

func (e *memtableRetriever) setDataForTiKVRegionStatus(ctx sessionctx.Context) error {
tikvStore, ok := ctx.GetStore().(tikv.Storage)
if !ok {
return errors.New("Information about TiKV region status can be gotten only when the storage is TiKV")
}
tikvHelper := &helper.Helper{
Store: tikvStore,
RegionCache: tikvStore.GetRegionCache(),
}
regionsInfo, err := tikvHelper.GetRegionsInfo()
if err != nil {
return err
}
allSchemas := ctx.GetSessionVars().TxnCtx.InfoSchema.(infoschema.InfoSchema).AllSchemas()
tableInfos := tikvHelper.GetRegionsTableInfo(regionsInfo, allSchemas)
for _, region := range regionsInfo.Regions {
tableList := tableInfos[region.ID]
if len(tableList) == 0 {
e.setNewTiKVRegionStatusCol(&region, nil)
}
for _, table := range tableList {
e.setNewTiKVRegionStatusCol(&region, &table)
}
}
return nil
}

func (e *memtableRetriever) setNewTiKVRegionStatusCol(region *helper.RegionInfo, table *helper.TableInfo) {
row := make([]types.Datum, len(infoschema.TableTiKVRegionStatusCols))
row[0].SetInt64(region.ID)
row[1].SetString(region.StartKey, mysql.DefaultCollationName)
row[2].SetString(region.EndKey, mysql.DefaultCollationName)
if table != nil {
row[3].SetInt64(table.Table.ID)
row[4].SetString(table.DB.Name.O, mysql.DefaultCollationName)
row[5].SetString(table.Table.Name.O, mysql.DefaultCollationName)
if table.IsIndex {
row[6].SetInt64(1)
row[7].SetInt64(table.Index.ID)
row[8].SetString(table.Index.Name.O, mysql.DefaultCollationName)
} else {
row[6].SetInt64(0)
}
}
row[9].SetInt64(region.Epoch.ConfVer)
row[10].SetInt64(region.Epoch.Version)
row[11].SetInt64(region.WrittenBytes)
row[12].SetInt64(region.ReadBytes)
row[13].SetInt64(region.ApproximateSize)
row[14].SetInt64(region.ApproximateKeys)
e.rows = append(e.rows, row)
}

func (e *memtableRetriever) setDataForTikVRegionPeers(ctx sessionctx.Context) error {
tikvStore, ok := ctx.GetStore().(tikv.Storage)
if !ok {
Expand Down
68 changes: 7 additions & 61 deletions infoschema/tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ const (
TableTiDBHotRegions = "TIDB_HOT_REGIONS"
tableTiKVStoreStatus = "TIKV_STORE_STATUS"
// TableAnalyzeStatus is the string constant of Analyze Status
TableAnalyzeStatus = "ANALYZE_STATUS"
tableTiKVRegionStatus = "TIKV_REGION_STATUS"
TableAnalyzeStatus = "ANALYZE_STATUS"
// TableTiKVRegionStatus is the string constant of infoschema table
TableTiKVRegionStatus = "TIKV_REGION_STATUS"
// TableTiKVRegionPeers is the string constant of infoschema table
TableTiKVRegionPeers = "TIKV_REGION_PEERS"
// TableTiDBServersInfo is the string constant of TiDB server information table.
Expand Down Expand Up @@ -180,7 +181,7 @@ var tableIDMap = map[string]int64{
TableTiDBHotRegions: autoid.InformationSchemaDBID + 36,
tableTiKVStoreStatus: autoid.InformationSchemaDBID + 37,
TableAnalyzeStatus: autoid.InformationSchemaDBID + 38,
tableTiKVRegionStatus: autoid.InformationSchemaDBID + 39,
TableTiKVRegionStatus: autoid.InformationSchemaDBID + 39,
TableTiKVRegionPeers: autoid.InformationSchemaDBID + 40,
TableTiDBServersInfo: autoid.InformationSchemaDBID + 41,
TableClusterInfo: autoid.InformationSchemaDBID + 42,
Expand Down Expand Up @@ -787,7 +788,8 @@ var tableAnalyzeStatusCols = []columnInfo{
{name: "STATE", tp: mysql.TypeVarchar, size: 64},
}

var tableTiKVRegionStatusCols = []columnInfo{
// TableTiKVRegionStatusCols is TiKV region status mem table columns.
var TableTiKVRegionStatusCols = []columnInfo{
{name: "REGION_ID", tp: mysql.TypeLonglong, size: 21},
{name: "START_KEY", tp: mysql.TypeBlob, size: types.UnspecifiedLength},
{name: "END_KEY", tp: mysql.TypeBlob, size: types.UnspecifiedLength},
Expand Down Expand Up @@ -1018,60 +1020,6 @@ var tableSequencesCols = []columnInfo{
{name: "COMMENT", tp: mysql.TypeVarchar, size: 64},
}

func dataForTiKVRegionStatus(ctx sessionctx.Context) (records [][]types.Datum, err error) {
tikvStore, ok := ctx.GetStore().(tikv.Storage)
if !ok {
return nil, errors.New("Information about TiKV region status can be gotten only when the storage is TiKV")
}
tikvHelper := &helper.Helper{
Store: tikvStore,
RegionCache: tikvStore.GetRegionCache(),
}
regionsInfo, err := tikvHelper.GetRegionsInfo()
if err != nil {
return nil, err
}
allSchemas := ctx.GetSessionVars().TxnCtx.InfoSchema.(InfoSchema).AllSchemas()
tableInfos := tikvHelper.GetRegionsTableInfo(regionsInfo, allSchemas)
for _, region := range regionsInfo.Regions {
tableList := tableInfos[region.ID]
if len(tableList) == 0 {
records = append(records, newTiKVRegionStatusCol(&region, nil))
}
for _, table := range tableList {
row := newTiKVRegionStatusCol(&region, &table)
records = append(records, row)
}
}
return records, nil
}

func newTiKVRegionStatusCol(region *helper.RegionInfo, table *helper.TableInfo) []types.Datum {
row := make([]types.Datum, len(tableTiKVRegionStatusCols))
row[0].SetInt64(region.ID)
row[1].SetString(region.StartKey, mysql.DefaultCollationName)
row[2].SetString(region.EndKey, mysql.DefaultCollationName)
if table != nil {
row[3].SetInt64(table.Table.ID)
row[4].SetString(table.DB.Name.O, mysql.DefaultCollationName)
row[5].SetString(table.Table.Name.O, mysql.DefaultCollationName)
if table.IsIndex {
row[6].SetInt64(1)
row[7].SetInt64(table.Index.ID)
row[8].SetString(table.Index.Name.O, mysql.DefaultCollationName)
} else {
row[6].SetInt64(0)
}
}
row[9].SetInt64(region.Epoch.ConfVer)
row[10].SetInt64(region.Epoch.Version)
row[11].SetInt64(region.WrittenBytes)
row[12].SetInt64(region.ReadBytes)
row[13].SetInt64(region.ApproximateSize)
row[14].SetInt64(region.ApproximateKeys)
return row
}

func dataForTiKVStoreStatus(ctx sessionctx.Context) (records [][]types.Datum, err error) {
tikvStore, ok := ctx.GetStore().(tikv.Storage)
if !ok {
Expand Down Expand Up @@ -1351,7 +1299,7 @@ var tableNameToColumns = map[string][]columnInfo{
TableTiDBHotRegions: TableTiDBHotRegionsCols,
tableTiKVStoreStatus: tableTiKVStoreStatusCols,
TableAnalyzeStatus: tableAnalyzeStatusCols,
tableTiKVRegionStatus: tableTiKVRegionStatusCols,
TableTiKVRegionStatus: TableTiKVRegionStatusCols,
TableTiKVRegionPeers: TableTiKVRegionPeersCols,
TableTiDBServersInfo: tableTiDBServersInfoCols,
TableClusterInfo: tableClusterInfoCols,
Expand Down Expand Up @@ -1426,8 +1374,6 @@ func (it *infoschemaTable) getRows(ctx sessionctx.Context, cols []*table.Column)
case tableTableSpaces:
case tableTiKVStoreStatus:
fullRows, err = dataForTiKVStoreStatus(ctx)
case tableTiKVRegionStatus:
fullRows, err = dataForTiKVRegionStatus(ctx)
}
if err != nil {
return nil, err
Expand Down