From: "n.pettik" <korablev@tarantool.org> To: tarantool-patches@freelists.org Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [tarantool-patches] Re: [PATCH 2/3] txn: merge struct sql_txn into struct txn Date: Wed, 21 Aug 2019 03:23:06 +0300 [thread overview] Message-ID: <3F4125D8-E07C-4FF9-A5D2-550C747BD2B4@tarantool.org> (raw) In-Reply-To: <de0f9b60-e565-02fc-5ac9-3444f8206489@tarantool.org> > On 19 Aug 2019, at 23:47, Vladislav Shpilevoy <v.shpilevoy@tarantool.org> wrote: > > Hi! Thanks for the fixes! Mine is in a separate commit > on the branch (after "txn: merge struct sql_txn into struct txn"), > and below. Please, squash if you are ok with that. Yep, thanks, squashed. > Talking of savepoint duplicate names - it is a bug existing in 2.2.1 > too. I think, we should backport the fix. Or not. Up to Kirill. > > =============================================================== > > commit e955f4ad3ad4114a15f35594153ed66f3c23d661 > Author: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> > Date: Mon Aug 19 22:39:15 2019 +0200 > > Review fix > > diff --git a/src/box/txn.c b/src/box/txn.c > index bd024a73c..1002c2136 100644 > --- a/src/box/txn.c > +++ b/src/box/txn.c > @@ -805,7 +805,7 @@ box_txn_rollback_to_savepoint(box_txn_savepoint_t *svp) > } > txn_rollback_to_svp(txn, svp->stmt); > /* Discard from list all newer savepoints. */ > - struct rlist discard = { }; > + RLIST_HEAD(discard); > rlist_cut_before(&discard, &txn->savepoints, &svp->link); > txn->fk_deferred_count = svp->fk_deferred_count; > return 0; > @@ -825,7 +825,7 @@ txn_savepoint_release(struct txn_savepoint *svp) > * Discard current savepoint alongside with all > * created after it savepoints. > */ > - struct rlist discard = { }; > + RLIST_HEAD(discard); > rlist_cut_before(&discard, &txn->savepoints, rlist_next(&svp->link)); > } > >
next prev parent reply other threads:[~2019-08-21 0:23 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-07 15:13 [tarantool-patches] [PATCH 0/3] Merge struct sql_txn into struct txn/savepoint Nikita Pettik 2019-08-07 15:13 ` [tarantool-patches] [PATCH 1/3] txn: move fk_deferred_count from psql_txn to txn Nikita Pettik 2019-08-09 20:59 ` [tarantool-patches] " Vladislav Shpilevoy 2019-08-15 11:03 ` n.pettik 2019-08-07 15:13 ` [tarantool-patches] [PATCH 2/3] txn: merge struct sql_txn into struct txn Nikita Pettik 2019-08-07 15:26 ` [tarantool-patches] " Konstantin Osipov 2019-08-09 21:02 ` Vladislav Shpilevoy 2019-08-12 21:55 ` Konstantin Osipov 2019-08-15 11:04 ` n.pettik 2019-08-15 22:03 ` Vladislav Shpilevoy 2019-08-16 18:52 ` n.pettik 2019-08-19 20:47 ` Vladislav Shpilevoy 2019-08-21 0:23 ` n.pettik [this message] 2019-08-21 20:45 ` Vladislav Shpilevoy 2019-08-07 15:13 ` [tarantool-patches] [PATCH 3/3] sql: use struct txn_savepoint as anonymous savepoint Nikita Pettik 2019-08-07 15:26 ` [tarantool-patches] Re: [PATCH 0/3] Merge struct sql_txn into struct txn/savepoint Konstantin Osipov 2019-08-22 11:56 ` Kirill Yukhin
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=3F4125D8-E07C-4FF9-A5D2-550C747BD2B4@tarantool.org \ --to=korablev@tarantool.org \ --cc=tarantool-patches@freelists.org \ --cc=v.shpilevoy@tarantool.org \ --subject='[tarantool-patches] Re: [PATCH 2/3] txn: merge struct sql_txn into struct txn' \ /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