From: Georgy Kirichenko <georgy@tarantool.org> To: tarantool-patches@freelists.org Cc: Georgy Kirichenko <georgy@tarantool.org> Subject: [tarantool-patches] [PATCH v3 02/14] ddl: synchronize privileges cache with actual data state. Date: Sun, 9 Jun 2019 23:44:31 +0300 [thread overview] Message-ID: <d74dbef73e1ca56ad45548fbedee487d71d28af1.1560112747.git.georgy@tarantool.org> (raw) In-Reply-To: <cover.1560112747.git.georgy@tarantool.org> We tend to synchronize cached data with the actual data changes: apply while on_replace and undo while on_rollback. --- src/box/alter.cc | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/box/alter.cc b/src/box/alter.cc index ed9e55907..c4a1c52a9 100644 --- a/src/box/alter.cc +++ b/src/box/alter.cc @@ -2938,31 +2938,23 @@ grant_or_revoke(struct priv_def *priv) /** A trigger called on rollback of grant, or on commit of revoke. */ static void -revoke_priv(struct trigger * /* trigger */, void *event) +revoke_priv(struct trigger *trigger, void *event) { - struct txn *txn = (struct txn *) event; - struct txn_stmt *stmt = txn_last_stmt(txn); - struct tuple *tuple = (stmt->new_tuple ? - stmt->new_tuple : stmt->old_tuple); + (void) event; + struct tuple *tuple = (struct tuple *)trigger->data; struct priv_def priv; priv_def_create_from_tuple(&priv, tuple); - /* - * Access to the object has been removed altogether so - * there should be no grants at all. If only some grants - * were removed, modify_priv trigger would have been - * invoked. - */ priv.access = 0; grant_or_revoke(&priv); } /** A trigger called on rollback of grant, or on commit of revoke. */ static void -modify_priv(struct trigger * /* trigger */, void *event) +modify_priv(struct trigger *trigger, void *event) { - struct txn_stmt *stmt = txn_last_stmt((struct txn *) event); + (void) event; struct priv_def priv; - priv_def_create_from_tuple(&priv, stmt->new_tuple); + priv_def_create_from_tuple(&priv, (struct tuple *)trigger->data); grant_or_revoke(&priv); } @@ -2985,21 +2977,24 @@ on_replace_dd_priv(struct trigger * /* trigger */, void *event) priv_def_check(&priv, PRIV_GRANT); grant_or_revoke(&priv); struct trigger *on_rollback = - txn_alter_trigger_new(revoke_priv, NULL); + txn_alter_trigger_new(revoke_priv, new_tuple); txn_on_rollback(txn, on_rollback); } else if (new_tuple == NULL) { /* revoke */ assert(old_tuple); priv_def_create_from_tuple(&priv, old_tuple); priv_def_check(&priv, PRIV_REVOKE); - struct trigger *on_commit = - txn_alter_trigger_new(revoke_priv, NULL); - txn_on_commit(txn, on_commit); + priv.access = 0; + grant_or_revoke(&priv); + struct trigger *on_rollback = + txn_alter_trigger_new(modify_priv, old_tuple); + txn_on_rollback(txn, on_rollback); } else { /* modify */ priv_def_create_from_tuple(&priv, new_tuple); priv_def_check(&priv, PRIV_GRANT); - struct trigger *on_commit = - txn_alter_trigger_new(modify_priv, NULL); - txn_on_commit(txn, on_commit); + grant_or_revoke(&priv); + struct trigger *on_rollback = + txn_alter_trigger_new(modify_priv, old_tuple); + txn_on_rollback(txn, on_rollback); } } -- 2.21.0
next prev parent reply other threads:[~2019-06-09 20:44 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-09 20:44 [tarantool-patches] [PATCH v3 00/14] Parallel applier Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 01/14] txn: Fire a trigger after a transaction finalization Georgy Kirichenko 2019-06-09 21:59 ` [tarantool-patches] " Konstantin Osipov 2019-06-11 11:42 ` [tarantool-patches] " Vladimir Davydov 2019-06-09 20:44 ` Georgy Kirichenko [this message] 2019-06-11 13:13 ` [tarantool-patches] [PATCH v3 02/14] ddl: synchronize privileges cache with actual data state Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 03/14] txn: transaction memory allocation Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 04/14] ddl: place alter structures onto a txn memory region Georgy Kirichenko 2019-06-11 14:14 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 05/14] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-13 14:11 ` Vladimir Davydov 2019-06-16 16:20 ` [tarantool-patches] " Konstantin Osipov 2019-06-16 16:14 ` Konstantin Osipov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 06/14] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-13 14:12 ` Vladimir Davydov 2019-06-13 19:28 ` Георгий Кириченко 2019-06-14 9:21 ` Vladimir Davydov 2019-06-16 16:38 ` [tarantool-patches] " Konstantin Osipov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 07/14] wal: remove fiber from a journal_entry structure Georgy Kirichenko 2019-06-13 14:17 ` Vladimir Davydov 2019-06-13 19:33 ` Георгий Кириченко 2019-06-14 8:05 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 08/14] wal: enable asyncronous wal writes Georgy Kirichenko 2019-06-13 14:21 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 09/14] wal: a dedicated wal scheduling fiber Georgy Kirichenko 2019-06-13 14:24 ` Vladimir Davydov 2019-06-13 19:36 ` Георгий Кириченко 2019-06-14 9:20 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 10/14] core: latch_unlock_external routine Georgy Kirichenko 2019-06-13 14:27 ` Vladimir Davydov 2019-06-13 19:38 ` Георгий Кириченко 2019-06-14 8:10 ` Vladimir Davydov 2019-06-14 9:18 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 11/14] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-13 14:34 ` Vladimir Davydov 2019-06-13 19:45 ` Георгий Кириченко 2019-06-14 7:58 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 12/14] txn: handle fiber stop event at transaction level Georgy Kirichenko 2019-06-13 14:36 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 13/14] applier: apply transaction in parallel Georgy Kirichenko 2019-06-13 15:17 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 14/14] test: fix flaky test Georgy Kirichenko
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=d74dbef73e1ca56ad45548fbedee487d71d28af1.1560112747.git.georgy@tarantool.org \ --to=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 02/14] ddl: synchronize privileges cache with actual data state.' \ /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