mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'
Make it clearer in the naming and documentation of the plug_bulk_checkin and unplug_bulk_checkin APIs that they can be thought of as a "transaction" to optimize operations on the object database. These transactions may be nested so that subsystems like the cache-tree writing code can optimize their operations without caring whether the top-level code has a transaction active. Add a flush_odb_transaction API that will be used in update-index to make objects visible even if a transaction is active. The flush call may also be useful in future cases if we hold a transaction active around calling hooks. Signed-off-by: Neeraj Singh <neerajsi@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
897c9e2575
commit
2c23d1b477
@@ -10,7 +10,7 @@
|
||||
#include "packfile.h"
|
||||
#include "object-store.h"
|
||||
|
||||
static int bulk_checkin_plugged;
|
||||
static int odb_transaction_nesting;
|
||||
|
||||
static struct bulk_checkin_packfile {
|
||||
char *pack_tmp_name;
|
||||
@@ -280,20 +280,29 @@ int index_bulk_checkin(struct object_id *oid,
|
||||
{
|
||||
int status = deflate_to_pack(&bulk_checkin_packfile, oid, fd, size, type,
|
||||
path, flags);
|
||||
if (!bulk_checkin_plugged)
|
||||
if (!odb_transaction_nesting)
|
||||
flush_bulk_checkin_packfile(&bulk_checkin_packfile);
|
||||
return status;
|
||||
}
|
||||
|
||||
void plug_bulk_checkin(void)
|
||||
void begin_odb_transaction(void)
|
||||
{
|
||||
assert(!bulk_checkin_plugged);
|
||||
bulk_checkin_plugged = 1;
|
||||
odb_transaction_nesting += 1;
|
||||
}
|
||||
|
||||
void unplug_bulk_checkin(void)
|
||||
void flush_odb_transaction(void)
|
||||
{
|
||||
assert(bulk_checkin_plugged);
|
||||
bulk_checkin_plugged = 0;
|
||||
flush_bulk_checkin_packfile(&bulk_checkin_packfile);
|
||||
}
|
||||
|
||||
void end_odb_transaction(void)
|
||||
{
|
||||
odb_transaction_nesting -= 1;
|
||||
if (odb_transaction_nesting < 0)
|
||||
BUG("Unbalanced ODB transaction nesting");
|
||||
|
||||
if (odb_transaction_nesting)
|
||||
return;
|
||||
|
||||
flush_odb_transaction();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user