diff --git a/src/box/box.cc b/src/box/box.cc index 200b36aca71dc0be878c375a2bb69b6fec4d875b..08a19fc0936836badda0758c096befe82de9453e 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -321,7 +321,7 @@ box_process_rw(struct request *request, struct space *space, rc = space_execute_dml(space, txn, request, &tuple); if (result == NULL) tuple = NULL; - result_process(&res_proc, &rc, &tuple); + result_process_perform(&res_proc, &rc, &tuple); if (rc != 0) { txn_rollback_stmt(txn); goto rollback; @@ -2523,7 +2523,7 @@ box_select(uint32_t space_id, uint32_t index_id, struct result_processor res_proc; result_process_prepare(&res_proc, space); rc = iterator_next(it, &tuple); - result_process(&res_proc, &rc, &tuple); + result_process_perform(&res_proc, &rc, &tuple); if (rc != 0 || tuple == NULL) break; if (offset > 0) { diff --git a/src/box/index.cc b/src/box/index.cc index 5bd4b2fbd78afafb89e0c49526a383ebad23e3a4..a17b63bb083c5e2409494736c8353ca6b2a2d83a 100644 --- a/src/box/index.cc +++ b/src/box/index.cc @@ -220,7 +220,7 @@ box_index_random(uint32_t space_id, uint32_t index_id, uint32_t rnd, struct result_processor res_proc; result_process_prepare(&res_proc, space); int rc = index_random(index, rnd, result); - result_process(&res_proc, &rc, result); + result_process_perform(&res_proc, &rc, result); if (rc != 0) return -1; if (*result != NULL) @@ -255,7 +255,7 @@ box_index_get(uint32_t space_id, uint32_t index_id, const char *key, struct result_processor res_proc; result_process_prepare(&res_proc, space); int rc = index_get(index, key, part_count, result); - result_process(&res_proc, &rc, result); + result_process_perform(&res_proc, &rc, result); if (rc != 0) { txn_rollback_stmt(txn); return -1; @@ -296,7 +296,7 @@ box_index_min(uint32_t space_id, uint32_t index_id, const char *key, struct result_processor res_proc; result_process_prepare(&res_proc, space); int rc = index_min(index, key, part_count, result); - result_process(&res_proc, &rc, result); + result_process_perform(&res_proc, &rc, result); if (rc != 0) { txn_rollback_stmt(txn); return -1; @@ -335,7 +335,7 @@ box_index_max(uint32_t space_id, uint32_t index_id, const char *key, struct result_processor res_proc; result_process_prepare(&res_proc, space); int rc = index_max(index, key, part_count, result); - result_process(&res_proc, &rc, result); + result_process_perform(&res_proc, &rc, result); if (rc != 0) { txn_rollback_stmt(txn); return -1; @@ -433,7 +433,7 @@ box_iterator_next(box_iterator_t *itr, box_tuple_t **result) struct result_processor res_proc; result_process_prepare(&res_proc, space); int rc = iterator_next(itr, result); - result_process(&res_proc, &rc, result); + result_process_perform(&res_proc, &rc, result); if (rc != 0) return -1; if (*result != NULL) diff --git a/src/box/result.h b/src/box/result.h index 2158ccb89962712a9092f5bc3cab6796627f5ff6..a443b36b7efb97b63c0794a8422c15dbe2124d52 100644 --- a/src/box/result.h +++ b/src/box/result.h @@ -28,9 +28,9 @@ extern "C" { * struct result_processor res_proc; * result_process_prepare(&res_proc, space); * rc = index_get(index, key, part_count, result); - * result_process(&res_proc, &rc, result); + * result_process_perform(&res_proc, &rc, result); * - * Note, if result_process_prepare() was called, then result_process() + * Note, if result_process_prepare() was called, then result_process_perform() * must be called as well, because it may need to free some resources. */ struct result_processor { @@ -47,7 +47,8 @@ result_process_prepare(struct result_processor *p, struct space *space) } static inline void -result_process(struct result_processor *p, int *rc, struct tuple **result) +result_process_perform(struct result_processor *p, int *rc, + struct tuple **result) { if (likely(p->upgrade == NULL)) return;