From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 06/25] vinyl: refactor unique check Date: Fri, 27 Jul 2018 14:29:46 +0300 [thread overview] Message-ID: <4d0636ed880889981a3a305cb27eb5f48195bae8.1532689066.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1532689065.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1532689065.git.vdavydov.dev@gmail.com> For the sake of further patches, let's do some refactoring: - Rename vy_check_is_unique to vy_check_is_unique_primary and use it only for checking the unique constraint of primary indexes. Also, make it return immediately if the primary index doesn't need uniqueness check, like vy_check_is_unique_secondary does. - Open-code uniqueness check in vy_check_is_unique_secondary instead of using vy_check_is_unique. - Reduce indentation level of vy_check_is_unique_secondary by inverting the if statement. --- src/box/vinyl.c | 82 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 31 deletions(-) diff --git a/src/box/vinyl.c b/src/box/vinyl.c index 8c0afd28..5da1c4bc 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -1385,36 +1385,39 @@ vy_get_by_raw_key(struct vy_lsm *lsm, struct vy_tx *tx, } /** - * Check if the LSM tree contains the key. If true, then set - * a duplicate key error in the diagnostics area. + * 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. * @param index_name Index name. - * @param lsm LSM tree in which to search. - * @param key Key statement. + * @param lsm LSM tree corresponding to the index. + * @param stmt New tuple. * - * @retval 0 Success, the key isn't found. - * @retval -1 Memory error or the key is found. + * @retval 0 Success, unique constraint is satisfied. + * @retval -1 Duplicate is found or read error occurred. */ static inline int -vy_check_is_unique(struct vy_env *env, struct vy_tx *tx, - const struct vy_read_view **rv, - const char *space_name, const char *index_name, - struct vy_lsm *lsm, struct tuple *key) +vy_check_is_unique_primary(struct vy_env *env, 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) { - struct tuple *found; + 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 (vy_get(lsm, tx, rv, key, &found)) + if (!lsm->check_is_unique) + return 0; + struct tuple *found; + if (vy_get(lsm, tx, rv, stmt, &found)) return -1; - - if (found) { + if (found != NULL) { tuple_unref(found); diag_set(ClientError, ER_TUPLE_FOUND, index_name, space_name); @@ -1444,19 +1447,36 @@ vy_check_is_unique_secondary(struct vy_env *env, struct vy_tx *tx, struct vy_lsm *lsm, const struct tuple *stmt) { assert(lsm->index_id > 0); - struct key_def *def = lsm->key_def; - if (lsm->check_is_unique && - !key_update_can_be_skipped(def->column_mask, - vy_stmt_column_mask(stmt)) && - (!def->is_nullable || !vy_tuple_key_contains_null(stmt, def))) { - struct tuple *key = vy_stmt_extract_key(stmt, def, - lsm->env->key_format); - if (key == NULL) - return -1; - int rc = vy_check_is_unique(env, tx, rv, space_name, - index_name, lsm, key); - tuple_unref(key); - return rc; + 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, + vy_stmt_column_mask(stmt))) + return 0; + if (lsm->key_def->is_nullable && + vy_tuple_key_contains_null(stmt, lsm->key_def)) + return 0; + struct tuple *key = vy_stmt_extract_key(stmt, lsm->key_def, + lsm->env->key_format); + if (key == NULL) + return -1; + struct tuple *found; + int rc = vy_get(lsm, tx, rv, key, &found); + tuple_unref(key); + if (rc != 0) + return -1; + if (found != NULL) { + tuple_unref(found); + diag_set(ClientError, ER_TUPLE_FOUND, + index_name, space_name); + return -1; } return 0; } @@ -1483,10 +1503,10 @@ vy_insert_primary(struct vy_env *env, struct vy_tx *tx, struct space *space, * A primary index is always unique and the new tuple must not * conflict with existing tuples. */ - if (pk->check_is_unique && - vy_check_is_unique(env, tx, vy_tx_read_view(tx), space_name(space), - index_name_by_id(space, pk->index_id), - pk, stmt) != 0) + if (vy_check_is_unique_primary(env, tx, vy_tx_read_view(tx), + space_name(space), + index_name_by_id(space, pk->index_id), + pk, stmt) != 0) return -1; return vy_tx_set(tx, pk, stmt); } -- 2.11.0
next prev parent reply other threads:[~2018-07-27 11:29 UTC|newest] Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-27 11:29 [PATCH 00/25] vinyl: eliminate disk read on REPLACE/DELETE Vladimir Davydov 2018-07-27 11:29 ` [PATCH 01/25] vinyl: make point lookup always return the latest tuple version Vladimir Davydov 2018-07-27 11:29 ` [PATCH 02/25] vinyl: simplify vy_squash_process Vladimir Davydov 2018-07-27 11:29 ` [PATCH 03/25] vinyl: always get full tuple from pk after reading from secondary index Vladimir Davydov 2018-07-27 11:29 ` [PATCH 04/25] vinyl: fold vy_replace_one and vy_replace_impl Vladimir Davydov 2018-07-27 11:29 ` [PATCH 05/25] vinyl: fold vy_delete_impl Vladimir Davydov 2018-07-27 11:29 ` Vladimir Davydov [this message] 2018-07-27 11:29 ` [PATCH 07/25] vinyl: check key uniqueness before modifying tx write set Vladimir Davydov 2018-07-27 11:29 ` [PATCH 08/25] vinyl: remove env argument of vy_check_is_unique_{primary,secondary} Vladimir Davydov 2018-07-31 20:45 ` [tarantool-patches] " Konstantin Osipov 2018-07-27 11:29 ` [PATCH 09/25] vinyl: store full tuples in secondary index cache Vladimir Davydov 2018-07-31 20:47 ` Konstantin Osipov 2018-07-27 11:29 ` [PATCH 10/25] vinyl: do not free pending tasks on shutdown Vladimir Davydov 2018-07-31 20:48 ` Konstantin Osipov 2018-07-27 11:29 ` [PATCH 11/25] vinyl: store pointer to scheduler in struct vy_task Vladimir Davydov 2018-07-31 20:49 ` Konstantin Osipov 2018-07-27 11:29 ` [PATCH 12/25] vinyl: rename some members of vy_scheduler and vy_task struct Vladimir Davydov 2018-07-27 11:29 ` [PATCH 13/25] vinyl: use cbus for communication between scheduler and worker threads Vladimir Davydov 2018-07-27 11:29 ` [PATCH 14/25] vinyl: zap vy_scheduler::is_worker_pool_running Vladimir Davydov 2018-07-27 11:29 ` [PATCH 15/25] vinyl: rename vy_task::status to is_failed Vladimir Davydov 2018-07-27 11:29 ` [PATCH 16/25] xrow: allow to store flags in DML requests Vladimir Davydov 2018-07-27 11:29 ` [PATCH 17/25] vinyl: pin last statement returned by write iterator explicitly Vladimir Davydov 2018-07-27 11:29 ` [PATCH 18/25] vinyl: teach write iterator to return overwritten tuples Vladimir Davydov 2018-07-27 11:29 ` [PATCH 19/25] vinyl: prepare write iterator heap comparator for deferred DELETEs Vladimir Davydov 2018-07-27 11:30 ` [PATCH 20/25] vinyl: allow to skip certain statements on read Vladimir Davydov 2018-07-27 11:30 ` [PATCH 21/25] vinyl: add function to create surrogate deletes from raw msgpack Vladimir Davydov 2018-07-27 11:30 ` [PATCH 22/25] vinyl: remove pointless assertion from vy_stmt_new_surrogate_delete Vladimir Davydov 2018-07-27 11:30 ` [PATCH 23/25] txn: add helper to detect transaction boundaries Vladimir Davydov 2018-07-31 20:52 ` [tarantool-patches] " Konstantin Osipov 2018-07-27 11:30 ` [PATCH 24/25] Introduce _vinyl_deferred_delete system space Vladimir Davydov 2018-07-31 20:54 ` Konstantin Osipov 2018-08-01 14:00 ` Vladimir Davydov 2018-08-01 20:25 ` [tarantool-patches] " Konstantin Osipov 2018-08-02 9:43 ` Vladimir Davydov 2018-08-06 8:42 ` Vladimir Davydov 2018-07-27 11:30 ` [PATCH 25/25] vinyl: eliminate disk read on REPLACE/DELETE Vladimir Davydov 2018-07-31 20:55 ` Konstantin Osipov 2018-08-01 16:03 ` Vladimir Davydov 2018-08-01 16:51 ` Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4d0636ed880889981a3a305cb27eb5f48195bae8.1532689066.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 06/25] vinyl: refactor unique check' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox