bulk-checkin: remove ODB transaction nesting
ODB transactions support being nested. Only the outermost
{begin,end}_odb_transaction() start and finish a transaction. This
allows internal object write codepaths to be optimized with ODB
transactions without worrying about whether a transaction is already
active. When {begin,end}_odb_transaction() is invoked during an active
transaction, these operations are essentially treated as no-ops. This
can make the interface a bit awkward to use, as calling
end_odb_transaction() does not guarantee that a transaction is actually
ended. Thus, in situations where a transaction needs to be explicitly
flushed, flush_odb_transaction() must be used.
To remove the need for an explicit transaction flush operation via
flush_odb_transaction() and better clarify transaction semantics, drop
the transaction nesting mechanism in favor of begin_odb_transaction()
returning a NULL transaction value to signal it was a no-op, and
end_odb_transaction() behaving as a no-op when a NULL transaction value
is passed. This is safe for existing callers as the transaction value
wired to end_odb_transaction() already comes from
begin_odb_transaction() and thus continues the same no-op behavior when
a transaction is already pending. With this model, passing a pending
transaction to end_odb_transaction() ensures it is committed at that
point in time.
Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
4a3422b161
commit
f3c1db4b2a
@@ -1267,7 +1267,7 @@ int index_fd(struct index_state *istate, struct object_id *oid,
|
||||
struct odb_transaction *transaction;
|
||||
|
||||
transaction = begin_odb_transaction(the_repository->objects);
|
||||
ret = index_blob_bulk_checkin(transaction,
|
||||
ret = index_blob_bulk_checkin(the_repository->objects->transaction,
|
||||
oid, fd, xsize_t(st->st_size),
|
||||
path, flags);
|
||||
end_odb_transaction(transaction);
|
||||
|
||||
Reference in New Issue
Block a user