Skip to content

Update java generic cataloger#1329

Merged
wagoodman merged 6 commits intomainfrom
update-java-generic-cataloger
Nov 9, 2022
Merged

Update java generic cataloger#1329
wagoodman merged 6 commits intomainfrom
update-java-generic-cataloger

Conversation

@wagoodman
Copy link
Copy Markdown
Contributor

Follow up to #1281 , porting the java cataloger to the new generic.Cataloger.

Since this is the last cataloger using common.GenericCataloger (the old cataloger) it has been removed in this PR.

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman requested a review from a team November 7, 2022 13:57
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 7, 2022

Benchmark Test Results

Benchmark results from the latest changes vs base branch
name                                                       old time/op    new time/op    delta
ImagePackageCatalogers/alpmdb-cataloger-2                    13.9ms ± 7%    15.4ms ± 2%  +10.86%  (p=0.008 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2              1.69ms ±13%    1.85ms ± 9%     ~     (p=0.056 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2            4.02ms ± 2%    4.34ms ± 3%   +8.05%  (p=0.008 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2    1.32ms ± 3%    1.46ms ± 1%  +10.22%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         938µs ± 3%    1018µs ± 2%   +8.58%  (p=0.008 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               7.62µs ± 2%    8.46µs ± 2%  +10.96%  (p=0.008 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                    1.09ms ± 2%    1.19ms ± 1%   +9.09%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                    1.57ms ± 2%    1.72ms ± 2%   +9.84%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      17.3ms ± 4%    19.4ms ± 1%  +12.27%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.54ms ± 3%    1.74ms ± 2%  +12.87%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          7.76µs ± 4%    8.58µs ± 3%  +10.55%  (p=0.008 n=5+5)
ImagePackageCatalogers/dotnet-deps-cataloger-2               1.71ms ± 1%    1.90ms ± 2%  +10.73%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    893µs ± 2%     973µs ± 1%   +8.93%  (p=0.008 n=5+5)

name                                                       old alloc/op   new alloc/op   delta
ImagePackageCatalogers/alpmdb-cataloger-2                    5.27MB ± 0%    5.27MB ± 0%     ~     (p=0.222 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               205kB ± 0%     205kB ± 0%   -0.21%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             962kB ± 0%     962kB ± 0%     ~     (p=0.841 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     218kB ± 0%     217kB ± 0%   -0.27%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         159kB ± 0%     159kB ± 0%   -0.18%  (p=0.008 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     200kB ± 0%     199kB ± 0%   -0.33%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     302kB ± 0%     302kB ± 0%     ~     (p=0.222 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      3.45MB ± 0%    3.49MB ± 0%   +0.98%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.25MB ± 0%    1.25MB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                376kB ± 0%     375kB ± 0%   -0.51%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    139kB ± 0%     138kB ± 0%   -0.08%  (p=0.008 n=5+5)

name                                                       old allocs/op  new allocs/op  delta
ImagePackageCatalogers/alpmdb-cataloger-2                     85.7k ± 0%     85.7k ± 0%   -0.02%  (p=0.008 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               4.26k ± 0%     4.24k ± 0%   -0.48%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             16.6k ± 0%     16.5k ± 0%   -0.24%  (p=0.008 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     5.53k ± 0%     5.50k ± 0%   -0.53%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         3.33k ± 0%     3.33k ± 0%   -0.30%  (p=0.000 n=5+4)
ImagePackageCatalogers/node-binary-cataloger-2                 38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     4.51k ± 0%     4.46k ± 0%   -1.02%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     8.13k ± 0%     8.11k ± 0%   -0.22%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                       57.5k ± 0%     57.5k ± 0%   -0.04%  (p=0.016 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                      5.39k ± 0%     5.36k ± 0%   -0.61%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2            38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                7.24k ± 0%     7.12k ± 0%     ~     (p=0.079 n=4+5)
ImagePackageCatalogers/portage-cataloger-2                    3.58k ± 0%     3.58k ± 0%   -0.25%  (p=0.000 n=5+4)

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the update-java-generic-cataloger branch from 1123e63 to 36ded75 Compare November 7, 2022 14:13
@wagoodman wagoodman enabled auto-merge (squash) November 8, 2022 22:08
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the update-java-generic-cataloger branch from 6872ad4 to c8f379c Compare November 8, 2022 22:19
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman merged commit d7a51a6 into main Nov 9, 2022
@wagoodman wagoodman deleted the update-java-generic-cataloger branch November 9, 2022 14:55
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
* remove centralize pURL generation

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* port java cataloger to new generic cataloger pattern

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* remove common.GenericCataloger

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* update format test fixtures to reflect ID updates

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

* fix package sort instability for encode-decode-encode cycles

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>

Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants