Skip to content

Commit 35e4519

Browse files
ktfktf
committed
DPL: remove deprecated header / payload code
Rest of the usecases removed. Abstract header / payload retrieval, with the idea that get_header / get_payload will work on any range of fair::mq::MessagePtrs.
1 parent 3d17e85 commit 35e4519

File tree

2 files changed

+20
-82
lines changed

2 files changed

+20
-82
lines changed

‎Framework/Core/include/Framework/MessageSet.h‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,6 @@ struct MessageSet {
136136
}
137137
}
138138

139-
fair::mq::MessagePtr& header(size_t partIndex)
140-
{
141-
return messages[messageMap[partIndex].position];
142-
}
143-
144-
fair::mq::MessagePtr& payload(size_t partIndex, size_t payloadIndex = 0)
145-
{
146-
assert(partIndex < messageMap.size());
147-
assert(messageMap[partIndex].position + payloadIndex + 1 < messages.size());
148-
return messages[messageMap[partIndex].position + payloadIndex + 1];
149-
}
150-
151-
fair::mq::MessagePtr const& header(size_t partIndex) const
152-
{
153-
return messages[messageMap[partIndex].position];
154-
}
155-
156-
fair::mq::MessagePtr const& payload(size_t partIndex, size_t payloadIndex = 0) const
157-
{
158-
assert(partIndex < messageMap.size());
159-
assert(messageMap[partIndex].position + payloadIndex + 1 < messages.size());
160-
return messages[messageMap[partIndex].position + payloadIndex + 1];
161-
}
162-
163139
fair::mq::MessagePtr const& associatedHeader(size_t pos) const
164140
{
165141
return messages[messageMap[pairMap[pos].partIndex].position];

‎Framework/Core/test/test_MessageSet.cxx‎

Lines changed: 20 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ TEST_CASE("MessageSet")
4545
REQUIRE((msgSet.messages | get_pair{0}).headerIdx == 0);
4646
REQUIRE((msgSet.messages | get_pair{0}).payloadIdx == 1);
4747
CHECK_THROWS((msgSet.messages | get_pair{1}));
48-
// Validate pipe operators match old API
49-
REQUIRE(&(msgSet.messages | get_header{0}) == &msgSet.header(0));
50-
REQUIRE(&(msgSet.messages | get_payload{0, 0}) == &msgSet.payload(0));
51-
REQUIRE((msgSet.messages | get_num_payloads{0}) == msgSet.messageMap[0].size);
52-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
53-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
48+
REQUIRE((msgSet.messages | get_num_payloads{0}) == 1);
49+
REQUIRE((msgSet.messages | count_parts{}) == 1);
5450
}
5551

5652
TEST_CASE("MessageSetWithFunction")
@@ -76,11 +72,8 @@ TEST_CASE("MessageSetWithFunction")
7672
REQUIRE((msgSet.messages | get_pair{0}).headerIdx == 0);
7773
REQUIRE((msgSet.messages | get_pair{0}).payloadIdx == 1);
7874
CHECK_THROWS((msgSet.messages | get_pair{1}));
79-
REQUIRE(&(msgSet.messages | get_header{0}) == &msgSet.header(0));
80-
REQUIRE(&(msgSet.messages | get_payload{0, 0}) == &msgSet.payload(0));
81-
REQUIRE((msgSet.messages | get_num_payloads{0}) == msgSet.messageMap[0].size);
82-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
83-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
75+
REQUIRE((msgSet.messages | get_num_payloads{0}) == 1);
76+
REQUIRE((msgSet.messages | count_parts{}) == 1);
8477
}
8578

8679
TEST_CASE("MessageSetWithMultipart")
@@ -112,13 +105,8 @@ TEST_CASE("MessageSetWithMultipart")
112105
REQUIRE((msgSet.messages | get_pair{1}).headerIdx == 0);
113106
REQUIRE((msgSet.messages | get_pair{1}).payloadIdx == 2);
114107
CHECK_THROWS((msgSet.messages | get_pair{2}));
115-
// Validate pipe operators match old API for multi-payload
116-
REQUIRE(&(msgSet.messages | get_header{0}) == &msgSet.header(0));
117-
REQUIRE(&(msgSet.messages | get_payload{0, 0}) == &msgSet.payload(0, 0));
118-
REQUIRE(&(msgSet.messages | get_payload{0, 1}) == &msgSet.payload(0, 1));
119-
REQUIRE((msgSet.messages | get_num_payloads{0}) == msgSet.messageMap[0].size);
120-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
121-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
108+
REQUIRE((msgSet.messages | get_num_payloads{0}) == 2);
109+
REQUIRE((msgSet.messages | count_parts{}) == 1);
122110
}
123111

124112
TEST_CASE("MessageSetAddPartRef")
@@ -190,18 +178,11 @@ TEST_CASE("MessageSetAddMultiple")
190178
REQUIRE((msgSet.messages | get_pair{2}).payloadIdx == 5);
191179
REQUIRE((msgSet.messages | get_pair{3}).headerIdx == 4);
192180
REQUIRE((msgSet.messages | get_pair{3}).payloadIdx == 6);
193-
// Validate pipe operators match old API for mixed modes
194-
for (size_t i = 0; i < 3; ++i) {
195-
REQUIRE(&(msgSet.messages | get_header{i}) == &msgSet.header(i));
196-
REQUIRE(&(msgSet.messages | get_payload{i, 0}) == &msgSet.payload(i, 0));
197-
}
198-
// Part 2 has a second payload (multi-payload with splitPayloadParts=2, splitPayloadIndex=2)
199-
REQUIRE(&(msgSet.messages | get_payload{2, 1}) == &msgSet.payload(2, 1));
200-
for (size_t i = 0; i < 3; ++i) {
201-
REQUIRE((msgSet.messages | get_num_payloads{i}) == msgSet.messageMap[i].size);
202-
}
203-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
204-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
181+
REQUIRE((msgSet.messages | get_num_payloads{0}) == 1);
182+
REQUIRE((msgSet.messages | get_num_payloads{1}) == 1);
183+
REQUIRE((msgSet.messages | get_num_payloads{2}) == 2);
184+
REQUIRE((msgSet.messages | count_parts{}) == 3);
185+
REQUIRE((msgSet.messages | count_payloads{}) == 4);
205186
}
206187

207188
TEST_CASE("GetHeaderPayloadOperators")
@@ -251,13 +232,8 @@ TEST_CASE("GetHeaderPayloadOperators")
251232
REQUIRE(pl1.get() != nullptr);
252233
REQUIRE(pl1->GetSize() == 200);
253234

254-
// Validate pipe operators match old API
255-
for (size_t i = 0; i < 2; ++i) {
256-
REQUIRE(&(msgSet.messages | get_header{i}) == &msgSet.header(i));
257-
REQUIRE(&(msgSet.messages | get_payload{i, 0}) == &msgSet.payload(i, 0));
258-
}
259-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
260-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
235+
REQUIRE((msgSet.messages | count_parts{}) == 2);
236+
REQUIRE((msgSet.messages | count_payloads{}) == 2);
261237
}
262238

263239
TEST_CASE("GetHeaderPayloadMultiPayload")
@@ -343,18 +319,10 @@ TEST_CASE("GetHeaderPayloadMultiPayload")
343319
// get_num_payloads for part 1 should be 3
344320
REQUIRE((msgSet.messages | get_num_payloads{1}) == 3);
345321

346-
// Validate pipe operators match old API for multi-payload (header, pl, pl, pl)
347-
REQUIRE(&(msgSet.messages | get_header{0}) == &msgSet.header(0));
348-
REQUIRE(&(msgSet.messages | get_header{1}) == &msgSet.header(1));
349-
REQUIRE(&(msgSet.messages | get_payload{0, 0}) == &msgSet.payload(0, 0));
350-
REQUIRE(&(msgSet.messages | get_payload{1, 0}) == &msgSet.payload(1, 0));
351-
REQUIRE(&(msgSet.messages | get_payload{1, 1}) == &msgSet.payload(1, 1));
352-
REQUIRE(&(msgSet.messages | get_payload{1, 2}) == &msgSet.payload(1, 2));
353-
for (size_t i = 0; i < 2; ++i) {
354-
REQUIRE((msgSet.messages | get_num_payloads{i}) == msgSet.messageMap[i].size);
355-
}
356-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
357-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
322+
REQUIRE((msgSet.messages | get_num_payloads{0}) == 1);
323+
REQUIRE((msgSet.messages | get_num_payloads{1}) == 3);
324+
REQUIRE((msgSet.messages | count_parts{}) == 2);
325+
REQUIRE((msgSet.messages | count_payloads{}) == 4);
358326
}
359327

360328
TEST_CASE("TraditionalSplitParts")
@@ -418,14 +386,8 @@ TEST_CASE("TraditionalSplitParts")
418386

419387
// get_num_payloads: each traditional split pair has 1 payload
420388
for (size_t i = 0; i < 3; ++i) {
421-
REQUIRE((msgSet.messages | get_num_payloads{i}) == msgSet.messageMap[i].size);
389+
REQUIRE((msgSet.messages | get_num_payloads{i}) == 1);
422390
}
423-
424-
// Validate pipe operators match old MessageSet::header()/payload() API
425-
for (size_t i = 0; i < 3; ++i) {
426-
REQUIRE(&(msgSet.messages | get_header{i}) == &msgSet.header(i));
427-
REQUIRE(&(msgSet.messages | get_payload{i, 0}) == &msgSet.payload(i));
428-
}
429-
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
430-
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
391+
REQUIRE((msgSet.messages | count_parts{}) == 3);
392+
REQUIRE((msgSet.messages | count_payloads{}) == 3);
431393
}

0 commit comments

Comments
 (0)