From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladislav Shpilevoy Subject: [PATCH 3/5] tuple: relax struct tuple_update dependency on rope Date: Sun, 14 Jul 2019 00:11:06 +0200 Message-Id: <06b89cfcb8250c6525b3b947d2ac5d972a404016.1563054879.git.v.shpilevoy@tarantool.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: tarantool-patches@freelists.org Cc: vdavydov.dev@gmail.com List-ID: Rope will not be used by tuple_update directly in next patches. --- src/box/tuple_update.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/box/tuple_update.c b/src/box/tuple_update.c index 7498d558a..21ea876c9 100644 --- a/src/box/tuple_update.c +++ b/src/box/tuple_update.c @@ -820,31 +820,29 @@ update_field_split(struct region *region, struct update_field *prev, * @retval 0 Success. * @retval -1 Error. */ -int -update_create_rope(struct tuple_update *update, const char *tuple_data, - const char *tuple_data_end, uint32_t field_count) +struct rope * +tuple_rope_new(struct region *region, const char *tuple_data, + const char *tuple_data_end, uint32_t field_count) { - update->rope = rope_new(update->region); - if (update->rope == NULL) - return -1; + struct rope *rope = rope_new(region); + if (rope == NULL) + return NULL; /* Initialize the rope with the old tuple. */ - - struct update_field *first = (struct update_field *) - update_alloc(update->region, sizeof(*first)); + struct update_field *first = + (struct update_field *) update_alloc(region, sizeof(*first)); if (first == NULL) - return -1; + return NULL; const char *field = tuple_data; const char *end = tuple_data_end; if (field == end) - return 0; + return rope; /* Add first field to rope */ mp_next(&tuple_data); uint32_t field_len = tuple_data - field; - update_field_init(first, field, field_len, - end - field - field_len); + update_field_init(first, field, field_len, end - field - field_len); - return rope_append(update->rope, first, field_count); + return rope_append(rope, first, field_count) != 0 ? NULL : rope; } static uint32_t @@ -1119,7 +1117,9 @@ static int update_do_ops(struct tuple_update *update, const char *old_data, const char *old_data_end, uint32_t part_count) { - if (update_create_rope(update, old_data, old_data_end, part_count) != 0) + update->rope = tuple_rope_new(update->region, old_data, old_data_end, + part_count); + if (update->rope == NULL) return -1; struct update_op *op = update->ops; struct update_op *ops_end = op + update->op_count; @@ -1140,7 +1140,9 @@ upsert_do_ops(struct tuple_update *update, const char *old_data, const char *old_data_end, uint32_t part_count, bool suppress_error) { - if (update_create_rope(update, old_data, old_data_end, part_count) != 0) + update->rope = tuple_rope_new(update->region, old_data, old_data_end, + part_count); + if (update->rope == NULL) return -1; struct update_op *op = update->ops; struct update_op *ops_end = op + update->op_count; -- 2.20.1 (Apple Git-117)