Skip to content

Commit cd8c336

Browse files
generatedunixname1030151775592158meta-codesync[bot]
generatedunixname1030151775592158
authored and
meta-codesync[bot]
committed
ThriftRemoveRefSuffix_mcrouter_lib_carbon
Reviewed By: stuclar Differential Revision: D99246546 fbshipit-source-id: 1c30ace6c9df6e485b0326aef0d34a885000f2f9
1 parent f47fe5c commit cd8c336

File tree

6 files changed

+460
-479
lines changed

6 files changed

+460
-479
lines changed

‎mcrouter/lib/carbon/example/ThreadAffinityHelloGoodbye.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ constexpr uint16_t kPort = 11303;
3838
struct ThreadAffinityOnRequest {
3939
void onRequest(McServerRequestContext&& ctx, HelloRequest&& request) {
4040
LOG(INFO) << "Hello! Server " << reinterpret_cast<uintptr_t>(this)
41-
<< " got key " << request.key_ref()->fullKey().str();
41+
<< " got key " << request.key()->fullKey().str();
4242
McServerRequestContext::reply(
4343
std::move(ctx), HelloReply(carbon::Result::OK));
4444
}
4545

4646
void onRequest(McServerRequestContext&& ctx, GoodbyeRequest&& request) {
4747
LOG(INFO) << "Good bye! Server " << reinterpret_cast<uintptr_t>(this)
48-
<< " got key " << request.key_ref()->fullKey().str();
48+
<< " got key " << request.key()->fullKey().str();
4949
McServerRequestContext::reply(
5050
std::move(ctx), GoodbyeReply(carbon::Result::OK));
5151
}
@@ -86,7 +86,7 @@ void sendHelloRequestSync(
8686

8787
client->send(req, [&baton](const HelloRequest&, HelloReply&& reply) {
8888
XLOG(INFO) << "Reply received! Result: "
89-
<< carbon::resultToString(*reply.result_ref());
89+
<< carbon::resultToString(*reply.result());
9090
baton.post();
9191
});
9292

‎mcrouter/lib/carbon/example/main.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ constexpr uint16_t kPort2 = 11305;
3939
struct HelloGoodbyeOnRequest {
4040
void onRequest(McServerRequestContext&& ctx, HelloRequest&& request) {
4141
LOG(INFO) << "Hello! Server " << reinterpret_cast<uintptr_t>(this)
42-
<< " got key " << request.key_ref()->fullKey().str();
42+
<< " got key " << request.key()->fullKey().str();
4343
McServerRequestContext::reply(
4444
std::move(ctx), HelloReply(carbon::Result::OK));
4545
}
4646

4747
void onRequest(McServerRequestContext&& ctx, GoodbyeRequest&& request) {
4848
LOG(INFO) << "Good bye! Server " << reinterpret_cast<uintptr_t>(this)
49-
<< " got key " << request.key_ref()->fullKey().str();
49+
<< " got key " << request.key()->fullKey().str();
5050
McServerRequestContext::reply(
5151
std::move(ctx), GoodbyeReply(carbon::Result::OK));
5252
}
@@ -61,7 +61,7 @@ class ThriftHandler : virtual public hellogoodbye::thrift::HelloGoodbyeSvIf {
6161
apache::thrift::HandlerCallbackPtr<hellogoodbye::HelloReply> callback,
6262
const hellogoodbye::HelloRequest& request) override {
6363
LOG(INFO) << "Hello! Thrift server " << reinterpret_cast<uintptr_t>(this)
64-
<< " got key " << request.key_ref()->fullKey().str();
64+
<< " got key " << request.key()->fullKey().str();
6565
auto ctx = callback->getConnectionContext();
6666
if (ctx) {
6767
auto headers = ctx->getHeaders();
@@ -98,7 +98,7 @@ class ThriftHandler : virtual public hellogoodbye::thrift::HelloGoodbyeSvIf {
9898
apache::thrift::HandlerCallbackPtr<hellogoodbye::GoodbyeReply> callback,
9999
const hellogoodbye::GoodbyeRequest& request) override {
100100
LOG(INFO) << "Good bye! Thrift server " << reinterpret_cast<uintptr_t>(this)
101-
<< " got key " << request.key_ref()->fullKey().str();
101+
<< " got key " << request.key()->fullKey().str();
102102
hellogoodbye::GoodbyeReply reply(carbon::Result::OK);
103103
callback->result(std::move(reply));
104104
}
@@ -148,18 +148,18 @@ AsyncMcServer::Options getOpts(uint16_t port) {
148148
fm.addTask([&client, i]() {
149149
auto reply =
150150
client.sendSync(HelloRequest(fmt::format("key:{}", i)), 200ms);
151-
if (*reply.result_ref() != carbon::Result::OK) {
151+
if (*reply.result() != carbon::Result::OK) {
152152
LOG(ERROR) << "Unexpected result: "
153-
<< carbon::resultToString(*reply.result_ref());
153+
<< carbon::resultToString(*reply.result());
154154
}
155155
});
156156
} else {
157157
fm.addTask([&client, i]() {
158158
auto reply =
159159
client.sendSync(GoodbyeRequest(fmt::format("key:{}", i)), 200ms);
160-
if (*reply.result_ref() != carbon::Result::OK) {
160+
if (*reply.result() != carbon::Result::OK) {
161161
LOG(ERROR) << "Unexpected result: "
162-
<< carbon::resultToString(*reply.result_ref());
162+
<< carbon::resultToString(*reply.result());
163163
}
164164
});
165165
}
@@ -179,16 +179,16 @@ void sendHelloRequestSync(
179179
std::string key) {
180180
HelloRequest req(std::move(key));
181181
req.setCryptoAuthToken("test_cat_token_from_client_req");
182-
req.shardId_ref() = 1;
183-
req.message_ref() = "test";
184-
req.priority_ref() = EnumUInt32::YESTERDAY;
182+
req.shardId() = 1;
183+
req.message() = "test";
184+
req.priority() = EnumUInt32::YESTERDAY;
185185
;
186186
folly::fibers::Baton baton;
187187

188188
client->send(req, [&baton](const HelloRequest&, HelloReply&& reply) {
189189
LOG(INFO) << "Reply received! Result: "
190-
<< carbon::resultToString(*reply.result_ref())
191-
<< ". Message: " << *reply.message_ref();
190+
<< carbon::resultToString(*reply.result())
191+
<< ". Message: " << *reply.message();
192192
baton.post();
193193
});
194194

‎mcrouter/lib/carbon/test/CarbonMessageConversionUtilsTest.cpp‎

Lines changed: 106 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,47 @@
1515

1616
TEST(CarbonMessageConversionUtils, toFollyDynamic_Complex) {
1717
carbon::test::TestRequest r;
18-
r.key_ref() = carbon::Keys<folly::IOBuf>("/test/key/");
19-
r.testBool_ref() = true;
20-
r.testChar_ref() = 'a';
21-
r.testInt8_ref() = -123;
22-
r.testInt16_ref() = -7890;
23-
r.testInt32_ref() = -123456789;
24-
r.testInt64_ref() = -9876543210123ll;
25-
r.testUInt8_ref() = 123;
26-
r.testUInt16_ref() = 7890;
27-
r.testUInt32_ref() = 123456789;
28-
r.testUInt64_ref() = 9876543210123ll;
29-
r.testFloat_ref() = 1.5;
30-
r.testDouble_ref() = 5.6;
31-
r.testShortString_ref() = "abcdef";
32-
r.testLongString_ref() =
33-
"asdfghjkl;'eqtirgwuifhiivlzkhbvjkhc3978y42h97*&687gba";
34-
r.testIobuf_ref() = folly::IOBuf(
18+
r.key() = carbon::Keys<folly::IOBuf>("/test/key/");
19+
r.testBool() = true;
20+
r.testChar() = 'a';
21+
r.testInt8() = -123;
22+
r.testInt16() = -7890;
23+
r.testInt32() = -123456789;
24+
r.testInt64() = -9876543210123ll;
25+
r.testUInt8() = 123;
26+
r.testUInt16() = 7890;
27+
r.testUInt32() = 123456789;
28+
r.testUInt64() = 9876543210123ll;
29+
r.testFloat() = 1.5;
30+
r.testDouble() = 5.6;
31+
r.testShortString() = "abcdef";
32+
r.testLongString() = "asdfghjkl;'eqtirgwuifhiivlzkhbvjkhc3978y42h97*&687gba";
33+
r.testIobuf() = folly::IOBuf(
3534
folly::IOBuf::CopyBufferOp(), folly::StringPiece("TestTheBuf"));
36-
r.testList_ref() = std::vector<std::string>({"abc", "bce", "xyz"});
37-
r.testNestedVec_ref() = {{1, 1, 1}, {2, 2, 2}};
38-
r.testUMap_ref() = std::unordered_map<std::string, std::string>(
35+
r.testList() = std::vector<std::string>({"abc", "bce", "xyz"});
36+
r.testNestedVec() = {{1, 1, 1}, {2, 2, 2}};
37+
r.testUMap() = std::unordered_map<std::string, std::string>(
3938
{{"key", "value"}, {"adele", "beyonce"}});
40-
r.testMap_ref() = std::map<double, double>({{3.14, 2.7}, {0.577, 0.2}});
41-
r.testF14FastMap_ref() = folly::F14FastMap<std::string, std::string>(
39+
r.testMap() = std::map<double, double>({{3.14, 2.7}, {0.577, 0.2}});
40+
r.testF14FastMap() = folly::F14FastMap<std::string, std::string>(
4241
{{"hello", "F14"}, {"Fast", "Map"}});
43-
r.testF14NodeMap_ref() = folly::F14NodeMap<std::string, std::string>(
42+
r.testF14NodeMap() = folly::F14NodeMap<std::string, std::string>(
4443
{{"hello", "F14"}, {"Node", "Map"}});
45-
r.testF14ValueMap_ref() = folly::F14ValueMap<std::string, std::string>(
44+
r.testF14ValueMap() = folly::F14ValueMap<std::string, std::string>(
4645
{{"hello", "F14"}, {"Value", "Map"}});
47-
r.testF14VectorMap_ref() = folly::F14VectorMap<std::string, std::string>(
46+
r.testF14VectorMap() = folly::F14VectorMap<std::string, std::string>(
4847
{{"hello", "F14"}, {"Vector", "Map"}});
49-
r.testComplexMap_ref() = std::map<std::string, std::vector<uint16_t>>(
48+
r.testComplexMap() = std::map<std::string, std::vector<uint16_t>>(
5049
{{"hello", {1, 1, 1}}, {"world", {2, 2, 2}}});
51-
r.testUSet_ref() = std::unordered_set<std::string>({"hello", "world"});
52-
r.testSet_ref() = std::set<uint64_t>({123, 456});
53-
r.testF14FastSet_ref() =
54-
folly::F14FastSet<std::string>({"hello", "F14FastSet"});
55-
r.testF14NodeSet_ref() =
56-
folly::F14NodeSet<std::string>({"hello", "F14NodeSet"});
57-
r.testF14ValueSet_ref() =
50+
r.testUSet() = std::unordered_set<std::string>({"hello", "world"});
51+
r.testSet() = std::set<uint64_t>({123, 456});
52+
r.testF14FastSet() = folly::F14FastSet<std::string>({"hello", "F14FastSet"});
53+
r.testF14NodeSet() = folly::F14NodeSet<std::string>({"hello", "F14NodeSet"});
54+
r.testF14ValueSet() =
5855
folly::F14ValueSet<std::string>({"hello", "F14ValueSet"});
59-
r.testF14VectorSet_ref() =
56+
r.testF14VectorSet() =
6057
folly::F14VectorSet<std::string>({"hello", "F14VectorSet"});
61-
r.testIOBufList_ref() =
58+
r.testIOBufList() =
6259
std::vector<folly::IOBuf>({folly::IOBuf(), folly::IOBuf()});
6360

6461
folly::dynamic expected = folly::dynamic::object("dummy2", false)(
@@ -212,100 +209,90 @@ TEST(CarbonMessageConversionUtils, fromFollyDynamic_Complex) {
212209

213210
EXPECT_EQ(0, numErrors);
214211

215-
EXPECT_EQ("sampleKey", r.key_ref()->fullKey());
212+
EXPECT_EQ("sampleKey", r.key()->fullKey());
216213

217-
EXPECT_EQ(-8, *r.testInt8_ref());
218-
EXPECT_EQ(-16, *r.testInt16_ref());
219-
EXPECT_EQ(-32, *r.testInt32_ref());
220-
EXPECT_EQ(-64, *r.testInt64_ref());
221-
EXPECT_EQ(8, *r.testUInt8_ref());
222-
EXPECT_EQ(16, *r.testUInt16_ref());
223-
EXPECT_EQ(32, *r.testUInt32_ref());
224-
EXPECT_EQ(64, *r.testUInt64_ref());
214+
EXPECT_EQ(-8, *r.testInt8());
215+
EXPECT_EQ(-16, *r.testInt16());
216+
EXPECT_EQ(-32, *r.testInt32());
217+
EXPECT_EQ(-64, *r.testInt64());
218+
EXPECT_EQ(8, *r.testUInt8());
219+
EXPECT_EQ(16, *r.testUInt16());
220+
EXPECT_EQ(32, *r.testUInt32());
221+
EXPECT_EQ(64, *r.testUInt64());
225222

226-
EXPECT_FLOAT_EQ(12.356, *r.testFloat_ref());
227-
EXPECT_DOUBLE_EQ(35.98765, *r.testDouble_ref());
223+
EXPECT_FLOAT_EQ(12.356, *r.testFloat());
224+
EXPECT_DOUBLE_EQ(35.98765, *r.testDouble());
228225

229226
EXPECT_EQ(
230227
"this is a very long and nice string in a json file 12",
231-
*r.testLongString_ref());
228+
*r.testLongString());
232229
const folly::IOBuf expectedIobuf(
233230
folly::IOBuf::CopyBufferOp(), folly::StringPiece("iobuf string here..."));
234-
EXPECT_TRUE(folly::IOBufEqualTo()(expectedIobuf, *r.testIobuf_ref()));
231+
EXPECT_TRUE(folly::IOBufEqualTo()(expectedIobuf, *r.testIobuf()));
235232

236-
ASSERT_EQ(2, r.testList_ref()->size());
237-
EXPECT_EQ("string 1", r.testList_ref()[0]);
238-
EXPECT_EQ("s2", r.testList_ref()[1]);
233+
ASSERT_EQ(2, r.testList()->size());
234+
EXPECT_EQ("string 1", r.testList()[0]);
235+
EXPECT_EQ("s2", r.testList()[1]);
239236

240-
ASSERT_TRUE(r.testOptionalString_ref().has_value());
241-
EXPECT_EQ("I exist!", r.testOptionalString_ref().value());
237+
ASSERT_TRUE(r.testOptionalString().has_value());
238+
EXPECT_EQ("I exist!", r.testOptionalString().value());
242239

243-
ASSERT_EQ(3, r.testNestedVec_ref()->size());
244-
ASSERT_EQ(2, r.testNestedVec_ref()[0].size());
245-
EXPECT_EQ(0, r.testNestedVec_ref()[1].size());
246-
ASSERT_EQ(1, r.testNestedVec_ref()[2].size());
247-
EXPECT_EQ(17, r.testNestedVec_ref()[0][0]);
248-
EXPECT_EQ(26, r.testNestedVec_ref()[0][1]);
249-
EXPECT_EQ(32, r.testNestedVec_ref()[2][0]);
240+
ASSERT_EQ(3, r.testNestedVec()->size());
241+
ASSERT_EQ(2, r.testNestedVec()[0].size());
242+
EXPECT_EQ(0, r.testNestedVec()[1].size());
243+
ASSERT_EQ(1, r.testNestedVec()[2].size());
244+
EXPECT_EQ(17, r.testNestedVec()[0][0]);
245+
EXPECT_EQ(26, r.testNestedVec()[0][1]);
246+
EXPECT_EQ(32, r.testNestedVec()[2][0]);
250247

251-
ASSERT_EQ(2, r.testF14FastSet_ref()->size());
252-
EXPECT_NE(
253-
r.testF14FastSet_ref()->find("hello"), r.testF14FastSet_ref()->end());
254-
EXPECT_NE(
255-
r.testF14FastSet_ref()->find("F14FastSet"),
256-
r.testF14FastSet_ref()->end());
248+
ASSERT_EQ(2, r.testF14FastSet()->size());
249+
EXPECT_NE(r.testF14FastSet()->find("hello"), r.testF14FastSet()->end());
250+
EXPECT_NE(r.testF14FastSet()->find("F14FastSet"), r.testF14FastSet()->end());
257251

258-
ASSERT_EQ(2, r.testF14NodeSet_ref()->size());
259-
EXPECT_NE(
260-
r.testF14NodeSet_ref()->find("hello"), r.testF14NodeSet_ref()->end());
261-
EXPECT_NE(
262-
r.testF14NodeSet_ref()->find("F14NodeSet"),
263-
r.testF14NodeSet_ref()->end());
252+
ASSERT_EQ(2, r.testF14NodeSet()->size());
253+
EXPECT_NE(r.testF14NodeSet()->find("hello"), r.testF14NodeSet()->end());
254+
EXPECT_NE(r.testF14NodeSet()->find("F14NodeSet"), r.testF14NodeSet()->end());
264255

265-
ASSERT_EQ(2, r.testF14ValueSet_ref()->size());
266-
EXPECT_NE(
267-
r.testF14ValueSet_ref()->find("hello"), r.testF14ValueSet_ref()->end());
256+
ASSERT_EQ(2, r.testF14ValueSet()->size());
257+
EXPECT_NE(r.testF14ValueSet()->find("hello"), r.testF14ValueSet()->end());
268258
EXPECT_NE(
269-
r.testF14ValueSet_ref()->find("F14ValueSet"),
270-
r.testF14ValueSet_ref()->end());
259+
r.testF14ValueSet()->find("F14ValueSet"), r.testF14ValueSet()->end());
271260

272-
ASSERT_EQ(2, r.testF14VectorSet_ref()->size());
273-
EXPECT_NE(
274-
r.testF14VectorSet_ref()->find("hello"), r.testF14VectorSet_ref()->end());
261+
ASSERT_EQ(2, r.testF14VectorSet()->size());
262+
EXPECT_NE(r.testF14VectorSet()->find("hello"), r.testF14VectorSet()->end());
275263
EXPECT_NE(
276-
r.testF14VectorSet_ref()->find("F14VectorSet"),
277-
r.testF14VectorSet_ref()->end());
278-
279-
ASSERT_EQ(2, r.testMap_ref()->size());
280-
EXPECT_EQ(11.8, r.testMap_ref()[10.7]);
281-
EXPECT_EQ(31.789, r.testMap_ref()[30.567]);
282-
283-
ASSERT_EQ(2, r.testF14FastMap_ref()->size());
284-
EXPECT_EQ("F14", r.testF14FastMap_ref()["hello"]);
285-
EXPECT_EQ("Map", r.testF14FastMap_ref()["Fast"]);
286-
287-
ASSERT_EQ(2, r.testF14NodeMap_ref()->size());
288-
EXPECT_EQ("F14", r.testF14NodeMap_ref()["hello"]);
289-
EXPECT_EQ("Map", r.testF14NodeMap_ref()["Node"]);
290-
291-
ASSERT_EQ(2, r.testF14ValueMap_ref()->size());
292-
EXPECT_EQ("F14", r.testF14ValueMap_ref()["hello"]);
293-
EXPECT_EQ("Map", r.testF14ValueMap_ref()["Value"]);
294-
295-
ASSERT_EQ(2, r.testF14VectorMap_ref()->size());
296-
EXPECT_EQ("F14", r.testF14VectorMap_ref()["hello"]);
297-
EXPECT_EQ("Map", r.testF14VectorMap_ref()["Vector"]);
298-
299-
ASSERT_EQ(3, r.testComplexMap_ref()->size());
300-
ASSERT_EQ(1, r.testComplexMap_ref()["v1"].size());
301-
EXPECT_EQ(10, r.testComplexMap_ref()["v1"][0]);
302-
ASSERT_EQ(2, r.testComplexMap_ref()["ve2"].size());
303-
EXPECT_EQ(20, r.testComplexMap_ref()["ve2"][0]);
304-
EXPECT_EQ(30, r.testComplexMap_ref()["ve2"][1]);
305-
ASSERT_EQ(3, r.testComplexMap_ref()["vec03"].size());
306-
EXPECT_EQ(50, r.testComplexMap_ref()["vec03"][0]);
307-
EXPECT_EQ(70, r.testComplexMap_ref()["vec03"][1]);
308-
EXPECT_EQ(90, r.testComplexMap_ref()["vec03"][2]);
264+
r.testF14VectorSet()->find("F14VectorSet"), r.testF14VectorSet()->end());
265+
266+
ASSERT_EQ(2, r.testMap()->size());
267+
EXPECT_EQ(11.8, r.testMap()[10.7]);
268+
EXPECT_EQ(31.789, r.testMap()[30.567]);
269+
270+
ASSERT_EQ(2, r.testF14FastMap()->size());
271+
EXPECT_EQ("F14", r.testF14FastMap()["hello"]);
272+
EXPECT_EQ("Map", r.testF14FastMap()["Fast"]);
273+
274+
ASSERT_EQ(2, r.testF14NodeMap()->size());
275+
EXPECT_EQ("F14", r.testF14NodeMap()["hello"]);
276+
EXPECT_EQ("Map", r.testF14NodeMap()["Node"]);
277+
278+
ASSERT_EQ(2, r.testF14ValueMap()->size());
279+
EXPECT_EQ("F14", r.testF14ValueMap()["hello"]);
280+
EXPECT_EQ("Map", r.testF14ValueMap()["Value"]);
281+
282+
ASSERT_EQ(2, r.testF14VectorMap()->size());
283+
EXPECT_EQ("F14", r.testF14VectorMap()["hello"]);
284+
EXPECT_EQ("Map", r.testF14VectorMap()["Vector"]);
285+
286+
ASSERT_EQ(3, r.testComplexMap()->size());
287+
ASSERT_EQ(1, r.testComplexMap()["v1"].size());
288+
EXPECT_EQ(10, r.testComplexMap()["v1"][0]);
289+
ASSERT_EQ(2, r.testComplexMap()["ve2"].size());
290+
EXPECT_EQ(20, r.testComplexMap()["ve2"][0]);
291+
EXPECT_EQ(30, r.testComplexMap()["ve2"][1]);
292+
ASSERT_EQ(3, r.testComplexMap()["vec03"].size());
293+
EXPECT_EQ(50, r.testComplexMap()["vec03"][0]);
294+
EXPECT_EQ(70, r.testComplexMap()["vec03"][1]);
295+
EXPECT_EQ(90, r.testComplexMap()["vec03"][2]);
309296
}
310297

311298
TEST(CarbonMessageConversionUtils, fromFollyDynamic_Errors) {
@@ -342,11 +329,11 @@ TEST(CarbonMessageConversionUtils, fromFollyDynamic_Errors) {
342329

343330
EXPECT_EQ(4, numErrors);
344331

345-
ASSERT_EQ(1, r.testList_ref()->size());
346-
EXPECT_EQ("string 1", r.testList_ref()[0]);
332+
ASSERT_EQ(1, r.testList()->size());
333+
EXPECT_EQ("string 1", r.testList()[0]);
347334

348-
ASSERT_EQ(2, r.testNestedVec_ref()->size());
349-
EXPECT_EQ(0, r.testNestedVec_ref()[0].size());
350-
ASSERT_EQ(1, r.testNestedVec_ref()[1].size());
351-
EXPECT_EQ(18, r.testNestedVec_ref()[1][0]);
335+
ASSERT_EQ(2, r.testNestedVec()->size());
336+
EXPECT_EQ(0, r.testNestedVec()[0].size());
337+
ASSERT_EQ(1, r.testNestedVec()[1].size());
338+
EXPECT_EQ(18, r.testNestedVec()[1][0]);
352339
}

0 commit comments

Comments
 (0)