threads / discuss / 55918

[GSoC] Git Blog 4

Subject: [GSoC] Git Blog 4

## tl;dr

9 messages between Jun 13, 2021 and Jun 15, 2021.

replies: 8people: 4as markdown or json

ZheNing Hu· Jun 13, 2021, 14:17 UTC · lore

My fourth week blog finished: The web version is here: https://adlternative.github.io/GSOC-Git-Blog-3/

## Week4: Trouble is a friend

At the beginning of this week , since my previous code broke some Github CI tests , I tried to solve these bugs related to the atom `%(raw)` . The most confusing thing is that some bugs may pass the tests of your local machine, but fail to pass in the CI of GitHub .

E.g. I need to add the `GPG` prerequisites to the test like this:

```sh test_expect_success GPG 'basic atom: refs/tags/signed-empty raw' ' git cat-file tag refs/tags/signed-empty >expected && git for-each-ref --format="%(raw)" refs/tags/signed-empty >actual && sanitize_pgp <expected >expected.clean && sanitize_pgp <actual >actual.clean && echo "" >>expected.clean && test_cmp expected.clean actual.clean ' ```

Otherwise, some operating systems that do not contain GnuPG may not be able to perform related tests.

In addition, some scripts like `printf "%b" "a\0b\0c" >blob1` will be truncated at the first NUL on a 32-bit machine, but it performs well on 64-bit machines, and NUL is normally stored in the file. This made me think that Git's file decompression had an error on a 32-bit machine before I used Ubuntu32's docker container to clone the git repository and In-depth analysis of bugs... In the end, I used `printf "a\0b\0c"` to make 32-bit machines not truncated in NUL. Is there a better way to write binary data onto a file than `printf` and `echo`?

Since I am a newbie to docker, I would like to know if there is any way to run the Git's Github CI program remotely or locally?

In the second half of this week, I tried to make `cat-file` reuse the logic of `ref-filter`. I have to say that this is a very difficult process. "rebase -i" again and again to repair the content of previous commits. squeeze commits, split commits, modify commit messages... Finally, I submitted the patches to the Git mailing list in [[PATCH 0/8] [GSOC][RFC] cat-file: reuse `ref-filter` logic](https://lore.kernel.org/git/pull.980.git.1623496458.gitgitgadget@gmail.com/). Now `cat-file` has learned most of the atoms in `ref-filter`. I am very happy to be able to make git support richer functions through my own code.

Regrettably, `git cat-file --batch --batch-all-objects` seems to take up a huge amount of memory on a large repo such as git.git, and it will be killed by Linux's oom. This is mainly because we will make a large number of copies of the object's raw data. The original `git cat-file` uses `read_object_file()` or `stream_blob()` to output the object's raw data, but in `ref-filter`, we have to use `v->s` to copy the object's data, it is difficult to eliminate `v->s` and print the output directly to the final output buffer. Because we may have atoms like `%(if)`, `%(else)` that need to use buffers on the stack to build the final output string layer by layer, or the `cmp_ref_sorting()` needs to use `v->s` to compare two refs. In short, it is very difficult for `ref-filter` to reduce copy overhead. I even thought about using the string pool API `memintern()` to replace `xmemdupz()`, but it seems that the effect is not obvious. A large number of objects' data will still reside in memory, so this may not be a good method.

Anyway, stay confident. I can solve these difficult problems with the help of mentors and reviewers. `:)`

Eric Sunshine· Jun 13, 2021, 23:28 UTC · re: ZheNing Hu · lore

Re: [GSoC] Git Blog 4

On Sun, Jun 13, 2021 at 10:18 AM ZheNing Hu <adlternative@gmail.com> wrote:
> My fourth week blog finished:
> The web version is here:
> https://adlternative.github.io/GSOC-Git-Blog-3/
I suppose you meant: https://adlternative.github.io/GSOC-Git-Blog-4/
ZheNing Hu· Jun 14, 2021, 03:41 UTC · re: Eric Sunshine · lore

Re: [GSoC] Git Blog 4

Eric Sunshine <sunshine@sunshineco.com> 于2021年6月14日周一 上午7:28写道:
Show 7 quoted lines
>
> On Sun, Jun 13, 2021 at 10:18 AM ZheNing Hu <adlternative@gmail.com> wrote:
> > My fourth week blog finished:
> > The web version is here:
> > https://adlternative.github.io/GSOC-Git-Blog-3/
>
> I suppose you meant: https://adlternative.github.io/GSOC-Git-Blog-4/
Yeah, it is 4. :-)

-- ZheNing Hu

Christian Couder· Jun 14, 2021, 08:02 UTC · re: ZheNing Hu · lore

Re: [GSoC] Git Blog 4

On Sun, Jun 13, 2021 at 4:17 PM ZheNing Hu <adlternative@gmail.com> wrote:
Show 9 quoted lines
> In addition, some scripts like `printf "%b" "a\0b\0c" >blob1` will
> be truncated at the first NUL on a 32-bit machine, but it performs
> well on 64-bit machines, and NUL is normally stored in the file.
> This made me think that Git's file decompression had an error on
> a 32-bit machine before I used Ubuntu32's docker container to
> clone the git repository and In-depth analysis of bugs... In the end,
> I used `printf "a\0b\0c"` to make 32-bit machines not truncated
> in NUL. Is there a better way to write binary data onto a file than
> `printf` and `echo`?

You might want to take a look at t/t4058-diff-duplicates.sh which has the following:

# make_tree_entry <mode> <mode> <sha1>
#
# We have to rely on perl here because not all printfs understand
# hex escapes (only octal), and xxd is not portable.
make_tree_entry () {
       printf '%s %s\0' "$1" "$2" &&
       perl -e 'print chr(hex($_)) for ($ARGV[0] =~ /../g)' "$3"
}
> Since I am a newbie to docker, I would like to know if there is any
> way to run the Git's Github CI program remotely or locally?

There are scripts in the ci/ directory, but yeah it could help if there was a README there.

Show 13 quoted lines
> In the second half of this week, I tried to make `cat-file` reuse the
> logic of `ref-filter`. I have to say that this is a very difficult process.
> "rebase -i" again and again to repair the content of previous commits.
> squeeze commits, split commits, modify commit messages... Finally, I
> submitted the patches to the Git mailing list in
> [[PATCH 0/8] [GSOC][RFC] cat-file: reuse `ref-filter`
> logic](https://lore.kernel.org/git/pull.980.git.1623496458.gitgitgadget@gmail.com/).
> Now `cat-file` has learned most of the atoms in `ref-filter`. I am very
> happy to be able to make git support richer functions through my own code.
>
> Regrettably, `git cat-file --batch --batch-all-objects` seems to take up
> a huge amount of memory on a large repo such as git.git, and it will
> be killed by Linux's oom.
In the cover letter of your patch series you say:

"There is still an unresolved issue: performance overhead is very large, so that when we use:

git cat-file --batch --batch-all-objects >/dev/null
on git.git, it may fail."

Is this the same issue? Is it only a memory issue, or is your patch series also making things slower?

Show 8 quoted lines
> This is mainly because we will make a large
> number of copies of the object's raw data. The original `git cat-file`
> uses `read_object_file()` or `stream_blob()` to output the object's
> raw data, but in `ref-filter`, we have to use `v->s` to copy the object's
> data, it is difficult to eliminate `v->s` and print the output directly to the
> final output buffer. Because we may have atoms like `%(if)`, `%(else)`
> that need to use buffers on the stack to build the final output string
> layer by layer,
What does layer by layer mean here?
Show 6 quoted lines
> or the `cmp_ref_sorting()` needs to use `v->s` to
> compare two refs. In short, it is very difficult for `ref-filter` to reduce
> copy overhead. I even thought about using the string pool API
> `memintern()` to replace `xmemdupz()`, but it seems that the effect
> is not obvious. A large number of objects' data will still reside in memory,
> so this may not be a good method.

Would it be possible to keep the data for a limited number of objects, then print everything related to these objects, free their data and start again with another limited number of objects?

> Anyway, stay confident. I can solve these difficult problems with
> the help of mentors and reviewers. `:)`
Sure :-)
Christian Couder· Jun 14, 2021, 12:02 UTC · re: Christian Couder · lore

Re: [GSoC] Git Blog 4

On Mon, Jun 14, 2021 at 10:02 AM Christian Couder <christian.couder@gmail.com> wrote:

>
> On Sun, Jun 13, 2021 at 4:17 PM ZheNing Hu <adlternative@gmail.com> wrote:
Show 5 quoted lines
> > Since I am a newbie to docker, I would like to know if there is any
> > way to run the Git's Github CI program remotely or locally?
>
> There are scripts in the ci/ directory, but yeah it could help if
> there was a README there.
There is a "GitHub-Travis CI hints" in Documentation/SubmittingPatches though.
ZheNing Hu· Jun 15, 2021, 08:59 UTC · re: Christian Couder · lore

Re: [GSoC] Git Blog 4

Christian Couder <christian.couder@gmail.com> 于2021年6月14日周一 下午4:02写道:
Show 25 quoted lines
>
> On Sun, Jun 13, 2021 at 4:17 PM ZheNing Hu <adlternative@gmail.com> wrote:
>
> > In addition, some scripts like `printf "%b" "a\0b\0c" >blob1` will
> > be truncated at the first NUL on a 32-bit machine, but it performs
> > well on 64-bit machines, and NUL is normally stored in the file.
> > This made me think that Git's file decompression had an error on
> > a 32-bit machine before I used Ubuntu32's docker container to
> > clone the git repository and In-depth analysis of bugs... In the end,
> > I used `printf "a\0b\0c"` to make 32-bit machines not truncated
> > in NUL. Is there a better way to write binary data onto a file than
> > `printf` and `echo`?
>
> You might want to take a look at t/t4058-diff-duplicates.sh which has
> the following:
>
> # make_tree_entry <mode> <mode> <sha1>
> #
> # We have to rely on perl here because not all printfs understand
> # hex escapes (only octal), and xxd is not portable.
> make_tree_entry () {
>        printf '%s %s\0' "$1" "$2" &&
>        perl -e 'print chr(hex($_)) for ($ARGV[0] =~ /../g)' "$3"
> }
>

Yes, perl can indeed do this, and perhaps python can do it too. However, python may need to consider portability issues.

Show 6 quoted lines
> > Since I am a newbie to docker, I would like to know if there is any
> > way to run the Git's Github CI program remotely or locally?
>
> There are scripts in the ci/ directory, but yeah it could help if
> there was a README there.
>

Thanks, I probably know how to use it. As you said in another article, GitHub-Travis CI, this is exactly what I need.

Show 26 quoted lines
> > In the second half of this week, I tried to make `cat-file` reuse the
> > logic of `ref-filter`. I have to say that this is a very difficult process.
> > "rebase -i" again and again to repair the content of previous commits.
> > squeeze commits, split commits, modify commit messages... Finally, I
> > submitted the patches to the Git mailing list in
> > [[PATCH 0/8] [GSOC][RFC] cat-file: reuse `ref-filter`
> > logic](https://lore.kernel.org/git/pull.980.git.1623496458.gitgitgadget@gmail.com/).
> > Now `cat-file` has learned most of the atoms in `ref-filter`. I am very
> > happy to be able to make git support richer functions through my own code.
> >
> > Regrettably, `git cat-file --batch --batch-all-objects` seems to take up
> > a huge amount of memory on a large repo such as git.git, and it will
> > be killed by Linux's oom.
>
> In the cover letter of your patch series you say:
>
> "There is still an unresolved issue: performance overhead is very large, so
> that when we use:
>
> git cat-file --batch --batch-all-objects >/dev/null
>
> on git.git, it may fail."
>
> Is this the same issue? Is it only a memory issue, or is your patch
> series also making things slower?
>

Yes, they are talking about the same thing, the memory usage is too large. Of course I should check for memory leaks first. However, this is mainly caused by changes in the strategy of cat-file printing object data.

The original cat-file needs do fewer (one time) copies in read_object_file() or stream_blob(), now cat-file needs do four time (or more) copy in oid_object_info_extended(), grab_sub_body_contents(), append_atom(), and pop_stack_element().

Show 11 quoted lines
> > This is mainly because we will make a large
> > number of copies of the object's raw data. The original `git cat-file`
> > uses `read_object_file()` or `stream_blob()` to output the object's
> > raw data, but in `ref-filter`, we have to use `v->s` to copy the object's
> > data, it is difficult to eliminate `v->s` and print the output directly to the
> > final output buffer. Because we may have atoms like `%(if)`, `%(else)`
> > that need to use buffers on the stack to build the final output string
> > layer by layer,
>
> What does layer by layer mean here?
>

In the case of using multiple nested %(if) %(else), the data may be copied to the "previous level" buffer of the stack through pop_stack_element().

Show 11 quoted lines
> > or the `cmp_ref_sorting()` needs to use `v->s` to
> > compare two refs. In short, it is very difficult for `ref-filter` to reduce
> > copy overhead. I even thought about using the string pool API
> > `memintern()` to replace `xmemdupz()`, but it seems that the effect
> > is not obvious. A large number of objects' data will still reside in memory,
> > so this may not be a good method.
>
> Would it be possible to keep the data for a limited number of objects,
> then print everything related to these objects, free their data and
> start again with another limited number of objects?
>

"limited number of objects", is this want to reduce the overhead of free()? May be a good solution. But I think, can we just only release the memory of an object after printing it instead of free() together like ref_array_clear() does?

> > Anyway, stay confident. I can solve these difficult problems with
> > the help of mentors and reviewers. `:)`
>
> Sure :-)

Thanks! -- ZheNing Hu

ZheNing Hu· Jun 15, 2021, 12:30 UTC · re: ZheNing Hu · lore

Re: [GSoC] Git Blog 4

ZheNing Hu <adlternative@gmail.com> 于2021年6月15日周二 下午4:59写道:
Show 19 quoted lines
>
> >
> > In the cover letter of your patch series you say:
> >
> > "There is still an unresolved issue: performance overhead is very large, so
> > that when we use:
> >
> > git cat-file --batch --batch-all-objects >/dev/null
> >
> > on git.git, it may fail."
> >
> > Is this the same issue? Is it only a memory issue, or is your patch
> > series also making things slower?
> >
>
> Yes, they are talking about the same thing, the memory usage is too large.
> Of course I should check for memory leaks first. However, this is mainly
> caused by changes in the strategy of cat-file printing object data.
>

In fact, it is indeed a problem caused by a memory leak: batch_object_write() forget to free the ref_array_item->value. After solving the problem, although the performance of `git cat-file --batch-all-objects --batch` is still poor, at least there will be no triggering the oom killer.

-- ZheNing Hu

Atharva Raykar· Jun 14, 2021, 13:20 UTC · re: ZheNing Hu · lore

Re: [GSoC] Git Blog 4

On 13-Jun-2021, at 19:47, ZheNing Hu <adlternative@gmail.com> wrote:
Show 5 quoted lines
> 
> [...]
> 
> Since I am a newbie to docker, I would like to know if there is any
> way to run the Git's Github CI program remotely or locally?

Whenever I push to my fork on GitHub, a GitHub Actions workflow gets triggered. I don't think you need to do any special setup for it.

You should be able to just access it from the 'Actions' tab.

Either way, if you are looking for something specific, there is some work going on to update the documentation to mention this:

https://lore.kernel.org/git/patch-2.3-7add00cc87-20210512T084137Z-avarab@gmail.com/
Maybe that might be of help to you :-)

--- Atharva Raykar ಅಥರ್ವ ರಾಯ್ಕರ್ अथर्व रायकर

ZheNing Hu· Jun 15, 2021, 09:06 UTC · re: Atharva Raykar · lore

Re: [GSoC] Git Blog 4

Atharva Raykar <raykar.ath@gmail.com> 于2021年6月14日周一 下午9:20写道:
Show 11 quoted lines
>
> On 13-Jun-2021, at 19:47, ZheNing Hu <adlternative@gmail.com> wrote:
> >
> > [...]
> >
> > Since I am a newbie to docker, I would like to know if there is any
> > way to run the Git's Github CI program remotely or locally?
>
> Whenever I push to my fork on GitHub, a GitHub Actions workflow gets
> triggered. I don't think you need to do any special setup for it.
>

Well, maybe sometimes I might want Github to give me a more humane error message instead of just telling me where the test failed. So I may need to make some changes to ".cirrus.yml" to do it. (just for debug)

Show 9 quoted lines
> You should be able to just access it from the 'Actions' tab.
>
> Either way, if you are looking for something specific, there is some
> work going on to update the documentation to mention this:
>
> https://lore.kernel.org/git/patch-2.3-7add00cc87-20210512T084137Z-avarab@gmail.com/
>
> Maybe that might be of help to you :-)
>
Thanks, it's helpful!
Show 5 quoted lines
> ---
> Atharva Raykar
> ಅಥರ್ವ ರಾಯ್ಕರ್
> अथर्व रायकर
>

-- ZheNing Hu

← back to recent threads