diff --git a/fdbserver/RestoreLoader.actor.cpp b/fdbserver/RestoreLoader.actor.cpp index d8a5b8491c..bcdbe0c25d 100644 --- a/fdbserver/RestoreLoader.actor.cpp +++ b/fdbserver/RestoreLoader.actor.cpp @@ -178,8 +178,9 @@ void handleRestoreSysInfoRequest(const RestoreSysInfoRequest& req, Reference _parsePartitionedLogFileOnLoader( KeyRangeMap* pRangeVersions, NotifiedVersion* processedFileOffset, - std::map::iterator kvOpsIter, LoaderCounters* cc, - std::map::iterator samplesIter, Reference bc, RestoreAsset asset) { + std::map::iterator kvOpsIter, + std::map::iterator samplesIter, LoaderCounters* cc, Reference bc, + RestoreAsset asset) { state Standalone buf = makeString(asset.len); state Reference file = wait(bc->readFile(asset.filename)); int rLen = wait(file->read(mutateString(buf), asset.len, asset.offset)); @@ -225,7 +226,7 @@ ACTOR static Future _parsePartitionedLogFileOnLoader( // Skip mutation whose commitVesion < range kv's version if (logMutationTooOld(pRangeVersions, mutation, msgVersion.version)) { - cc->oldLogMutations++; + cc->oldLogMutations += 1; continue; } @@ -755,7 +756,7 @@ void _parseSerializedMutation(KeyRangeMap* pRangeVersions, // Should this mutation be skipped? // Skip mutation whose commitVesion < range kv's version if (logMutationTooOld(pRangeVersions, mutation, commitVersion)) { - cc->oldLogMutations++; + cc->oldLogMutations += 1; continue; } diff --git a/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp b/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp index 5f3b056354..987a394cbb 100644 --- a/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp +++ b/fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp @@ -464,11 +464,9 @@ struct BackupAndParallelRestoreCorrectnessWorkload : TestWorkload { TraceEvent("BAFRW_Restore", randomID) .detail("LastBackupContainer", lastBackupContainer->getURL()) - .detail("MinRestorableVersion", - desc.minRestorableVersion.present() ? desc.minRestorableVersion.get() : -1) - .detail("MaxRestorableVersion", - desc.maxRestorableVersion.present() ? desc.maxRestorableVersion.get() : -1) - .detail("ContiguousLogEnd", desc.contiguousLogEnd.present() ? desc.contiguousLogEnd.get() : -1) + .detail("MinRestorableVersion", desc.minRestorableVersion.get()) + .detail("MaxRestorableVersion", desc.maxRestorableVersion.get()) + .detail("ContiguousLogEnd", desc.contiguousLogEnd.get()) .detail("TargetVersion", targetVersion); state std::vector> restores;