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

combineMessages still did not serialize tags correctly

This commit is contained in:
Evan Tschannen 2019-11-05 18:44:30 -08:00
parent 1c873591be
commit dbc5a2393c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdbserver/LogSystemPeekCursor.actor.cpp
View File

@ -946,7 +946,6 @@ void ILogSystem::BufferedCursor::combineMessages() {
auto& msg = messages[messageIndex]; auto& msg = messages[messageIndex];
BinaryWriter messageWriter(Unversioned()); BinaryWriter messageWriter(Unversioned());
messageWriter << uint32_t(msg.message.size() + sizeof(uint32_t) + sizeof(uint16_t) + tags.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 : tags) { for(auto t : tags) {
messageWriter << t; messageWriter << t;
} }
@ -954,6 +953,10 @@ void ILogSystem::BufferedCursor::combineMessages() {
Standalone<StringRef> val = messageWriter.toValue(); Standalone<StringRef> val = messageWriter.toValue();
msg.arena = val.arena(); msg.arena = val.arena();
msg.message = val; msg.message = val;
msg.tags = VectorRef<Tag>();
for(auto t : tags) {
msg.tags.push_back(msg.arena, t);
}
} }
Reference<ILogSystem::IPeekCursor> ILogSystem::BufferedCursor::cloneNoMore() { Reference<ILogSystem::IPeekCursor> ILogSystem::BufferedCursor::cloneNoMore() {