From 81a68e597e8fb73a61e9f90113ad2c8e0f86e342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Date: Wed, 10 Aug 2022 13:32:58 +0300 Subject: [PATCH] Revert "query: Close() after using query (#5410)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 54a0deb98237e4474d6d3d0df70ea3d08869e859. Signed-off-by: Giedrius Statkevičius --- pkg/api/query/grpc.go | 2 -- pkg/api/query/v1.go | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkg/api/query/grpc.go b/pkg/api/query/grpc.go index 459b94b6f75..25464123a66 100644 --- a/pkg/api/query/grpc.go +++ b/pkg/api/query/grpc.go @@ -84,7 +84,6 @@ 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 { @@ -158,7 +157,6 @@ 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 9aa3534e5b1..bb72f0321d9 100644 --- a/pkg/api/query/v1.go +++ b/pkg/api/query/v1.go @@ -374,7 +374,6 @@ 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) @@ -503,7 +502,6 @@ 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)