From 33290f166887697a4c231c3d0dbe153e0347f417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Date: Wed, 10 Aug 2022 16:03:28 +0300 Subject: [PATCH] Revert "Revert "query: Close() after using query (#5410)"" This reverts commit 5f2fde833de73f240a74c2754da8179919dff1f6. --- pkg/api/query/grpc.go | 2 ++ pkg/api/query/v1.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkg/api/query/grpc.go b/pkg/api/query/grpc.go index 25464123a6..459b94b6f7 100644 --- a/pkg/api/query/grpc.go +++ b/pkg/api/query/grpc.go @@ -84,6 +84,7 @@ func (g *GRPCAPI) Query(request *querypb.QueryRequest, server querypb.Query_Quer if err != nil { return err } + defer qry.Close() result := qry.Exec(ctx) if err := server.Send(querypb.NewQueryWarningsResponse(result.Warnings)); err != nil { @@ -157,6 +158,7 @@ func (g *GRPCAPI) QueryRange(request *querypb.QueryRangeRequest, srv querypb.Que if err != nil { return err } + defer qry.Close() result := qry.Exec(ctx) if err := srv.Send(querypb.NewQueryRangeWarningsResponse(result.Warnings)); err != nil { diff --git a/pkg/api/query/v1.go b/pkg/api/query/v1.go index bb72f0321d..9aa3534e5b 100644 --- a/pkg/api/query/v1.go +++ b/pkg/api/query/v1.go @@ -374,6 +374,7 @@ func (qapi *QueryAPI) query(r *http.Request) (interface{}, []error, *api.ApiErro if err != nil { return nil, nil, &api.ApiError{Typ: api.ErrorBadData, Err: err} } + defer qry.Close() tracing.DoInSpan(ctx, "query_gate_ismyturn", func(ctx context.Context) { err = qapi.gate.Start(ctx) @@ -502,6 +503,7 @@ func (qapi *QueryAPI) queryRange(r *http.Request) (interface{}, []error, *api.Ap if err != nil { return nil, nil, &api.ApiError{Typ: api.ErrorBadData, Err: err} } + defer qry.Close() tracing.DoInSpan(ctx, "query_gate_ismyturn", func(ctx context.Context) { err = qapi.gate.Start(ctx)