git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 28/30] refs.c: add transaction.status and track OPEN/CLOSED/ERROR

From
Ronnie Sahlberg <sahlberg@google.com>
Date
Apr 29, 2014, 22:19 UTC
Message-ID
<1398809955-32008-29-git-send-email-sahlberg@google.com>
In-Reply-To
<1398809955-32008-1-git-send-email-sahlberg@google.com>

Track the status of a transaction in a new status field. Check the field for sanity, i.e. that status must be OPEN when _commit/_create/_delete or _update is called or else die(BUG:...)

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
---
 refs.c | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/refs.c b/refs.c
index a82d6ba..206e1a2 100644
--- a/refs.c
+++ b/refs.c
@@ -3288,6 +3288,12 @@ struct ref_update {
 	const char refname[FLEX_ARRAY];
 };
 
+enum ref_transaction_status {
+	REF_TRANSACTION_OPEN   = 0,
+	REF_TRANSACTION_CLOSED = 1,
+	REF_TRANSACTION_ERROR  = 2,
+};
+
 /*
  * Data structure for holding a reference transaction, which can
  * consist of checks and updates to multiple references, carried out
@@ -3297,6 +3303,7 @@ struct ref_transaction {
 	struct ref_update **updates;
 	size_t alloc;
 	size_t nr;
+	enum ref_transaction_status status;
 };
 
 struct ref_transaction *ref_transaction_begin(void)
@@ -3320,6 +3327,11 @@ void ref_transaction_free(struct ref_transaction *transaction)
 
 void ref_transaction_rollback(struct ref_transaction *transaction)
 {
+	if (!transaction)
+		return;
+
+	transaction->status = REF_TRANSACTION_ERROR;
+
 	ref_transaction_free(transaction);
 }
 
@@ -3344,7 +3356,10 @@ int ref_transaction_update(struct ref_transaction *transaction,
 	struct ref_update *update;
 
 	if (have_old && !old_sha1)
-		die("have_old is true but old_sha1 is NULL");
+		die("BUG: have_old is true but old_sha1 is NULL");
+
+	if (transaction->status != REF_TRANSACTION_OPEN)
+		die("BUG: update on transaction that is not open");
 
 	update = add_update(transaction, refname);
 	hashcpy(update->new_sha1, new_sha1);
@@ -3363,7 +3378,10 @@ int ref_transaction_create(struct ref_transaction *transaction,
 	struct ref_update *update;
 
 	if (!new_sha1 || is_null_sha1(new_sha1))
-		die("create ref with null new_sha1");
+		die("BUG: create ref with null new_sha1");
+
+	if (transaction->status != REF_TRANSACTION_OPEN)
+		die("BUG: create on transaction that is not open");
 
 	update = add_update(transaction, refname);
 
@@ -3382,7 +3400,10 @@ int ref_transaction_delete(struct ref_transaction *transaction,
 	struct ref_update *update;
 
 	if (have_old && !old_sha1)
-		die("have_old is true but old_sha1 is NULL");
+		die("BUG: have_old is true but old_sha1 is NULL");
+
+	if (transaction->status != REF_TRANSACTION_OPEN)
+		die("BUG: delete on transaction that is not open");
 
 	update = add_update(transaction, refname);
 	update->flags = flags;
@@ -3454,8 +3475,13 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	int n = transaction->nr;
 	struct ref_update **updates = transaction->updates;
 
-	if (!n)
+	if (transaction->status != REF_TRANSACTION_OPEN)
+		die("BUG: commit on transaction that is not open");
+
+	if (!n) {
+		transaction->status = REF_TRANSACTION_CLOSED;
 		return 0;
+	}
 
 	/* Allocate work space */
 	delnames = xmalloc(sizeof(*delnames) * n);
@@ -3517,6 +3543,9 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 	clear_loose_ref_cache(&ref_cache);
 
 cleanup:
+	transaction->status = ret ? REF_TRANSACTION_ERROR
+	  : REF_TRANSACTION_CLOSED;
+
 	for (i = 0; i < n; i++)
 		if (updates[i]->lock)
 			unlock_ref(updates[i]->lock);

-- 
1.9.1.532.gf8485a6
Previous: Ronnie SahlbergNext: Ronnie Sahlberg
Message 29 of 31 in “Use ref transactions for all ref updates”
  1. 00/30 Use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  2. 01/30 refs.c: constify the sha arguments for ref_transaction_create|delete|updateRonnie Sahlberg, Apr 29, 2014
  3. 02/30 refs.c: allow passing NULL to ref_transaction_freeRonnie Sahlberg, Apr 29, 2014
  4. 03/30 refs.c: add a strbuf argument to ref_transaction_commit for error loggingRonnie Sahlberg, Apr 29, 2014
  5. 04/30 refs.c: make ref_update_reject_duplicates take a strbuf argument for errorsRonnie Sahlberg, Apr 29, 2014
  6. 05/30 update-ref.c: log transaction error from the update_refRonnie Sahlberg, Apr 29, 2014
  7. 06/30 refs.c: make update_ref_write update a strbuf on failureRonnie Sahlberg, Apr 29, 2014
  8. 07/30 refs.c: remove the onerr argument to ref_transaction_commitRonnie Sahlberg, Apr 29, 2014
  9. 08/30 refs.c: change ref_transaction_update() to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  10. 09/30 refs.c: change ref_transaction_create to do error checking and return statusRonnie Sahlberg, Apr 29, 2014
  11. 10/30 refs.c: ref_transaction_delete to check for error and return statusRonnie Sahlberg, Apr 29, 2014
  12. 11/30 tag.c: use ref transactions when doing updatesRonnie Sahlberg, Apr 29, 2014
  13. 12/30 replace.c: use the ref transaction functions for updatesRonnie Sahlberg, Apr 29, 2014
  14. 13/30 commit.c: use ref transactions for updatesRonnie Sahlberg, Apr 29, 2014
  15. 14/30 sequencer.c: use ref transactions for all ref updatesRonnie Sahlberg, Apr 29, 2014
  16. 15/30 fast-import.c: change update_branch to use ref transactionsRonnie Sahlberg, Apr 29, 2014
  17. 16/30 branch.c: use ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  18. 17/30 refs.c: change update_ref to use a transactionRonnie Sahlberg, Apr 29, 2014
  19. 18/30 refs.c: free the transaction before returning when number of updates is 0Ronnie Sahlberg, Apr 29, 2014
  20. 19/30 refs.c: ref_transaction_commit should not free the transactionRonnie Sahlberg, Apr 29, 2014
  21. 20/30 fetch.c: clear errno before calling functions that might set itRonnie Sahlberg, Apr 29, 2014
  22. 21/30 fetch.c: change s_update_ref to use a ref transactionRonnie Sahlberg, Apr 29, 2014
  23. 22/30 fetch.c: use a single ref transaction for all ref updatesRonnie Sahlberg, Apr 29, 2014
  24. 23/30 receive-pack.c: use a reference transaction for updating the refsRonnie Sahlberg, Apr 29, 2014
  25. 24/30 fast-import.c: use a ref transaction when dumping tagsRonnie Sahlberg, Apr 29, 2014
  26. 25/30 walker.c: use ref transaction for ref updatesRonnie Sahlberg, Apr 29, 2014
  27. 26/30 refs.c: make write_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  28. 27/30 refs.c: make lock_ref_sha1 staticRonnie Sahlberg, Apr 29, 2014
  29. 28/30 refs.c: add transaction.status and track OPEN/CLOSED/ERRORRonnie Sahlberg, Apr 29, 2014
  30. 29/30 refs.c: remove the update_ref_lock functionRonnie Sahlberg, Apr 29, 2014
  31. 30/30 refs.c: remove the update_ref_write functionRonnie Sahlberg, Apr 29, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.