Make one result set per chunk for improved performance and API compatibility with non-chunked responses

Panos · Panos · commit 3625e4ce605a · 2017-02-21T16:52:38.000Z
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -294,12 +294,16 @@ def write(self, data, params=None, expected_response_code=204,
         return True
 
     def _read_chunked_response(self, response, raise_errors=True):
+        result_set = {}
         for line in response.iter_lines():
             if isinstance(line, bytes):
                 line = line.decode('utf-8')
             data = json.loads(line)
             for result in data.get('results', []):
-                yield ResultSet(result, raise_errors=raise_errors)
+                for _key in result:
+                    if type(result[_key]) == list:
+                        result_set.setdefault(_key, []).extend(result[_key])
+        return ResultSet(result_set, raise_errors=raise_errors)
 
     def query(self,
               query,
@@ -330,8 +334,8 @@ def query(self,
         :type raise_errors: bool
 
         :param chunked: Enable to use chunked responses from InfluxDB.
-            With ``chunked`` enabled, a _generator_ of ResultSet objects
-            is returned as opposed to a list.
+            With ``chunked`` enabled, one ResultSet is returned per chunk
+            containing all results within that chunk
         :type chunked: bool
 
         :param chunk_size: Size of each chunk to tell InfluxDB to use.
