From faea66a137963981cade86561d56d556bcadb187 Mon Sep 17 00:00:00 2001 From: Anthony Schneider Date: Wed, 25 Oct 2017 14:36:07 -0400 Subject: [PATCH 1/2] Fix chucnk_size param --- influxdb/client.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/influxdb/client.py b/influxdb/client.py index a8adb915..0cf0d835 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -308,9 +308,13 @@ def write(self, data, params=None, expected_response_code=204, return True @staticmethod - def _read_chunked_response(response, raise_errors=True): + def _read_chunked_response( + response, + raise_errors=True, + chunk_size=requests.models.ITER_CHUNK_SIZE): + result_set = {} - for line in response.iter_lines(): + for line in response.iter_lines(chunk_size=chunk_size): if isinstance(line, bytes): line = line.decode('utf-8') data = json.loads(line) @@ -329,7 +333,7 @@ def query(self, database=None, raise_errors=True, chunked=False, - chunk_size=0): + chunk_size=512): """Send a query to InfluxDB. :param query: the actual query string @@ -377,8 +381,7 @@ def query(self, if chunked: params['chunked'] = 'true' - if chunk_size > 0: - params['chunk_size'] = chunk_size + params['chunk_size'] = chunk_size response = self.request( url="query", @@ -389,7 +392,10 @@ def query(self, ) if chunked: - return self._read_chunked_response(response) + return self._read_chunked_response( + response, + chunk_size=params['chunk_size'] + ) data = response.json() From a2cdf47a7da2d3ec153a7c6f29318b0a5b3762bc Mon Sep 17 00:00:00 2001 From: Anthony Schneider Date: Wed, 25 Oct 2017 15:05:44 -0400 Subject: [PATCH 2/2] 512 -> ITER_CHUNK_SIZE --- influxdb/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/influxdb/client.py b/influxdb/client.py index 0cf0d835..89187369 100644 --- a/influxdb/client.py +++ b/influxdb/client.py @@ -312,7 +312,7 @@ def _read_chunked_response( response, raise_errors=True, chunk_size=requests.models.ITER_CHUNK_SIZE): - + result_set = {} for line in response.iter_lines(chunk_size=chunk_size): if isinstance(line, bytes): @@ -333,7 +333,7 @@ def query(self, database=None, raise_errors=True, chunked=False, - chunk_size=512): + chunk_size=requests.models.ITER_CHUNK_SIZE): """Send a query to InfluxDB. :param query: the actual query string