Skip to content

Commit b10ae7c

Browse files
honzakralhonzakral
committed
Merge branch 'async'
2 parents 359cb97 + c51b8fd commit b10ae7c

File tree

8 files changed

+137
-310
lines changed

8 files changed

+137
-310
lines changed

‎elasticsearch/client/__init__.py‎

Lines changed: 33 additions & 119 deletions
Large diffs are not rendered by default.

‎elasticsearch/client/cat.py‎

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ def aliases(self, name=None, params=None):
1616
node
1717
:arg v: Verbose mode. Display column headers, default False
1818
"""
19-
_, data = self.transport.perform_request('GET', _make_path('_cat',
19+
return self.transport.perform_request('GET', _make_path('_cat',
2020
'aliases', name), params=params)
21-
return data
2221

2322
@query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'v')
2423
def allocation(self, node_id=None, params=None):
@@ -39,9 +38,8 @@ def allocation(self, node_id=None, params=None):
3938
node
4039
:arg v: Verbose mode. Display column headers, default False
4140
"""
42-
_, data = self.transport.perform_request('GET', _make_path('_cat',
41+
return self.transport.perform_request('GET', _make_path('_cat',
4342
'allocation', node_id), params=params)
44-
return data
4543

4644
@query_params('h', 'help', 'local', 'master_timeout', 'v')
4745
def count(self, index=None, params=None):
@@ -60,9 +58,8 @@ def count(self, index=None, params=None):
6058
node
6159
:arg v: Verbose mode. Display column headers, default False
6260
"""
63-
_, data = self.transport.perform_request('GET', _make_path('_cat',
61+
return self.transport.perform_request('GET', _make_path('_cat',
6462
'count', index), params=params)
65-
return data
6663

6764
@query_params('h', 'help', 'local', 'master_timeout', 'ts', 'v')
6865
def health(self, params=None):
@@ -80,9 +77,8 @@ def health(self, params=None):
8077
:arg ts: Set to false to disable timestamping, default True
8178
:arg v: Verbose mode. Display column headers, default False
8279
"""
83-
_, data = self.transport.perform_request('GET', '/_cat/health',
80+
return self.transport.perform_request('GET', '/_cat/health',
8481
params=params)
85-
return data
8682

8783
@query_params('help')
8884
def help(self, params=None):
@@ -92,8 +88,7 @@ def help(self, params=None):
9288
9389
:arg help: Return help information, default False
9490
"""
95-
_, data = self.transport.perform_request('GET', '/_cat', params=params)
96-
return data
91+
return self.transport.perform_request('GET', '/_cat', params=params)
9792

9893
@query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'pri', 'v')
9994
def indices(self, index=None, params=None):
@@ -115,9 +110,8 @@ def indices(self, index=None, params=None):
115110
False
116111
:arg v: Verbose mode. Display column headers, default False
117112
"""
118-
_, data = self.transport.perform_request('GET', _make_path('_cat',
113+
return self.transport.perform_request('GET', _make_path('_cat',
119114
'indices', index), params=params)
120-
return data
121115

122116
@query_params('h', 'help', 'local', 'master_timeout', 'v')
123117
def master(self, params=None):
@@ -133,9 +127,8 @@ def master(self, params=None):
133127
node
134128
:arg v: Verbose mode. Display column headers, default False
135129
"""
136-
_, data = self.transport.perform_request('GET', '/_cat/master',
130+
return self.transport.perform_request('GET', '/_cat/master',
137131
params=params)
138-
return data
139132

140133
@query_params('h', 'help', 'local', 'master_timeout', 'v')
141134
def nodes(self, params=None):
@@ -151,9 +144,8 @@ def nodes(self, params=None):
151144
node
152145
:arg v: Verbose mode. Display column headers, default False
153146
"""
154-
_, data = self.transport.perform_request('GET', '/_cat/nodes',
147+
return self.transport.perform_request('GET', '/_cat/nodes',
155148
params=params)
156-
return data
157149

158150
@query_params('bytes', 'h', 'help', 'master_timeout', 'v')
159151
def recovery(self, index=None, params=None):
@@ -171,9 +163,8 @@ def recovery(self, index=None, params=None):
171163
node
172164
:arg v: Verbose mode. Display column headers, default False
173165
"""
174-
_, data = self.transport.perform_request('GET', _make_path('_cat',
166+
return self.transport.perform_request('GET', _make_path('_cat',
175167
'recovery', index), params=params)
176-
return data
177168

178169
@query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'v')
179170
def shards(self, index=None, params=None):
@@ -193,9 +184,8 @@ def shards(self, index=None, params=None):
193184
node
194185
:arg v: Verbose mode. Display column headers, default False
195186
"""
196-
_, data = self.transport.perform_request('GET', _make_path('_cat',
187+
return self.transport.perform_request('GET', _make_path('_cat',
197188
'shards', index), params=params)
198-
return data
199189

200190
@query_params('bytes', 'h', 'help', 'v')
201191
def segments(self, index=None, params=None):
@@ -211,9 +201,8 @@ def segments(self, index=None, params=None):
211201
:arg help: Return help information, default False
212202
:arg v: Verbose mode. Display column headers, default False
213203
"""
214-
_, data = self.transport.perform_request('GET', _make_path('_cat',
204+
return self.transport.perform_request('GET', _make_path('_cat',
215205
'segments', index), params=params)
216-
return data
217206

218207
@query_params('h', 'help', 'local', 'master_timeout', 'v')
219208
def pending_tasks(self, params=None):
@@ -231,9 +220,8 @@ def pending_tasks(self, params=None):
231220
node
232221
:arg v: Verbose mode. Display column headers, default False
233222
"""
234-
_, data = self.transport.perform_request('GET', '/_cat/pending_tasks',
223+
return self.transport.perform_request('GET', '/_cat/pending_tasks',
235224
params=params)
236-
return data
237225

238226
@query_params('full_id', 'h', 'help', 'local', 'master_timeout', 'v')
239227
def thread_pool(self, params=None):
@@ -250,9 +238,8 @@ def thread_pool(self, params=None):
250238
node
251239
:arg v: Verbose mode. Display column headers, default False
252240
"""
253-
_, data = self.transport.perform_request('GET', '/_cat/thread_pool',
241+
return self.transport.perform_request('GET', '/_cat/thread_pool',
254242
params=params)
255-
return data
256243

257244
@query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'v')
258245
def fielddata(self, fields=None, params=None):
@@ -272,9 +259,8 @@ def fielddata(self, fields=None, params=None):
272259
node
273260
:arg v: Verbose mode. Display column headers, default False
274261
"""
275-
_, data = self.transport.perform_request('GET', _make_path('_cat',
262+
return self.transport.perform_request('GET', _make_path('_cat',
276263
'fielddata', fields), params=params)
277-
return data
278264

279265
@query_params('h', 'help', 'local', 'master_timeout', 'v')
280266
def plugins(self, params=None):
@@ -290,9 +276,8 @@ def plugins(self, params=None):
290276
node
291277
:arg v: Verbose mode. Display column headers, default False
292278
"""
293-
_, data = self.transport.perform_request('GET', '/_cat/plugins',
279+
return self.transport.perform_request('GET', '/_cat/plugins',
294280
params=params)
295-
return data
296281

297282
@query_params('h', 'help', 'local', 'master_timeout', 'v')
298283
def nodeattrs(self, params=None):
@@ -307,9 +292,8 @@ def nodeattrs(self, params=None):
307292
node
308293
:arg v: Verbose mode. Display column headers, default False
309294
"""
310-
_, data = self.transport.perform_request('GET', '/_cat/nodeattrs',
295+
return self.transport.perform_request('GET', '/_cat/nodeattrs',
311296
params=params)
312-
return data
313297

314298
@query_params('h', 'help', 'local', 'master_timeout', 'v')
315299
def repositories(self, params=None):
@@ -324,9 +308,8 @@ def repositories(self, params=None):
324308
node
325309
:arg v: Verbose mode. Display column headers, default False
326310
"""
327-
_, data = self.transport.perform_request('GET', '/_cat/repositories',
311+
return self.transport.perform_request('GET', '/_cat/repositories',
328312
params=params)
329-
return data
330313

331314
@query_params('h', 'help', 'master_timeout', 'v')
332315
def snapshots(self, repository=None, params=None):
@@ -341,6 +324,5 @@ def snapshots(self, repository=None, params=None):
341324
node
342325
:arg v: Verbose mode. Display column headers, default False
343326
"""
344-
_, data = self.transport.perform_request('GET', _make_path('_cat',
327+
return self.transport.perform_request('GET', _make_path('_cat',
345328
'snapshots', repository), params=params)
346-
return data

‎elasticsearch/client/cluster.py‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ def health(self, index=None, params=None):
2626
:arg wait_for_status: Wait until cluster is in a specific state, default
2727
None, valid choices are: 'green', 'yellow', 'red'
2828
"""
29-
_, data = self.transport.perform_request('GET', _make_path('_cluster',
29+
return self.transport.perform_request('GET', _make_path('_cluster',
3030
'health', index), params=params)
31-
return data
3231

3332
@query_params('local', 'master_timeout')
3433
def pending_tasks(self, params=None):
@@ -42,9 +41,8 @@ def pending_tasks(self, params=None):
4241
master node (default: false)
4342
:arg master_timeout: Specify timeout for connection to master
4443
"""
45-
_, data = self.transport.perform_request('GET',
44+
return self.transport.perform_request('GET',
4645
'/_cluster/pending_tasks', params=params)
47-
return data
4846

4947
@query_params('allow_no_indices', 'expand_wildcards', 'flat_settings',
5048
'ignore_unavailable', 'local', 'master_timeout')
@@ -71,9 +69,8 @@ def state(self, metric=None, index=None, params=None):
7169
"""
7270
if index and not metric:
7371
metric = '_all'
74-
_, data = self.transport.perform_request('GET', _make_path('_cluster',
72+
return self.transport.perform_request('GET', _make_path('_cluster',
7573
'state', metric, index), params=params)
76-
return data
7774

7875
@query_params('flat_settings', 'human', 'timeout')
7976
def stats(self, node_id=None, params=None):
@@ -95,8 +92,7 @@ def stats(self, node_id=None, params=None):
9592
url = '/_cluster/stats'
9693
if node_id:
9794
url = _make_path('_cluster/stats/nodes', node_id)
98-
_, data = self.transport.perform_request('GET', url, params=params)
99-
return data
95+
return self.transport.perform_request('GET', url, params=params)
10096

10197
@query_params('dry_run', 'explain', 'master_timeout', 'metric', 'timeout')
10298
def reroute(self, body=None, params=None):
@@ -116,9 +112,8 @@ def reroute(self, body=None, params=None):
116112
'metadata', 'nodes', 'routing_table', 'master_node', 'version'
117113
:arg timeout: Explicit operation timeout
118114
"""
119-
_, data = self.transport.perform_request('POST', '/_cluster/reroute',
115+
return self.transport.perform_request('POST', '/_cluster/reroute',
120116
params=params, body=body)
121-
return data
122117

123118
@query_params('flat_settings', 'master_timeout', 'timeout')
124119
def get_settings(self, params=None):
@@ -131,9 +126,8 @@ def get_settings(self, params=None):
131126
node
132127
:arg timeout: Explicit operation timeout
133128
"""
134-
_, data = self.transport.perform_request('GET', '/_cluster/settings',
129+
return self.transport.perform_request('GET', '/_cluster/settings',
135130
params=params)
136-
return data
137131

138132
@query_params('flat_settings', 'master_timeout', 'timeout')
139133
def put_settings(self, body=None, params=None):
@@ -148,7 +142,6 @@ def put_settings(self, body=None, params=None):
148142
node
149143
:arg timeout: Explicit operation timeout
150144
"""
151-
_, data = self.transport.perform_request('PUT', '/_cluster/settings',
145+
return self.transport.perform_request('PUT', '/_cluster/settings',
152146
params=params, body=body)
153-
return data
154147

0 commit comments

Comments
 (0)