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

More fixes to the merge problem

This commit is contained in:
A.J. Beamon 2020-05-07 16:06:46 -07:00
parent a8e3ad3c15
commit 0e21c0c17e
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fdbclient/ClientLogEvents.h
View File

@ -92,7 +92,7 @@ namespace FdbClientLogEvents {
default: default:
ASSERT(false); ASSERT(false);
} }
} }
EventGetVersion_V2() { } EventGetVersion_V2() { }
template <typename Ar> Ar& serialize(Ar &ar) { template <typename Ar> Ar& serialize(Ar &ar) {
@ -115,17 +115,22 @@ namespace FdbClientLogEvents {
// Version V3 of EventGetVersion starting at 6.3 // Version V3 of EventGetVersion starting at 6.3
struct EventGetVersion_V3 : public Event { struct EventGetVersion_V3 : public Event {
EventGetVersion_V3(double ts, double lat, uint32_t type, Version version) : Event(GET_VERSION_LATENCY, ts), latency(lat), readVersion(version) { EventGetVersion_V3(double ts, double lat, TransactionPriority priority, Version version) : Event(GET_VERSION_LATENCY, ts), latency(lat), readVersion(version) {
if(type == GetReadVersionRequest::PRIORITY_DEFAULT) { switch(priority) {
priorityType = PRIORITY_DEFAULT; // Unfortunately, the enum serialized here disagrees with the enum used elsewhere for the values used by each priority
} else if (type == GetReadVersionRequest::PRIORITY_BATCH) { case TransactionPriority::IMMEDIATE:
priorityType = PRIORITY_BATCH; priorityType = PRIORITY_IMMEDIATE;
} else if (type == GetReadVersionRequest::PRIORITY_SYSTEM_IMMEDIATE){ break;
priorityType = PRIORITY_IMMEDIATE; case TransactionPriority::DEFAULT:
} else { priorityType = PRIORITY_DEFAULT;
ASSERT(0); break;
case TransactionPriority::BATCH:
priorityType = PRIORITY_BATCH;
break;
default:
ASSERT(false);
} }
} }
EventGetVersion_V3() { } EventGetVersion_V3() { }
template <typename Ar> Ar& serialize(Ar &ar) { template <typename Ar> Ar& serialize(Ar &ar) {