Re: [PATCH v2 05/10] cache-tree: implement cache_tree_find_path()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 19, 2022, 20:14 UTC
- Message-ID
- <xmqqczg9mg8s.fsf@gitster.g>
- In-Reply-To
- <c977001c033e8689f6d0ca52a6021bde61b1b476.1652982759.git.gitgitgadget@gmail.com>
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 23 quoted lines
> +struct cache_tree *cache_tree_find_path(struct cache_tree *it, const char *path)
> +{
> + const char *slash;
> + int namelen;
> + struct cache_tree_sub *down;
> +
> + if (!it)
> + return NULL;
> + slash = strchrnul(path, '/');
> + namelen = slash - path;
> + it->entry_count = -1;
> + if (!*slash) {
> + int pos;
> + pos = cache_tree_subtree_pos(it, path, namelen);
> + if (0 <= pos)
> + return it->down[pos]->cache_tree;
> + return NULL;
> + }
> + down = find_subtree(it, path, namelen, 0);
> + if (down)
> + return cache_tree_find_path(down->cache_tree, slash + 1);
> + return NULL;
> +}The tail recursion (and the one in the orginal) may want to be trivially converted to iteration with "goto".
It is somewhat surprising that we didn't have any external interface to expose a sub-part of the cache_tree at all so far. It may be because the API was so well designed that the abstraction did not have to be exposed. I dunno.
Show 12 quoted lines
> diff --git a/cache-tree.h b/cache-tree.h > index 8efeccebfc9..f75f8e74dcd 100644 > --- a/cache-tree.h > +++ b/cache-tree.h > @@ -29,6 +29,8 @@ struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *); > > int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen); > > +struct cache_tree *cache_tree_find_path(struct cache_tree *it, const char *path); > + > void cache_tree_write(struct strbuf *, struct cache_tree *root); > struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);