From c9515fa5d7ad64bb3c3a59ab46f8169c48893928 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Tue, 21 Jul 2020 19:49:52 +0000 Subject: [PATCH] Fix several pessimizing move warnings --- fdbserver/MutationTracking.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/fdbserver/MutationTracking.cpp b/fdbserver/MutationTracking.cpp index ddd17437a3..9d090d59e3 100644 --- a/fdbserver/MutationTracking.cpp +++ b/fdbserver/MutationTracking.cpp @@ -37,15 +37,15 @@ TraceEvent debugMutationEnabled( const char* context, Version version, MutationR } else if (mutation.param1 == debugKey || mutation.param1 == debugKey2) { return std::move(TraceEvent("MutationTracking").detail("At", context).detail("Version", version).detail("MutationType", typeString[mutation.type]).detail("Key", mutation.param1).detail("Value", mutation.param2)); } else { - return std::move(TraceEvent()); + return TraceEvent(); } } TraceEvent debugKeyRangeEnabled( const char* context, Version version, KeyRangeRef const& keys ) { if (keys.contains(debugKey) || keys.contains(debugKey2)) { - return std::move(debugMutation(context, version, MutationRef(MutationRef::DebugKeyRange, keys.begin, keys.end) )); + return debugMutation(context, version, MutationRef(MutationRef::DebugKeyRange, keys.begin, keys.end)); } else { - return std::move(TraceEvent()); + return TraceEvent(); } } @@ -81,7 +81,7 @@ TraceEvent debugTagsAndMessageEnabled( const char* context, Version version, Str } } } - return std::move(TraceEvent()); + return TraceEvent(); } #if MUTATION_TRACKING_ENABLED @@ -95,7 +95,13 @@ TraceEvent debugTagsAndMessage( const char* context, Version version, StringRef return debugTagsAndMessageEnabled( context, version, commitBlob ); } #else -TraceEvent debugMutation( const char* context, Version version, MutationRef const& mutation ) { return std::move(TraceEvent()); } -TraceEvent debugKeyRange( const char* context, Version version, KeyRangeRef const& keys ) { return std::move(TraceEvent()); } -TraceEvent debugTagsAndMessage( const char* context, Version version, StringRef commitBlob ) { return std::move(TraceEvent()); } +TraceEvent debugMutation(const char* context, Version version, MutationRef const& mutation) { + return TraceEvent(); +} +TraceEvent debugKeyRange(const char* context, Version version, KeyRangeRef const& keys) { + return TraceEvent(); +} +TraceEvent debugTagsAndMessage(const char* context, Version version, StringRef commitBlob) { + return TraceEvent(); +} #endif