summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Update repository URLs in CONTRIBUTING.mdMatthias Sohn2023-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after the move to eclipse.gerrithub.io. Change-Id: I8e7aac62c991b941def263d3d7585991f1355738
* | | | | | | | | | | Merge "Fix typo in FileUtils.isStaleFileHandle() javadoc"Matthias Sohn2023-11-171-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix typo in FileUtils.isStaleFileHandle() javadocDariusz Luksza2023-11-171-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com> Change-Id: Iac431bbcb00f0a1fa36e2ba4af5fe33fcee69e04
* | | | | | | | | | | | Fix branch ref exist checkflorian.signoret2023-11-182-3/+16
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | gpg.bc: Supress errorprone InsecureCryptoUsageIvan Frade2023-11-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Adjust javadoc to pass errorprone checksIvan Frade2023-11-174-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge "Update org.apache.commons:commons-compress to 1.25.0"Matthias Sohn2023-11-1717-32/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update org.apache.commons:commons-compress to 1.25.0Matthias Sohn2023-11-1717-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9c6910853ad00075501aa3e03888fefbe634bf6
* | | | | | | | | | | | Merge "Fix annotation of deprecated constant CONFIG_KEY_STREAM_FILE_TRESHOLD"Matthias Sohn2023-11-161-1/+2
|\| | | | | | | | | | |
| * | | | | | | | | | | Fix annotation of deprecated constant CONFIG_KEY_STREAM_FILE_TRESHOLDMatthias Sohn2023-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I71f067199c63aa1407f543f6d40ef05b928e9f95
* | | | | | | | | | | | Merge "BitmapWalkListener: Use plain interface with noop instance"Ivan Frade2023-11-161-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | BitmapWalkListener: Use plain interface with noop instanceIvan Frade2023-11-161-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Update bouncycastle to 1.77"Matthias Sohn2023-11-1617-84/+84
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update bouncycastle to 1.77Matthias Sohn2023-11-1617-84/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2dc011247ace2eeea8c46587cae55a39be086f36
* | | | | | | | | | | | BitmapWalkListener: Add method and rename for commitsIvan Frade2023-11-161-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "CommitGraphWriter: Remove unnecesary progress update call"Ivan Frade2023-11-161-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | CommitGraphWriter: Remove unnecesary progress update callIvan Frade2023-11-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "PatchApplier: wrap output's TemporaryBuffer with a CountingOutputStream"Jonathan Nieder2023-11-165-2/+2000021
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | PatchApplier: wrap output's TemporaryBuffer with a CountingOutputStreamNitzan Gur-Furman2023-11-165-2/+2000021
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "BitmapWalker: announce walked objects via listener interface"Ivan Frade2023-11-151-2/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | BitmapWalker: announce walked objects via listener interfaceIvan Frade2023-11-151-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'stable-6.8'Matthias Sohn2023-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.8: Prepare 6.8.0-SNAPSHOT builds JGit v6.8.0.202311151710-m2 Change-Id: I26603b974f0ccd5a6da3801988d925d73a692c0e
| * | | | | | | | | | | | Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-11-1591-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id11a260db84aea6743f2e6edec8b8010693aab42
| * | | | | | | | | | | | JGit v6.8.0.202311151710-m2v6.8.0.202311151710-m2Matthias Sohn2023-11-1591-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I9d06bb08fc1f9a2a08d4bc5a4459ec7e7e8c1be4
| * | | | | | | | | | | | Merge branch 'master' into stable-6.8Matthias Sohn2023-11-1592-485/+2021
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | | | Update jetty to 10.0.18Matthias Sohn2023-11-1517-135/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I34c9f7c062400bb69849812d57390dd2e7b04cac
* | | | | | | | | | | | | SSH: bump org.apache.sshd to 2.11.0Thomas Wolf2023-11-1521-166/+138
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | | | | | Fix typo in constant name CONFIG_KEY_STREAM_FILE_TRESHOLDMatthias Sohn2023-11-153-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's part of the API deprecate the wrong spelling and add the correct one with the same value. Change-Id: I0f6ea95a5e66c9e80142eb6d40eb7ec3a7aaf8e2
* | | | | | | | | | | | Simplify StringUtils#commonPrefixNasser Grainawi2023-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Optimize RefDirectory.getRefsByPrefix(String...)Dariusz Luksza2023-11-124-0/+81
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge changes I0d10aeac,I9aced1b7,Ied394859,Ibb61f63f,I20498746, ...Matthias Sohn2023-11-1038-108/+324
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | | | Use try-with-resource to ensure UploadPack is closedMatthias Sohn2023-11-091-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0d10aeac959a49b3bf2e83b0c104699d1d21f5e9
| * | | | | | | | | | | Fix hiding field warningMatthias Sohn2023-11-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9aced1b711901918667555a4cfff76992024e59c
| * | | | | | | | | | | Fix warning for empty code blocksMatthias Sohn2023-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied394859e8c76bb1a2362d31962ab862b26b279f
| * | | | | | | | | | | Fix boxing warningsMatthias Sohn2023-11-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb61f63f17e909ee0e6a781c9418f7c1ac2c7cd7
| * | | | | | | | | | | errorprone: remove unnecessary parenthesesMatthias Sohn2023-11-091-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://errorprone.info/bugpattern/UnnecessaryParentheses Change-Id: I204987469d478c9cc887ac66c9ffc84c9977c400
| * | | | | | | | | | | Update mockito to 5.7.0 and bytebuddy to 1.14.9Matthias Sohn2023-11-0918-75/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c93847054050a0af0d2c16e724e5755f9fa33bf
| * | | | | | | | | | | Enable Maven reproducible buildsMatthias Sohn2023-11-0918-20/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - configure Maven to run build reproducibly [1] - use UTC timestamp of checked out commit as build timestamp - add git-describe, git-commit-id, git-commit-id, git-tags, git-remote-origin-url to MANIFEST.MF files - configure cyclonedx-maven-plugin to also use UTC timestamp of checked out commit - for packaging build use tycho-buildtimestamp-jgit [2] to ensure version uses the timestamp of the last commit - SBOMs are not reproducible by design [3] they should have a build timestamp matching the time when the build was executed and a serial number which is a unique UUID per build run. Hence exclude them from comparison [4]. - Use gmavenplus-plugin to format build timestamps. Maven expects build timestamp in ISO-8601 format, to replace the qualifier in versions the timestamp format must be compatible with rules for OSGi version numbers. Didn't find a way to read the properties set by the git-commit-id-maven-plugin from another plugin. Hence use JGit in a groovy script to get the commit time of the current HEAD and provide it in these two formats. TODO: packaging build (features and p2 repository) is not yet binary reproducible since that's not yet supported by Tycho [5], artefacts have reproducible version numbers but file lastModified timestamps are not yet reproducible. Test plan for Maven build: - build using mvn clean install" - verify second build is reproducible: mvn -T1 clean verify artifact:compare verification seems not to be thread-safe, hence run it with a single thread using option -T1 For packaging build (still fails due to non-reproducible file timestamps): - build using mvn -f org.eclipse.jgit.packaging/pom.xml clean install - verify second build is reproducible: mvn -T1 -f org.eclipse.jgit.packaging/pom.xml clean verify artifact:compare [1] https://maven.apache.org/guides/mini/guide-reproducible-builds.html [2] https://wiki.eclipse.org/Tycho/Reproducible_Version_Qualifiers [3] https://github.com/CycloneDX/cyclonedx-maven-plugin/issues/84 [4] https://maven.apache.org/plugins/maven-artifact-plugin/compare-mojo.html [5] https://github.com/eclipse-tycho/tycho/issues/233 Change-Id: I0202f55a1b6ae0edd922cfef638beb39d2ce9417
| * | | | | | | | | | | Upgrade bazlets to the latest revisionDavid Ostrovsky2023-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes: junit.bzl: Suppress default package warning flagged by error prone Change-Id: Id8e8dd7cca7264328c4121ac3da4d9d5e8e407de
* | | | | | | | | | | | Merge "Revert "Optimise Git protocol v2 `ref-prefix` scanning""Ivan Frade2023-11-081-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Revert "Optimise Git protocol v2 `ref-prefix` scanning"Ivan Frade2023-11-081-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3937300f3eb4dd557ec2d195f21793f737d6cb4e. Reason for revert: This kills performance on the DFS side, that relies on loading the minimal amount of refs and reftables for quick prefix searches. Reverting as a safe option to keep master in good performance until we decide how to reintroduce this change. Change-Id: I7b1a3f900d9c78ce95cf0972abb50b6becfe3bb1
* | | | | | | | | | | | Merge "ComboBitset: Add Javadoc"Matthias Sohn2023-11-081-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ComboBitset: Add JavadocHan-Wen Nienhuys2023-11-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I799991327cadf646329eacbac40d41cb1b3391ad
* | | | | | | | | | | | | Document GIT_TRACE_PERFORMANCE to show timingsMatthias Sohn2023-11-081-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a39b072c50e64a2d940680ed85866edfe9d0d28
* | | | | | | | | | | | | config-options.md: fix sort orderMatthias Sohn2023-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf233e7b6ca41de9460b41b3d24c84f9e85472d6
* | | | | | | | | | | | | CommitGraphWriter: Add progress monitor to bloom filter computationIvan Frade2023-11-073-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bloom filter computation can be an expensive process and right now it is invisible to the user. Report progress while calculating bloom filters. Log of GC with bloom filter enabled: Computing commit-graph path bloom filters: 100% (9551/9551) Computing commit-graph generation numbers: 100% (9551/9551) Writing out commit-graph: 100% (9551/9551) Change-Id: Ife65e63ac2c37d064d5f049a366cbb52c3ef6798
* | | | | | | | | | | | | CommitGraphWriter: Use ProgressMonitor from the OutputStreamIvan Frade2023-11-071-8/+8
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same progress monitor is passed around as parameter and inside the output stream. The functions use one to start tasks and another to report progress, which is confusing. The stream needs the monitor to check cancellations so we cannot remove it from there. Make all code take the monitor from the stream. Change-Id: Id3cb9c1cb0bd47318b46ef934a9d4037341e25a7
* / / / / / / / / / / / CommitGraphWriter: Unnest generation-number progressIvan Frade2023-11-073-11/+56
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProgressMonitor task to track the calculation of generation numbers is nested inside the task that follows the writing of all lines in the commit-graph. ProgressMonitor doesn't support nested tasks and this confuses the counting. Move the start/end of the "writing commit graph" task to the writeCommitData section, after calculating the generation numbers. Make that task track by commits instead of by lines. Moving the start/end of the progress task to the chunk-writing functions is clearer and easier to extend. Logging of GC before: Writing out commit-graph in 3 passes: 51% ( 9807/19358) Computing commit-graph generation numbers: 100% (9551/9551) Logging of GC after: Computing commit-graph generation numbers: 100% (9551/9551) Writing out commit-graph: 100% (9551/9551) Change-Id: I87d69c06c9a3c7e75be12b6f0d1a63b5924e298a
* | | | | | | | | | | Optimise Git protocol v2 `ref-prefix` scanningDariusz Luksza2023-11-071-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currenty JGit will go over all refs in the repository for each `ref-prefix`. This means that refs will be read multiple times, which leads to subpar performance. 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. And makes `ref-prefix` filtering ~28% faster for a repository with fully packed refs and ~5% when RefTable is used instead of refdir. Different implementations were tested on a synthetic file repository with 300k refs. Different implementations were tested for unpacked and fully packed refs (results are in seconds). Unpacked refs: Current Impl: 54.838 57.234 56.138 Nested for loops: 36.094 37.025 36.502 Nested stream's: 36.154 35.989 37.262 Parallel stream + stream: 36.923 37.272 35.362 Nested parallel stream's: 35.512 38.395 36.745 Stream + for loop: 34.950 36.164 37.191 Parallel stream + for loop: 37.695 35.511 35.378 Packed refs: Current Impl: 39.713 39.954 38.653 Nested for loops: 29.891 29.753 29.377 Nested stream's: 30.340 29.637 30.412 Parallel stream + stream: 28.653 28.254 29.138 Nested parallel stream's: 29.942 28.850 31.030 Stream + for loop: 29.405 29.576 30.539 Parallel stream + for loop: 29.012 29.215 29.380 RefTable: Current Impl: 0.273 0.294 0.330 Nested for loops: 0.252 0.169 0.215 Nested stream's: 0.252 0.228 0.213 Parallel stream + stream: 0.233 0.259 0.247 Nested parallel stream's: 0.416 0.309 0.340 Stream + for loop: 0.224 0.247 0.242 Parallel stream + for loop: 0.347 0.246 0.346 The elapsed time was measured around `getRefsByPrefix` call in `UploadPack.getFilteredRefs(Collection<String>)` (around lines 952 and 954). Based on the above results, the implementation with parallel stream and stream was selected. Bug: 578550 Change-Id: Iac3a3aacf897b87b3448c1d528cdac64ad312199 Signed-off-by: Dariusz Luksza <dariusz.luksza@gmail.com>
* | | | | | | | | | | UploadPackTest: Cover using wanted-refs as advertised setIvan Frade2023-10-271-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parent change introduced using "wanted-refs" as advertised set during fetchV2, but it tested only a request without wantIds (only wanted-refs). Add a second where the request has wanted-refs AND wantId (which disables the optimization). Change the test to measure the amount of refs considered advertised, instead of relying in calls to the refdb. Change-Id: Id64ec933fd737bae1bfd429c7b8cc05b51a83870
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-12 15:21:21 +0000