Re: [PATCH 2/4] refs/reftable: don't write new table when expire is a no-op
Patrick Steinhardt <ps@pks.im> writes:
Show 23 quoted lines
> diff --git a/refs/reftable-backend.c b/refs/reftable-backend.c
> index 4216a18684d..e2027bb9c02 100644
> --- a/refs/reftable-backend.c
> +++ b/refs/reftable-backend.c
> @@ -2607,6 +2607,7 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
> struct strbuf referent = STRBUF_INIT;
> uint8_t *last_hash = NULL;
> size_t logs_nr = 0, logs_alloc = 0, i;
> + bool has_changes = false;
> unsigned int type = 0;
> int ret;
>
> @@ -2696,17 +2697,25 @@ static int reftable_be_reflog_expire(struct ref_store *ref_store,
> logs[i].value.update.message,
> policy_cb_data)) {
> dest->value_type = REFTABLE_LOG_DELETION;
> + has_changes = true;
> } else {
> - if ((flags & EXPIRE_REFLOGS_REWRITE) && last_hash)
> + if ((flags & EXPIRE_REFLOGS_REWRITE) && last_hash &&
> + memcmp(dest->value.update.old_hash, last_hash,
> + ref_store->repo->hash_algo->rawsz)) {
> memcpy(dest->value.update.old_hash, last_hash, GIT_MAX_RAWSZ);We can skip this second copy.
Show 10 quoted lines
> + has_changes = true;
> + }
> last_hash = logs[i].value.update.new_hash;
> }
> }
>
> - if (flags & EXPIRE_REFLOGS_UPDATE_REF && last_hash && !is_null_oid(&oid))
> + if (flags & EXPIRE_REFLOGS_UPDATE_REF && last_hash && !is_null_oid(&oid)) {
> oidread(&arg.update_oid, last_hash, ref_store->repo->hash_algo);
> + if (!oideq(&arg.update_oid, &oid))We now check if its changed, makes sense.
Show 8 quoted lines
> + has_changes = true;
> + }
>
> - if ((flags & EXPIRE_REFLOGS_DRY_RUN)) {
> + if (!has_changes || (flags & EXPIRE_REFLOGS_DRY_RUN)) {
> ret = 0;
> goto done;
> }Nit: it would be nice to mention that we exit early to skip writing any
new tables.
Show 37 quoted lines
> diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh
> index a7027458395..d808f1887f6 100755
> --- a/t/t0610-reftable-basics.sh
> +++ b/t/t0610-reftable-basics.sh
> @@ -912,6 +912,36 @@ test_expect_success 'reflog: expiry empties reflog' '
> )
> '
>
> +test_expect_success 'reflog: expiry without changes does not write tables' '
> + test_when_finished "rm -rf repo" &&
> + git init repo &&
> + (
> + cd repo &&
> +
> + test_commit A &&
> + test_commit B &&
> + test_commit C &&
> + cp .git/reftable/tables.list expect &&
> +
> + git reflog expire --all --expire=never --expire-unreachable=never &&
> + test_cmp expect .git/reftable/tables.list &&
> +
> + git reflog expire --all --rewrite \
> + --expire=never --expire-unreachable=never &&
> + test_cmp expect .git/reftable/tables.list &&
> +
> + git reflog expire --all --updateref \
> + --expire=never --expire-unreachable=never &&
> + test_cmp expect .git/reftable/tables.list &&
> +
> + git reflog expire --all --dry-run --expire=all &&
> + test_cmp expect .git/reftable/tables.list &&
> +
> + git reflog expire --all --expire=all &&
> + ! test_cmp expect .git/reftable/tables.list
> + )
> +'
Nice. Could we add a similar test for the previous patch too?