Merge remote-tracking branch 'origin/devel' into experimental/replica…

…tion-key-tests
arangodb · jsteemann · Feb 10, 2021 · Feb 8, 2021 · Feb 8, 2021 · Feb 8, 2021
commit b63d2bbd8dee09b45ae505fb599cd340f5c77158
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,6 +13,20 @@ devel
 
 * Fixed a rare internal buffer overflow around ridBuffers.
 
+* Issue #13141: The `move-filters-into-enumerate` optimization, when applied to
+  an EnumerateCollectionNode (i.e. full collection scan), did not do regular
+  checks for the query being killed during the filtering of documents, resulting
+  in the maxRuntime option and manual kill of a query not working timely.
+
+* Simplify the DistributeExecutor and avoid implicit modification of its input
+  variable. Previously the DistributeExecutor could update the input variable
+  in-place, leading to unexpected results (see #13509).
+  The modification logic has now been moved into three new _internal_ AQL
+  functions (MAKE_DISTRIBUTE_INPUT, MAKE_DISTRIBUTE_INPUT_WITH_KEY_CREATION,
+  and MAKE_DISTRIBUTE_GRAPH_INPUT) and an additional calculation node with an
+  according function call will be introduced if we need to prepare the input
+  data for the distribute node.
+
 * Added new REST APIs for retrieving the sharding distribution:
 
   - GET `/_api/database/shardDistribution` will return the number of