Skip to content

perf: rebuild Multimap canonicalization without intermediate vectors/maps #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harshavardhana merged 1 commit into from
Jun 10, 2026
Merged

perf: rebuild Multimap canonicalization without intermediate vectors/maps #231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 37 additions & 45 deletions src/utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,18 +533,6 @@ std::list<std::string> Multimap::ToHttpHeaders() const {
return headers;
}

std::string Multimap::ToQueryString() const {
std::string query_string;
for (auto& [key, values] : map_) {
for (auto& value : values) {
std::string s = curlpp::escape(key) + "=" + curlpp::escape(value);
if (!query_string.empty()) query_string += "&";
query_string += s;
}
}
return query_string;
}

bool Multimap::Contains(std::string_view key) const {
return keys_.find(ToLower(std::string(key))) != keys_.end();
}
Expand Down Expand Up @@ -573,58 +561,62 @@ std::list<std::string> Multimap::Keys() const {
return keys;
}

std::string removeExtraSpaces(const std::string& s) {
std::string result;
result.reserve(s.size());
bool inSpace = false;

for (char c : s) {
if (c != ' ') {
if (inSpace && !result.empty()) result += ' ';
result += c;
inSpace = false;
} else {
inSpace = true;
}
}
return result;
}

void Multimap::GetCanonicalHeaders(std::string& signed_headers,
std::string& canonical_headers) const {
std::vector<std::string> signed_headerslist;
std::map<std::string, std::string> map;

for (const auto& [k, values] : map_) {
std::string key = ToLower(k);
if ("authorization" == key || "user-agent" == key) continue;
if (std::find(signed_headerslist.begin(), signed_headerslist.end(), key) ==
signed_headerslist.end()) {
signed_headerslist.push_back(key);
if (!signed_headers.empty()) {
signed_headers += ";";
canonical_headers += "\n";
}
signed_headers += key;

std::string value;
for (const auto& v : values) {
if (!value.empty()) value += ",";
value += utils::Trim(std::regex_replace(v, MULTI_SPACE_REGEX, " "));
value += removeExtraSpaces(v);
}

map[key] = value;
}

std::sort(signed_headerslist.begin(), signed_headerslist.end());
signed_headers = utils::Join(signed_headerslist, ";");

std::vector<std::string> canonical_headerslist;
for (auto& [key, value] : map) {
canonical_headerslist.push_back(key + ":" + value);
canonical_headers += key;
canonical_headers += ":";
canonical_headers += value;
Comment thread
jiuker marked this conversation as resolved.
}

std::sort(canonical_headerslist.begin(), canonical_headerslist.end());
canonical_headers = utils::Join(canonical_headerslist, "\n");
}

std::string Multimap::GetCanonicalQueryString() const {
std::vector<std::string> keys;
for (auto& [key, _] : map_) {
keys.push_back(key);
}

std::sort(keys.begin(), keys.end());
std::vector<std::string> values;
std::string query_string;
query_string.reserve(map_.size() * 30);

for (auto& key : keys) {
if (const auto i = map_.find(key); i != map_.cend()) {
for (auto& value : i->second) {
values.push_back(curlpp::escape(key) + "=" + curlpp::escape(value));
}
for (auto& [key, values] : map_) {
for (auto& value : values) {
if (!query_string.empty()) query_string += "&";
query_string += curlpp::escape(key);
query_string += '=';
query_string += curlpp::escape(value);
}
}
return query_string;
}

return utils::Join(values, "&");
std::string Multimap::ToQueryString() const {
return this->GetCanonicalQueryString();
}

error::Error CheckBucketName(std::string_view bucket_name, bool strict) {
Expand Down
Loading