From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [RFC PATCH 07/23] vinyl: refactor unique check Date: Sun, 8 Jul 2018 19:48:38 +0300 [thread overview] Message-ID: <3cb0d304b76b6594421cbcf178c36d540a39f83f.1531065648.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1531065648.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1531065648.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 44238450..e4563cb6 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -1397,36 +1397,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); @@ -1456,19 +1459,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; } @@ -1495,10 +1515,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-08 16:48 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-08 16:48 [RFC PATCH 02/23] vinyl: always get full tuple from pk after reading from secondary index Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 00/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 01/23] vinyl: do not turn REPLACE into INSERT when processing DML request Vladimir Davydov 2018-07-10 12:15 ` Konstantin Osipov 2018-07-10 12:19 ` Vladimir Davydov 2018-07-10 18:39 ` Konstantin Osipov 2018-07-11 7:57 ` Vladimir Davydov 2018-07-11 10:25 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 03/23] vinyl: use vy_mem_iterator for point lookup Vladimir Davydov 2018-07-17 10:14 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 04/23] vinyl: make point lookup always return the latest tuple version Vladimir Davydov 2018-07-10 16:19 ` Konstantin Osipov 2018-07-10 16:43 ` Vladimir Davydov 2018-07-11 16:33 ` Vladimir Davydov 2018-07-31 19:17 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 05/23] vinyl: fold vy_replace_one and vy_replace_impl Vladimir Davydov 2018-07-31 20:28 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 06/23] vinyl: fold vy_delete_impl Vladimir Davydov 2018-07-31 20:28 ` Konstantin Osipov 2018-07-08 16:48 ` Vladimir Davydov [this message] 2018-07-31 20:28 ` [RFC PATCH 07/23] vinyl: refactor unique check Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 08/23] vinyl: check key uniqueness before modifying tx write set Vladimir Davydov 2018-07-31 20:34 ` Konstantin Osipov 2018-08-01 10:42 ` Vladimir Davydov 2018-08-09 20:26 ` Konstantin Osipov 2018-08-10 8:26 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 09/23] vinyl: remove env argument of vy_check_is_unique_{primary,secondary} Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 10/23] vinyl: store full tuples in secondary index cache Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 11/23] xrow: allow to store flags in DML requests Vladimir Davydov 2018-07-31 20:36 ` Konstantin Osipov 2018-08-01 14:10 ` Vladimir Davydov 2018-08-17 13:34 ` Vladimir Davydov 2018-08-17 13:34 ` [PATCH 1/2] xrow: allow to store tuple metadata in request Vladimir Davydov 2018-08-17 13:34 ` [PATCH 2/2] vinyl: introduce statement flags Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 12/23] vinyl: do not pass region explicitly to write iterator functions Vladimir Davydov 2018-07-17 10:16 ` Vladimir Davydov 2018-07-31 20:38 ` Konstantin Osipov 2018-08-01 14:14 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 13/23] vinyl: fix potential use-after-free in vy_read_view_merge Vladimir Davydov 2018-07-17 10:16 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 14/23] test: unit/vy_write_iterator: minor refactoring Vladimir Davydov 2018-07-17 10:17 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 15/23] vinyl: teach write iterator to return overwritten tuples Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 16/23] vinyl: allow to skip certain statements on read Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 17/23] vinyl: do not free pending tasks on shutdown Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 18/23] vinyl: store pointer to scheduler in struct vy_task Vladimir Davydov 2018-07-31 20:39 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 19/23] vinyl: rename some members of vy_scheduler and vy_task struct Vladimir Davydov 2018-07-31 20:40 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 20/23] vinyl: use cbus for communication between scheduler and worker threads Vladimir Davydov 2018-07-31 20:43 ` Konstantin Osipov 2018-08-01 14:26 ` Vladimir Davydov 2018-07-08 16:48 ` [RFC PATCH 21/23] vinyl: zap vy_scheduler::is_worker_pool_running Vladimir Davydov 2018-07-31 20:43 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 22/23] vinyl: rename vy_task::status to is_failed Vladimir Davydov 2018-07-31 20:44 ` Konstantin Osipov 2018-07-08 16:48 ` [RFC PATCH 23/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov 2018-07-13 10:53 ` Vladimir Davydov 2018-07-13 10:53 ` [PATCH 1/3] stailq: add stailq_insert function Vladimir Davydov 2018-07-15 7:02 ` Konstantin Osipov 2018-07-15 13:17 ` Vladimir Davydov 2018-07-15 18:40 ` Konstantin Osipov 2018-07-17 10:18 ` Vladimir Davydov 2018-07-13 10:53 ` [PATCH 2/3] vinyl: link all indexes of the same space Vladimir Davydov 2018-07-13 10:53 ` [PATCH 3/3] vinyl: generate deferred DELETEs on tx commit 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=3cb0d304b76b6594421cbcf178c36d540a39f83f.1531065648.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [RFC PATCH 07/23] 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