Support MultiFlatMap

apache · Apr 14, 2024 · 7abda2b · 7abda2b
1 parent 30ed3aa
commit 7abda2b
Show file tree

Hide file tree

Showing 9 changed files with 474 additions and 175 deletions.
diff --git a/src/brpc/details/http_message.cpp b/src/brpc/details/http_message.cpp
@@ -105,7 +105,7 @@ int HttpMessage::on_header_value(http_parser *parser,
                 &header.GetOrAddHeader(http_message->_cur_header);
         } else {
             http_message->_cur_value =
-                &header.GetNewHeader(http_message->_cur_header);
+                &header.AddHeader(http_message->_cur_header);
         }
         if (http_message->_cur_value && !http_message->_cur_value->empty()) {
             http_message->_cur_value->append(

diff --git a/src/brpc/http_header.cpp b/src/brpc/http_header.cpp
@@ -30,7 +30,8 @@ HttpHeader::HttpHeader()
     : _status_code(HTTP_STATUS_OK)
     , _method(HTTP_METHOD_GET)
     , _version(1, 1)
-    , _first_set_cookie_iter(_headers.end()) {
+    , _first_set_cookie(NULL) {
+    CHECK_EQ(0, _headers.init(29));
     // NOTE: don't forget to clear the field in Clear() as well.
 }
 
@@ -55,21 +56,18 @@ void HttpHeader::Clear() {
 }
 
 const std::string* HttpHeader::GetHeader(const char* key) const {
-    HeaderIterator iter;
-    if (IsSetCookie(key)) {
-        iter = _first_set_cookie_iter;
-    } else {
-        iter = _headers.find(key);
-    }
-    return iter != _headers.end() ? &iter->second : NULL;
+    return GetHeader(std::string(key));
 }
 
 const std::string* HttpHeader::GetHeader(const std::string& key) const {
-    return GetHeader(key.c_str());
+    if (IsSetCookie(key)) {
+        return _first_set_cookie;
+    }
+    std::string* val = _headers.seek(key);
+    return val;
 }
 
-std::vector<const std::string*>
-HttpHeader::GetAllSetCookieHeader() const {
+std::vector<const std::string*> HttpHeader::GetAllSetCookieHeader() const {
     return GetMultiLineHeaders(SET_COOKIE);
 }
 
@@ -95,7 +93,7 @@ void HttpHeader::RemoveHeader(const char* key) {
     } else {
         _headers.erase(key);
         if (IsSetCookie(key)) {
-            _first_set_cookie_iter = _headers.end();
+            _first_set_cookie = NULL;
         }
     }
 }
@@ -104,7 +102,7 @@ void HttpHeader::AppendHeader(const std::string& key,
     const butil::StringPiece& value) {
     if (!CanFoldedInLine(key)) {
         // Add a new Set-Cookie header field.
-        std::string& slot = GetNewHeader(key);
+        std::string& slot = AddHeader(key);
         slot.assign(value.data(), value.size());
     } else {
         std::string& slot = GetOrAddHeader(key);
@@ -133,26 +131,26 @@ std::string& HttpHeader::GetOrAddHeader(const std::string& key) {
 
     bool is_set_cookie = IsSetCookie(key);
     // Only returns the first Set-Cookie header field for compatibility.
-    if (is_set_cookie && _first_set_cookie_iter != _headers.end()) {
-        return _first_set_cookie_iter->second;
+    if (is_set_cookie && NULL != _first_set_cookie) {
+        return *_first_set_cookie;
     }
 
-    auto iter = _headers.find(key);
-    if (iter == _headers.end()) {
-        iter = _headers.insert({ key, "" });
-    }
-    if (is_set_cookie) {
-        _first_set_cookie_iter = iter;
+    std::string* val = _headers.seek(key);
+    if (NULL == val) {
+        val = _headers.insert({ key, "" });
+        if (is_set_cookie) {
+            _first_set_cookie = val;
+        }
     }
-    return iter->second;
+    return *val;
 }
 
-std::string& HttpHeader::GetNewHeader(const std::string& key) {
-    auto iter = _headers.insert({ key, "" });
-    if (IsSetCookie(key) && _first_set_cookie_iter == _headers.end()) {
-        _first_set_cookie_iter = iter;
+std::string& HttpHeader::AddHeader(const std::string& key) {
+    std::string* val = _headers.insert({ key, "" });
+    if (IsSetCookie(key) && NULL == _first_set_cookie) {
+        _first_set_cookie = val;
     }
-    return iter->second;
+    return *val;
 }
 
 const HttpHeader& DefaultHttpHeader() {

diff --git a/src/brpc/http_header.h b/src/brpc/http_header.h
@@ -41,10 +41,7 @@ class H2StreamContext;
 // Non-body part of a HTTP message.
 class HttpHeader {
 public:
-    typedef std::unordered_multimap<
-        std::string, std::string,
-        butil::CaseIgnoredHasher,
-        butil::CaseIgnoredEqual> HeaderMap;
+    typedef butil::CaseIgnoredMultiFlatMap<std::string> HeaderMap;
     typedef HeaderMap::const_iterator HeaderIterator;
     typedef HeaderMap::key_equal HeaderKeyEqual;
 
@@ -173,7 +170,7 @@ friend void policy::ProcessHttpRequest(InputMessageBase *msg);
 
     std::string& GetOrAddHeader(const std::string& key);
 
-    std::string& GetNewHeader(const std::string& key);
+    std::string& AddHeader(const std::string& key);
 
     bool IsSetCookie(const std::string& key) const {
         return _header_key_equal(key, SET_COOKIE);
@@ -206,7 +203,7 @@ friend void policy::ProcessHttpRequest(InputMessageBase *msg);
     std::string _content_type;
     std::string _unresolved_path;
     std::pair<int, int> _version;
-    HeaderMap::iterator _first_set_cookie_iter;
+    std::string* _first_set_cookie;
 };
 
 const HttpHeader& DefaultHttpHeader();

diff --git a/src/butil/containers/case_ignored_flat_map.h b/src/butil/containers/case_ignored_flat_map.h
@@ -68,6 +68,10 @@ class CaseIgnoredFlatMap : public butil::FlatMap<
 class CaseIgnoredFlatSet : public butil::FlatSet<
     std::string, CaseIgnoredHasher, CaseIgnoredEqual> {};
 
+template <typename T>
+class CaseIgnoredMultiFlatMap : public butil::FlatMap<
+    std::string, T, CaseIgnoredHasher, CaseIgnoredEqual, false, PtAllocator, true> {};
+
 } // namespace butil
 
 #endif  // BUTIL_CASE_IGNORED_FLAT_MAP_H