address

Signed-off-by: nolouch <nolouch@gmail.com>

pkg/core/region.go

@@ -1369,21 +1369,21 @@ func (r *RegionsInfo) GetStoreRegions(storeID uint64) []*RegionInfo {
 }
 
 // SubTreeRegionType is the type of sub tree region.
-type SubTreeRegionType int
+type SubTreeRegionType string
 
 const (
 	// AllInSubTree is all sub trees.
-	AllInSubTree SubTreeRegionType = iota
+	AllInSubTree SubTreeRegionType = "all"
 	// LeaderInSubTree is the leader sub tree.
-	LeaderInSubTree
+	LeaderInSubTree SubTreeRegionType = "leader"
 	// FollowerInSubTree is the follower sub tree.
-	FollowerInSubTree
+	FollowerInSubTree SubTreeRegionType = "follower"
 	// LearnerInSubTree is the learner sub tree.
-	LearnerInSubTree
+	LearnerInSubTree SubTreeRegionType = "learner"
 	// WitnessInSubTree is the witness sub tree.
-	WitnessInSubTree
+	WitnessInSubTree SubTreeRegionType = "witness"
 	// PendingPeerInSubTree is the pending peer sub tree.
-	PendingPeerInSubTree
+	PendingPeerInSubTree SubTreeRegionType = "pending"
 )
 
 // GetStoreRegions gets all RegionInfo with a given storeID

server/api/region.go

@@ -219,11 +219,12 @@ func (h *regionsHandler) GetStoreRegions(w http.ResponseWriter, r *http.Request)
 		return
 	}
 	// get type from query
-	typID, err := strconv.Atoi(r.URL.Query().Get("type"))
-	if err != nil {
-		typID = int(core.AllInSubTree)
+	typ := r.URL.Query().Get("type")
+	if len(typ) == 0 {
+		typ = string(core.AllInSubTree)
 	}
-	regions, err := rc.GetStoreRegionsByTypeInSubTree(uint64(id), core.SubTreeRegionType(typID))
+
+	regions, err := rc.GetStoreRegionsByTypeInSubTree(uint64(id), core.SubTreeRegionType(typ))
 	if err != nil {
 		h.rd.JSON(w, http.StatusBadRequest, err.Error())
 		return

tools/pd-ctl/pdctl/command/region_command.go

@@ -497,26 +497,8 @@ func showRegionWithStoreCommandFunc(cmd *cobra.Command, args []string) {
 	}
 	storeID := args[0]
 	prefix := regionsStorePrefix + "/" + storeID
-	flag := cmd.Flag("type")
-	typ := 0
-	switch flag.Value.String() {
-	case "all":
-		typ = 0
-	case "leader":
-		typ = 1
-	case "follower":
-		typ = 2
-	case "learner":
-		typ = 3
-	case "witness":
-		typ = 4
-	case "pending":
-		typ = 5
-	default:
-		cmd.Println("unknown type")
-		return
-	}
-	prefix += "?type=" + strconv.Itoa(typ)
+	flagType := cmd.Flag("type")
+	prefix += "?type=" + flagType.Value.String()
 	r, err := doRequest(cmd, prefix, http.MethodGet, http.Header{})
 	if err != nil {
 		cmd.Printf("Failed to get regions with the given storeID: %s\n", err)