[Tarantool-patches] [PATCH 5/5] qsync: fix release build
Cyrill Gorcunov
gorcunov at gmail.com
Wed Jul 22 18:33:59 MSK 2020
We use txn for debug purpose only so it
triggers unused variable issue in release
build.
Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
src/box/txn_limbo.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c
index de043f53d..9c12f4fa6 100644
--- a/src/box/txn_limbo.c
+++ b/src/box/txn_limbo.c
@@ -167,13 +167,13 @@ txn_limbo_write_rollback(struct txn_limbo *limbo, int64_t lsn);
int
txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry)
{
- struct txn *txn = entry->txn;
assert(entry->lsn > 0 || !txn_has_flag(entry->txn, TXN_WAIT_ACK));
if (txn_limbo_entry_is_complete(entry))
goto complete;
- assert(!txn_has_flag(txn, TXN_IS_DONE));
- assert(txn_has_flag(txn, TXN_WAIT_SYNC));
+ assert(!txn_has_flag(entry->txn, TXN_IS_DONE));
+ assert(txn_has_flag(entry->txn, TXN_WAIT_SYNC));
+
double start_time = fiber_clock();
while (true) {
double deadline = start_time + replication_synchro_timeout;
@@ -229,7 +229,7 @@ txn_limbo_wait_complete(struct txn_limbo *limbo, struct txn_limbo_entry *entry)
* installed the commit/rollback flag.
*/
assert(rlist_empty(&entry->in_queue));
- assert(txn_has_flag(txn, TXN_IS_DONE));
+ assert(txn_has_flag(entry->txn, TXN_IS_DONE));
/*
* The first tx to be rolled back already performed all
* the necessary cleanups for us.
--
2.26.2
More information about the Tarantool-patches
mailing list