Skip to content

Commit c3d6d5c

Browse files
generatedunixname1030151775592158meta-codesync[bot]
generatedunixname1030151775592158
authored and
meta-codesync[bot]
committed
ThriftRemoveRefSuffix_mcrouter_lib_network
Reviewed By: stuclar Differential Revision: D98901889 fbshipit-source-id: f35465b22bfb3916a09a716601f9b5c234280ff5
1 parent cd8c336 commit c3d6d5c

13 files changed

+369
-382
lines changed

‎mcrouter/lib/network/AsciiSerialized.cpp‎

Lines changed: 194 additions & 195 deletions
Large diffs are not rendered by default.

‎mcrouter/lib/network/McServerSession.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void McServerSession::beginClose(folly::StringPiece reason) {
259259
} else {
260260
McServerRequestContext ctx(*this, kCaretConnectionControlReqId);
261261
GoAwayRequest goAway;
262-
goAway.reason_ref() = reason.str();
262+
goAway.reason() = reason.str();
263263
McServerRequestContext::reply(std::move(ctx), std::move(goAway));
264264
goAwayTimeout_ = folly::AsyncTimeout::schedule(
265265
options_.goAwayTimeout, eventBase_, [this]() noexcept { close(); });
@@ -339,7 +339,7 @@ void McServerSession::onRequest(
339339

340340
if (options_.defaultVersionHandler) {
341341
McVersionReply reply(carbon::Result::OK);
342-
reply.value_ref() =
342+
reply.value() =
343343
folly::IOBuf(folly::IOBuf::COPY_BUFFER, options_.versionString);
344344
McServerRequestContext::reply(std::move(ctx), std::move(reply));
345345
return;
@@ -394,7 +394,7 @@ void McServerSession::caretRequestReady(
394394
if (McVersionRequest::typeId == headerInfo.typeId &&
395395
options_.defaultVersionHandler) {
396396
McVersionReply versionReply(carbon::Result::OK);
397-
versionReply.value_ref() =
397+
versionReply.value() =
398398
folly::IOBuf(folly::IOBuf::COPY_BUFFER, options_.versionString);
399399
McServerRequestContext::reply(std::move(ctx), std::move(versionReply));
400400
} else {
@@ -445,9 +445,8 @@ void McServerSession::parseError(
445445
}
446446

447447
McVersionReply errorReply(result);
448-
errorReply.message_ref() = reason.str();
449-
errorReply.value_ref() =
450-
folly::IOBuf(folly::IOBuf::COPY_BUFFER, reason.str());
448+
errorReply.message() = reason.str();
449+
errorReply.value() = folly::IOBuf(folly::IOBuf::COPY_BUFFER, reason.str());
451450
McServerRequestContext::reply(
452451
McServerRequestContext(*this, tailReqid_++), std::move(errorReply));
453452
close();

‎mcrouter/lib/network/MultiOpParent.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ bool MultiOpParent::reply(
2626
stolen = true;
2727
error_ = true;
2828
reply_.emplace(result);
29-
reply_->message_ref() = std::move(errorMessage);
30-
reply_->appSpecificErrorCode_ref() = errorCode;
29+
reply_->message() = std::move(errorMessage);
30+
reply_->appSpecificErrorCode() = errorCode;
3131
}
3232

3333
assert(waiting_ > 0);

‎mcrouter/lib/network/test/AsyncMcClientTestSync.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ TEST(AsyncMcClient, eventBaseDestructionWhileConnecting) {
546546
McGetRequest req("hold");
547547
auto reply = client->sendSync(req, std::chrono::milliseconds(100));
548548
EXPECT_STREQ(
549-
carbon::resultToString(*reply.result_ref()),
549+
carbon::resultToString(*reply.result()),
550550
carbon::resultToString(carbon::Result::CONNECT_TIMEOUT));
551551
replied = true;
552552
});

‎mcrouter/lib/network/test/CarbonMessageDispatcherTest.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct TestCallback
4949
TEST(CarbonMessage, basic) {
5050
/* construct a request */
5151
McGetRequest get;
52-
get.key_ref() = folly::IOBuf(folly::IOBuf::COPY_BUFFER, "12345");
52+
get.key() = folly::IOBuf(folly::IOBuf::COPY_BUFFER, "12345");
5353

5454
/* serialize into an iobuf */
5555
carbon::CarbonQueueAppenderStorage storage;
@@ -90,7 +90,7 @@ TEST(CarbonMessage, basic) {
9090
[&getCalled](McGetRequest&& req) {
9191
/* check unserialized request is the same as sent */
9292
getCalled = true;
93-
EXPECT_EQ(req.key_ref()->fullKey(), folly::StringPiece("12345"));
93+
EXPECT_EQ(req.key()->fullKey(), folly::StringPiece("12345"));
9494
},
9595
[&setCalled](McSetRequest&&) { setCalled = true; });
9696

‎mcrouter/lib/network/test/CarbonMockMcTest.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@ struct TypedMockMcOnRequest {
3434
explicit TypedMockMcOnRequest(MockMc& mc) : mc_(mc) {}
3535

3636
void onRequest(McServerRequestContext&& ctx, McGetRequest&& req) {
37-
auto item = mc_.get(req.key_ref()->fullKey());
37+
auto item = mc_.get(req.key()->fullKey());
3838
McGetReply reply;
3939
if (!item) {
40-
reply.result_ref() = carbon::Result::NOTFOUND;
40+
reply.result() = carbon::Result::NOTFOUND;
4141
} else {
42-
reply.result_ref() = carbon::Result::FOUND;
43-
reply.value_ref() = *item->value;
44-
reply.flags_ref() = item->flags;
42+
reply.result() = carbon::Result::FOUND;
43+
reply.value() = *item->value;
44+
reply.flags() = item->flags;
4545
}
4646
McServerRequestContext::reply(std::move(ctx), std::move(reply));
4747
}
4848

4949
void onRequest(McServerRequestContext&& ctx, McSetRequest&& req) {
5050
mc_.set(
51-
req.key_ref()->fullKey(),
52-
MockMc::Item(*req.value_ref(), *req.exptime_ref(), *req.flags_ref()));
51+
req.key()->fullKey(),
52+
MockMc::Item(*req.value(), *req.exptime(), *req.flags()));
5353
McSetReply reply(carbon::Result::STORED);
5454
McServerRequestContext::reply(std::move(ctx), std::move(reply));
5555
}
5656

5757
void onRequest(McServerRequestContext&& ctx, McDeleteRequest&& req) {
5858
McDeleteReply reply;
59-
if (mc_.del(req.key_ref()->fullKey())) {
60-
reply.result_ref() = carbon::Result::DELETED;
59+
if (mc_.del(req.key()->fullKey())) {
60+
reply.result() = carbon::Result::DELETED;
6161
} else {
62-
reply.result_ref() = carbon::Result::NOTFOUND;
62+
reply.result() = carbon::Result::NOTFOUND;
6363
}
6464

6565
McServerRequestContext::reply(std::move(ctx), std::move(reply));
@@ -134,7 +134,7 @@ TEST(CarbonMockMc, basic) {
134134
McGetReply getReply;
135135
reader.readRawInto(getReply);
136136

137-
EXPECT_EQ(carbon::Result::FOUND, *getReply.result_ref());
137+
EXPECT_EQ(carbon::Result::FOUND, *getReply.result());
138138

139139
const auto resultVal = carbon::valueRangeSlow(getReply);
140140
EXPECT_EQ("value", resultVal.str());

‎mcrouter/lib/network/test/CarbonQueueAppenderTest.cpp‎

Lines changed: 83 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ TEST(CarbonQueueAppenderTest, longString) {
2929
// Require more space than CarbonQueueAppenderStorage's internal 512B buffer.
3030
// This will append() a copy of the string allocated on the heap.
3131
const std::string message(1024, 'a');
32-
reply.message_ref() = message;
32+
reply.message() = message;
3333

3434
carbon::CarbonProtocolWriter writer(storage);
3535
writer.writeRaw(reply);
@@ -66,8 +66,8 @@ TEST(CarbonQueueAppenderTest, longString) {
6666
carbon::CarbonProtocolReader reader(folly::io::Cursor(inputBody.get()));
6767
reader.readRawInto(inputReply);
6868

69-
EXPECT_EQ(carbon::Result::REMOTE_ERROR, *inputReply.result_ref());
70-
EXPECT_EQ(message, *inputReply.message_ref());
69+
EXPECT_EQ(carbon::Result::REMOTE_ERROR, *inputReply.result());
70+
EXPECT_EQ(message, *inputReply.message());
7171
}
7272

7373
namespace {
@@ -89,46 +89,46 @@ TEST(CarbonQueueAppender, manyFields) {
8989
const char str1[] = "abcde";
9090
const char str2[] = "xyzzyx";
9191
// Write null-terminating character too so we can use EXPECT_STREQ
92-
writeToBuf(manyFields.buf1_ref(), str1, std::strlen(str1) + 1);
93-
writeToBuf(manyFields.buf2_ref(), str1, std::strlen(str1) + 1);
94-
writeToBuf(manyFields.buf3_ref(), str1, std::strlen(str1) + 1);
95-
writeToBuf(manyFields.buf4_ref(), str1, std::strlen(str1) + 1);
96-
writeToBuf(manyFields.buf5_ref(), str1, std::strlen(str1) + 1);
97-
writeToBuf(manyFields.buf6_ref(), str1, std::strlen(str1) + 1);
98-
writeToBuf(manyFields.buf7_ref(), str1, std::strlen(str1) + 1);
99-
writeToBuf(manyFields.buf8_ref(), str1, std::strlen(str1) + 1);
100-
writeToBuf(manyFields.buf9_ref(), str1, std::strlen(str1) + 1);
101-
writeToBuf(manyFields.buf10_ref(), str1, std::strlen(str1) + 1);
102-
writeToBuf(manyFields.buf11_ref(), str1, std::strlen(str1) + 1);
103-
writeToBuf(manyFields.buf12_ref(), str1, std::strlen(str1) + 1);
104-
writeToBuf(manyFields.buf13_ref(), str1, std::strlen(str1) + 1);
105-
writeToBuf(manyFields.buf14_ref(), str1, std::strlen(str1) + 1);
106-
writeToBuf(manyFields.buf15_ref(), str1, std::strlen(str1) + 1);
107-
writeToBuf(manyFields.buf16_ref(), str1, std::strlen(str1) + 1);
108-
writeToBuf(manyFields.buf17_ref(), str1, std::strlen(str1) + 1);
109-
writeToBuf(manyFields.buf18_ref(), str1, std::strlen(str1) + 1);
110-
writeToBuf(manyFields.buf19_ref(), str1, std::strlen(str1) + 1);
111-
writeToBuf(manyFields.buf20_ref(), str1, std::strlen(str1) + 1);
112-
writeToBuf(manyFields.buf21_ref(), str1, std::strlen(str1) + 1);
113-
writeToBuf(manyFields.buf22_ref(), str1, std::strlen(str1) + 1);
114-
writeToBuf(manyFields.buf23_ref(), str1, std::strlen(str1) + 1);
115-
writeToBuf(manyFields.buf24_ref(), str1, std::strlen(str1) + 1);
116-
writeToBuf(manyFields.buf25_ref(), str1, std::strlen(str1) + 1);
117-
writeToBuf(manyFields.buf26_ref(), str1, std::strlen(str1) + 1);
118-
writeToBuf(manyFields.buf27_ref(), str1, std::strlen(str1) + 1);
119-
writeToBuf(manyFields.buf28_ref(), str1, std::strlen(str1) + 1);
120-
writeToBuf(manyFields.buf29_ref(), str1, std::strlen(str1) + 1);
121-
writeToBuf(manyFields.buf30_ref(), str1, std::strlen(str1) + 1);
122-
writeToBuf(manyFields.buf31_ref(), str1, std::strlen(str1) + 1);
123-
writeToBuf(manyFields.buf32_ref(), str1, std::strlen(str1) + 1);
124-
writeToBuf(manyFields.buf33_ref(), str1, std::strlen(str1) + 1);
125-
writeToBuf(manyFields.buf34_ref(), str1, std::strlen(str1) + 1);
126-
writeToBuf(manyFields.buf35_ref(), str1, std::strlen(str1) + 1);
127-
writeToBuf(manyFields.buf36_ref(), str1, std::strlen(str1) + 1);
128-
writeToBuf(manyFields.buf37_ref(), str1, std::strlen(str1) + 1);
129-
writeToBuf(manyFields.buf38_ref(), str1, std::strlen(str1) + 1);
130-
writeToBuf(manyFields.buf39_ref(), str1, std::strlen(str1) + 1);
131-
writeToBuf(manyFields.buf40_ref(), str2, std::strlen(str2) + 1);
92+
writeToBuf(manyFields.buf1(), str1, std::strlen(str1) + 1);
93+
writeToBuf(manyFields.buf2(), str1, std::strlen(str1) + 1);
94+
writeToBuf(manyFields.buf3(), str1, std::strlen(str1) + 1);
95+
writeToBuf(manyFields.buf4(), str1, std::strlen(str1) + 1);
96+
writeToBuf(manyFields.buf5(), str1, std::strlen(str1) + 1);
97+
writeToBuf(manyFields.buf6(), str1, std::strlen(str1) + 1);
98+
writeToBuf(manyFields.buf7(), str1, std::strlen(str1) + 1);
99+
writeToBuf(manyFields.buf8(), str1, std::strlen(str1) + 1);
100+
writeToBuf(manyFields.buf9(), str1, std::strlen(str1) + 1);
101+
writeToBuf(manyFields.buf10(), str1, std::strlen(str1) + 1);
102+
writeToBuf(manyFields.buf11(), str1, std::strlen(str1) + 1);
103+
writeToBuf(manyFields.buf12(), str1, std::strlen(str1) + 1);
104+
writeToBuf(manyFields.buf13(), str1, std::strlen(str1) + 1);
105+
writeToBuf(manyFields.buf14(), str1, std::strlen(str1) + 1);
106+
writeToBuf(manyFields.buf15(), str1, std::strlen(str1) + 1);
107+
writeToBuf(manyFields.buf16(), str1, std::strlen(str1) + 1);
108+
writeToBuf(manyFields.buf17(), str1, std::strlen(str1) + 1);
109+
writeToBuf(manyFields.buf18(), str1, std::strlen(str1) + 1);
110+
writeToBuf(manyFields.buf19(), str1, std::strlen(str1) + 1);
111+
writeToBuf(manyFields.buf20(), str1, std::strlen(str1) + 1);
112+
writeToBuf(manyFields.buf21(), str1, std::strlen(str1) + 1);
113+
writeToBuf(manyFields.buf22(), str1, std::strlen(str1) + 1);
114+
writeToBuf(manyFields.buf23(), str1, std::strlen(str1) + 1);
115+
writeToBuf(manyFields.buf24(), str1, std::strlen(str1) + 1);
116+
writeToBuf(manyFields.buf25(), str1, std::strlen(str1) + 1);
117+
writeToBuf(manyFields.buf26(), str1, std::strlen(str1) + 1);
118+
writeToBuf(manyFields.buf27(), str1, std::strlen(str1) + 1);
119+
writeToBuf(manyFields.buf28(), str1, std::strlen(str1) + 1);
120+
writeToBuf(manyFields.buf29(), str1, std::strlen(str1) + 1);
121+
writeToBuf(manyFields.buf30(), str1, std::strlen(str1) + 1);
122+
writeToBuf(manyFields.buf31(), str1, std::strlen(str1) + 1);
123+
writeToBuf(manyFields.buf32(), str1, std::strlen(str1) + 1);
124+
writeToBuf(manyFields.buf33(), str1, std::strlen(str1) + 1);
125+
writeToBuf(manyFields.buf34(), str1, std::strlen(str1) + 1);
126+
writeToBuf(manyFields.buf35(), str1, std::strlen(str1) + 1);
127+
writeToBuf(manyFields.buf36(), str1, std::strlen(str1) + 1);
128+
writeToBuf(manyFields.buf37(), str1, std::strlen(str1) + 1);
129+
writeToBuf(manyFields.buf38(), str1, std::strlen(str1) + 1);
130+
writeToBuf(manyFields.buf39(), str1, std::strlen(str1) + 1);
131+
writeToBuf(manyFields.buf40(), str2, std::strlen(str2) + 1);
132132

133133
carbon::CarbonProtocolWriter writer(storage);
134134

@@ -167,84 +167,75 @@ TEST(CarbonQueueAppender, manyFields) {
167167
carbon::CarbonProtocolReader reader(folly::io::Cursor(inputBody.get()));
168168
reader.readRawInto(manyFields2);
169169

170+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf1()->data()));
171+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf2()->data()));
172+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf3()->data()));
173+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf4()->data()));
174+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf5()->data()));
175+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf6()->data()));
176+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf7()->data()));
177+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf8()->data()));
178+
EXPECT_STREQ(str1, reinterpret_cast<const char*>(manyFields2.buf9()->data()));
170179
EXPECT_STREQ(
171-
str1, reinterpret_cast<const char*>(manyFields2.buf1_ref()->data()));
180+
str1, reinterpret_cast<const char*>(manyFields2.buf10()->data()));
172181
EXPECT_STREQ(
173-
str1, reinterpret_cast<const char*>(manyFields2.buf2_ref()->data()));
182+
str1, reinterpret_cast<const char*>(manyFields2.buf11()->data()));
174183
EXPECT_STREQ(
175-
str1, reinterpret_cast<const char*>(manyFields2.buf3_ref()->data()));
184+
str1, reinterpret_cast<const char*>(manyFields2.buf12()->data()));
176185
EXPECT_STREQ(
177-
str1, reinterpret_cast<const char*>(manyFields2.buf4_ref()->data()));
186+
str1, reinterpret_cast<const char*>(manyFields2.buf13()->data()));
178187
EXPECT_STREQ(
179-
str1, reinterpret_cast<const char*>(manyFields2.buf5_ref()->data()));
188+
str1, reinterpret_cast<const char*>(manyFields2.buf14()->data()));
180189
EXPECT_STREQ(
181-
str1, reinterpret_cast<const char*>(manyFields2.buf6_ref()->data()));
190+
str1, reinterpret_cast<const char*>(manyFields2.buf15()->data()));
182191
EXPECT_STREQ(
183-
str1, reinterpret_cast<const char*>(manyFields2.buf7_ref()->data()));
192+
str1, reinterpret_cast<const char*>(manyFields2.buf16()->data()));
184193
EXPECT_STREQ(
185-
str1, reinterpret_cast<const char*>(manyFields2.buf8_ref()->data()));
194+
str1, reinterpret_cast<const char*>(manyFields2.buf17()->data()));
186195
EXPECT_STREQ(
187-
str1, reinterpret_cast<const char*>(manyFields2.buf9_ref()->data()));
196+
str1, reinterpret_cast<const char*>(manyFields2.buf18()->data()));
188197
EXPECT_STREQ(
189-
str1, reinterpret_cast<const char*>(manyFields2.buf10_ref()->data()));
198+
str1, reinterpret_cast<const char*>(manyFields2.buf19()->data()));
190199
EXPECT_STREQ(
191-
str1, reinterpret_cast<const char*>(manyFields2.buf11_ref()->data()));
200+
str1, reinterpret_cast<const char*>(manyFields2.buf20()->data()));
192201
EXPECT_STREQ(
193-
str1, reinterpret_cast<const char*>(manyFields2.buf12_ref()->data()));
202+
str1, reinterpret_cast<const char*>(manyFields2.buf21()->data()));
194203
EXPECT_STREQ(
195-
str1, reinterpret_cast<const char*>(manyFields2.buf13_ref()->data()));
204+
str1, reinterpret_cast<const char*>(manyFields2.buf22()->data()));
196205
EXPECT_STREQ(
197-
str1, reinterpret_cast<const char*>(manyFields2.buf14_ref()->data()));
206+
str1, reinterpret_cast<const char*>(manyFields2.buf23()->data()));
198207
EXPECT_STREQ(
199-
str1, reinterpret_cast<const char*>(manyFields2.buf15_ref()->data()));
208+
str1, reinterpret_cast<const char*>(manyFields2.buf24()->data()));
200209
EXPECT_STREQ(
201-
str1, reinterpret_cast<const char*>(manyFields2.buf16_ref()->data()));
210+
str1, reinterpret_cast<const char*>(manyFields2.buf25()->data()));
202211
EXPECT_STREQ(
203-
str1, reinterpret_cast<const char*>(manyFields2.buf17_ref()->data()));
212+
str1, reinterpret_cast<const char*>(manyFields2.buf26()->data()));
204213
EXPECT_STREQ(
205-
str1, reinterpret_cast<const char*>(manyFields2.buf18_ref()->data()));
214+
str1, reinterpret_cast<const char*>(manyFields2.buf27()->data()));
206215
EXPECT_STREQ(
207-
str1, reinterpret_cast<const char*>(manyFields2.buf19_ref()->data()));
216+
str1, reinterpret_cast<const char*>(manyFields2.buf28()->data()));
208217
EXPECT_STREQ(
209-
str1, reinterpret_cast<const char*>(manyFields2.buf20_ref()->data()));
218+
str1, reinterpret_cast<const char*>(manyFields2.buf29()->data()));
210219
EXPECT_STREQ(
211-
str1, reinterpret_cast<const char*>(manyFields2.buf21_ref()->data()));
220+
str1, reinterpret_cast<const char*>(manyFields2.buf30()->data()));
212221
EXPECT_STREQ(
213-
str1, reinterpret_cast<const char*>(manyFields2.buf22_ref()->data()));
222+
str1, reinterpret_cast<const char*>(manyFields2.buf31()->data()));
214223
EXPECT_STREQ(
215-
str1, reinterpret_cast<const char*>(manyFields2.buf23_ref()->data()));
224+
str1, reinterpret_cast<const char*>(manyFields2.buf32()->data()));
216225
EXPECT_STREQ(
217-
str1, reinterpret_cast<const char*>(manyFields2.buf24_ref()->data()));
226+
str1, reinterpret_cast<const char*>(manyFields2.buf33()->data()));
218227
EXPECT_STREQ(
219-
str1, reinterpret_cast<const char*>(manyFields2.buf25_ref()->data()));
228+
str1, reinterpret_cast<const char*>(manyFields2.buf34()->data()));
220229
EXPECT_STREQ(
221-
str1, reinterpret_cast<const char*>(manyFields2.buf26_ref()->data()));
230+
str1, reinterpret_cast<const char*>(manyFields2.buf35()->data()));
222231
EXPECT_STREQ(
223-
str1, reinterpret_cast<const char*>(manyFields2.buf27_ref()->data()));
232+
str1, reinterpret_cast<const char*>(manyFields2.buf36()->data()));
224233
EXPECT_STREQ(
225-
str1, reinterpret_cast<const char*>(manyFields2.buf28_ref()->data()));
234+
str1, reinterpret_cast<const char*>(manyFields2.buf37()->data()));
226235
EXPECT_STREQ(
227-
str1, reinterpret_cast<const char*>(manyFields2.buf29_ref()->data()));
236+
str1, reinterpret_cast<const char*>(manyFields2.buf38()->data()));
228237
EXPECT_STREQ(
229-
str1, reinterpret_cast<const char*>(manyFields2.buf30_ref()->data()));
238+
str1, reinterpret_cast<const char*>(manyFields2.buf39()->data()));
230239
EXPECT_STREQ(
231-
str1, reinterpret_cast<const char*>(manyFields2.buf31_ref()->data()));
232-
EXPECT_STREQ(
233-
str1, reinterpret_cast<const char*>(manyFields2.buf32_ref()->data()));
234-
EXPECT_STREQ(
235-
str1, reinterpret_cast<const char*>(manyFields2.buf33_ref()->data()));
236-
EXPECT_STREQ(
237-
str1, reinterpret_cast<const char*>(manyFields2.buf34_ref()->data()));
238-
EXPECT_STREQ(
239-
str1, reinterpret_cast<const char*>(manyFields2.buf35_ref()->data()));
240-
EXPECT_STREQ(
241-
str1, reinterpret_cast<const char*>(manyFields2.buf36_ref()->data()));
242-
EXPECT_STREQ(
243-
str1, reinterpret_cast<const char*>(manyFields2.buf37_ref()->data()));
244-
EXPECT_STREQ(
245-
str1, reinterpret_cast<const char*>(manyFields2.buf38_ref()->data()));
246-
EXPECT_STREQ(
247-
str1, reinterpret_cast<const char*>(manyFields2.buf39_ref()->data()));
248-
EXPECT_STREQ(
249-
str2, reinterpret_cast<const char*>(manyFields2.buf40_ref()->data()));
240+
str2, reinterpret_cast<const char*>(manyFields2.buf40()->data()));
250241
}

‎mcrouter/lib/network/test/McAsciiParserTest.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,23 +206,23 @@ McMetagetReply createMetagetHitReply(
206206
uint64_t /* flags */,
207207
std::string host) {
208208
McMetagetReply msg;
209-
msg.age_ref() = age;
210-
msg.exptime_ref() = exptime;
209+
msg.age() = age;
210+
msg.exptime() = exptime;
211211

212212
if (host != "unknown") {
213213
struct in6_addr addr;
214214
memset(&addr, 0, sizeof(addr));
215215
if (strchr(host.data(), ':') != nullptr) {
216216
EXPECT_TRUE(inet_pton(AF_INET6, host.data(), &addr) > 0);
217-
msg.ipv_ref() = 6;
217+
msg.ipv() = 6;
218218
} else {
219219
EXPECT_TRUE(inet_pton(AF_INET, host.data(), &addr) > 0);
220-
msg.ipv_ref() = 4;
220+
msg.ipv() = 4;
221221
}
222222
}
223-
msg.result_ref() = carbon::Result::FOUND;
223+
msg.result() = carbon::Result::FOUND;
224224
if (host != "unknown") {
225-
msg.ipAddress_ref() = host;
225+
msg.ipAddress() = host;
226226
}
227227
return msg;
228228
}

0 commit comments

Comments
 (0)