From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Mar 2024 21:05:23 +0000 (-0700)
Subject: Merge branch 'ps/reftable-iteration-perf-part2'
X-Git-Tag: v2.45.0-rc0~116
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=448a74e1515ca63bc0877a0461624d7beb1bec2e

Merge branch 'ps/reftable-iteration-perf-part2'

The code to iterate over refs with the reftable backend has seen
some optimization.

* ps/reftable-iteration-perf-part2:
  refs/reftable: precompute prefix length
  reftable: allow inlining of a few functions
  reftable/record: decode keys in place
  reftable/record: reuse refname when copying
  reftable/record: reuse refname when decoding
  reftable/merged: avoid duplicate pqueue emptiness check
  reftable/merged: circumvent pqueue with single subiter
  reftable/merged: handle subiter cleanup on close only
  reftable/merged: remove unnecessary null check for subiters
  reftable/merged: make subiters own their records
  reftable/merged: advance subiter on subsequent iteration
  reftable/merged: make `merged_iter` structure private
  reftable/pq: use `size_t` to track iterator index
---

448a74e1515ca63bc0877a0461624d7beb1bec2e
diff --cc refs/reftable-backend.c
index 2c88bbd448,4d27fdde54..74dab18eda
--- a/refs/reftable-backend.c
+++ b/refs/reftable-backend.c
@@@ -364,18 -365,15 +365,18 @@@ static int reftable_ref_iterator_advanc
  			break;
  
  		/*
 -		 * The files backend only lists references contained in
 -		 * "refs/". We emulate the same behaviour here and thus skip
 -		 * all references that don't start with this prefix.
 +		 * The files backend only lists references contained in "refs/" unless
 +		 * the root refs are to be included. We emulate the same behaviour here.
  		 */
 -		if (!starts_with(iter->ref.refname, "refs/"))
 +		if (!starts_with(iter->ref.refname, "refs/") &&
 +		    !(iter->flags & DO_FOR_EACH_INCLUDE_ROOT_REFS &&
 +		     (is_pseudoref(&iter->refs->base, iter->ref.refname) ||
 +		      is_headref(&iter->refs->base, iter->ref.refname)))) {
  			continue;
 +		}
  
- 		if (iter->prefix &&
- 		    strncmp(iter->prefix, iter->ref.refname, strlen(iter->prefix))) {
+ 		if (iter->prefix_len &&
+ 		    strncmp(iter->prefix, iter->ref.refname, iter->prefix_len)) {
  			iter->err = 1;
  			break;
  		}
@@@ -482,8 -480,9 +483,9 @@@ static struct reftable_ref_iterator *re
  	int ret;
  
  	iter = xcalloc(1, sizeof(*iter));
 -	base_ref_iterator_init(&iter->base, &reftable_ref_iterator_vtable, 1);
 +	base_ref_iterator_init(&iter->base, &reftable_ref_iterator_vtable);
  	iter->prefix = prefix;
+ 	iter->prefix_len = prefix ? strlen(prefix) : 0;
  	iter->base.oid = &iter->oid;
  	iter->flags = flags;
  	iter->refs = refs;