drop _ref() in RpcMetadataUtil

Summary: `field()` and `field_ref()` are the same thing in this context, we can drop `_ref()` for clarity. Reviewed By: robertroeser Differential Revision: D63398091 fbshipit-source-id: ec304938e07f88c45efb630ba0e03d6120730363
facebook · Sep 25, 2024 · 1bec44a · 1bec44a
1 parent 7589ba4
commit 1bec44a
Showing 1 changed file with 25 additions and 26 deletions.
diff --git a/thrift/lib/cpp2/transport/core/RpcMetadataUtil.cpp b/thrift/lib/cpp2/transport/core/RpcMetadataUtil.cpp
@@ -42,29 +42,28 @@ RequestRpcMetadata makeRequestRpcMetadata(
     std::variant<InteractionCreate, int64_t, std::monostate> interactionHandle,
     transport::THeader& header) {
   RequestRpcMetadata metadata;
-  metadata.protocol_ref() = protocolId;
-  metadata.kind_ref() = kind;
-  metadata.name_ref() = ManagedStringViewWithConversions(std::move(methodName));
+  metadata.protocol() = protocolId;
+  metadata.kind() = kind;
+  metadata.name() = ManagedStringViewWithConversions(std::move(methodName));
 
   if (!rpcOptions.getClientOnlyTimeouts()) {
     if (clientTimeout.has_value()) {
-      metadata.clientTimeoutMs_ref() = clientTimeout->count();
+      metadata.clientTimeoutMs() = clientTimeout->count();
     }
     if (rpcOptions.getQueueTimeout() > std::chrono::milliseconds::zero()) {
-      metadata.queueTimeoutMs_ref() = rpcOptions.getQueueTimeout().count();
+      metadata.queueTimeoutMs() = rpcOptions.getQueueTimeout().count();
     }
   }
 
   if (rpcOptions.getPriority() < concurrency::N_PRIORITIES) {
-    metadata.priority_ref() =
-        static_cast<RpcPriority>(rpcOptions.getPriority());
+    metadata.priority() = static_cast<RpcPriority>(rpcOptions.getPriority());
   }
   if (header.getCrc32c().has_value()) {
-    metadata.crc32c_ref() = header.getCrc32c().value();
+    metadata.crc32c() = header.getCrc32c().value();
   }
   // add user specified compression settings to metadata
   if (auto compressionConfig = header.getDesiredCompressionConfig()) {
-    metadata.compressionConfig_ref() = *compressionConfig;
+    metadata.compressionConfig() = *compressionConfig;
   }
 
   auto writeHeaders = header.releaseWriteHeaders();
@@ -78,32 +77,32 @@ RequestRpcMetadata makeRequestRpcMetadata(
   }
 
   if (const auto& clientId = header.clientId()) {
-    metadata.clientId_ref() = *clientId;
+    metadata.clientId() = *clientId;
   }
 
   if (const auto& serviceTraceMeta = header.serviceTraceMeta()) {
-    metadata.serviceTraceMeta_ref() = *serviceTraceMeta;
+    metadata.serviceTraceMeta() = *serviceTraceMeta;
   }
 
   if (const auto& tenantId = header.tenantId()) {
-    metadata.tenantId_ref() = *tenantId;
+    metadata.tenantId() = *tenantId;
   }
 
   auto loadIt = writeHeaders.find(transport::THeader::QUERY_LOAD_HEADER);
   if (loadIt != writeHeaders.end()) {
-    metadata.loadMetric_ref() = std::move(loadIt->second);
+    metadata.loadMetric() = std::move(loadIt->second);
     writeHeaders.erase(loadIt);
   }
 
   if (!writeHeaders.empty()) {
-    metadata.otherMetadata_ref() = std::move(writeHeaders);
+    metadata.otherMetadata() = std::move(writeHeaders);
   }
 
   if (rpcOptions.getContextPropMask()) {
     folly::dynamic logMessages = folly::dynamic::object();
     auto frameworkMetadata = makeFrameworkMetadata(rpcOptions, logMessages);
     if (frameworkMetadata) {
-      metadata.frameworkMetadata_ref() = std::move(frameworkMetadata);
+      metadata.frameworkMetadata() = std::move(frameworkMetadata);
     }
     if (!logMessages.empty()) {
       THRIFT_APPLICATION_EVENT(framework_metadata_construction).log([&] {
@@ -128,18 +127,18 @@ RequestRpcMetadata makeRequestRpcMetadata(
 
 void fillTHeaderFromResponseRpcMetadata(
     ResponseRpcMetadata& responseMetadata, transport::THeader& header) {
-  if (responseMetadata.otherMetadata_ref()) {
-    header.setReadHeaders(std::move(*responseMetadata.otherMetadata_ref()));
+  if (responseMetadata.otherMetadata()) {
+    header.setReadHeaders(std::move(*responseMetadata.otherMetadata()));
   }
-  if (auto load = responseMetadata.load_ref()) {
+  if (auto load = responseMetadata.load()) {
     header.setServerLoad(*load);
     header.setReadHeader(
         transport::THeader::QUERY_LOAD_HEADER, folly::to<std::string>(*load));
   }
-  if (auto crc32c = responseMetadata.crc32c_ref()) {
+  if (auto crc32c = responseMetadata.crc32c()) {
     header.setCrc32c(*crc32c);
   }
-  if (auto compression = responseMetadata.compression_ref()) {
+  if (auto compression = responseMetadata.compression()) {
     // for fb internal logging purpose only; does not actually do transformation
     // based on THeader
     transport::THeader::TRANSFORMS transform;
@@ -158,10 +157,10 @@ void fillTHeaderFromResponseRpcMetadata(
       header.setReadTransform(static_cast<uint16_t>(transform));
     }
   }
-  if (auto queueMetadata = responseMetadata.queueMetadata_ref()) {
+  if (auto queueMetadata = responseMetadata.queueMetadata()) {
     header.setProcessDelay(
-        std::chrono::milliseconds(*queueMetadata->queueingTimeMs_ref()));
-    if (auto queueTimeout = queueMetadata->queueTimeoutMs_ref()) {
+        std::chrono::milliseconds(*queueMetadata->queueingTimeMs()));
+    if (auto queueTimeout = queueMetadata->queueTimeoutMs()) {
       header.setServerQueueTimeout(std::chrono::milliseconds(*queueTimeout));
     }
   }
@@ -173,14 +172,14 @@ void fillResponseRpcMetadataFromTHeader(
   {
     auto loadIt = otherMetadata.find(transport::THeader::QUERY_LOAD_HEADER);
     if (loadIt != otherMetadata.end()) {
-      responseMetadata.load_ref() = folly::to<int64_t>(loadIt->second);
+      responseMetadata.load() = folly::to<int64_t>(loadIt->second);
       otherMetadata.erase(loadIt);
     }
   }
   if (auto crc32c = header.getCrc32c()) {
-    responseMetadata.crc32c_ref() = *crc32c;
+    responseMetadata.crc32c() = *crc32c;
   }
-  responseMetadata.otherMetadata_ref() = std::move(otherMetadata);
+  responseMetadata.otherMetadata() = std::move(otherMetadata);
 }
 
 std::string serializeErrorClassification(ErrorClassification ec) {