git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 03/11] ref-filter: implement '--points-at' option

From
Karthik Nayak <karthik.188@gmail.com>
Date
Jun 29, 2015, 19:37 UTC
Message-ID
<CAOLa=ZSMkcyp5zPbWTJVj5xoDb3OUojgAzUukbjmr5vmKsLSNw@mail.gmail.com>
In-Reply-To
<xmqqmvzibegt.fsf@gitster.dls.corp.google.com>
On Mon, Jun 29, 2015 at 11:10 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 33 quoted lines
> Karthik Nayak <karthik.188@gmail.com> writes:
>
>> +/*
>> + * Given a ref (sha1, refname) see if it points to one of the sha1s
>> + * in a sha1_array.
>> + */
>> +static int match_points_at(struct sha1_array *points_at, const unsigned char *sha1,
>> +                        const char *refname)
>> +{
>> +     struct object *obj;
>> +
>> +     if (!points_at || !points_at->nr)
>> +             return 1;
>> +
>> +     if (sha1_array_lookup(points_at, sha1) >= 0)
>> +             return 1;
>> +
>> +     obj = parse_object_or_die(sha1, refname);
>> +     if (obj->type == OBJ_TAG &&
>> +         sha1_array_lookup(points_at, ((struct tag *)obj)->tagged->sha1) >= 0)
>> +             return 1;
>> +
>> +     return 0;
>> +}
>> +
>
> Interesting.  I think the change done while copying the code does
> not change anything from the original (other than that the helper
> lost its ability to return the peeled object name), and I think you
> shouldn't make any change while copying the code that would change
> the benaviour, but I notice a few things that we might want to keep
> in mind and revisit them later (i.e. might be a good idea to add
> NEEDSWORK comment to record them near the function):

Reverted the change. OK will do and add this, I will work on this after GSoC is done. But like you said I'll add a comment so if someone wants to they can work on it for now.

Show 18 quoted lines
>
>  - The original only peeled one level of indirection, so does this
>    implementation.  But is that really what we want, I wonder?
>
>    After doing:
>
>    $ git tag -a -m 'annotated' atag $commit
>    $ git tag -a -m 'annotated doubly' dtag atag
>
>    atag^0, dtag^0 and $commit all refer to the same commit object.
>    Do we want to miss dtag with --point-at=$commit?
>
>  - As we are in for-each-ref (or eventually tag -l) that is walking
>    the cached refs, we may know what refname peels to without
>    parsing the object at all.  Could it be more efficient to ask
>    peel_ref() for the pointee without doing parse_object()
>    ourselves?
>
Shouldn't both these scenarios be solved together by using peel_ref()?

After what you said I just tried a hacked up version of using peel_ref() rather than parsing the object, tried it out on the Linux tree.

$time git tag -l --points-at=HEAD~501 git tag -l --points-at=HEAD~501 0.03s user 0.01s system 97% cpu 0.044 total

*Using the modified version which uses peel_ref() * $time ../git/git tag -l --points-at=HEAD~501 ../git/git tag -l --points-at=HEAD~501 0.01s user 0.02s system 90% cpu 0.033 total

This was the average of around 5 tests, Might not be the best way to check, but I'm sure there's an improvement.

Thanks :)
-- 
Regards,
Karthik Nayak
Previous: Junio C HamanoNext: Karthik Nayak
Message 6 of 25 in “add options to for-each-ref”
  1. 00/11 add options to for-each-refKarthik Nayak, Jun 25, 2015
  2. 01/11 t6302: for-each-ref tests for ref-filter APIsKarthik Nayak, Jun 25, 2015
  3. 02/11 tag: libify parse_opt_points_at()Karthik Nayak, Jun 25, 2015
  4. 03/11 ref-filter: implement '--points-at' optionKarthik Nayak, Jun 25, 2015
  5. Junio C HamanoJun 29, 2015
  6. Karthik NayakJun 29, 2015
  7. 04/11 for-each-ref: add '--points-at' optionKarthik Nayak, Jun 25, 2015
  8. Junio C HamanoJun 29, 2015
  9. Karthik NayakJun 29, 2015
  10. Junio C HamanoJun 29, 2015
  11. Karthik NayakJun 29, 2015
  12. 05/11 ref-filter: add parse_opt_merge_filter()Karthik Nayak, Jun 25, 2015
  13. 06/11 ref-filter: implement '--merged' and '--no-merged' optionsKarthik Nayak, Jun 25, 2015
  14. Junio C HamanoJun 29, 2015
  15. Junio C HamanoJun 29, 2015
  16. Karthik NayakJun 30, 2015
  17. Junio C HamanoJun 30, 2015
  18. Karthik NayakJun 30, 2015
  19. 07/11 for-each-ref: add '--merged' and '--no-merged' optionsKarthik Nayak, Jun 25, 2015
  20. 08/11 parse-option: rename parse_opt_with_commit()Karthik Nayak, Jun 25, 2015
  21. 09/11 parse-options.h: add macros for '--contains' optionKarthik Nayak, Jun 25, 2015
  22. 10/11 ref-filter: implement '--contains' optionKarthik Nayak, Jun 25, 2015
  23. 11/11 for-each-ref: add '--contains' optionKarthik Nayak, Jun 25, 2015
  24. Junio C HamanoJun 29, 2015
  25. Karthik NayakJun 29, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.