fix conflict

Signed-off-by: lhy1024 <[email protected]>
tikv · Oct 8, 2023 · e6c42ac · e6c42ac
1 parent e7c26d9
commit e6c42ac
Showing 1 changed file with 1 addition and 149 deletions.
diff --git a/server/api/region.go b/server/api/region.go
@@ -468,71 +468,12 @@ func (h *regionsHandler) GetStoreRegions(w http.ResponseWriter, r *http.Request)
 }
 
 // @Tags     region
-<<<<<<< HEAD
-=======
-// @Summary  List regions belongs to the given keyspace ID.
-// @Param    keyspace_id  query  string   true   "Keyspace ID"
-// @Param    limit        query  integer  false  "Limit count"  default(16)
-// @Produce  json
-// @Success  200  {object}  RegionsInfo
-// @Failure  400  {string}  string  "The input is invalid."
-// @Router   /regions/keyspace/id/{id} [get]
-func (h *regionsHandler) GetKeyspaceRegions(w http.ResponseWriter, r *http.Request) {
-	rc := getCluster(r)
-	vars := mux.Vars(r)
-	keyspaceIDStr := vars["id"]
-	if keyspaceIDStr == "" {
-		h.rd.JSON(w, http.StatusBadRequest, "keyspace id is empty")
-		return
-	}
-
-	keyspaceID64, err := strconv.ParseUint(keyspaceIDStr, 10, 32)
-	if err != nil {
-		h.rd.JSON(w, http.StatusBadRequest, err.Error())
-		return
-	}
-	keyspaceID := uint32(keyspaceID64)
-	keyspaceManager := h.svr.GetKeyspaceManager()
-	if _, err := keyspaceManager.LoadKeyspaceByID(keyspaceID); err != nil {
-		h.rd.JSON(w, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	limit := defaultRegionLimit
-	if limitStr := r.URL.Query().Get("limit"); limitStr != "" {
-		limit, err = strconv.Atoi(limitStr)
-		if err != nil {
-			h.rd.JSON(w, http.StatusBadRequest, err.Error())
-			return
-		}
-	}
-	if limit > maxRegionLimit {
-		limit = maxRegionLimit
-	}
-	regionBound := keyspace.MakeRegionBound(keyspaceID)
-	regions := rc.ScanRegions(regionBound.RawLeftBound, regionBound.RawRightBound, limit)
-	if limit <= 0 || limit > len(regions) {
-		txnRegion := rc.ScanRegions(regionBound.TxnLeftBound, regionBound.TxnRightBound, limit-len(regions))
-		regions = append(regions, txnRegion...)
-	}
-	b, err := marshalRegionsInfoJSON(r.Context(), regions)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	h.rd.Data(w, http.StatusOK, b)
-}
-
-// @Tags     region
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 // @Summary  List all regions that miss peer.
 // @Produce  json
 // @Success  200  {object}  RegionsInfo
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/miss-peer [get]
 func (h *regionsHandler) GetMissPeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-=======
 	h.getRegionsByType(w, statistics.MissPeer, r)
 }
 
@@ -541,9 +482,8 @@ func (h *regionsHandler) getRegionsByType(
 	typ statistics.RegionStatisticType,
 	r *http.Request,
 ) {
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.MissPeer)
+	regions, err := handler.GetRegionsByType(typ)
 	if err != nil {
 		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
 		return
@@ -563,18 +503,7 @@ func (h *regionsHandler) getRegionsByType(
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/extra-peer [get]
 func (h *regionsHandler) GetExtraPeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.ExtraPeer)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.ExtraPeer, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -584,18 +513,7 @@ func (h *regionsHandler) GetExtraPeerRegions(w http.ResponseWriter, r *http.Requ
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/pending-peer [get]
 func (h *regionsHandler) GetPendingPeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.PendingPeer)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.PendingPeer, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -605,18 +523,7 @@ func (h *regionsHandler) GetPendingPeerRegions(w http.ResponseWriter, r *http.Re
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/down-peer [get]
 func (h *regionsHandler) GetDownPeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.DownPeer)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.DownPeer, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -626,18 +533,7 @@ func (h *regionsHandler) GetDownPeerRegions(w http.ResponseWriter, r *http.Reque
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/learner-peer [get]
 func (h *regionsHandler) GetLearnerPeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.LearnerPeer)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.LearnerPeer, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -647,18 +543,7 @@ func (h *regionsHandler) GetLearnerPeerRegions(w http.ResponseWriter, r *http.Re
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/offline-peer [get]
 func (h *regionsHandler) GetOfflinePeerRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetOfflinePeer(statistics.OfflinePeer)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.OfflinePeer, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -668,18 +553,7 @@ func (h *regionsHandler) GetOfflinePeerRegions(w http.ResponseWriter, r *http.Re
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/oversized-region [get]
 func (h *regionsHandler) GetOverSizedRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.OversizedRegion)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.OversizedRegion, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -689,18 +563,7 @@ func (h *regionsHandler) GetOverSizedRegions(w http.ResponseWriter, r *http.Requ
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/undersized-region [get]
 func (h *regionsHandler) GetUndersizedRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.UndersizedRegion)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.UndersizedRegion, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 // @Tags     region
@@ -710,18 +573,7 @@ func (h *regionsHandler) GetUndersizedRegions(w http.ResponseWriter, r *http.Req
 // @Failure  500  {string}  string  "PD server failed to proceed the request."
 // @Router   /regions/check/empty-region [get]
 func (h *regionsHandler) GetEmptyRegions(w http.ResponseWriter, r *http.Request) {
-<<<<<<< HEAD
-	handler := h.svr.GetHandler()
-	regions, err := handler.GetRegionsByType(statistics.EmptyRegion)
-	if err != nil {
-		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	regionsInfo := convertToAPIRegions(regions)
-	h.rd.JSON(w, http.StatusOK, regionsInfo)
-=======
 	h.getRegionsByType(w, statistics.EmptyRegion, r)
->>>>>>> 4db173597 (api: use easyjson and context in regions interface (#6838))
 }
 
 type histItem struct {