Commit Graph

9734 Commits

Author SHA1 Message Date
Ivan Frade 8ea5409ec1 BitmapWalkerTest: New test for the walker
Change-Id: I414f5bdd86e5623d7669fa187df19e06acd02cef
2023-11-30 11:58:32 -08:00
Ivan Frade 5e563e1ba1 PackWriter: store the objects with bitmaps in the statistics
We want to know what objects had bitmaps in the walk of the
request. We can check their position in the history and evaluate
our bitmap selection algorithm.

Use the listener interface of the BitmapWalker to get the objects
walked with bitmaps and store them in the statistics.

Change-Id: Id15a904eb642d7f50d80ac77d1146db4fe4706eb
2023-11-30 11:58:32 -08:00
Ivan Frade 5552242588 FooterLine: First line cannot be a footer
The first line of the commit message cannot be a footer line. This
restriction was dropped in commit [1] while adding multiline
footers. This affects at least the git-numberer gerrit plugin, that
even have a test for it [2].

Reintroduce the restriction that the first line of the commit message
cannot be a footer and bring the test from git-numberer to jgit.

[1] https://review.gerrithub.io/c/eclipse-jgit/jgit/+/1172664
[2] https://chromium.googlesource.com/infra/gerrit-plugins/git-numberer/+/refs/heads/main/src/test/java/com/googlesource/chromium/plugins/gitnumberer/GetFooterLinesTest.java

Change-Id: Id3fa6b8614664dbc3fdccffe1006b0b9752a8de6
2023-11-29 14:18:12 -08:00
Ivan Frade acf97be2d6 Reapply "Improve footer parsing to allow multiline footers."
This reverts commit e99fb6edc4.
2023-11-29 13:44:02 -08:00
Ivan Frade e99fb6edc4 Revert "Improve footer parsing to allow multiline footers."
This reverts commit 340cc787a0.

This breaks a test in the git_numberer gerrit plugin used by chromium
[1].  The test checks that first line is never a footer, which sounds
right. That test should be included in FooterLineTest.

[1]
https://chromium.googlesource.com/infra/gerrit-plugins/git-numberer/+/refs/heads/main/src/test/java/com/googlesource/chromium/plugins/gitnumberer/GetFooterLinesTest.java
2023-11-29 10:05:07 -08:00
Matthias Sohn 42666cca34 Merge "Improve footer parsing to allow multiline footers." 2023-11-26 18:35:54 +00:00
Matthias Sohn e9433d338c Merge "Make the tests buildable by bazel test" 2023-11-25 19:54:02 +00:00
Matthias Sohn ef901e9aea Adapt to type parameter added in commons-compress 1.25.0
In 1.25.0 commons-compress added a generic type parameter to
ArchiveOutputStream to avoid unchecked/unconfirmed type casts in
subclasses.

Change-Id: Ib4c208fc1fb65f73ea57c5bf723fde71b0d6d9f7
2023-11-24 18:22:07 +00:00
Kamil Musin 340cc787a0 Improve footer parsing to allow multiline footers.
According to the https://git-scm.com/docs/git-interpret-trailers the
CGit supports multiline trailers. Subsequent lines of such multiline
trailers have to start with a whitespace.

We also rewrite the original parsing code to make it easier to work
with. The old code had pointers moving both backwards and forwards at
the same time. In the rewritten code we first find the start of the last
paragraph and then do all the parsing.

Since all the getters of the FooterLine return String, I've considered
rewriting the parsing code to operate on strings. However the original
code seems to be written with the idea, that the data is only lazily
copied in getters and no extra allocations should be performed during
original parsing (ex. during RevWalk). The changed code keeps to this
idea.

Bug: Google b/312440626
Change-Id: Ie1e3b17a4a5ab767b771c95f00c283ea6c300220
2023-11-24 15:39:02 +01:00
Kamil Musin 2a739ad2c1 Make the tests buildable by bazel test
All the errorprone checkers fail in many existing places of the
codebase, making it impossible to run bazel test. Downgrade all to
":WARN".

MergeToolTest is asserting a wrong error line, but the line seems
different between bazel and mvn test runs. Therefore we don't fix it and
simply run

```
bazel test -- //... -//org.eclipse.jgit.pgm.test:pgm
```

Change-Id: I44913ebc70dcc934cb69481cc3ff9ae0d8059707
2023-11-23 14:07:41 +01:00
Ivan Frade aab75dba7e BitmapIndex: Add interface to track bitmaps found (or not)
We want to know what objects had bitmaps in the walk of the
request. We can check their position in the history and evaluate our
bitmap selection algorithm.

Introduce a listener interface to the BitmapIndex to report which
getBitmap() calls returned a bitmap (or not) and a method to the
bitmap index to set the listener.

Change-Id: Iac8fcc1539ddd2dd450e8a1cf5a5b1089679c378
2023-11-21 11:19:01 -08:00
Ivan Frade c0d15c2abf BitmapWalker: Remove BitmapWalkListener
We can track bitmaps queries that found a bitmap directly in the
BitmapIndex.

Remove the listener.

Change-Id: I5ad518a58b681bf327fee3ae5c5f6e4449d3da1f
2023-11-21 11:18:59 -08:00
Matthias Sohn cd8322091e Update repository URLs in CONTRIBUTING.md
after the move to eclipse.gerrithub.io.

Change-Id: I8e7aac62c991b941def263d3d7585991f1355738
2023-11-20 22:05:27 +01:00
Matthias Sohn d1b0530fee Merge "Fix typo in FileUtils.isStaleFileHandle() javadoc" 2023-11-17 18:45:17 -05:00
Dariusz Luksza 823b6a45ff Fix typo in FileUtils.isStaleFileHandle() javadoc
Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
Change-Id: Iac431bbcb00f0a1fa36e2ba4af5fe33fcee69e04
2023-11-17 23:23:23 +00:00
florian.signoret e4a341db43 Fix branch ref exist check
When a tag with the same name as the branch exists, the branch creation
process should work too. We should detect that the branch already
exists, and allow to force create it when the force option is used.

Bug: 582538
Change-Id: I3b350d03be8edcde10e97b2318343240ca896cb0
2023-11-18 00:05:35 +01:00
Ivan Frade 52af8dbaff gpg.bc: Supress errorprone InsecureCryptoUsage
From errorprone doc: "Dynamically constructed transformation strings
are also flagged, as they may conceal an instance of ECB mode."

https://errorprone.info/bugpattern/InsecureCryptoUsage

Silence the message as a quick relief.

Change-Id: I348f0fff0e3b24ce1f11917e849b4095b186d1f0
2023-11-17 10:17:28 -08:00
Ivan Frade 5c173c632d Adjust javadoc to pass errorprone checks
bazel build //org.eclipse.jgit.test:all doesn't build due to
errorprone errors. This leds to disabling the checks and find the
errors later in the jenkins builder.

Fix javadoc errors reported by errorprone. This doesn't fix completely
the build but it is a step towards it.

Change-Id: Ic4ec93a2d71d4628bf3a05277c60157881156393
2023-11-17 10:17:28 -08:00
Matthias Sohn 6b4787a727 Merge "Update org.apache.commons:commons-compress to 1.25.0" 2023-11-17 02:34:54 -05:00
Matthias Sohn 9167ee57a3 Merge "Fix annotation of deprecated constant CONFIG_KEY_STREAM_FILE_TRESHOLD" 2023-11-16 19:41:46 -05:00
Ivan Frade 3ed190a788 Merge "BitmapWalkListener: Use plain interface with noop instance" 2023-11-16 19:22:16 -05:00
Matthias Sohn 705e3d686b Update org.apache.commons:commons-compress to 1.25.0
Change-Id: Ic9c6910853ad00075501aa3e03888fefbe634bf6
2023-11-17 01:13:57 +01:00
Matthias Sohn 2986d39ae8 Fix annotation of deprecated constant CONFIG_KEY_STREAM_FILE_TRESHOLD
Change-Id: I71f067199c63aa1407f543f6d40ef05b928e9f95
2023-11-17 01:13:01 +01:00
Matthias Sohn a58cd805dc Merge "Update bouncycastle to 1.77" 2023-11-16 19:06:15 -05:00
Ivan Frade e612c25228 BitmapWalkListener: Use plain interface with noop instance
In this new interface default methods are useful only to instantiate
noop instances. We rather reuse the same noop instance and save the
"default" to add backward compatible methods to existing interfaces.

Make the methods regular interface methods and provide a noop
instance.

Change-Id: Ie84ff17c8e9f16837245751739ee8c99463e76ee
2023-11-16 16:05:14 -08:00
Ivan Frade 4d82d0aa1f BitmapWalkListener: Add method and rename for commits
During the walk, the commit can be either
1. already in the walk bitmap
2. unvisited so far with bitmap in the bitmap index
3. unvisited so far without bitmap in the bitmap index

Expose these three states in the interface. This makes the interface
easier to explain: it reports the commits found during the walk.

As it is all about commits, rename the methods to onCommit***.

Change-Id: I661f303eb22d3e735b0e439f16df7ace612376d9
2023-11-16 14:37:24 -08:00
Ivan Frade 4b5e992834 Merge "CommitGraphWriter: Remove unnecesary progress update call" 2023-11-16 14:53:13 -05:00
Matthias Sohn 8af2f785e3 Update bouncycastle to 1.77
Change-Id: I2dc011247ace2eeea8c46587cae55a39be086f36
2023-11-16 14:16:08 -05:00
Jonathan Nieder decd86992a Merge "PatchApplier: wrap output's TemporaryBuffer with a CountingOutputStream" 2023-11-16 05:26:55 -05:00
Nitzan Gur-Furman 754a1b4922 PatchApplier: wrap output's TemporaryBuffer with a CountingOutputStream
The documentation for TemporaryBuffer::length says:
"The length is only accurate after {@link #close()} has been invoked".
However, we need to have the stream open while accessing the length.

This prevents patches on large files to be applied correctly, as the
result get trimmed.

Bug: Google b/309500446
Change-Id: Ic1540f6d0044088f3b46f1fad5f6a28ec254b711
2023-11-16 09:47:19 +01:00
Ivan Frade 9c4100b977 Merge "BitmapWalker: announce walked objects via listener interface" 2023-11-15 18:33:30 -05:00
Ivan Frade d3f711ca1d BitmapWalker: announce walked objects via listener interface
We want to know what objects had a bitmap in the walk, to see where do
they sit in the commit history and evaluate our bitmap selection
algorithm.

Add a listener interface to the bitmap walker announcing the objects
walked and whether they had bitmap.

Change-Id: I956fe2ad927a500710d2cbe78ecd4d26f178c266
2023-11-15 15:04:31 -08:00
Matthias Sohn df6f0bb655 Merge branch 'stable-6.8'
* stable-6.8:
  Prepare 6.8.0-SNAPSHOT builds
  JGit v6.8.0.202311151710-m2

Change-Id: I26603b974f0ccd5a6da3801988d925d73a692c0e
2023-11-15 23:43:53 +01:00
Matthias Sohn d9568eda92 Prepare 6.8.0-SNAPSHOT builds
Change-Id: Id11a260db84aea6743f2e6edec8b8010693aab42
2023-11-15 23:42:56 +01:00
Matthias Sohn 8db605620b Update jetty to 10.0.18
Change-Id: I34c9f7c062400bb69849812d57390dd2e7b04cac
2023-11-15 22:20:29 +01:00
Thomas Wolf ac0a995975 SSH: bump org.apache.sshd to 2.11.0
Update maven build, bazel build, and target platform.

Also remove a file in a ./bin directory that got committed by mistake
in commit f5f4bf0ad.

Change-Id: Ia653c71643f8fad290874d723dacdafbef25c13f
Signed-off-by: Thomas Wolf <twolf@apache.org>
2023-11-15 21:38:23 +01:00
Matthias Sohn 375710194d JGit v6.8.0.202311151710-m2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I9d06bb08fc1f9a2a08d4bc5a4459ec7e7e8c1be4
2023-11-15 18:11:07 +01:00
Matthias Sohn a5356e7f4c Merge branch 'master' into stable-6.8
* master: (42 commits)
  Fix typo in constant name CONFIG_KEY_STREAM_FILE_TRESHOLD
  Simplify StringUtils#commonPrefix
  Optimize RefDirectory.getRefsByPrefix(String...)
  Use try-with-resource to ensure UploadPack is closed
  Fix hiding field warning
  Fix warning for empty code blocks
  Fix boxing warnings
  errorprone: remove unnecessary parentheses
  Update mockito to 5.7.0 and bytebuddy to 1.14.9
  Enable Maven reproducible builds
  Upgrade bazlets to the latest revision
  Revert "Optimise Git protocol v2 `ref-prefix` scanning"
  Document GIT_TRACE_PERFORMANCE to show timings
  config-options.md: fix sort order
  ComboBitset: Add Javadoc
  CommitGraphWriter: Add progress monitor to bloom filter computation
  CommitGraphWriter: Use ProgressMonitor from the OutputStream
  CommitGraphWriter: Unnest generation-number progress
  Optimise Git protocol v2 `ref-prefix` scanning
  UploadPackTest: Cover using wanted-refs as advertised set
  ...

Change-Id: I5398f2342eac83ebdc823befe8e7de0cf8ba6d5b
2023-11-15 18:05:54 +01:00
Matthias Sohn 91c9146224 Fix typo in constant name CONFIG_KEY_STREAM_FILE_TRESHOLD
Since it's part of the API deprecate the wrong spelling and add the
correct one with the same value.

Change-Id: I0f6ea95a5e66c9e80142eb6d40eb7ec3a7aaf8e2
2023-11-15 16:02:43 +01:00
Nasser Grainawi 4aaf8cad90 Simplify StringUtils#commonPrefix
By first checking for null-ness and then for the number of strings to
compare we can get rid of a redundant null check.

Change-Id: I0d9a088352c6c1ffea12bc2cded2c63e5293a8a7
2023-11-14 09:13:19 +01:00
Dariusz Luksza 4f18c50950 Optimize RefDirectory.getRefsByPrefix(String...)
Currently for file-based repositories JGit will go over all refs in the
repository forach `ref-prefix` listed in the `ls-refs` command in git
protocol v2 request.

Native git, uses a different approach, where all refs are read once and
then for each ref, all `ref-prefix` filter values are checked in one
pass.

This change implements this approach in JGit only in the `RefDirectory`
backend. And makes `ref-prefix` filtering ~40% faster for repositories
with packed refs.

Different implementations were tested on a synthetic file repository
with 10k refs in `refs/heads/` and `290k` in `refs/changes`. Before
testing `git pack-refs` command was executed. All results are in
seconds.

Current Impl:               39.340   37.093   35.996
Nested for loops:           25.077   24.742   24.748
Nested streams:             24.827   24.890   27.525
Parallel stream + stream:   23.357   23.318   23.174
Nested parallel streams:    23.490   23.318   23.317
Stream + for loop:          23.147   23.210   23.126
Parallel stream + for loop: 23.317   23.423   22.847

The elapsed time was measured around `getRefByPrefix` call in
`Uploadapack.getFilteredRefs(Collection<String>)` (around lines 952 and
954). For testing a modified version of
`UploadPackTest.testV2LsRefsRefPrefix()` was used. The modifications
here included:
  * shadowing protected `repo` variable with `FileRepository` pointing
    to the synthetic repo with 300k refs described above,
  * mimicking the git client clone request by adding `ref-prefix HEAD`,
    `ref-prefix refs/heads/` and `ref-prefix refs/tags/`

Based on the above results, the implementation with parallel stream and
stream was selected.

Bug: 578550
Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
Change-Id: I6416846c074b611ff6ec9d351dbafcfbcaf68e66
2023-11-12 13:31:16 +01:00
Ivan Frade fcea1fe496 CommitGraphWriter: Remove unnecesary progress update call
Change [1] reduced the scope of the "writing commit graph" monitoring
task. This left some monitor#update() calls out of any task. When out
of a task, the #update call is a noop.

Delete this update calls as they are noops and misleading.

The affected chunks are usually small and quick to write, so probably
they don't need progress monitoring.

[1] https://git.eclipse.org/r/c/jgit/jgit/+/205339

Change-Id: I74d94e6e44e58816937dc8a84e5a10b340e54e0b
2023-11-10 08:33:00 -08:00
Matthias Sohn 1b28c2d001 Merge changes I0d10aeac,I9aced1b7,Ied394859,Ibb61f63f,I20498746, ...
* changes:
  Use try-with-resource to ensure UploadPack is closed
  Fix hiding field warning
  Fix warning for empty code blocks
  Fix boxing warnings
  errorprone: remove unnecessary parentheses
  Update mockito to 5.7.0 and bytebuddy to 1.14.9
  Enable Maven reproducible builds
  Upgrade bazlets to the latest revision
2023-11-10 03:03:36 -05:00
Ivan Frade c2c61a88f9 Merge "Revert "Optimise Git protocol v2 `ref-prefix` scanning"" 2023-11-08 18:15:51 -05:00
Matthias Sohn b761a0fc3e Use try-with-resource to ensure UploadPack is closed
Change-Id: I0d10aeac959a49b3bf2e83b0c104699d1d21f5e9
2023-11-09 00:08:42 +01:00
Matthias Sohn 32f7db784d Fix hiding field warning
Change-Id: I9aced1b711901918667555a4cfff76992024e59c
2023-11-09 00:08:42 +01:00
Matthias Sohn 15c6947fd7 Fix warning for empty code blocks
Change-Id: Ied394859e8c76bb1a2362d31962ab862b26b279f
2023-11-09 00:08:42 +01:00
Matthias Sohn 3652dd437f Fix boxing warnings
Change-Id: Ibb61f63f17e909ee0e6a781c9418f7c1ac2c7cd7
2023-11-09 00:08:42 +01:00
Matthias Sohn 3ca786d767 errorprone: remove unnecessary parentheses
See https://errorprone.info/bugpattern/UnnecessaryParentheses

Change-Id: I204987469d478c9cc887ac66c9ffc84c9977c400
2023-11-09 00:08:42 +01:00
Matthias Sohn 50d6701334 Update mockito to 5.7.0 and bytebuddy to 1.14.9
Change-Id: I7c93847054050a0af0d2c16e724e5755f9fa33bf
2023-11-09 00:08:42 +01:00