HTTPHeaders replace folly::StringPiece w/ std::string_view

hanidamlaj · meta-codesync[bot] · commit 30c192513cdd · 2026-03-09T20:24:44.000-07:00
Summary: as title indicates, this diff migrates all folly::StringPiece decls in HTTPHeaders w/ std::string_view

Reviewed By: sharmafb

Differential Revision: D95121210

fbshipit-source-id: a88c48815bc99a07ff283fd7de5f710031305fba
diff --git a/proxygen/lib/http/HTTPHeaders.cpp b/proxygen/lib/http/HTTPHeaders.cpp
@@ -86,7 +86,7 @@ HTTPHeaders::HTTPHeaders() : deletedCount_(0) {
   resize(kInitialVectorReserve);
 }
 
-void HTTPHeaders::add(folly::StringPiece name, std::string&& value) {
+void HTTPHeaders::add(std::string_view name, std::string&& value) {
   assert(name.size());
   const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
   auto namePtr =
@@ -108,7 +108,7 @@ void HTTPHeaders::add(HTTPHeaders::headers_initializer_list l) {
   }
 }
 
-bool HTTPHeaders::exists(folly::StringPiece name) const {
+bool HTTPHeaders::exists(std::string_view name) const {
   const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
   if (code != HTTP_HEADER_OTHER) {
     return exists(code);
@@ -130,16 +130,16 @@ size_t HTTPHeaders::getNumberOfValues(HTTPHeaderCode code) const {
   return count;
 }
 
-size_t HTTPHeaders::getNumberOfValues(folly::StringPiece name) const {
+size_t HTTPHeaders::getNumberOfValues(std::string_view name) const {
   size_t count = 0;
-  forEachValueOfHeader(name, [&](folly::StringPiece /*value*/) -> bool {
+  forEachValueOfHeader(name, [&](std::string_view) -> bool {
     ++count;
     return false;
   });
   return count;
 }
 
-bool HTTPHeaders::remove(folly::StringPiece name) {
+bool HTTPHeaders::remove(std::string_view name) {
   const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
   if (code != HTTP_HEADER_OTHER) {
     return remove(code);
@@ -165,7 +165,7 @@ bool HTTPHeaders::remove(HTTPHeaderCode code) {
 }
 
 bool HTTPHeaders::removeAllVersions(HTTPHeaderCode code,
-                                    folly::StringPiece name) {
+                                    std::string_view name) {
   bool removed = false;
   if (code != HTTP_HEADER_OTHER) {
     removed = remove(code);
@@ -261,7 +261,7 @@ size_t HTTPHeaders::size() const {
   return length_ - deletedCount_;
 }
 
-bool HTTPHeaders::transferHeaderIfPresent(folly::StringPiece name,
+bool HTTPHeaders::transferHeaderIfPresent(std::string_view name,
                                           HTTPHeaders& strippedHeaders) {
   bool transferred = false;
   const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
@@ -388,7 +388,7 @@ HTTPHeaders::SingleOrNullptrResult HTTPHeaders::getSingleOrNullptr(
 }
 
 HTTPHeaders::SingleOrNullptrResult HTTPHeaders::getSingleOrNullptr(
-    folly::StringPiece name) const noexcept {
+    std::string_view name) const noexcept {
   SingleOrNullptrResult res;
   forEachValueOfHeader(name, [&](const std::string& value) -> bool {
     res.value = (res.value == nullptr) ? &value : nullptr;
@@ -401,8 +401,7 @@ HTTPHeaders::SingleOrNullptrResult HTTPHeaders::getSingleOrNullptr(
 const std::string& HTTPHeaders::getSingleOrEmpty(HTTPHeaderCode code) const {
   return *getSingleOrNullptr(code);
 }
-const std::string& HTTPHeaders::getSingleOrEmpty(
-    folly::StringPiece name) const {
+const std::string& HTTPHeaders::getSingleOrEmpty(std::string_view name) const {
   return *getSingleOrNullptr(name);
 }
 
@@ -507,7 +506,7 @@ void HTTPHeaders::forEachWithCode(const ForEachWithCodeFnT& func) const {
 }
 
 bool HTTPHeaders::forEachValueOfHeader(
-    folly::StringPiece name, const ForEachValueOfHeaderFnT& func) const {
+    std::string_view name, const ForEachValueOfHeaderFnT& func) const {
   const HTTPHeaderCode code = HTTPCommonHeaders::hash(name.data(), name.size());
   if (code != HTTPHeaderCode::HTTP_HEADER_OTHER) {
     return forEachValueOfHeader(code, func);
diff --git a/proxygen/lib/http/HTTPHeaders.h b/proxygen/lib/http/HTTPHeaders.h
@@ -72,7 +72,7 @@ class HTTPHeaders {
   struct HTTPHeaderName {
     enum Type { CODE, STRING };
     union {
-      folly::StringPiece name_;
+      std::string_view name_;
       HTTPHeaderCode code_;
     };
     Type type_;
@@ -82,13 +82,13 @@ class HTTPHeaders {
     /* implicit */ HTTPHeaderName(const char* name)
         : name_(name), type_(STRING) {
     }
-    /* implicit */ HTTPHeaderName(folly::StringPiece name)
+    /* implicit */ HTTPHeaderName(std::string_view name)
         : name_(name), type_(STRING) {
     }
   };
 
   using headers_initializer_list =
-      std::initializer_list<std::pair<HTTPHeaderName, folly::StringPiece>>;
+      std::initializer_list<std::pair<HTTPHeaderName, std::string_view>>;
 
   /*
    * separator used to concatenate multiple values of the same header
@@ -107,28 +107,20 @@ class HTTPHeaders {
    * Add the header 'name' with value 'value'; if other instances of this
    * header name exist, they will be retained.
    */
-  void add(folly::StringPiece name, std::string&& value);
-  void add(folly::StringPiece name, const std::string& value) {
+  void add(std::string_view name, std::string&& value);
+  void add(std::string_view name, std::string_view value) {
     add(name, std::string(value));
   }
-  void add(folly::StringPiece name, folly::StringPiece value) {
-    add(name, std::string(value));
-  }
-  // TODO(@damlaj): remove this fn & patch up all callsites
-  void add(folly::StringPiece name, const char* value) {
-    return add(name, std::string(value));
+  FOLLY_ALWAYS_INLINE void add(std::string_view name, const char* value) {
+    return add(name, std::string_view{value});
   }
 
   void add(HTTPHeaderCode code, std::string&& value);
-  void add(HTTPHeaderCode code, const std::string& value) {
+  void add(HTTPHeaderCode code, std::string_view value) {
     add(code, std::string(value));
   }
-  void add(HTTPHeaderCode code, folly::StringPiece value) {
-    add(code, std::string(value));
-  }
-  // TODO(@damlaj): remove this fn & patch up all callsites
-  void add(HTTPHeaderCode code, const char* value) {
-    return add(code, std::string(value));
+  FOLLY_ALWAYS_INLINE void add(HTTPHeaderCode code, const char* value) {
+    return add(code, std::string_view{value});
   }
 
   void add(headers_initializer_list l);
@@ -137,12 +129,12 @@ class HTTPHeaders {
    * For the header 'name', set its value to the single header 'value',
    * removing any other instances of this header.
    */
-  void set(folly::StringPiece name, const std::string& value) {
+  void set(std::string_view name, std::string_view value) {
     // this could be somewhat optimized but probably not an issue yet
     remove(name);
     add(name, value);
   }
-  void set(HTTPHeaderCode code, const std::string& value) {
+  void set(HTTPHeaderCode code, std::string_view value) {
     remove(code);
     add(code, value);
   }
@@ -153,21 +145,18 @@ class HTTPHeaders {
    * argument it will remove x-y_z, x_y-z and x_y_z too and then set the given
    * header name, value.
    */
-  void setOneVersion(folly::StringPiece name,
+  void setOneVersion(std::string_view name,
                      HTTPHeaderCode code,
-                     const std::string& value) {
+                     std::string_view value) {
     removeAllVersions(code, name);
     add(name, value);
   }
 
   /**
    * Do we have an instance of the given header?
    */
-  [[nodiscard]] bool exists(folly::StringPiece name) const;
+  [[nodiscard]] bool exists(std::string_view name) const;
   [[nodiscard]] bool exists(HTTPHeaderCode code) const;
-  bool rawExists(std::string& name) const {
-    return exists(name);
-  }
 
   /**
    * combine all the value for this header into a string
@@ -253,7 +242,7 @@ class HTTPHeaders {
   [[nodiscard]] SingleOrNullptrResult getSingleOrNullptr(
       HTTPHeaderCode code) const noexcept;
   [[nodiscard]] SingleOrNullptrResult getSingleOrNullptr(
-      folly::StringPiece name) const noexcept;
+      std::string_view name) const noexcept;
 
   /**
    * Returns the value of the header if it's found in the message and is the
@@ -262,7 +251,7 @@ class HTTPHeaders {
    */
   [[nodiscard]] const std::string& getSingleOrEmpty(HTTPHeaderCode code) const;
   [[nodiscard]] const std::string& getSingleOrEmpty(
-      folly::StringPiece name) const;
+      std::string_view name) const;
   [[nodiscard]] const std::string rawGet(const std::string& header) const {
     return getSingleOrEmpty(header);
   }
@@ -271,7 +260,7 @@ class HTTPHeaders {
    * Get the number of values corresponding to a given header name.
    */
   [[nodiscard]] size_t getNumberOfValues(HTTPHeaderCode code) const;
-  [[nodiscard]] size_t getNumberOfValues(folly::StringPiece name) const;
+  [[nodiscard]] size_t getNumberOfValues(std::string_view name) const;
 
   /**
    * Process the ordered list of values for the given header name:
@@ -286,7 +275,7 @@ class HTTPHeaders {
    * true), and false otherwise.
    */
   using ForEachValueOfHeaderFnT = std::function<bool(const std::string&)>;
-  bool forEachValueOfHeader(folly::StringPiece name,
+  bool forEachValueOfHeader(std::string_view name,
                             const ForEachValueOfHeaderFnT& func) const;
   bool forEachValueOfHeader(HTTPHeaderCode code,
                             const ForEachValueOfHeaderFnT& func) const;
@@ -295,7 +284,7 @@ class HTTPHeaders {
    * Remove all instances of the given header, returning true if anything was
    * removed and false if this header didn't exist in our set.
    */
-  bool remove(folly::StringPiece name);
+  bool remove(std::string_view name);
   bool remove(HTTPHeaderCode code);
   void rawRemove(const std::string& name) {
     remove(name);
@@ -305,7 +294,7 @@ class HTTPHeaders {
    * Remove all possible versions of header eg. if x-y-z is the
    * argument it will remove x-y_z, x_y-z and x_y_z too.
    */
-  bool removeAllVersions(HTTPHeaderCode code, folly::StringPiece name);
+  bool removeAllVersions(HTTPHeaderCode code, std::string_view name);
 
   /**
    * Remove all headers.
@@ -365,7 +354,7 @@ class HTTPHeaders {
    * group.  No-op if the header doesn't exist.  Returns true if header(s) were
    * moved.
    */
-  bool transferHeaderIfPresent(folly::StringPiece name, HTTPHeaders& dest);
+  bool transferHeaderIfPresent(std::string_view name, HTTPHeaders& dest);
 
   // deletes the strings in headerNames_ that we own
   void disposeOfHeaderNames();
diff --git a/proxygen/lib/http/test/HTTPMessageTest.cpp b/proxygen/lib/http/test/HTTPMessageTest.cpp
@@ -560,12 +560,12 @@ TEST(HTTPHeaders, InitializerList) {
   EXPECT_EQ("x", hdrs.getSingleOrEmpty(HTTP_HEADER_SERVER));
 }
 
-TEST(HTTPHeaders, InitializerListStringPiece) {
+TEST(HTTPHeaders, InitializerListStringView) {
   HTTPHeaders hdrs;
 
   const char* foo = "name:value";
   folly::StringPiece str(foo);
-  folly::StringPiece name = str.split_step(':');
+  std::string_view name = str.split_step(':');
   hdrs.add({{name, str}, {HTTP_HEADER_CONNECTION, str}});
 
   EXPECT_EQ("value", hdrs.getSingleOrEmpty("name"));
