From 882327b0a6b0f52d5f681d21e685492876b9edca Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Mon, 10 May 2021 10:36:24 -0500 Subject: [PATCH 1/2] remove inspect router --- http/handler.go | 1 - 1 file changed, 1 deletion(-) diff --git a/http/handler.go b/http/handler.go index 94f14a011..b3f7e3751 100644 --- a/http/handler.go +++ b/http/handler.go @@ -397,7 +397,6 @@ func newRouter(handler *Handler) http.Handler { router.HandleFunc("/index/{index}/field/{field}/import-roaring/{shard}", handler.handlePostImportRoaring).Methods("POST").Name("PostImportRoaring") router.HandleFunc("/index/{index}/query", handler.handlePostQuery).Methods("POST").Name("PostQuery") router.HandleFunc("/info", handler.handleGetInfo).Methods("GET").Name("GetInfo") - router.HandleFunc("/inspect", handler.handleInspect).Methods("GET").Name("Inspect") router.HandleFunc("/recalculate-caches", handler.handleRecalculateCaches).Methods("POST").Name("RecalculateCaches") router.HandleFunc("/schema", handler.handleGetSchema).Methods("GET").Name("GetSchema") router.HandleFunc("/schema/details", handler.handleGetSchemaDetails).Methods("GET").Name("GetSchemaDetails") From e21382fab88e932877e430eace554883762753d7 Mon Sep 17 00:00:00 2001 From: Maxton Huff Date: Mon, 10 May 2021 13:14:50 -0500 Subject: [PATCH 2/2] remove handleInspect and inspect validator --- http/handler.go | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/http/handler.go b/http/handler.go index b3f7e3751..ad795efb4 100644 --- a/http/handler.go +++ b/http/handler.go @@ -260,7 +260,6 @@ func (h *Handler) populateValidators() { h.validators["GetTransaction"] = queryValidationSpecRequired() h.validators["PostTransaction"] = queryValidationSpecRequired() h.validators["PostFinishTransaction"] = queryValidationSpecRequired() - h.validators["Inspect"] = queryValidationSpecRequired().Optional("indexes", "fields", "views", "shards", "checksum", "containers") } @@ -802,37 +801,6 @@ func (h *Handler) handleGetInfo(w http.ResponseWriter, r *http.Request) { } } -func (h *Handler) handleInspect(w http.ResponseWriter, r *http.Request) { - if !validHeaderAcceptJSON(r.Header) { - http.Error(w, "JSON only acceptable response", http.StatusNotAcceptable) - return - } - q := r.URL.Query() - _, checksum := q["checksum"] - _, containers := q["containers"] - req := pilosa.InspectRequest{ - HolderFilterParams: pilosa.HolderFilterParams{ - Indexes: q.Get("indexes"), - Fields: q.Get("fields"), - Views: q.Get("views"), - Shards: q.Get("shards"), - }, - InspectRequestParams: pilosa.InspectRequestParams{ - Checksum: checksum, - Containers: containers, - }, - } - info, err := h.api.Inspect(r.Context(), &req) - if err != nil { - http.Error(w, fmt.Sprintf("inspect request: %v", err), http.StatusBadRequest) - return - } - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(info); err != nil { - h.logger.Errorf("write inspect response error: %s", err) - } -} - type getSchemaResponse struct { Indexes []*pilosa.IndexInfo `json:"indexes"` }