From 4bb208eeb3676873fa866aec94c71bd1c4943eec Mon Sep 17 00:00:00 2001 From: Chris Marchbanks Date: Fri, 18 Nov 2022 09:01:00 +0000 Subject: [PATCH] Use const for Arrow MIME type Signed-off-by: Chris Marchbanks --- web/api/v1/api.go | 6 ++++-- web/api/v1/api_test.go | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 46a4089e32..dbb1b4a0b7 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -84,6 +84,8 @@ const ( var LocalhostRepresentations = []string{"127.0.0.1", "localhost", "::1"} +const mimeTypeArrowStream = "application/vnd.apache.arrow.stream" + type apiError struct { typ errorType err error @@ -1572,7 +1574,7 @@ func (api *API) tryArrowResponse(w http.ResponseWriter, r *http.Request, data in } } - w.Header().Set("Content-Type", "application/vnd.apache.arrow.stream") + w.Header().Set("Content-Type", mimeTypeArrowStream) w.WriteHeader(http.StatusOK) pool := memory.NewGoAllocator() @@ -1609,7 +1611,7 @@ func (api *API) tryArrowResponse(w http.ResponseWriter, r *http.Request, data in } func (api *API) respond(w http.ResponseWriter, r *http.Request, data interface{}, warnings storage.Warnings) { - if r.Header.Get("Accept") == "application/vnd.apache.arrow.stream" { + if r.Header.Get("Accept") == mimeTypeArrowStream { err := api.tryArrowResponse(w, r, data, warnings) if err == nil { return diff --git a/web/api/v1/api_test.go b/web/api/v1/api_test.go index 3bca024543..4872567fae 100644 --- a/web/api/v1/api_test.go +++ b/web/api/v1/api_test.go @@ -3192,7 +3192,7 @@ func TestRespond(t *testing.T) { for _, c := range cases { s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if useArrow { - r.Header.Add("Accept", "application/vnd.apache.arrow.stream") + r.Header.Add("Accept", mimeTypeArrowStream) } api := API{} api.respond(w, r, c.response, nil) @@ -3204,7 +3204,7 @@ func TestRespond(t *testing.T) { t.Fatalf("Error on test request: %s", err) } var body []byte - if resp.Header.Get("Content-Type") == "application/vnd.apache.arrow.stream" { + if resp.Header.Get("Content-Type") == mimeTypeArrowStream { body, err = arrowToJSONResponse(resp.Body) } else { body, err = io.ReadAll(resp.Body) @@ -3387,7 +3387,7 @@ func BenchmarkRespondArrow(b *testing.B) { }, } request, _ := http.NewRequest("GET", "http://localhost:9090", nil) - request.Header.Add("Accept", "application/vnd.apache.arrow.stream") + request.Header.Add("Accept", mimeTypeArrowStream) b.ResetTimer() api := API{} for n := 0; n < b.N; n++ {