wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: tempTags was not used correctly

This commit is contained in:
Evan Tschannen 2019-11-05 18:22:25 -08:00
parent a8ca47beff
commit 86560fe727
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdbserver/LogSystemPeekCursor.actor.cpp
View File

@ -937,17 +937,17 @@ void ILogSystem::BufferedCursor::combineMessages() {
return;
}
std::vector<Tag> tempTags;
tempTags.push_back(messages[messageIndex].tags[0]);
tags.clear();
tags.push_back(messages[messageIndex].tags[0]);
for(int i = messageIndex + 1; i < messages.size() && messages[messageIndex].version == messages[i].version; i++) {
tempTags.push_back(messages[i].tags[0]);
tags.push_back(messages[i].tags[0]);
messageIndex = i;
}
auto& msg = messages[messageIndex];
BinaryWriter messageWriter(Unversioned());
messageWriter << uint32_t(msg.message.size() + sizeof(uint32_t) + sizeof(uint16_t) + tempTags.size()*sizeof(Tag)) << msg.version.sub << uint16_t(tags.size());
messageWriter << uint32_t(msg.message.size() + sizeof(uint32_t) + sizeof(uint16_t) + tags.size()*sizeof(Tag)) << msg.version.sub << uint16_t(tags.size());
msg.tags = VectorRef<Tag>((Tag*)(((uint8_t*)messageWriter.getData())+messageWriter.getLength()), tags.size());
for(auto t : tempTags) {
for(auto t : tags) {
messageWriter << t;
}
messageWriter.serializeBytes(msg.message);