On Tue, Apr 18, 2017 at 10:56:08PM -0400, Jeff King wrote:
> > When adding many things, we often just append and then sort at the
> > end after we finished adding. I wonder if recent "check the last
> > one and append" optimization beats that strategy.
>
> The big question is whether we need to detect duplicates while we're
> appending to the list, which is hard on an unsorted list. In this
> function, at least, we do detect when the path already exists and return
> the existing entry. I'm not sure under what circumstances we would see
> such a duplicate, though, as each filename should appear only once in
> the tree diff. I would think.
>
> Doing:
>
> diff --git a/diffcore-rename.c b/diffcore-rename.c
> index f7444c86b..56a493d97 100644
> --- a/diffcore-rename.c
> +++ b/diffcore-rename.c
> @@ -86,7 +86,7 @@ static struct diff_rename_src *register_rename_src(struct
> diff_filepair *p)
> struct diff_rename_src *src = &(rename_src[next]);
> int cmp = strcmp(one->path, src->p->one->path);
> if (!cmp)
> - return src;
> + die("BUG: duplicate rename src: %s", one->path);
> if (cmp < 0) {
> last = next;
> continue;
>
> passes the test suite, at least. :)
Maybe relevant: 4d6be03b9 (diffcore-rename: avoid processing duplicate
destinations, 2015-02-26). That's on the dst side, but possibly we
should do something similar on the src side.
BTW, I think the return value from register_rename_src() is
questionable. It points to a "struct diff_rename_src" that may be
reallocated by further calls to the function. Fortunately nobody
actually looks at it, let alone saves it, so there's no bug.
We may want to convert that return value to a void (if not just return
an int for "hey, there's a duplicate", like we do for add_rename_dst()).
Also, presumably that function could learn the same "check the last one"
trick that the src side does. Which leads me back to "surely we can
generalize this". I don't think bsearch() is quite what we want, because
its interface doesn't tell us where to put the item when it isn't found.
But I think we could make a general bsearch-like function that has
similar semantics to index_name_pos(), with its negative-integer return.
And then that would be a general lookup function, and we could easily
build a general "look up and add" function around that. And the "check
the last one" optimization would go in the latter.
-Peff
