Reverting ucache_bench gen updates

Summary: Reverting ucache_bench gen updates

Differential Revision: D95604666

Author: ahmadelyoussef

packages/ucache_bench/protocol/CMakeLists.txt

@@ -153,6 +153,7 @@ set(PROTOCOL_HEADERS
     gen/UcacheBenchMessages-inl.h
     gen/UcacheBenchRouteHandleIf.h
     gen/UcacheBenchRouterInfo.h
+    gen/UcacheBenchRouterInfoFwd.h
     gen/UcacheBenchRouterStats.h
     gen/UcacheBenchRoutingGroups.h
     gen/UcacheBenchServer.h

packages/ucache_bench/protocol/gen/UcacheBench.thrift

@@ -24,16 +24,61 @@ namespace cpp2 facebook.ucachebench.thrift
 namespace py3 facebook.ucachebench.thrift
 namespace hack ucachebench
 
+@thrift.DeprecatedUnvalidatedAnnotations{
+  items = {
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+"
+  },
+}
 struct UcacheBenchRequestCommon {
   1: optional i64 productId
   2: optional string bucketId
 }
+@thrift.DeprecatedUnvalidatedAnnotations{
+  items = {
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+"
+  },
+}
 struct UcacheBenchReplyCommon {
   1: carbon.ui32 replySourceBitMask
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbGetRequest {
@@ -44,7 +89,20 @@ struct UcbGetRequest {
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbGetReply {
@@ -59,7 +117,20 @@ struct UcbGetReply {
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbSetRequest {
@@ -72,7 +143,20 @@ struct UcbSetRequest {
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbSetReply {
@@ -86,7 +170,20 @@ struct UcbSetReply {
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbDeleteRequest {
@@ -97,7 +194,20 @@ struct UcbDeleteRequest {
 }
 @thrift.DeprecatedUnvalidatedAnnotations{
   items = {
-    "cpp.virtual": "1"
+    "cpp.methods": "
+  template <class V>
+  void visitFields(V&& v);
+  template <class V>
+  void visitFields(V&& v) const;
+
+  template <class Writer>
+  void serialize(Writer&& writer) const;
+
+  void deserialize(carbon::CarbonProtocolReader& reader);
+
+",
+"cpp.virtual": "1"
+
   },
 }
 struct UcbDeleteReply {
@@ -108,4 +218,3 @@ struct UcbDeleteReply {
   3: string message
   4: i16 appSpecificErrorCode
 }
-