From: Phillip Wood <phillip.wood123@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 1/2] patience diff: remove unnecessary string comparisons
Date: Wed, 5 May 2021 19:00:57 +0100 [thread overview]
Message-ID: <67b46d8c-6a84-d2f7-dadf-e63050149e93@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2105051649280.50@tvgsbejvaqbjf.bet>
Hi Dscho
On 05/05/2021 15:58, Johannes Schindelin wrote:
> Hi Junio,
>
> On Wed, 5 May 2021, Junio C Hamano wrote:
>
>> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
>>
>>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>>
>>> xdl_prepare_env() calls xdl_classify_record() which arranges for the
>>> hashes of non-matching lines to be different so lines can be tested
>>> for equality by comparing just their hashes.
>>
>> Hmph, that is a bit different from what I read from the comment in
>> the post context of the first hunk, though.
>>
>> /*
>> * After xdl_prepare_env() (or more precisely, due to
>> * xdl_classify_record()), the "ha" member of the records (AKA lines)
>> * is _not_ the hash anymore, but a linearized version of it. In
>> * other words, the "ha" member is guaranteed to start with 0 and
>> * the second record's ha can only be 0 or 1, etc.
>> *
>> * So we multiply ha by 2 in the hope that the hashing was
>> * "unique enough".
>> */
>>
>> The words "home" and "enough" hints to me that the "ha" member is
>> not hash, but "lineralized version of it" (whatever it means) does
>> not guarantee that two records with the same "ha" are identical, or
>> does it?
>>
>> Well, I should just go read xdl_classify_record() to see what it
>> really does, but if it eliminates collisions, then the patch is a
>> clear and obvious improvement.
>
> Right. I had the same concern. But it does look as if
> `xdl_classify_record()` replaced the possibly non-unique hash values to
> unique sequential identifiers.
>
> I have to admit that the code is unnecessarily hard to read for me:
> https://github.com/git/git/blob/v2.31.1/xdiff/xprepare.c#L110-L157
>
> But I do gather that the loop at
> https://github.com/git/git/blob/v2.31.1/xdiff/xprepare.c#L119-L123
> is called for every line, that it does compare it to every seen line with
> the same hash, and that it exits the loop early if the contents disagree:
>
> for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next)
> if (rcrec->ha == rec->ha &&
> xdl_recmatch(rcrec->line, rcrec->size,
> rec->ptr, rec->size, cf->flags))
> break;
>
> Since naming is hard (and you can easily err on saving space at the
> expense of costing readers' time, as libxdiff proves), and since I am
> running out of review time, I'll have to assume that
> https://github.com/git/git/blob/v2.31.1/xdiff/xprepare.c#L150-L154 means
> that indeed, the `ha` field is set to a counter that uniquely identifies
> the line contents:
>
> rec->ha = (unsigned long) rcrec->idx;
>
>
> hi = (long) XDL_HASHLONG(rec->ha, hbits);
> rec->next = rhash[hi];
> rhash[hi] = rec;
>
> So I am fairly confident that the patch is good, and the performance win
> is nice.
Thanks for taking the time to review this patch, I agree with your
analysis. The output of `git log -p --diff-algorithm=patience
origin/master` for the whole history of git.git is unchanged by this patch.
Best Wishes
Phillip
>
> Thanks!
> Dscho
>
>>
>> Thanks.
>>
>>> diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
>>> index 20699a6f6054..db2d53e89cb0 100644
>>> --- a/xdiff/xpatience.c
>>> +++ b/xdiff/xpatience.c
>>> @@ -90,7 +90,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
>>> {
>>> xrecord_t **records = pass == 1 ?
>>> map->env->xdf1.recs : map->env->xdf2.recs;
>>> - xrecord_t *record = records[line - 1], *other;
>>> + xrecord_t *record = records[line - 1];
>>> /*
>>> * After xdl_prepare_env() (or more precisely, due to
>>> * xdl_classify_record()), the "ha" member of the records (AKA lines)
>>> @@ -104,11 +104,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
>>> int index = (int)((record->ha << 1) % map->alloc);
>>>
>>> while (map->entries[index].line1) {
>>> - other = map->env->xdf1.recs[map->entries[index].line1 - 1];
>>> - if (map->entries[index].hash != record->ha ||
>>> - !xdl_recmatch(record->ptr, record->size,
>>> - other->ptr, other->size,
>>> - map->xpp->flags)) {
>>> + if (map->entries[index].hash != record->ha) {
>>> if (++index >= map->alloc)
>>> index = 0;
>>> continue;
>>> @@ -253,8 +249,7 @@ static int match(struct hashmap *map, int line1, int line2)
>>> {
>>> xrecord_t *record1 = map->env->xdf1.recs[line1 - 1];
>>> xrecord_t *record2 = map->env->xdf2.recs[line2 - 1];
>>> - return xdl_recmatch(record1->ptr, record1->size,
>>> - record2->ptr, record2->size, map->xpp->flags);
>>> + return record1->ha == record2->ha;
>>> }
>>>
>>> static int patience_diff(mmfile_t *file1, mmfile_t *file2,
>>
next prev parent reply other threads:[~2021-05-05 18:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 9:25 [PATCH 0/2] A couple of small patience diff cleanups Phillip Wood via GitGitGadget
2021-05-04 9:25 ` [PATCH 1/2] patience diff: remove unnecessary string comparisons Phillip Wood via GitGitGadget
2021-05-05 0:31 ` Junio C Hamano
2021-05-05 9:34 ` Phillip Wood
2021-05-05 14:58 ` Johannes Schindelin
2021-05-05 18:00 ` Phillip Wood [this message]
2021-05-06 1:32 ` Junio C Hamano
2021-05-04 9:25 ` [PATCH 2/2] patience diff: remove unused variable Phillip Wood via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=67b46d8c-6a84-d2f7-dadf-e63050149e93@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).