bulk-checkin: drop flush_odb_transaction()
Object database transactions can be explicitly flushed via flush_odb_transaction() without actually completing the transaction. This makes the provided transactional interface a bit awkward. Now that there are no longer any flush_odb_transaction() call sites, drop the function to simplify the interface and further ensure that a transaction is only finalized when end_odb_transaction() is invoked. Signed-off-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Justin Tobler committed
Sep 16, 2025 at 13:29 UTC
ca7d93453b6c309aa1fca411e1bdaa9ca4c82199
2 files changed
+2
-17
bulk-checkin.c
+2
-10
index eb6ef704c3..5de848deff 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -376,15 +376,6 @@ struct odb_transaction *begin_odb_transaction(struct object_database *odb)
return odb->transaction;
}
-void flush_odb_transaction(struct odb_transaction *transaction)
-{
- if (!transaction)
- return;
-
- flush_batch_fsync(transaction);
- flush_bulk_checkin_packfile(transaction);
-}
-
void end_odb_transaction(struct odb_transaction *transaction)
{
if (!transaction)
@@ -395,7 +386,8 @@ void end_odb_transaction(struct odb_transaction *transaction)
*/
ASSERT(transaction == transaction->odb->transaction);
- flush_odb_transaction(transaction);
+ flush_batch_fsync(transaction);
+ flush_bulk_checkin_packfile(transaction);
transaction->odb->transaction = NULL;
free(transaction);
}
bulk-checkin.h
-7
index 51d0ac6134..eea728f0d4 100644
--- a/bulk-checkin.h
+++ b/bulk-checkin.h
@@ -43,13 +43,6 @@ int index_blob_bulk_checkin(struct odb_transaction *transaction,
*/
struct odb_transaction *begin_odb_transaction(struct object_database *odb);
-/*
- * Make any objects that are currently part of a pending object
- * database transaction visible. It is valid to call this function
- * even if no transaction is active.
- */
-void flush_odb_transaction(struct odb_transaction *transaction);
-
/*
* Tell the object database to make any objects from the
* current transaction visible.