From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladimir Davydov Subject: [PATCH 08/25] vinyl: remove env argument of vy_check_is_unique_{primary,secondary} Date: Fri, 27 Jul 2018 14:29:48 +0300 Message-Id: In-Reply-To: References: In-Reply-To: References: To: kostja@tarantool.org Cc: tarantool-patches@freelists.org List-ID: Besides vy_check_is_unique, other callers of vy_check_is_unique_primary and vy_check_is_unique_secondary are only called when vinyl engine is online. So let's move the optimization that skips uniqueness check on recovery to vy_check_is_unique and remove the env argument. --- src/box/vinyl.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index 1d086439..c29f139e 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -1387,7 +1387,6 @@ vy_get_by_raw_key(struct vy_lsm *lsm, struct vy_tx *tx, /** * Check if insertion of a new tuple violates unique constraint * of the primary index. - * @param env Vinyl environment. * @param tx Current transaction. * @param rv Read view. * @param space_name Space name. @@ -1399,19 +1398,13 @@ vy_get_by_raw_key(struct vy_lsm *lsm, struct vy_tx *tx, * @retval -1 Duplicate is found or read error occurred. */ static inline int -vy_check_is_unique_primary(struct vy_env *env, struct vy_tx *tx, - const struct vy_read_view **rv, +vy_check_is_unique_primary(struct vy_tx *tx, const struct vy_read_view **rv, const char *space_name, const char *index_name, struct vy_lsm *lsm, struct tuple *stmt) { assert(lsm->index_id == 0); assert(vy_stmt_type(stmt) == IPROTO_INSERT); - /* - * During recovery we apply rows that were successfully - * applied before restart so no conflict is possible. - */ - if (env->status != VINYL_ONLINE) - return 0; + if (!lsm->check_is_unique) return 0; struct tuple *found; @@ -1429,7 +1422,6 @@ vy_check_is_unique_primary(struct vy_env *env, struct vy_tx *tx, /** * Check if insertion of a new tuple violates unique constraint * of a secondary index. - * @param env Vinyl environment. * @param tx Current transaction. * @param rv Read view. * @param space_name Space name. @@ -1441,20 +1433,14 @@ vy_check_is_unique_primary(struct vy_env *env, struct vy_tx *tx, * @retval -1 Duplicate is found or read error occurred. */ static int -vy_check_is_unique_secondary(struct vy_env *env, struct vy_tx *tx, - const struct vy_read_view **rv, +vy_check_is_unique_secondary(struct vy_tx *tx, const struct vy_read_view **rv, const char *space_name, const char *index_name, struct vy_lsm *lsm, const struct tuple *stmt) { assert(lsm->index_id > 0); assert(vy_stmt_type(stmt) == IPROTO_INSERT || vy_stmt_type(stmt) == IPROTO_REPLACE); - /* - * During recovery we apply rows that were successfully - * applied before restart so no conflict is possible. - */ - if (env->status != VINYL_ONLINE) - return 0; + if (!lsm->check_is_unique) return 0; if (key_update_can_be_skipped(lsm->key_def->column_mask, @@ -1510,6 +1496,12 @@ vy_check_is_unique(struct vy_env *env, struct vy_tx *tx, assert(space->index_count > 0); assert(vy_stmt_type(stmt) == IPROTO_INSERT || vy_stmt_type(stmt) == IPROTO_REPLACE); + /* + * During recovery we apply rows that were successfully + * applied before restart so no conflict is possible. + */ + if (env->status != VINYL_ONLINE) + return 0; const struct vy_read_view **rv = vy_tx_read_view(tx); @@ -1520,7 +1512,7 @@ vy_check_is_unique(struct vy_env *env, struct vy_tx *tx, */ if (vy_stmt_type(stmt) == IPROTO_INSERT) { struct vy_lsm *lsm = vy_lsm(space->index[0]); - if (vy_check_is_unique_primary(env, tx, rv, space_name(space), + if (vy_check_is_unique_primary(tx, rv, space_name(space), index_name_by_id(space, 0), lsm, stmt) != 0) return -1; @@ -1532,7 +1524,7 @@ vy_check_is_unique(struct vy_env *env, struct vy_tx *tx, */ for (uint32_t i = 1; i < space->index_count; i++) { struct vy_lsm *lsm = vy_lsm(space->index[i]); - if (vy_check_is_unique_secondary(env, tx, rv, space_name(space), + if (vy_check_is_unique_secondary(tx, rv, space_name(space), index_name_by_id(space, i), lsm, stmt) != 0) return -1; @@ -3866,8 +3858,6 @@ vinyl_index_get(struct index *index, const char *key, /** Argument passed to vy_build_on_replace(). */ struct vy_build_ctx { - /** Vinyl environment. */ - struct vy_env *env; /** LSM tree under construction. */ struct vy_lsm *lsm; /** Format to check new tuples against. */ @@ -3908,7 +3898,7 @@ vy_build_on_replace(struct trigger *trigger, void *event) /* Check key uniqueness if necessary. */ if (stmt->new_tuple != NULL && - vy_check_is_unique_secondary(ctx->env, tx, vy_tx_read_view(tx), + vy_check_is_unique_secondary(tx, vy_tx_read_view(tx), ctx->space_name, ctx->index_name, lsm, stmt->new_tuple) != 0) goto err; @@ -3994,9 +3984,8 @@ vy_build_insert_tuple(struct vy_env *env, struct vy_lsm *lsm, * into it after the yield. */ vy_mem_pin(mem); - rc = vy_check_is_unique_secondary(env, NULL, - &env->xm->p_committed_read_view, - space_name, index_name, lsm, tuple); + rc = vy_check_is_unique_secondary(NULL, &env->xm->p_committed_read_view, + space_name, index_name, lsm, tuple); vy_mem_unpin(mem); if (rc != 0) return -1; @@ -4189,7 +4178,6 @@ vinyl_space_build_index(struct space *src_space, struct index *new_index, struct trigger on_replace; struct vy_build_ctx ctx; - ctx.env = env; ctx.lsm = new_lsm; ctx.format = new_format; ctx.space_name = space_name(src_space); -- 2.11.0