arangodb · cpjulia · Nov 14, 2025 · Nov 14, 2025 · Nov 14, 2025 · Nov 17, 2025
diff --git a/arangod/Aql/Function/DistributeFunctions.cpp b/arangod/Aql/Function/DistributeFunctions.cpp
@@ -60,7 +60,7 @@ void buildKeyObject(VPackBuilder& builder, std::string_view key,
 
 AqlValue convertToObject(transaction::Methods& trx, VPackSlice input,
                          bool allowKeyConversionToObject, bool canUseCustomKey,
-                         bool ignoreErrors) {
+                         bool ignoreErrors, ResourceMonitor* rm = nullptr) {
   // input is not an object.
   // if this happens, it must be a string key
   if (!input.isString() || !allowKeyConversionToObject) {
@@ -102,8 +102,9 @@ AqlValue functions::MakeDistributeInput(
         flags["allowKeyConversionToObject"].getBool();
     bool canUseCustomKey = flags["canUseCustomKey"].getBool();
     bool ignoreErrors = flags["ignoreErrors"].getBool();
+    ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
     return convertToObject(trx, input, allowKeyConversionToObject,
-                           canUseCustomKey, ignoreErrors);
+                           canUseCustomKey, ignoreErrors, rm);
   }
   TRI_ASSERT(input.isObject());
 
@@ -163,7 +164,8 @@ AqlValue functions::MakeDistributeInputWithKeyCreation(
 
   VPackSlice input = value.slice();  // will throw when wrong type
   if (!input.isObject()) {
-    return convertToObject(trx, input, true, canUseCustomKey, ignoreErrors);
+    ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+    return convertToObject(trx, input, true, canUseCustomKey, ignoreErrors, rm);
   }
 
   TRI_ASSERT(input.isObject());

diff --git a/arangod/Aql/Function/EncodingFunctions.cpp b/arangod/Aql/Function/EncodingFunctions.cpp
@@ -57,7 +57,9 @@ AqlValue functions::ToBase64(ExpressionContext* expr, AstNode const&,
 
   std::string encoded = absl::Base64Escape({buffer->data(), buffer->length()});
 
-  return AqlValue(std::move(encoded));
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
+
+  return AqlValue(std::move(encoded), rm);
 }
 
 /// @brief function TO_HEX
@@ -74,7 +76,9 @@ AqlValue functions::ToHex(ExpressionContext* expr, AstNode const&,
   std::string encoded =
       basics::StringUtils::encodeHex(buffer->data(), buffer->length());
 
-  return AqlValue(encoded);
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
+
+  return AqlValue(encoded, rm);
 }
 
 /// @brief function ENCODE_URI_COMPONENT
@@ -91,7 +95,9 @@ AqlValue functions::EncodeURIComponent(ExpressionContext* expr, AstNode const&,
   std::string encoded =
       basics::StringUtils::encodeURIComponent(buffer->data(), buffer->length());
 
-  return AqlValue(encoded);
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
+
+  return AqlValue(encoded, rm);
 }
 
 }  // namespace arangodb::aql
diff --git a/arangod/Aql/Function/InformationFunctions.cpp b/arangod/Aql/Function/InformationFunctions.cpp
@@ -43,27 +43,31 @@ using namespace arangodb;
 namespace arangodb::aql {
 
 /// @brief function CURRENT_USER
-AqlValue functions::CurrentUser(ExpressionContext*, AstNode const&,
+AqlValue functions::CurrentUser(ExpressionContext* expressionContext,
+                                AstNode const&,
                                 VPackFunctionParametersView parameters) {
   std::string const& username = ExecContext::current().user();
   if (username.empty()) {
     return AqlValue(AqlValueHintNull());
   }
-  return AqlValue(username);
+  ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+  return AqlValue(username, rm);
 }
 
 /// @brief function CURRENT_DATABASE
 AqlValue functions::CurrentDatabase(ExpressionContext* expressionContext,
                                     AstNode const&,
                                     VPackFunctionParametersView parameters) {
-  return AqlValue(expressionContext->vocbase().name());
+  ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+  return AqlValue(expressionContext->vocbase().name(), rm);
 }
 
 /// @brief function VERSION
 AqlValue functions::Version(ExpressionContext* expressionContext,
                             AstNode const&,
                             VPackFunctionParametersView parameters) {
-  return AqlValue(rest::Version::getServerVersion());
+  ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+  return AqlValue(rest::Version::getServerVersion(), rm);
 }
 
 }  // namespace arangodb::aql
diff --git a/arangod/Aql/Function/RandomFunctions.cpp b/arangod/Aql/Function/RandomFunctions.cpp
@@ -43,7 +43,7 @@ AqlValue functions::Rand(ExpressionContext*, AstNode const&,
 }
 
 /// @brief function RANDOM_TOKEN
-AqlValue functions::RandomToken(ExpressionContext*, AstNode const&,
+AqlValue functions::RandomToken(ExpressionContext* expr, AstNode const&,
                                 VPackFunctionParametersView parameters) {
   AqlValue const& value =
       aql::functions::extractFunctionParameterValue(parameters, 0);
@@ -54,9 +54,10 @@ AqlValue functions::RandomToken(ExpressionContext*, AstNode const&,
         TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "RANDOM_TOKEN");
   }
 
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
   UniformCharacter generator(
       "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
-  return AqlValue(generator.random(static_cast<size_t>(length)));
+  return AqlValue(generator.random(static_cast<size_t>(length)), rm);
 }
 
 }  // namespace arangodb::aql
diff --git a/arangod/Aql/Function/StatisticsFunctions.cpp b/arangod/Aql/Function/StatisticsFunctions.cpp
@@ -476,7 +476,8 @@ AqlValue functions::Min(ExpressionContext* expressionContext, AstNode const&,
   if (minValue.isNone()) {
     return AqlValue(AqlValueHintNull());
   }
-  return AqlValue(minValue);
+  ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+  return AqlValue(minValue, 0, rm);
 }
 
 /// @brief function MAX
@@ -507,7 +508,8 @@ AqlValue functions::Max(ExpressionContext* expressionContext, AstNode const&,
   if (maxValue.isNone()) {
     return AqlValue(AqlValueHintNull());
   }
-  return AqlValue(maxValue);
+  ResourceMonitor* rm = expressionContext->getResourceMonitorPtr();
+  return AqlValue(maxValue, 0, rm);
 }
 
 /// @brief function SUM

diff --git a/arangod/Aql/Function/TypeCheckFunctions.cpp b/arangod/Aql/Function/TypeCheckFunctions.cpp
@@ -81,10 +81,11 @@ AqlValue functions::IsObject(ExpressionContext*, AstNode const&,
 }
 
 /// @brief function TYPENAME
-AqlValue functions::Typename(ExpressionContext*, AstNode const&,
+AqlValue functions::Typename(ExpressionContext* expr, AstNode const&,
                              VPackFunctionParametersView parameters) {
   AqlValue const& value = extractFunctionParameterValue(parameters, 0);
-  return AqlValue(value.getTypeString());
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
+  return AqlValue(value.getTypeString(), rm);
 }
 
 }  // namespace arangodb::aql
diff --git a/arangod/Aql/Function/UuidFunctions.cpp b/arangod/Aql/Function/UuidFunctions.cpp
@@ -49,7 +49,7 @@ static std::mutex uuidMutex;
 }  // namespace
 
 /// @brief function UUID
-AqlValue functions::Uuid(ExpressionContext*, AstNode const&,
+AqlValue functions::Uuid(ExpressionContext* expr, AstNode const&,
                          VPackFunctionParametersView parameters) {
   boost::uuids::uuid uuid;
   {
@@ -58,7 +58,8 @@ AqlValue functions::Uuid(ExpressionContext*, AstNode const&,
     uuid = boost::uuids::random_generator()();
   }
 
-  return AqlValue(boost::uuids::to_string(uuid));
+  ResourceMonitor* rm = expr->getResourceMonitorPtr();
+  return AqlValue(boost::uuids::to_string(uuid), rm);
 }
 
 }  // namespace arangodb::aql
diff --git a/arangod/VocBase/ComputedValues.cpp b/arangod/VocBase/ComputedValues.cpp
@@ -52,6 +52,7 @@
 #include <span>
 #include <string_view>
 #include <type_traits>
+#include <immer/detail/combine_standard_layout.hpp>
 
 namespace {
 // name of bind parameter variable that contains the current document
@@ -147,7 +148,8 @@ aql::AqlValue ComputedValuesExpressionContext::getVariableValue(
     return aql::AqlValue(aql::AqlValueHintNull());
   }
   if (doCopy) {
-    return aql::AqlValue(aql::AqlValueHintSliceCopy(it->second));
+    return aql::AqlValue(aql::AqlValueHintSliceCopy(it->second),
+                         getResourceMonitorPtr());
   }
   return aql::AqlValue(aql::AqlValueHintSliceNoCopy(it->second));
 }