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

pd-ctl: return full region information for /region api #1252

Merged
merged 7 commits into from
Sep 25, 2018
Merged

pd-ctl: return full region information for /region api #1252

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99c9881
get full region information for /region api
liukun4515 Sep 21, 2018
e54c92d
add test case for getAll region for pd-ctl/pd-api
liukun4515 Sep 25, 2018
f53d8bf
fix test
liukun4515 Sep 25, 2018
fc9f79e
modifty the region assert
liukun4515 Sep 25, 2018
236df1c
change the region id and store id for other test case
liukun4515 Sep 25, 2018
78d33f5
make slice with a given capacity
liukun4515 Sep 25, 2018
d3457c0
Merge branch 'master' into full-region-api
liukun4515 Sep 25, 2018
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
5 changes: 2 additions & 3 deletions server/api/region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,10 @@ func (h *regionsHandler) GetAll(w http.ResponseWriter, r *http.Request) {
h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
return
}

regions := cluster.GetMetaRegions()
regions := cluster.GetRegions()
regionInfos := make([]*regionInfo, len(regions))
for i, r := range regions {
regionInfos[i] = newRegionInfo(core.NewRegionInfo(r, nil))
regionInfos[i] = newRegionInfo(r)
}
regionsInfo := &regionsInfo{
Count: len(regions),
Expand Down
26 changes: 26 additions & 0 deletions server/api/region_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,32 @@ func (s *testRegionSuite) TestRegion(c *C) {
c.Assert(r2, DeepEquals, newRegionInfo(r))
}

func (s *testRegionSuite) TestRegions(c *C) {
rs := []*core.RegionInfo{
newTestRegionInfo(2, 1, []byte("a"), []byte("b")),
newTestRegionInfo(3, 1, []byte("b"), []byte("c")),
newTestRegionInfo(4, 2, []byte("c"), []byte("d")),
}
regions := make([]*regionInfo, 0)
Copy link
Contributor

Choose a reason for hiding this comment

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

make([]*regionInfo, 0, len(rs))

for _, r := range rs {
regions = append(regions, newRegionInfo(r))
mustRegionHeartbeat(c, s.svr, r)
}
url := fmt.Sprintf("%s/regions", s.urlPrefix)
regionsInfo := &regionsInfo{}
err := readJSONWithURL(url, regionsInfo)
c.Assert(err, IsNil)
c.Assert(regionsInfo.Count, Equals, len(regions))
sort.Slice(regionsInfo.Regions, func(i, j int) bool {
return regionsInfo.Regions[i].ID < regionsInfo.Regions[j].ID
})
for i, r := range regionsInfo.Regions {
c.Assert(r.ID, Equals, regions[i].ID)
c.Assert(r.ApproximateSize, Equals, regions[i].ApproximateSize)
c.Assert(r.ApproximateKeys, Equals, regions[i].ApproximateKeys)
}
}

func (s *testRegionSuite) TestStoreRegions(c *C) {
r1 := newTestRegionInfo(2, 1, []byte("a"), []byte("b"))
r2 := newTestRegionInfo(3, 1, []byte("b"), []byte("c"))
Expand Down