From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladimir Davydov Subject: [PATCH v2 13/14] vinyl: don't use vy_stmt_new_surrogate_delete if not necessary Date: Wed, 13 Mar 2019 11:52:59 +0300 Message-Id: <9fc6bd59f685ae46394f8cf2c692bc3641489e20.1552464666.git.vdavydov.dev@gmail.com> In-Reply-To: References: In-Reply-To: References: To: kostja@tarantool.org Cc: tarantool-patches@freelists.org List-ID: There are three places where we use this expensive functions while we could get along with a cheaper one: - Deferred DELETE space on_replace trigger. Here we can use simple vy_stmt_new_delete, because the trigger is already passed a surrogate DELETE statement. - Secondary index build on_replace trigger. Here we can extract the secondary key, set its type to DELETE and insert it into the index. We don't need all the other indexed fields. - Secondary index build recovery procedure. Similarly to the previous case, we can use extracted here rather than building a surrogate DELETE statement. --- src/box/vinyl.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index f2d9ab55..80296269 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -3935,10 +3935,11 @@ vy_build_on_replace(struct trigger *trigger, void *event) /* Forward the statement to the new LSM tree. */ if (stmt->old_tuple != NULL) { - struct tuple *delete = vy_stmt_new_surrogate_delete(format, - stmt->old_tuple); + struct tuple *delete = vy_stmt_extract_key(stmt->old_tuple, + lsm->cmp_def, lsm->env->key_format); if (delete == NULL) goto err; + vy_stmt_set_type(delete, IPROTO_DELETE); int rc = vy_tx_set(tx, lsm, delete); tuple_unref(delete); if (rc != 0) @@ -4076,10 +4077,11 @@ vy_build_recover_stmt(struct vy_lsm *lsm, struct vy_lsm *pk, struct tuple *delete = NULL; struct tuple *insert = NULL; if (old_tuple != NULL) { - delete = vy_stmt_new_surrogate_delete(lsm->mem_format, - old_tuple); + delete = vy_stmt_extract_key(old_tuple, lsm->cmp_def, + lsm->env->key_format); if (delete == NULL) return -1; + vy_stmt_set_type(delete, IPROTO_DELETE); } enum iproto_type type = vy_stmt_type(mem_stmt); if (type == IPROTO_REPLACE || type == IPROTO_INSERT) { @@ -4387,8 +4389,8 @@ vy_deferred_delete_on_replace(struct trigger *trigger, void *event) /* Create the deferred DELETE statement. */ struct vy_lsm *pk = vy_lsm(space->index[0]); - struct tuple *delete = vy_stmt_new_surrogate_delete_raw(pk->mem_format, - delete_data, delete_data_end); + struct tuple *delete = vy_stmt_new_delete(pk->mem_format, delete_data, + delete_data_end); if (delete == NULL) diag_raise(); /* -- 2.11.0