Subject: Re: [PATCH 7/8] reftable/merged: drain priority queue on reseek

From: Junio C Hamano <[email-masked]>
Date: Mon, 04 Nov 2024 19:23:21 -0800

Junio C Hamano <[email-masked]> writes:

> Did you mean REFTABLE_HASH_SIZE_SHA1 instead?

Ah, that transition hasn't happened yet on 'master'.  I'll carry the
semantic conflict resoluion in merge-fix hierarchy then.

> diff --git i/t/unit-tests/t-reftable-merged.c w/t/unit-tests/t-reftable-merged.c
> index 620803e0ed..a12bd0e1a3 100644
> --- i/t/unit-tests/t-reftable-merged.c
> +++ w/t/unit-tests/t-reftable-merged.c
> @@ -326,14 +326,14 @@ static void t_merged_seek_multiple_times_without_draining(void)
>  	check(!err);
>  	err = reftable_iterator_next_ref(&it, &rec);
>  	check(!err);
> -	err = reftable_ref_record_equal(&rec, &r2[0], GIT_SHA1_RAWSZ);
> +	err = reftable_ref_record_equal(&rec, &r2[0], REFTABLE_HASH_SIZE_SHA1);
>  	check(err == 1);
>  
>  	err = reftable_iterator_seek_ref(&it, "a");
>  	check(!err);
>  	err = reftable_iterator_next_ref(&it, &rec);
>  	check(!err);
> -	err = reftable_ref_record_equal(&rec, &r1[0], GIT_SHA1_RAWSZ);
> +	err = reftable_ref_record_equal(&rec, &r1[0], REFTABLE_HASH_SIZE_SHA1);
>  	check(err == 1);
>  
>  	for (size_t i = 0; i < ARRAY_SIZE(bufs); i++)