From: Georgy Kirichenko <georgy@tarantool.org> To: tarantool-patches@freelists.org Cc: Georgy Kirichenko <georgy@tarantool.org> Subject: [tarantool-patches] [PATCH v5 1/7] txn: unref statement at txn_free Date: Sat, 22 Jun 2019 00:48:15 +0300 [thread overview] Message-ID: <e48a9d54c60e7cc7c2837520d48b0ecd91eccf36.1561153472.git.georgy@tarantool.org> (raw) In-Reply-To: <cover.1561153472.git.georgy@tarantool.org> Refactoring: put txn statement unref code into transaction free function. --- src/box/txn.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index 7a2c8cdaf..9aa460f50 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -168,6 +168,10 @@ txn_new() inline static void txn_free(struct txn *txn) { + struct txn_stmt *stmt; + stailq_foreach_entry(stmt, &txn->stmts, next) + txn_stmt_unref_tuples(stmt); + /* Truncate region up to struct txn size. */ region_truncate(&txn->region, sizeof(struct txn)); stailq_add(&txn_cache, &txn->in_txn_cache); @@ -448,10 +452,6 @@ txn_commit(struct txn *txn) panic("commit trigger failed"); } - struct txn_stmt *stmt; - stailq_foreach_entry(stmt, &txn->stmts, next) - txn_stmt_unref_tuples(stmt); - fiber_set_txn(fiber(), NULL); txn_free(txn); return 0; @@ -489,10 +489,6 @@ txn_rollback() panic("rollback trigger failed"); } - struct txn_stmt *stmt; - stailq_foreach_entry(stmt, &txn->stmts, next) - txn_stmt_unref_tuples(stmt); - /** Free volatile txn memory. */ fiber_gc(); fiber_set_txn(fiber(), NULL); -- 2.22.0
next prev parent reply other threads:[~2019-06-21 21:48 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-21 21:48 [tarantool-patches] [PATCH v5 0/7] Parallel applier Georgy Kirichenko 2019-06-21 21:48 ` Georgy Kirichenko [this message] 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 2/7] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 3/7] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 4/7] wal: introduce a journal entry finalization callback Georgy Kirichenko 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 5/7] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 6/7] applier: apply transaction in parallel Georgy Kirichenko 2019-06-21 21:48 ` [tarantool-patches] [PATCH v5 7/7] test: fix flaky test Georgy Kirichenko 2019-06-25 16:08 ` [tarantool-patches] [PATCH v5 0/7] Parallel applier 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=e48a9d54c60e7cc7c2837520d48b0ecd91eccf36.1561153472.git.georgy@tarantool.org \ --to=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v5 1/7] txn: unref statement at txn_free' \ /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