From 2723922f5f5946f9b40af846a49193c74ed240ff Mon Sep 17 00:00:00 2001 From: Jingyu Zhou Date: Thu, 5 Sep 2019 11:30:02 -0700 Subject: [PATCH] Replace -1 as VERSION_HEADER constant for serialization --- fdbclient/CommitTransaction.h | 3 +++ fdbserver/LogRouter.actor.cpp | 2 +- fdbserver/LogSystemPeekCursor.actor.cpp | 2 +- fdbserver/OldTLogServer_6_0.actor.cpp | 4 ++-- fdbserver/TLogServer.actor.cpp | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fdbclient/CommitTransaction.h b/fdbclient/CommitTransaction.h index d33d5e24dd..5ebb245c72 100644 --- a/fdbclient/CommitTransaction.h +++ b/fdbclient/CommitTransaction.h @@ -24,6 +24,9 @@ #include "fdbclient/FDBTypes.h" +// The versioned message has wire format : -1, version, messages +static const int32_t VERSION_HEADER = -1; + static const char* typeString[] = { "SetValue", "ClearRange", "AddValue", diff --git a/fdbserver/LogRouter.actor.cpp b/fdbserver/LogRouter.actor.cpp index bbabe5a71c..cfd3165651 100644 --- a/fdbserver/LogRouter.actor.cpp +++ b/fdbserver/LogRouter.actor.cpp @@ -309,7 +309,7 @@ void peekMessagesFromMemory( LogRouterData* self, TLogPeekRequest const& req, Bi } currentVersion = it->first; - messages << int32_t(-1) << currentVersion; + messages << VERSION_HEADER << currentVersion; } messages << it->second.toStringRef(); diff --git a/fdbserver/LogSystemPeekCursor.actor.cpp b/fdbserver/LogSystemPeekCursor.actor.cpp index 246c0767be..5c9328bef2 100644 --- a/fdbserver/LogSystemPeekCursor.actor.cpp +++ b/fdbserver/LogSystemPeekCursor.actor.cpp @@ -70,7 +70,7 @@ void ILogSystem::ServerPeekCursor::nextMessage() { hasMsg = false; return; } - if (*(int32_t*)rd.peekBytes(4) == -1) { + if (*(int32_t*)rd.peekBytes(4) == VERSION_HEADER) { // A version int32_t dummy; Version ver; diff --git a/fdbserver/OldTLogServer_6_0.actor.cpp b/fdbserver/OldTLogServer_6_0.actor.cpp index cc6341a075..35abc02411 100644 --- a/fdbserver/OldTLogServer_6_0.actor.cpp +++ b/fdbserver/OldTLogServer_6_0.actor.cpp @@ -1008,7 +1008,7 @@ void peekMessagesFromMemory( Reference self, TLogPeekRequest const& req } currentVersion = it->first; - messages << int32_t(-1) << currentVersion; + messages << VERSION_HEADER << currentVersion; } messages << it->second.toStringRef(); @@ -1152,7 +1152,7 @@ ACTOR Future tLogPeekMessages( TLogData* self, TLogPeekRequest req, Refere for (auto &kv : kvs) { auto ver = decodeTagMessagesKey(kv.key); - messages << int32_t(-1) << ver; + messages << VERSION_HEADER << ver; messages.serializeBytes(kv.value); } diff --git a/fdbserver/TLogServer.actor.cpp b/fdbserver/TLogServer.actor.cpp index 8c90937379..c45e694d37 100644 --- a/fdbserver/TLogServer.actor.cpp +++ b/fdbserver/TLogServer.actor.cpp @@ -1267,7 +1267,7 @@ void peekMessagesFromMemory( Reference self, TLogPeekRequest const& req } currentVersion = it->first; - messages << int32_t(-1) << currentVersion; + messages << VERSION_HEADER << currentVersion; } messages << it->second.toStringRef(); @@ -1447,7 +1447,7 @@ ACTOR Future tLogPeekMessages( TLogData* self, TLogPeekRequest req, Refere for (auto &kv : kvs) { auto ver = decodeTagMessagesKey(kv.key); - messages << int32_t(-1) << ver; + messages << VERSION_HEADER << ver; messages.serializeBytes(kv.value); } @@ -1519,7 +1519,7 @@ ACTOR Future tLogPeekMessages( TLogData* self, TLogPeekRequest req, Refere ASSERT( valid == 0x01 ); ASSERT( length + sizeof(valid) == queueEntryData.size() ); - messages << int32_t(-1) << entry.version; + messages << VERSION_HEADER << entry.version; std::vector parsedMessages = wait(parseMessagesForTag(entry.messages, req.tag, logData->logRouterTags)); for (StringRef msg : parsedMessages) {