From 6d21ea840265eac8fcbd7ef4a635f3ae858f376e Mon Sep 17 00:00:00 2001 From: Ahmad El Youssef Date: Fri, 6 Mar 2026 14:53:56 -0800 Subject: [PATCH] Reverting ucache_bench gen updates (#507) Summary: Reverting ucache_bench gen updates Differential Revision: D95604666 --- packages/ucache_bench/protocol/CMakeLists.txt | 1 + .../protocol/gen/UcacheBench.thrift | 123 +++++++++++++++++- .../protocol/gen/UcacheBenchMessages-inl.h | 120 +++++++++++++++++ .../gen/UcacheBenchMessagesThrift.cpp | 32 +++++ 4 files changed, 269 insertions(+), 7 deletions(-) diff --git a/packages/ucache_bench/protocol/CMakeLists.txt b/packages/ucache_bench/protocol/CMakeLists.txt index 1c31686e..f8248e75 100644 --- a/packages/ucache_bench/protocol/CMakeLists.txt +++ b/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 diff --git a/packages/ucache_bench/protocol/gen/UcacheBench.thrift b/packages/ucache_bench/protocol/gen/UcacheBench.thrift index 5b69f180..91c0a884 100644 --- a/packages/ucache_bench/protocol/gen/UcacheBench.thrift +++ b/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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 + void visitFields(V&& v); + template + void visitFields(V&& v) const; + + template + 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 } - diff --git a/packages/ucache_bench/protocol/gen/UcacheBenchMessages-inl.h b/packages/ucache_bench/protocol/gen/UcacheBenchMessages-inl.h index e9e8e155..68d8f7ea 100644 --- a/packages/ucache_bench/protocol/gen/UcacheBenchMessages-inl.h +++ b/packages/ucache_bench/protocol/gen/UcacheBenchMessages-inl.h @@ -26,6 +26,11 @@ void serialize(const UcacheBenchRequestCommon& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcacheBenchRequestCommon::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcacheBenchRequestCommon& self, V&& v) { if (!v.visitField(1, "productId", self.productId_ref())) { @@ -46,6 +51,16 @@ void visitFields(const UcacheBenchRequestCommon& self, V&& v) { } } +template +void UcacheBenchRequestCommon::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcacheBenchRequestCommon::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcacheBenchReplyCommon& self, Writer&& writer) { writer.writeStructBegin(); @@ -54,6 +69,11 @@ void serialize(const UcacheBenchReplyCommon& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcacheBenchReplyCommon::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcacheBenchReplyCommon& self, V&& v) { if (!v.visitField(1, "replySourceBitMask", *self.replySourceBitMask_ref())) { @@ -68,6 +88,16 @@ void visitFields(const UcacheBenchReplyCommon& self, V&& v) { } } +template +void UcacheBenchReplyCommon::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcacheBenchReplyCommon::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbGetRequest& self, Writer&& writer) { writer.writeStructBegin(); @@ -78,6 +108,11 @@ void serialize(const UcbGetRequest& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbGetRequest::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbGetRequest& self, V&& v) { if (v.enterMixin(1, "UcacheBenchRequestCommon", *self.ucacheBenchRequestCommon_ref())) { @@ -110,6 +145,16 @@ void visitFields(const UcbGetRequest& self, V&& v) { } } +template +void UcbGetRequest::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbGetRequest::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbGetReply& self, Writer&& writer) { writer.writeStructBegin(); @@ -124,6 +169,11 @@ void serialize(const UcbGetReply& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbGetReply::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbGetReply& self, V&& v) { if (v.enterMixin(1, "UcacheBenchReplyCommon", *self.ucacheBenchReplyCommon_ref())) { @@ -180,6 +230,16 @@ void visitFields(const UcbGetReply& self, V&& v) { } } +template +void UcbGetReply::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbGetReply::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbSetRequest& self, Writer&& writer) { writer.writeStructBegin(); @@ -192,6 +252,11 @@ void serialize(const UcbSetRequest& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbSetRequest::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbSetRequest& self, V&& v) { if (v.enterMixin(1, "UcacheBenchRequestCommon", *self.ucacheBenchRequestCommon_ref())) { @@ -236,6 +301,16 @@ void visitFields(const UcbSetRequest& self, V&& v) { } } +template +void UcbSetRequest::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbSetRequest::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbSetReply& self, Writer&& writer) { writer.writeStructBegin(); @@ -249,6 +324,11 @@ void serialize(const UcbSetReply& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbSetReply::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbSetReply& self, V&& v) { if (v.enterMixin(1, "UcacheBenchReplyCommon", *self.ucacheBenchReplyCommon_ref())) { @@ -299,6 +379,16 @@ void visitFields(const UcbSetReply& self, V&& v) { } } +template +void UcbSetReply::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbSetReply::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbDeleteRequest& self, Writer&& writer) { writer.writeStructBegin(); @@ -309,6 +399,11 @@ void serialize(const UcbDeleteRequest& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbDeleteRequest::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbDeleteRequest& self, V&& v) { if (v.enterMixin(1, "UcacheBenchRequestCommon", *self.ucacheBenchRequestCommon_ref())) { @@ -341,6 +436,16 @@ void visitFields(const UcbDeleteRequest& self, V&& v) { } } +template +void UcbDeleteRequest::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbDeleteRequest::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + template void serialize(const UcbDeleteReply& self, Writer&& writer) { writer.writeStructBegin(); @@ -353,6 +458,11 @@ void serialize(const UcbDeleteReply& self, Writer&& writer) { writer.writeStructEnd(); } +template +void UcbDeleteReply::serialize(Writer&& writer) const { + facebook::ucachebench::thrift::serialize(*this, std::forward(writer)); +} + template void visitFields(UcbDeleteReply& self, V&& v) { if (v.enterMixin(1, "UcacheBenchReplyCommon", *self.ucacheBenchReplyCommon_ref())) { @@ -396,6 +506,16 @@ void visitFields(const UcbDeleteReply& self, V&& v) { return; } } + +template +void UcbDeleteReply::visitFields(V&& v) { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} + +template +void UcbDeleteReply::visitFields(V&& v) const { + facebook::ucachebench::thrift::visitFields(*this, std::forward(v)); +} } // namespace thrift } // namespace ucachebench } // namespace facebook diff --git a/packages/ucache_bench/protocol/gen/UcacheBenchMessagesThrift.cpp b/packages/ucache_bench/protocol/gen/UcacheBenchMessagesThrift.cpp index 47b0db73..4b1a0677 100644 --- a/packages/ucache_bench/protocol/gen/UcacheBenchMessagesThrift.cpp +++ b/packages/ucache_bench/protocol/gen/UcacheBenchMessagesThrift.cpp @@ -49,6 +49,10 @@ void deserialize(UcacheBenchRequestCommon& self, carbon::CarbonProtocolReader& r reader.readStructEnd(); } +void UcacheBenchRequestCommon::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcacheBenchReplyCommon& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -74,6 +78,10 @@ void deserialize(UcacheBenchReplyCommon& self, carbon::CarbonProtocolReader& rea reader.readStructEnd(); } +void UcacheBenchReplyCommon::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbGetRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -107,6 +115,10 @@ void deserialize(UcbGetRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructEnd(); } +void UcbGetRequest::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbGetReply& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -156,6 +168,10 @@ void deserialize(UcbGetReply& self, carbon::CarbonProtocolReader& reader) { reader.readStructEnd(); } +void UcbGetReply::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbSetRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -197,6 +213,10 @@ void deserialize(UcbSetRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructEnd(); } +void UcbSetRequest::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbSetReply& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -242,6 +262,10 @@ void deserialize(UcbSetReply& self, carbon::CarbonProtocolReader& reader) { reader.readStructEnd(); } +void UcbSetReply::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbDeleteRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -275,6 +299,10 @@ void deserialize(UcbDeleteRequest& self, carbon::CarbonProtocolReader& reader) { reader.readStructEnd(); } +void UcbDeleteRequest::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} + void deserialize(UcbDeleteReply& self, carbon::CarbonProtocolReader& reader) { reader.readStructBegin(); while (true) { @@ -315,6 +343,10 @@ void deserialize(UcbDeleteReply& self, carbon::CarbonProtocolReader& reader) { } reader.readStructEnd(); } + +void UcbDeleteReply::deserialize(carbon::CarbonProtocolReader& reader) { + facebook::ucachebench::thrift::deserialize(*this, reader); +} } // namespace thrift } // namespace ucachebench } // namespace facebook