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

http: add region-id when getting mvcc by handle (#11436) #11557

Merged
merged 13 commits into from
Aug 1, 2019
Merged

http: add region-id when getting mvcc by handle (#11436) #11557

Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
57478a3
add region-id for mvcc
Jul 25, 2019
2219dbb
run gofmt
Jul 25, 2019
3a4ef0d
manual test and fixed
Jul 25, 2019
ca920ee
run gofmt
Jul 25, 2019
007643e
fix ci
Jul 25, 2019
4db082d
fix error
Jul 25, 2019
9e7a390
address comment
Jul 26, 2019
e34d967
change return value
Jul 30, 2019
36b8015
add function
Jul 31, 2019
7c66a48
Merge branch 'release-3.0' into release-3.0-7b632931803d
lysu Aug 1, 2019
a9d98be
Merge branch 'release-3.0' into release-3.0-7b632931803d
Aug 1, 2019
c9be427
Merge branch 'release-3.0' into release-3.0-7b632931803d
sre-bot Aug 1, 2019
8b2c3c1
Merge branch 'release-3.0' into release-3.0-7b632931803d
Aug 1, 2019
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
48 changes: 40 additions & 8 deletions server/http_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,33 @@ func (s *Server) newTikvHandlerTool() *tikvHandlerTool {
}

type mvccKV struct {
Key string `json:"key"`
Value *kvrpcpb.MvccGetByKeyResponse `json:"value"`
Key string `json:"key"`
RegionID uint64 `json:"region_id"`
Value *kvrpcpb.MvccGetByKeyResponse `json:"value"`
}

func (t *tikvHandlerTool) getRegionIDByKey(encodedKey []byte) (uint64, error) {
keyLocation, err := t.RegionCache.LocateKey(tikv.NewBackoffer(context.Background(), 500), encodedKey)
if err != nil {
return 0, err
}
return keyLocation.Region.GetID(), nil
}

func (t *tikvHandlerTool) getMvccByHandle(tableID, handle int64) (*mvccKV, error) {
encodedKey := tablecodec.EncodeRowKeyWithHandle(tableID, handle)
data, err := t.GetMvccByEncodedKey(encodedKey)
return &mvccKV{Key: strings.ToUpper(hex.EncodeToString(encodedKey)), Value: data}, err
if err != nil {
return nil, err
}
regionID, err := t.getRegionIDByKey(encodedKey)
if err != nil {
return nil, err
}
return &mvccKV{Key: strings.ToUpper(hex.EncodeToString(encodedKey)), Value: data, RegionID: regionID}, err
}

func (t *tikvHandlerTool) getMvccByStartTs(startTS uint64, startKey, endKey []byte) (*kvrpcpb.MvccGetByStartTsResponse, error) {
func (t *tikvHandlerTool) getMvccByStartTs(startTS uint64, startKey, endKey []byte) (*mvccKV, error) {
bo := tikv.NewBackoffer(context.Background(), 5000)
for {
curRegion, err := t.RegionCache.LocateKey(bo, startKey)
Expand Down Expand Up @@ -197,7 +213,8 @@ func (t *tikvHandlerTool) getMvccByStartTs(startTS uint64, startKey, endKey []by

key := data.GetKey()
if len(key) > 0 {
return data, nil
resp := &kvrpcpb.MvccGetByKeyResponse{Info: data.Info, RegionError: data.RegionError, Error: data.Error}
return &mvccKV{Key: strings.ToUpper(hex.EncodeToString(key)), Value: resp, RegionID: curRegion.Region.GetID()}, nil
}

if len(endKey) > 0 && curRegion.Contains(endKey) {
Expand Down Expand Up @@ -228,7 +245,14 @@ func (t *tikvHandlerTool) getMvccByIdxValue(idx table.Index, values url.Values,
return nil, errors.Trace(err)
}
data, err := t.GetMvccByEncodedKey(encodedKey)
return &mvccKV{strings.ToUpper(hex.EncodeToString(encodedKey)), data}, err
if err != nil {
return nil, err
}
regionID, err := t.getRegionIDByKey(encodedKey)
if err != nil {
return nil, err
}
return &mvccKV{strings.ToUpper(hex.EncodeToString(encodedKey)), regionID, data}, err
}

// formValue2DatumRow converts URL query string to a Datum Row.
Expand Down Expand Up @@ -287,12 +311,20 @@ func (t *tikvHandlerTool) schema() (infoschema.InfoSchema, error) {
return domain.GetDomain(session.(sessionctx.Context)).InfoSchema(), nil
}

func (t *tikvHandlerTool) handleMvccGetByHex(params map[string]string) (interface{}, error) {
func (t *tikvHandlerTool) handleMvccGetByHex(params map[string]string) (*mvccKV, error) {
encodedKey, err := hex.DecodeString(params[pHexKey])
if err != nil {
return nil, errors.Trace(err)
}
return t.GetMvccByEncodedKey(encodedKey)
data, err := t.GetMvccByEncodedKey(encodedKey)
if err != nil {
return nil, errors.Trace(err)
}
regionID, err := t.getRegionIDByKey(encodedKey)
if err != nil {
return nil, err
}
return &mvccKV{Key: strings.ToUpper(params[pHexKey]), Value: data, RegionID: regionID}, nil
}

// settingsHandler is the handler for list tidb server settings.
Expand Down