diff --git a/site/content/3.12/release-notes/version-3.12/incompatible-changes-in-3-12.md b/site/content/3.12/release-notes/version-3.12/incompatible-changes-in-3-12.md index 83c6574767..9a5311bb92 100644 --- a/site/content/3.12/release-notes/version-3.12/incompatible-changes-in-3-12.md +++ b/site/content/3.12/release-notes/version-3.12/incompatible-changes-in-3-12.md @@ -320,6 +320,15 @@ per-query limit with the [`memoryLimit` query option](../../aql/how-to-invoke-aq or its default using the `--query.memory-limit` startup option. You can adjust the global limit with the `--query.global-memory-limit` startup option. +--- + +Introduced in: v3.12.6 + +The memory accounting for AQL queries has been extended to track the memory usage +of the `MERGE()` function, `RETURN DISTINCT`, and certain uses of the `COLLECT` +operation. More queries compared to previous 3.12 versions may get killed due to +exceeding the memory limit as a result of the improved tracking. + ## Adjustable Stream Transaction size [Stream Transactions](../../develop/transactions/stream-transactions.md) may diff --git a/site/content/3.12/release-notes/version-3.12/whats-new-in-3-12.md b/site/content/3.12/release-notes/version-3.12/whats-new-in-3-12.md index ac5720ae8f..3ee8768a74 100644 --- a/site/content/3.12/release-notes/version-3.12/whats-new-in-3-12.md +++ b/site/content/3.12/release-notes/version-3.12/whats-new-in-3-12.md @@ -180,6 +180,24 @@ The following new metrics have been added for memory observability: | `arangodb_transactions_internal_memory_usage` | Total memory usage of internal transactions. | | `arangodb_transactions_rest_memory_usage` | Total memory usage of user transactions (excluding top-level AQL queries). | +--- + +Introduced in: v3.12.6 + +The memory accounting for AQL queries has been extended to track the memory usage +of the following: + +- Grouping with the `COLLECT` operation if the `sorted` method is used. +- Aggregating with `COLLECT ... AGGREGATE`. +- Deduplicating results with `RETURN DISTINCT`. +- Using the `MERGE()` function to combine objects. +- Internal buffers for execution blocks, late materialization, building results, + and distributing AQL queries in cluster deployments. +- Internal buffers for decay, distance, and replace functions. +- Internal buffers used by the query parser and optimizer. + +It is expected that the reported memory consumption is now higher. + ## Web interface ### Shard rebalancing diff --git a/site/content/3.13/release-notes/version-3.12/incompatible-changes-in-3-12.md b/site/content/3.13/release-notes/version-3.12/incompatible-changes-in-3-12.md index 83c6574767..9a5311bb92 100644 --- a/site/content/3.13/release-notes/version-3.12/incompatible-changes-in-3-12.md +++ b/site/content/3.13/release-notes/version-3.12/incompatible-changes-in-3-12.md @@ -320,6 +320,15 @@ per-query limit with the [`memoryLimit` query option](../../aql/how-to-invoke-aq or its default using the `--query.memory-limit` startup option. You can adjust the global limit with the `--query.global-memory-limit` startup option. +--- + +Introduced in: v3.12.6 + +The memory accounting for AQL queries has been extended to track the memory usage +of the `MERGE()` function, `RETURN DISTINCT`, and certain uses of the `COLLECT` +operation. More queries compared to previous 3.12 versions may get killed due to +exceeding the memory limit as a result of the improved tracking. + ## Adjustable Stream Transaction size [Stream Transactions](../../develop/transactions/stream-transactions.md) may diff --git a/site/content/3.13/release-notes/version-3.12/whats-new-in-3-12.md b/site/content/3.13/release-notes/version-3.12/whats-new-in-3-12.md index ac5720ae8f..3ee8768a74 100644 --- a/site/content/3.13/release-notes/version-3.12/whats-new-in-3-12.md +++ b/site/content/3.13/release-notes/version-3.12/whats-new-in-3-12.md @@ -180,6 +180,24 @@ The following new metrics have been added for memory observability: | `arangodb_transactions_internal_memory_usage` | Total memory usage of internal transactions. | | `arangodb_transactions_rest_memory_usage` | Total memory usage of user transactions (excluding top-level AQL queries). | +--- + +Introduced in: v3.12.6 + +The memory accounting for AQL queries has been extended to track the memory usage +of the following: + +- Grouping with the `COLLECT` operation if the `sorted` method is used. +- Aggregating with `COLLECT ... AGGREGATE`. +- Deduplicating results with `RETURN DISTINCT`. +- Using the `MERGE()` function to combine objects. +- Internal buffers for execution blocks, late materialization, building results, + and distributing AQL queries in cluster deployments. +- Internal buffers for decay, distance, and replace functions. +- Internal buffers used by the query parser and optimizer. + +It is expected that the reported memory consumption is now higher. + ## Web interface ### Shard rebalancing