From 0d045630c8ecdbde795b9e6083fb6e89e6e4c98b Mon Sep 17 00:00:00 2001
From: "Jonathan A. Sternberg" <jonathan@influxdata.com>
Date: Thu, 14 Mar 2019 11:12:53 -0500
Subject: [PATCH] fix(query): release the query results before requesting
 statistics (#12622)

The statistics are only finalized after release is called. Defer a call
to release to ensure they are released, but explicitly release on
success to ensure that the statistics are finalized from all sources
before returning them.
---
 query/bridges.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/query/bridges.go b/query/bridges.go
index ef2df5a93bf..2aa7c2059fb 100644
--- a/query/bridges.go
+++ b/query/bridges.go
@@ -85,10 +85,10 @@ func (b ProxyQueryServiceAsyncBridge) Query(ctx context.Context, w io.Writer, re
 	defer results.Release()
 
 	encoder := req.Dialect.Encoder()
-	_, err = encoder.Encode(w, results)
-	if err != nil {
+	if _, err := encoder.Encode(w, results); err != nil {
 		return flux.Statistics{}, tracing.LogError(span, err)
 	}
+	results.Release()
 
 	stats := results.Statistics()
 	return stats, nil