mirror of
https://github.com/git/git.git
synced 2026-02-25 17:33:34 +00:00
object-file: rename transaction functions
In a subsequent commit, ODB transactions are made more generic to
facilitate each ODB source providing its own transaction handling.
Rename `object_file_transaction_{begin,commit}()` to
`odb_transaction_files_{begin,commit}()` to better match the future
source specific transaction implementation.
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
585e8dfa27
commit
8bf06d05a5
@@ -723,7 +723,7 @@ static void prepare_loose_object_transaction(struct odb_transaction *transaction
|
||||
* We lazily create the temporary object directory
|
||||
* the first time an object might be added, since
|
||||
* callers may not know whether any objects will be
|
||||
* added at the time they call object_file_transaction_begin.
|
||||
* added at the time they call odb_transaction_files_begin.
|
||||
*/
|
||||
if (!transaction || transaction->objdir)
|
||||
return;
|
||||
@@ -1985,7 +1985,7 @@ out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct odb_transaction *object_file_transaction_begin(struct odb_source *source)
|
||||
struct odb_transaction *odb_transaction_files_begin(struct odb_source *source)
|
||||
{
|
||||
struct object_database *odb = source->odb;
|
||||
|
||||
@@ -1998,7 +1998,7 @@ struct odb_transaction *object_file_transaction_begin(struct odb_source *source)
|
||||
return odb->transaction;
|
||||
}
|
||||
|
||||
void object_file_transaction_commit(struct odb_transaction *transaction)
|
||||
void odb_transaction_files_commit(struct odb_transaction *transaction)
|
||||
{
|
||||
if (!transaction)
|
||||
return;
|
||||
|
||||
@@ -202,16 +202,16 @@ struct odb_transaction;
|
||||
|
||||
/*
|
||||
* Tell the object database to optimize for adding
|
||||
* multiple objects. object_file_transaction_commit must be called
|
||||
* multiple objects. odb_transaction_files_commit must be called
|
||||
* to make new objects visible. If a transaction is already
|
||||
* pending, NULL is returned.
|
||||
*/
|
||||
struct odb_transaction *object_file_transaction_begin(struct odb_source *source);
|
||||
struct odb_transaction *odb_transaction_files_begin(struct odb_source *source);
|
||||
|
||||
/*
|
||||
* Tell the object database to make any objects from the
|
||||
* current transaction visible.
|
||||
*/
|
||||
void object_file_transaction_commit(struct odb_transaction *transaction);
|
||||
void odb_transaction_files_commit(struct odb_transaction *transaction);
|
||||
|
||||
#endif /* OBJECT_FILE_H */
|
||||
|
||||
4
odb.c
4
odb.c
@@ -1153,10 +1153,10 @@ void odb_reprepare(struct object_database *o)
|
||||
|
||||
struct odb_transaction *odb_transaction_begin(struct object_database *odb)
|
||||
{
|
||||
return object_file_transaction_begin(odb->sources);
|
||||
return odb_transaction_files_begin(odb->sources);
|
||||
}
|
||||
|
||||
void odb_transaction_commit(struct odb_transaction *transaction)
|
||||
{
|
||||
object_file_transaction_commit(transaction);
|
||||
odb_transaction_files_commit(transaction);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user