try with adjusted limits

arangodb · jsteemann · Jul 14, 2021 · Jul 7, 2021 · Jul 8, 2021 · Jul 8, 2021
commit 6ad1ad60a58987d14a418755883b5101e646630b
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,12 +13,12 @@ devel
   passes etc.).
   This change introduces 2 limits:
   - a recursion limit for AQL query expressions. An expression can now be
-    up to 1,000 levels deep. An example expression is `1 + 2 + 3 + 4`, which
+    up to 500 levels deep. An example expression is `1 + 2 + 3 + 4`, which
     is 3 levels deep `1 + (2 + (3 + 4))`.
-    The expression recursion is limited to 1,000 levels.
+    The expression recursion is limited to 500 levels.
   - a limit for the number of execution nodes in the initial query 
     execution plan. 
-    The number of execution nodes is limited to 4,000.
+    The number of execution nodes is limited to 3,000.
 
 * APM-112: invalid use of OPTIONS in AQL queries will now raise a warning in
   the query. 

diff --git a/arangod/Aql/Ast.h b/arangod/Aql/Ast.h
@@ -88,7 +88,7 @@ class Ast {
   ~Ast();
 
   /// @brief maximum nesting level for expressions
-  static constexpr uint64_t maxExpressionNesting = 1000;
+  static constexpr uint64_t maxExpressionNesting = 500;
 
   /// @brief return the query
   QueryContext& query() const { return _query; }

diff --git a/arangod/Aql/ExecutionPlan.h b/arangod/Aql/ExecutionPlan.h
@@ -65,7 +65,7 @@ class ExecutionPlan {
   /// (at the time the initial execution plan is created). we have to limit
   /// this to prevent super-long runtimes for query optimization and
   /// execution)
-  static constexpr uint64_t maxPlanNodes = 4000;
+  static constexpr uint64_t maxPlanNodes = 3000;
 
   /// @brief create an execution plan from an AST
   /// note: tracking memory usage requires accessing the Ast/Query objects,

diff --git a/tests/js/server/aql/aql-queries-simple.js b/tests/js/server/aql/aql-queries-simple.js
@@ -1361,7 +1361,7 @@ function ahuacatlQuerySimpleTestSuite () {
 
     testQueryWithManyNodes : function() {
       let q = "LET x = NOOPT('testi')\n";
-      const cnt = 4000 - 4; // singleton + calculation + calculation + return
+      const cnt = 3000 - 4; // singleton + calculation + calculation + return
       for (let i = 0; i < cnt; ++i) {
         q += `FILTER x\n `;
       }
@@ -1371,7 +1371,7 @@ function ahuacatlQuerySimpleTestSuite () {
 
     testQueryWithTooManyNodes : function() {
       let q = "LET x = NOOPT('testi')\n";
-      const cnt = 4000; // plus singleton + calculation + calculation + return
+      const cnt = 3000; // plus singleton + calculation + calculation + return
       for (let i = 0; i < cnt; ++i) {
         q += `FILTER x\n `;
       }
@@ -1381,7 +1381,7 @@ function ahuacatlQuerySimpleTestSuite () {
 
     testQueryWithDeepExpression : function() {
       let q = "RETURN 0";
-      const cnt = 1000 - 2; 
+      const cnt = 500 - 2; 
       for (let i = 1; i <= cnt; ++i) {
         q += " + " + i;
       }
@@ -1390,7 +1390,7 @@ function ahuacatlQuerySimpleTestSuite () {
 
     testQueryWithTooDeepExpression : function() {
       let q = "RETURN 0";
-      const cnt = 1000; 
+      const cnt = 500; 
       for (let i = 0; i < cnt; ++i) {
         q += " + " + i;
       }