From 27fd5a210120b169c92e8a82a39afc2766a0c909 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 5 Mar 2020 15:29:38 +0300
Subject: [PATCH] box/txn: add txn_commit_nop helper
To reuse in sync trancastion once journal
redesign is complete.
Acked-by: Konstantin Osipov <kostja.osipov@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
src/box/txn.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/box/txn.c b/src/box/txn.c
index 6bb1b06ed9..7a2a4877ee 100644
--- a/src/box/txn.c
+++ b/src/box/txn.c
@@ -559,6 +559,22 @@ txn_prepare(struct txn *txn)
return 0;
}
+/**
+ * Complete transaction early if it is barely nop.
+ */
+static bool
+txn_commit_nop(struct txn *txn)
+{
+ if (txn->n_new_rows + txn->n_applier_rows == 0) {
+ txn->signature = 0;
+ txn_complete(txn);
+ fiber_set_txn(fiber(), NULL);
+ return true;
+ }
+
+ return false;
+}
+
int
txn_commit_async(struct txn *txn)
{
@@ -567,17 +583,13 @@ txn_commit_async(struct txn *txn)
return -1;
}
+ if (txn_commit_nop(txn))
+ return 0;
+
/*
* After this point the transaction must not be used
* so reset the corresponding key in the fiber storage.
*/
- if (txn->n_new_rows + txn->n_applier_rows == 0) {
- /* Nothing to do. */
- txn->signature = 0;
- txn_complete(txn);
- fiber_set_txn(fiber(), NULL);
- return 0;
- }
fiber_set_txn(fiber(), NULL);
return txn_write_to_wal(txn);
}
--
GitLab