Move duration header to fix error handling

This commit is contained in:
Cody Soyland 2021-02-01 09:30:24 -06:00
parent e2331372d8
commit c30e3f0c2d
No known key found for this signature in database
GPG key ID: 6F5D2986DCC5DC8A

View file

@ -215,13 +215,6 @@ func (h *GRPCHandler) QueryPQL(req *pb.QueryPQLRequest, stream pb.Pilosa_QueryPQ
resp, err := h.api.Query(stream.Context(), &query)
durQuery := time.Since(t)
err = stream.SendHeader(metadata.New(map[string]string{
"duration": strconv.Itoa(int(durQuery)),
}))
if err != nil {
return errors.Wrap(err, "sending header")
}
// TODO: what about resp.CollumnAttrSets?
if err != nil {
return errToStatusError(err)
@ -240,6 +233,13 @@ func (h *GRPCHandler) QueryPQL(req *pb.QueryPQLRequest, stream pb.Pilosa_QueryPQ
return errors.Wrap(err, "wrapping as type ToRowser")
}
err = stream.SendHeader(metadata.New(map[string]string{
"duration": strconv.Itoa(int(durQuery)),
}))
if err != nil {
return errors.Wrap(err, "sending header")
}
t = time.Now()
if err := newDurationRowser(toRowser, durQuery).ToRows(stream.Send); err != nil {
return errToStatusError(err)