@@ -38,11 +38,6 @@ struct MessageSet {
3838 };
3939 // linear storage of messages
4040 std::vector<fair::mq::MessagePtr> messages;
41- // message map describes O2 messages consisting of a header message and
42- // payload message(s), index describes position in the linear storage
43- std::vector<Index> messageMap;
44- // pair map describes all messages in one sequence of header-payload pairs and
45- // where in the message index the associated header and payload can be found
4641 struct PairMapping {
4742 PairMapping (size_t partId, size_t payloadId) : partIndex(partId), payloadIndex(payloadId) {}
4843 // O2 message where the pair is located in
@@ -52,19 +47,19 @@ struct MessageSet {
5247 };
5348
5449 MessageSet ()
55- : messages(), messageMap()
50+ : messages()
5651 {
5752 }
5853
5954 template <typename F>
6055 MessageSet (F getter, size_t size)
61- : messages(), messageMap()
56+ : messages()
6257 {
6358 add (std::forward<F>(getter), size);
6459 }
6560
6661 MessageSet (MessageSet&& other)
67- : messages(std::move(other.messages)), messageMap(std::move(other.messageMap))
62+ : messages(std::move(other.messages))
6863 {
6964 other.clear ();
7065 }
@@ -75,7 +70,6 @@ struct MessageSet {
7570 return *this ;
7671 }
7772 messages = std::move (other.messages );
78- messageMap = std::move (other.messageMap );
7973 other.clear ();
8074 return *this ;
8175 }
@@ -96,7 +90,6 @@ struct MessageSet {
9690 void clear ()
9791 {
9892 messages.clear ();
99- messageMap.clear ();
10093 }
10194
10295 // this is more or less legacy
@@ -113,7 +106,6 @@ struct MessageSet {
113106 // add content of the part ref
114107 void add (PartRef&& ref)
115108 {
116- messageMap.emplace_back (messages.size (), 1 );
117109 messages.emplace_back (std::move (ref.header ));
118110 messages.emplace_back (std::move (ref.payload ));
119111 }
@@ -122,7 +114,6 @@ struct MessageSet {
122114 template <typename F>
123115 void add (F getter, size_t size)
124116 {
125- messageMap.emplace_back (messages.size (), size - 1 );
126117 for (size_t i = 0 ; i < size; ++i) {
127118 messages.emplace_back (std::move (getter (i)));
128119 }
0 commit comments