Included review comments

arangodb · mpoeter · Jun 20, 2024 · Jun 6, 2024 · Jun 11, 2024 · Jun 11, 2024
commit effb1b80b3053a7d4a4687b1600ce042617f5535
diff --git a/arangod/RocksDBEngine/Methods/RocksDBTrxMethods.cpp b/arangod/RocksDBEngine/Methods/RocksDBTrxMethods.cpp
@@ -299,7 +299,8 @@ void RocksDBTrxMethods::beginQuery(
     std::shared_ptr<ResourceMonitor> resourceMonitor,
     bool isModificationQuery) {
   // report to parent
-  RocksDBTrxBaseMethods::beginQuery(resourceMonitor, isModificationQuery);
+  RocksDBTrxBaseMethods::beginQuery(std::move(resourceMonitor),
+                                    isModificationQuery);
 
   if (!_state->hasHint(transaction::Hints::Hint::GLOBAL_MANAGED)) {
     // don't bother with query tracking in non globally managed trx

diff --git a/arangod/RocksDBEngine/ReplicatedRocksDBTransactionCollection.cpp b/arangod/RocksDBEngine/ReplicatedRocksDBTransactionCollection.cpp
@@ -124,7 +124,7 @@ void ReplicatedRocksDBTransactionCollection::beginQuery(
     bool isModificationQuery) {
   auto* trxMethods = dynamic_cast<RocksDBTrxMethods*>(_rocksMethods.get());
   if (trxMethods) {
-    trxMethods->beginQuery(resourceMonitor, isModificationQuery);
+    trxMethods->beginQuery(std::move(resourceMonitor), isModificationQuery);
   }
 }
 

diff --git a/arangod/RocksDBEngine/RocksDBMethodsMemoryTracker.cpp b/arangod/RocksDBEngine/RocksDBMethodsMemoryTracker.cpp
@@ -140,7 +140,7 @@ void RocksDBMethodsMemoryTracker::beginQuery(
   if (_resourceMonitor == nullptr && resourceMonitor != nullptr) {
     TRI_ASSERT(_memoryUsageAtBeginQuery == 0);
 
-    _resourceMonitor = resourceMonitor;
+    _resourceMonitor = std::move(resourceMonitor);
     _memoryUsageAtBeginQuery = _memoryUsage;
   }
 }

diff --git a/arangod/RocksDBEngine/SimpleRocksDBTransactionState.cpp b/arangod/RocksDBEngine/SimpleRocksDBTransactionState.cpp
@@ -143,7 +143,7 @@ void SimpleRocksDBTransactionState::beginQuery(
     bool isModificationQuery) {
   auto* trxMethods = dynamic_cast<RocksDBTrxMethods*>(_rocksMethods.get());
   if (trxMethods) {
-    trxMethods->beginQuery(resourceMonitor, isModificationQuery);
+    trxMethods->beginQuery(std::move(resourceMonitor), isModificationQuery);
   }
 }