6
6
import socket
7
7
import requests
8
8
9
- from influxdb import chunked_json
10
9
11
10
try :
12
11
xrange
@@ -195,40 +194,21 @@ def query(self,
195
194
query ,
196
195
params = {},
197
196
expected_response_code = 200 ,
198
- time_precision = 's' ,
199
197
database = None ,
200
- raw = False ,
201
- chunked = False ):
198
+ raw = False ):
202
199
"""
203
200
Query data
204
201
205
202
:param params: Additional parameters to be passed to requests.
206
- :param time_precision: [Optional, default 's'] Either 's', 'm', 'ms'
207
- or 'u'.
208
203
:param database: Database to query, default to None.
209
204
:param expected_response_code: Expected response code. Defaults to 200.
210
205
:param raw: Wether or not to return the raw influxdb response.
211
- :param chunked: [Optional, default=False] True if the data shall be
212
- retrieved in chunks, False otherwise.
213
-
214
206
"""
215
207
216
- if time_precision not in ['s' , 'm' , 'ms' , 'u' ]:
217
- raise Exception (
218
- "Invalid time precision is given. (use 's', 'm', 'ms' or 'u')" )
219
-
220
208
params ['q' ] = query
221
209
if database :
222
210
params ['db' ] = database
223
211
224
- if time_precision :
225
- params ['time_precision' ] = time_precision
226
-
227
- if chunked is True :
228
- params ['chunked' ] = 'true'
229
- else :
230
- params ['chunked' ] = 'false'
231
-
232
212
response = self .request (
233
213
url = "query" ,
234
214
method = 'GET' ,
@@ -237,10 +217,8 @@ def query(self,
237
217
expected_response_code = expected_response_code
238
218
)
239
219
240
- if raw and not chunked :
220
+ if raw :
241
221
return response .json ()
242
- elif not raw and chunked :
243
- return list (chunked_json .loads (response .content .decode ()))
244
222
else :
245
223
return self .format_query_response (response .json ())
246
224
0 commit comments