update compress plugin to use more functionality from libswoc #12544
+171
−215
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
looking to make use of more functionality from swoc within the compress plugin i noticed that it has a file path utilities that we can make use of
…mpression_algorithms to use swoc::TextView
…erate with swoc::TextView for consistency
…ressible and HostConfiguration::is_url_allowed
|
Good updates. Looks like there's a couple wrinkles to iron out though: https://ci.trafficserver.apache.org/job/Github_Builds/job/autest/31205/console |
bneradt
requested changes
Oct 6, 2025
bneradt
reviewed
Oct 6, 2025
Comment on lines
+155
to
156
| return compressible_status_codes_.contains(status_code); | ||
| } |
…edicates and reserve space for host configurations
…or parameter detection
JakeChampion
force-pushed
the
jake/compress-swoc
branch
from
b310613 to
2190c85
Compare
JakeChampion
force-pushed
the
jake/compress-swoc
branch
from
938f3d0 to
80ffce1
Compare
|
@bneradt all looking good now on ci :D |
bneradt
requested changes
Oct 10, 2025
Comment on lines
42
to
+52
| { | ||
| using namespace std; | ||
|
|
||
| void | ||
| ltrim_if(string &s, int (*fp)(int)) | ||
| inline auto | ||
| make_char_predicate(int (*fp)(int)) | ||
| { | ||
| for (size_t i = 0; i < s.size();) { | ||
| if (fp(s[i])) { | ||
| s.erase(i, 1); | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
| return [fp](char c) -> bool { return fp(static_cast<unsigned char>(c)) != 0; }; | ||
| } | ||
|
|
||
| void | ||
| rtrim_if(string &s, int (*fp)(int)) | ||
| swoc::TextView | ||
| extractFirstToken(swoc::TextView &view, int (*fp)(int)) | ||
| { | ||
| for (ssize_t i = static_cast<ssize_t>(s.size()) - 1; i >= 0; i--) { | ||
| if (fp(s[i])) { | ||
| s.erase(i, 1); | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void | ||
| trim_if(string &s, int (*fp)(int)) | ||
| { | ||
| ltrim_if(s, fp); | ||
| rtrim_if(s, fp); | ||
| } | ||
|
|
||
| string | ||
| extractFirstToken(string &s, int (*fp)(int)) | ||
| { | ||
| int startTok{-1}, endTok{-1}, idx{0}; | ||
|
|
||
| for (;; ++idx) { | ||
| if (idx == int(s.length())) { | ||
| if (endTok < 0) { | ||
| endTok = idx; | ||
| } | ||
| break; | ||
| } else if (fp(s[idx])) { | ||
| if ((startTok >= 0) and (endTok < 0)) { | ||
| endTok = idx; | ||
| } | ||
| } else if (endTok > 0) { | ||
| break; | ||
| } else if (startTok < 0) { | ||
| startTok = idx; | ||
| } | ||
| } | ||
| auto predicate = make_char_predicate(fp); |
There was a problem hiding this comment.
I don't think you need make_char_predicate. You can just pass fp directly to your *_if TextView functions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I've been working on the compress plugin quite a lot recently and came to learn about libswoc from another pull-request i was doing, I thought it was a really good library and that this plugin might benefit from using more of it's utilities
most of these commits are likely able to be landed individually, if it would be better to open each one as a separate pull-request/patch i can do that☺️