Skip to content

Commit 3698d27

Browse files
committed
box: rename result_process to result_process_perform
We're going to use the 'result_process' name for a function that processes a result without creating a result_processor struct. Follow-up commit 21e2def ("box: introduce result processor"). NO_DOC=refactoring NO_TEST=refactoring NO_CHANGELOG=refactoring
1 parent 1810ddf commit 3698d27

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

src/box/box.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ box_process_rw(struct request *request, struct space *space,
321321
rc = space_execute_dml(space, txn, request, &tuple);
322322
if (result == NULL)
323323
tuple = NULL;
324-
result_process(&res_proc, &rc, &tuple);
324+
result_process_perform(&res_proc, &rc, &tuple);
325325
if (rc != 0) {
326326
txn_rollback_stmt(txn);
327327
goto rollback;
@@ -2523,7 +2523,7 @@ box_select(uint32_t space_id, uint32_t index_id,
25232523
struct result_processor res_proc;
25242524
result_process_prepare(&res_proc, space);
25252525
rc = iterator_next(it, &tuple);
2526-
result_process(&res_proc, &rc, &tuple);
2526+
result_process_perform(&res_proc, &rc, &tuple);
25272527
if (rc != 0 || tuple == NULL)
25282528
break;
25292529
if (offset > 0) {

src/box/index.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ box_index_random(uint32_t space_id, uint32_t index_id, uint32_t rnd,
220220
struct result_processor res_proc;
221221
result_process_prepare(&res_proc, space);
222222
int rc = index_random(index, rnd, result);
223-
result_process(&res_proc, &rc, result);
223+
result_process_perform(&res_proc, &rc, result);
224224
if (rc != 0)
225225
return -1;
226226
if (*result != NULL)
@@ -255,7 +255,7 @@ box_index_get(uint32_t space_id, uint32_t index_id, const char *key,
255255
struct result_processor res_proc;
256256
result_process_prepare(&res_proc, space);
257257
int rc = index_get(index, key, part_count, result);
258-
result_process(&res_proc, &rc, result);
258+
result_process_perform(&res_proc, &rc, result);
259259
if (rc != 0) {
260260
txn_rollback_stmt(txn);
261261
return -1;
@@ -296,7 +296,7 @@ box_index_min(uint32_t space_id, uint32_t index_id, const char *key,
296296
struct result_processor res_proc;
297297
result_process_prepare(&res_proc, space);
298298
int rc = index_min(index, key, part_count, result);
299-
result_process(&res_proc, &rc, result);
299+
result_process_perform(&res_proc, &rc, result);
300300
if (rc != 0) {
301301
txn_rollback_stmt(txn);
302302
return -1;
@@ -335,7 +335,7 @@ box_index_max(uint32_t space_id, uint32_t index_id, const char *key,
335335
struct result_processor res_proc;
336336
result_process_prepare(&res_proc, space);
337337
int rc = index_max(index, key, part_count, result);
338-
result_process(&res_proc, &rc, result);
338+
result_process_perform(&res_proc, &rc, result);
339339
if (rc != 0) {
340340
txn_rollback_stmt(txn);
341341
return -1;
@@ -433,7 +433,7 @@ box_iterator_next(box_iterator_t *itr, box_tuple_t **result)
433433
struct result_processor res_proc;
434434
result_process_prepare(&res_proc, space);
435435
int rc = iterator_next(itr, result);
436-
result_process(&res_proc, &rc, result);
436+
result_process_perform(&res_proc, &rc, result);
437437
if (rc != 0)
438438
return -1;
439439
if (*result != NULL)

src/box/result.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ extern "C" {
2828
* struct result_processor res_proc;
2929
* result_process_prepare(&res_proc, space);
3030
* rc = index_get(index, key, part_count, result);
31-
* result_process(&res_proc, &rc, result);
31+
* result_process_perform(&res_proc, &rc, result);
3232
*
33-
* Note, if result_process_prepare() was called, then result_process()
33+
* Note, if result_process_prepare() was called, then result_process_perform()
3434
* must be called as well, because it may need to free some resources.
3535
*/
3636
struct result_processor {
@@ -47,7 +47,8 @@ result_process_prepare(struct result_processor *p, struct space *space)
4747
}
4848

4949
static inline void
50-
result_process(struct result_processor *p, int *rc, struct tuple **result)
50+
result_process_perform(struct result_processor *p, int *rc,
51+
struct tuple **result)
5152
{
5253
if (likely(p->upgrade == NULL))
5354
return;

0 commit comments

Comments
 (0)