Skip to content

Commit 13b697d

Browse files
iahsmeta-codesync[bot]
iahs
authored and
meta-codesync[bot]
committed
Replace unstructured "thread" annotation in Thrift output
Summary: X-link: facebookresearch/DCPerf#501 Migrates to supported structured annotation Reviewed By: aristidisp Differential Revision: D95448139 fbshipit-source-id: b43aa45000faafb64127260b86e95c616cd7b626
1 parent f99cbf3 commit 13b697d

5 files changed

Lines changed: 60 additions & 30 deletions

File tree

‎third-party/mcrouter/src/mcrouter/lib/carbon/example/gen/HelloGoodbyeService.thrift‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ namespace cpp2 hellogoodbye.thrift
2424
namespace py3 hellogoodbye.thrift
2525

2626
service HelloGoodbye extends fb303.FacebookService {
27-
HelloGoodbye_GoodbyeReply goodbye(1: HelloGoodbye_GoodbyeRequest request) (thread = "eb")
28-
HelloGoodbye_HelloReply hello(1: HelloGoodbye_HelloRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
29-
Common_McVersionReply mcVersion(1: Common_McVersionRequest request) (thread = "eb")
27+
@cpp.ProcessInEbThreadUnsafe
28+
HelloGoodbye_GoodbyeReply goodbye(1: HelloGoodbye_GoodbyeRequest request)
29+
@cpp.ProcessInEbThreadUnsafe
30+
HelloGoodbye_HelloReply hello(1: HelloGoodbye_HelloRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
31+
@cpp.ProcessInEbThreadUnsafe
32+
Common_McVersionReply mcVersion(1: Common_McVersionRequest request)
3033
}
3134

3235
@cpp.Type{name = "hellogoodbye::GoodbyeReply"}

‎third-party/mcrouter/src/mcrouter/lib/carbon/test/gen/AService.thrift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ namespace cpp2 carbon.test.A.thrift
2424
namespace py3 carbon.test.A.thrift
2525

2626
service A extends fb303.FacebookService {
27-
A_TestAReply testA(1: A_TestARequest request) (thread = "eb")
28-
Common_McVersionReply mcVersion(1: Common_McVersionRequest request) (thread = "eb")
27+
@cpp.ProcessInEbThreadUnsafe
28+
A_TestAReply testA(1: A_TestARequest request)
29+
@cpp.ProcessInEbThreadUnsafe
30+
Common_McVersionReply mcVersion(1: Common_McVersionRequest request)
2931
}
3032

3133
@cpp.Type{name = "carbon::test::A::TestAReply"}

‎third-party/mcrouter/src/mcrouter/lib/carbon/test/gen/BService.thrift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ namespace cpp2 carbon.test.B.thrift
2424
namespace py3 carbon.test.B.thrift
2525

2626
service B extends fb303.FacebookService {
27-
B_TestBReply testB(1: B_TestBRequest request) (thread = "eb")
28-
Common_McVersionReply mcVersion(1: Common_McVersionRequest request) (thread = "eb")
27+
@cpp.ProcessInEbThreadUnsafe
28+
B_TestBReply testB(1: B_TestBRequest request)
29+
@cpp.ProcessInEbThreadUnsafe
30+
Common_McVersionReply mcVersion(1: Common_McVersionRequest request)
2931
}
3032

3133
@cpp.Type{name = "carbon::test::B::TestBReply"}

‎third-party/mcrouter/src/mcrouter/lib/carbon/test/gen/CarbonTestService.thrift‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ namespace cpp2 carbon.test.thrift
2424
namespace py3 carbon.test.thrift
2525

2626
service CarbonTest extends fb303.FacebookService {
27-
CarbonTest_TestReply test(1: CarbonTest_TestRequest request) (thread = "eb")
28-
CarbonTest_TestReplyStringKey testStringKey(1: CarbonTest_TestRequestStringKey request) (thread = "eb")
29-
Common_McVersionReply mcVersion(1: Common_McVersionRequest request) (thread = "eb")
27+
@cpp.ProcessInEbThreadUnsafe
28+
CarbonTest_TestReply test(1: CarbonTest_TestRequest request)
29+
@cpp.ProcessInEbThreadUnsafe
30+
CarbonTest_TestReplyStringKey testStringKey(1: CarbonTest_TestRequestStringKey request)
31+
@cpp.ProcessInEbThreadUnsafe
32+
Common_McVersionReply mcVersion(1: Common_McVersionRequest request)
3033
}
3134

3235
@cpp.Type{name = "carbon::test::TestReply"}

‎third-party/mcrouter/src/mcrouter/lib/network/gen/MemcacheService.thrift‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,46 @@ namespace cpp2 facebook.memcache.thrift
2222
namespace py3 facebook.memcache.thrift
2323

2424
service Memcache {
25-
Memcache_McAddReply mcAdd(1: Memcache_McAddRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
26-
Memcache_McAppendReply mcAppend(1: Memcache_McAppendRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
27-
Memcache_McCasReply mcCas(1: Memcache_McCasRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
28-
Memcache_McDecrReply mcDecr(1: Memcache_McDecrRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
29-
Memcache_McDeleteReply mcDelete(1: Memcache_McDeleteRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
30-
Memcache_McFlushAllReply mcFlushAll(1: Memcache_McFlushAllRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
31-
Memcache_McFlushReReply mcFlushRe(1: Memcache_McFlushReRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
32-
Memcache_McGatReply mcGat(1: Memcache_McGatRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
33-
Memcache_McGatsReply mcGats(1: Memcache_McGatsRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
34-
Memcache_McGetReply mcGet(1: Memcache_McGetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
35-
Memcache_McGetsReply mcGets(1: Memcache_McGetsRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
36-
Memcache_McIncrReply mcIncr(1: Memcache_McIncrRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
37-
Memcache_McLeaseGetReply mcLeaseGet(1: Memcache_McLeaseGetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
38-
Memcache_McLeaseSetReply mcLeaseSet(1: Memcache_McLeaseSetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
39-
Memcache_McMetagetReply mcMetaget(1: Memcache_McMetagetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
40-
Memcache_McPrependReply mcPrepend(1: Memcache_McPrependRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
41-
Memcache_McReplaceReply mcReplace(1: Memcache_McReplaceRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
42-
Memcache_McSetReply mcSet(1: Memcache_McSetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
43-
Memcache_McTouchReply mcTouch(1: Memcache_McTouchRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError) (thread = "eb")
44-
Common_McVersionReply mcVersion(1: Common_McVersionRequest request) (thread = "eb")
25+
@cpp.ProcessInEbThreadUnsafe
26+
Memcache_McAddReply mcAdd(1: Memcache_McAddRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
27+
@cpp.ProcessInEbThreadUnsafe
28+
Memcache_McAppendReply mcAppend(1: Memcache_McAppendRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
29+
@cpp.ProcessInEbThreadUnsafe
30+
Memcache_McCasReply mcCas(1: Memcache_McCasRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
31+
@cpp.ProcessInEbThreadUnsafe
32+
Memcache_McDecrReply mcDecr(1: Memcache_McDecrRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
33+
@cpp.ProcessInEbThreadUnsafe
34+
Memcache_McDeleteReply mcDelete(1: Memcache_McDeleteRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
35+
@cpp.ProcessInEbThreadUnsafe
36+
Memcache_McFlushAllReply mcFlushAll(1: Memcache_McFlushAllRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
37+
@cpp.ProcessInEbThreadUnsafe
38+
Memcache_McFlushReReply mcFlushRe(1: Memcache_McFlushReRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
39+
@cpp.ProcessInEbThreadUnsafe
40+
Memcache_McGatReply mcGat(1: Memcache_McGatRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
41+
@cpp.ProcessInEbThreadUnsafe
42+
Memcache_McGatsReply mcGats(1: Memcache_McGatsRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
43+
@cpp.ProcessInEbThreadUnsafe
44+
Memcache_McGetReply mcGet(1: Memcache_McGetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
45+
@cpp.ProcessInEbThreadUnsafe
46+
Memcache_McGetsReply mcGets(1: Memcache_McGetsRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
47+
@cpp.ProcessInEbThreadUnsafe
48+
Memcache_McIncrReply mcIncr(1: Memcache_McIncrRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
49+
@cpp.ProcessInEbThreadUnsafe
50+
Memcache_McLeaseGetReply mcLeaseGet(1: Memcache_McLeaseGetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
51+
@cpp.ProcessInEbThreadUnsafe
52+
Memcache_McLeaseSetReply mcLeaseSet(1: Memcache_McLeaseSetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
53+
@cpp.ProcessInEbThreadUnsafe
54+
Memcache_McMetagetReply mcMetaget(1: Memcache_McMetagetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
55+
@cpp.ProcessInEbThreadUnsafe
56+
Memcache_McPrependReply mcPrepend(1: Memcache_McPrependRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
57+
@cpp.ProcessInEbThreadUnsafe
58+
Memcache_McReplaceReply mcReplace(1: Memcache_McReplaceRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
59+
@cpp.ProcessInEbThreadUnsafe
60+
Memcache_McSetReply mcSet(1: Memcache_McSetRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
61+
@cpp.ProcessInEbThreadUnsafe
62+
Memcache_McTouchReply mcTouch(1: Memcache_McTouchRequest request) throws (1: Common.CarbonResultBusy carbonResultBusy, 2: Common.CarbonResultRemoteError carbonResultRemoteError)
63+
@cpp.ProcessInEbThreadUnsafe
64+
Common_McVersionReply mcVersion(1: Common_McVersionRequest request)
4565
}
4666

4767
@cpp.Type{name = "facebook::memcache::McAddReply"}

0 commit comments

Comments
 (0)