From: Vladimir Davydov <vdavydov.dev@gmail.com> To: kostja@tarantool.org Cc: tarantool-patches@freelists.org Subject: [PATCH 08/10] ddl: don't use txn_last_stmt on _trigger commit/rollback Date: Wed, 3 Jul 2019 22:30:10 +0300 [thread overview] Message-ID: <234c9046b8e98c6be9990e097b46ae7aab833a3d.1562181197.git.vdavydov.dev@gmail.com> (raw) In-Reply-To: <cover.1562181197.git.vdavydov.dev@gmail.com> In-Reply-To: <cover.1562181197.git.vdavydov.dev@gmail.com> When we implement transactional DDL, txn_last_stmt won't necessarily point to the right statement on commit or rollback so we must avoid using it. --- src/box/alter.cc | 84 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 37 deletions(-) diff --git a/src/box/alter.cc b/src/box/alter.cc index 071258b7..3ddddabb 100644 --- a/src/box/alter.cc +++ b/src/box/alter.cc @@ -3720,45 +3720,50 @@ lock_before_dd(struct trigger *trigger, void *event) latch_lock(&schema_lock); } +/** Delete the new trigger on rollback of an INSERT statement. */ +static void +on_create_trigger_rollback(struct trigger *trigger, void * /* event */) +{ + struct sql_trigger *old_trigger = (struct sql_trigger *)trigger->data; + struct sql_trigger *new_trigger; + int rc = sql_trigger_replace(sql_trigger_name(old_trigger), + sql_trigger_space_id(old_trigger), + NULL, &new_trigger); + (void)rc; + assert(rc == 0); + assert(new_trigger == old_trigger); + sql_trigger_delete(sql_get(), new_trigger); +} + +/** Restore the old trigger on rollback of a DELETE statement. */ +static void +on_drop_trigger_rollback(struct trigger *trigger, void * /* event */) +{ + struct sql_trigger *old_trigger = (struct sql_trigger *)trigger->data; + struct sql_trigger *new_trigger; + if (old_trigger == NULL) + return; + if (sql_trigger_replace(sql_trigger_name(old_trigger), + sql_trigger_space_id(old_trigger), + old_trigger, &new_trigger) != 0) + panic("Out of memory on insertion into trigger hash"); + assert(new_trigger == NULL); +} + /** - * Trigger invoked on rollback in the _trigger space. - * Since rollback trigger is invoked after insertion to hash and space, - * we have to delete it from those structures and release memory. - * Vice versa, after deletion of trigger we must return it back to hash and space*. + * Restore the old trigger and delete the new trigger on rollback + * of a REPLACE statement. */ static void -on_replace_trigger_rollback(struct trigger *trigger, void *event) +on_replace_trigger_rollback(struct trigger *trigger, void * /* event */) { - struct txn_stmt *stmt = txn_last_stmt((struct txn*) event); struct sql_trigger *old_trigger = (struct sql_trigger *)trigger->data; struct sql_trigger *new_trigger; - - if (stmt->old_tuple != NULL && stmt->new_tuple == NULL) { - /* Rollback DELETE trigger. */ - if (old_trigger == NULL) - return; - if (sql_trigger_replace(sql_trigger_name(old_trigger), - sql_trigger_space_id(old_trigger), - old_trigger, &new_trigger) != 0) - panic("Out of memory on insertion into trigger hash"); - assert(new_trigger == NULL); - } else if (stmt->new_tuple != NULL && stmt->old_tuple == NULL) { - /* Rollback INSERT trigger. */ - int rc = sql_trigger_replace(sql_trigger_name(old_trigger), - sql_trigger_space_id(old_trigger), - NULL, &new_trigger); - (void)rc; - assert(rc == 0); - assert(new_trigger == old_trigger); - sql_trigger_delete(sql_get(), new_trigger); - } else { - /* Rollback REPLACE trigger. */ - if (sql_trigger_replace(sql_trigger_name(old_trigger), - sql_trigger_space_id(old_trigger), - old_trigger, &new_trigger) != 0) - panic("Out of memory on insertion into trigger hash"); - sql_trigger_delete(sql_get(), new_trigger); - } + if (sql_trigger_replace(sql_trigger_name(old_trigger), + sql_trigger_space_id(old_trigger), + old_trigger, &new_trigger) != 0) + panic("Out of memory on insertion into trigger hash"); + sql_trigger_delete(sql_get(), new_trigger); } /** @@ -3785,8 +3790,7 @@ on_replace_dd_trigger(struct trigger * /* trigger */, void *event) struct tuple *old_tuple = stmt->old_tuple; struct tuple *new_tuple = stmt->new_tuple; - struct trigger *on_rollback = - txn_alter_trigger_new(on_replace_trigger_rollback, NULL); + struct trigger *on_rollback = txn_alter_trigger_new(NULL, NULL); struct trigger *on_commit = txn_alter_trigger_new(on_replace_trigger_commit, NULL); @@ -3813,6 +3817,7 @@ on_replace_dd_trigger(struct trigger * /* trigger */, void *event) on_commit->data = old_trigger; on_rollback->data = old_trigger; + on_rollback->run = on_drop_trigger_rollback; } else { /* INSERT, REPLACE trigger. */ uint32_t trigger_name_len; @@ -3860,8 +3865,13 @@ on_replace_dd_trigger(struct trigger * /* trigger */, void *event) diag_raise(); on_commit->data = old_trigger; - on_rollback->data = - old_tuple == NULL ? new_trigger : old_trigger; + if (old_tuple != NULL) { + on_rollback->data = old_trigger; + on_rollback->run = on_replace_trigger_rollback; + } else { + on_rollback->data = new_trigger; + on_rollback->run = on_create_trigger_rollback; + } new_trigger_guard.is_active = false; } -- 2.11.0
next prev parent reply other threads:[~2019-07-03 19:30 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-03 19:30 [PATCH 00/10] Prepare box/alter.cc for transactional DDL Vladimir Davydov 2019-07-03 19:30 ` [PATCH 01/10] ddl: unreference view on space drop synchronously Vladimir Davydov 2019-07-03 19:37 ` Konstantin Osipov 2019-07-03 19:30 ` [PATCH 02/10] ddl: synchronize user cache with actual data state Vladimir Davydov 2019-07-03 19:43 ` Konstantin Osipov 2019-07-03 20:00 ` Vladimir Davydov 2019-07-04 7:42 ` [tarantool-patches] " Konstantin Osipov 2019-07-03 19:30 ` [PATCH 03/10] ddl: synchronize func " Vladimir Davydov 2019-07-04 8:12 ` Konstantin Osipov 2019-07-03 19:30 ` [PATCH 04/10] ddl: synchronize sequence " Vladimir Davydov 2019-07-04 8:16 ` Konstantin Osipov 2019-07-03 19:30 ` [PATCH 05/10] ddl: fix _space_sequence rollback Vladimir Davydov 2019-07-03 19:30 ` [PATCH 06/10] ddl: restore sequence value if drop is rolled back Vladimir Davydov 2019-07-03 19:30 ` [PATCH 07/10] ddl: don't use txn_last_stmt on _collation commit/rollback Vladimir Davydov 2019-07-03 19:30 ` Vladimir Davydov [this message] 2019-07-03 19:30 ` [PATCH 09/10] ddl: don't use txn_last_stmt on _ck_constraint commit/rollback Vladimir Davydov 2019-07-03 19:30 ` [PATCH 10/10] ddl: don't use txn_last_stmt on _cluster commit/rollback Vladimir Davydov 2019-07-04 15:01 ` [PATCH 00/10] Prepare box/alter.cc for transactional DDL 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=234c9046b8e98c6be9990e097b46ae7aab833a3d.1562181197.git.vdavydov.dev@gmail.com \ --to=vdavydov.dev@gmail.com \ --cc=kostja@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [PATCH 08/10] ddl: don'\''t use txn_last_stmt on _trigger commit/rollback' \ /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