admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs: allow multiple reflog entries for the same refname

Browse Source 
The reference transaction only allows a single update for a given
reference to avoid conflicts. This, however, isn't an issue for reflogs.
There are no conflicts to be resolved in reflogs and when migrating
reflogs between backends we'd have multiple reflog entries for the same
refname.

So allow multiple reflog updates within a single transaction. Also the
reflog creation logic isn't exposed to the end user. While this might
change in the future, currently, this reduces the scope of issues to
think about.

In the reftable backend, the writer sorts all updates based on the
update_index before writing to the block. When there are multiple
reflogs for a given refname, it is essential that the order of the
reflogs is maintained. So add the `index` value to the `update_index`.
The `index` field is only set when multiple reflog entries for a given
refname are added and as such in most scenarios the old behavior
remains.

This is required to add reflog migration support to `git refs migrate`.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karthik Nayak
2024-12-16 17:44:32 +01:00
committed by Junio C Hamano
parent 84675fa271
commit 297c09eabb
2 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
refs/reftable-backend.c
View File

@@ -990,8 +990,9 @@ static int reftable_be_transaction_prepare(struct ref_store *ref_store,
if (ret)
goto done;
string_list_append(&affected_refnames,
transaction->updates[i]->refname);
if (!(transaction->updates[i]->flags & REF_LOG_ONLY))
string_list_append(&affected_refnames,
transaction->updates[i]->refname);
}
/*
@@ -1301,6 +1302,7 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
struct reftable_log_record *logs = NULL;
struct ident_split committer_ident = {0};
size_t logs_nr = 0, logs_alloc = 0, i;
uint64_t max_update_index = ts;
const char *committer_info;
int ret = 0;
@@ -1405,7 +1407,19 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
}
fill_reftable_log_record(log, &c);
log->update_index = ts;
/*
* Updates are sorted by the writer. So updates for the same
* refname need to contain different update indices.
*/
log->update_index = ts + u->index;
/*
* Note the max update_index so the limit can be set later on.
*/
if (log->update_index > max_update_index)
max_update_index = log->update_index;
log->refname = xstrdup(u->refname);
memcpy(log->value.update.new_hash,
u->new_oid.hash, GIT_MAX_RAWSZ);
@@ -1469,6 +1483,8 @@ static int write_transaction_table(struct reftable_writer *writer, void *cb_data
* and log blocks.
*/
if (logs) {
reftable_writer_set_limits(writer, ts, max_update_index);
ret = reftable_writer_add_logs(writer, logs, logs_nr);
if (ret < 0)
goto done;