Skip to content

Port ruby cataloger to new generic cataloger pattern#1322

Merged
wagoodman merged 1 commit intomainfrom
update-ruby-generic-cataloger
Nov 4, 2022
Merged

Port ruby cataloger to new generic cataloger pattern#1322
wagoodman merged 1 commit intomainfrom
update-ruby-generic-cataloger

Conversation

@wagoodman
Copy link
Copy Markdown
Contributor

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

@wagoodman wagoodman requested a review from a team November 4, 2022 14:51
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
@wagoodman wagoodman force-pushed the update-ruby-generic-cataloger branch from 69096a8 to 45eccaf Compare November 4, 2022 14:52
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 4, 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                    11.2ms ± 1%    14.0ms ± 2%  +24.53%  (p=0.008 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2              1.26ms ± 1%    1.59ms ± 1%  +26.15%  (p=0.016 n=5+4)
ImagePackageCatalogers/python-package-cataloger-2            3.20ms ± 0%    4.02ms ± 2%  +25.74%  (p=0.016 n=4+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2    1.02ms ± 2%    1.34ms ± 3%  +31.21%  (p=0.008 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         711µs ± 1%     929µs ± 2%  +30.53%  (p=0.008 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               6.82µs ± 1%    7.93µs ± 2%  +16.19%  (p=0.008 n=5+5)
ImagePackageCatalogers/dpkgdb-cataloger-2                     815µs ± 0%    1075µs ± 3%  +31.96%  (p=0.008 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                    1.19ms ± 1%    1.56ms ± 1%  +31.31%  (p=0.008 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      13.9ms ± 1%    17.6ms ± 2%  +26.44%  (p=0.008 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.20ms ± 1%    1.54ms ± 2%  +28.06%  (p=0.008 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          6.76µs ± 1%    7.84µs ± 2%  +16.02%  (p=0.008 n=5+5)
ImagePackageCatalogers/dotnet-deps-cataloger-2               1.31ms ± 0%    1.67ms ± 3%  +28.03%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    664µs ± 1%     878µs ± 2%  +32.23%  (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.421 n=5+5)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               204kB ± 0%     205kB ± 0%   +0.27%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             962kB ± 0%     962kB ± 0%     ~     (p=0.310 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     218kB ± 0%     218kB ± 0%   -0.11%  (p=0.032 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         159kB ± 0%     159kB ± 0%     ~     (p=0.095 n=5+5)
ImagePackageCatalogers/node-binary-cataloger-2               1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     200kB ± 0%     200kB ± 0%     ~     (p=0.310 n=5+5)
ImagePackageCatalogers/rpm-db-cataloger-2                     303kB ± 0%     303kB ± 0%     ~     (p=0.151 n=5+5)
ImagePackageCatalogers/java-cataloger-2                      3.45MB ± 0%    3.45MB ± 0%     ~     (p=0.421 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                     1.25MB ± 0%    1.25MB ± 0%     ~     (p=0.095 n=5+5)
ImagePackageCatalogers/go-module-binary-cataloger-2          1.12kB ± 0%    1.12kB ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                376kB ± 0%     377kB ± 0%   +0.11%  (p=0.008 n=5+5)
ImagePackageCatalogers/portage-cataloger-2                    139kB ± 0%     139kB ± 0%     ~     (p=0.841 n=5+5)

name                                                       old allocs/op  new allocs/op  delta
ImagePackageCatalogers/alpmdb-cataloger-2                     85.7k ± 0%     85.7k ± 0%     ~     (all equal)
ImagePackageCatalogers/ruby-gemspec-cataloger-2               4.24k ± 0%     4.26k ± 0%   +0.53%  (p=0.008 n=5+5)
ImagePackageCatalogers/python-package-cataloger-2             16.6k ± 0%     16.6k ± 0%     ~     (p=0.135 n=5+5)
ImagePackageCatalogers/php-composer-installed-cataloger-2     5.53k ± 0%     5.53k ± 0%     ~     (p=0.492 n=5+5)
ImagePackageCatalogers/javascript-package-cataloger-2         3.33k ± 0%     3.33k ± 0%     ~     (all equal)
ImagePackageCatalogers/node-binary-cataloger-2                 38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dpkgdb-cataloger-2                     4.51k ± 0%     4.51k ± 0%     ~     (all equal)
ImagePackageCatalogers/rpm-db-cataloger-2                     8.13k ± 0%     8.13k ± 0%     ~     (all equal)
ImagePackageCatalogers/java-cataloger-2                       57.5k ± 0%     57.5k ± 0%     ~     (p=0.730 n=5+5)
ImagePackageCatalogers/apkdb-cataloger-2                      5.39k ± 0%     5.39k ± 0%     ~     (all equal)
ImagePackageCatalogers/go-module-binary-cataloger-2            38.0 ± 0%      38.0 ± 0%     ~     (all equal)
ImagePackageCatalogers/dotnet-deps-cataloger-2                7.24k ± 0%     7.24k ± 0%     ~     (all equal)
ImagePackageCatalogers/portage-cataloger-2                    3.58k ± 0%     3.58k ± 0%     ~     (all equal)


// match example: files = ["exe/bundle".freeze, "exe/bundler".freeze] ---> "exe/bundle".freeze, "exe/bundler".freeze
"files": regexp.MustCompile(`.*\.files\s*=\s*\[(?P<files>.*)\] *`),
"files": regexp.MustCompile(`.*\.files\s*=\s*\[(?P<files>.*)] *`),
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we have to remove matching on the \ here?

Copy link
Copy Markdown
Contributor Author

@wagoodman wagoodman Nov 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IDE flagged this as a redundant escape (which appears correct) -- I've been doing a lot of boyscouting with these port PRs

@wagoodman wagoodman merged commit 41464bb into main Nov 4, 2022
@wagoodman wagoodman deleted the update-ruby-generic-cataloger branch November 4, 2022 15:33
GijsCalis pushed a commit to GijsCalis/syft that referenced this pull request Feb 19, 2024
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