Improve query memory usage

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

package.json

@@ -19,7 +19,7 @@
     "stop_arangodb": "arangodb --starter.mode=single --starter.local --starter.port=8528 --starter.data-dir=./db stop",
     "compile-json-schema": "ajv --all-errors true compile -s src/schema/preparation/source-validation-modules/schema/schema.json -o src/schema/preparation/source-validation-modules/schema/validate-schema.js",
     "mrproper": "rimraf dist db node_modules package-lock.json",
-    "prepare": "husky install",
+    "prepare": "husky",
     "dev": "node cruddl-dev.js",
     "knip": "knip",
     "knip:prod": "knip --production"
@@ -60,11 +60,11 @@
     "deep-equal-in-any-order": "^1.1.20",
     "express": "^4.19.2",
     "graphql": "^16.6.0",
-    "husky": "^8.0.1",
+    "husky": "^9.1.7",
     "knip": "^5.27.0",
     "lint-staged": "^15.2.10",
     "log4js": "^6.6.0",
-    "mocha": "^11.7.1",
+    "mocha": "^11.7.5",
     "nyc": "^15.1.0",
     "prettier": "^3.3.3",
     "rimraf": "^3.0.2",
@@ -111,11 +111,6 @@
     ],
     "all": true
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npx lint-staged"
-    }
-  },
   "lint-staged": {
     "*": "prettier --ignore-unknown --write"
   }

spec/dev/model/simple.graphqls

@@ -50,7 +50,7 @@ type Skill @valueObject {
 }
 
 "A superhero movie"
-type Movie @rootEntity @roles(read: ["logistics-reader"]) {
+type Movie @rootEntity {
     name: String
     "All the heroes starring in this movie"
     heroes: [Hero] @relation
@@ -71,6 +71,7 @@ type Movie @rootEntity @roles(read: ["logistics-reader"]) {
 type Director @rootEntity {
     name: String
     movies: [Movie] @relation(inverseOf: "director")
+    allMissions: [Mission] @collect(path: "movies.heroes.missions", aggregate: DISTINCT)
 }
 
 "A description of a hero suit"

spec/dev/server.ts

@@ -3,7 +3,7 @@ import bodyParser from 'body-parser';
 import cors from 'cors';
 import express from 'express';
 import { resolve } from 'path';
-import { ArangoDBAdapter, Project } from '../..';
+import { ArangoDBAdapter, ExecutionOptions, Project } from '../..';
 import { globalContext } from '../../src/config/global';
 import { InMemoryAdapter } from '../../src/database/inmemory';
 import { getMetaSchema } from '../../src/meta-schema/meta-schema';
@@ -18,7 +18,7 @@ const databaseURL = 'http://root:@localhost:8529';
 // const databaseURL = 'http://root:@localhost:7050';
 
 export async function start() {
-    const loggerProvider = new Log4jsLoggerProvider('error');
+    const loggerProvider = new Log4jsLoggerProvider();
 
     let db;
     if (process.argv.includes('--db=in-memory')) {
@@ -44,7 +44,7 @@ export async function start() {
             );
         },
         getOperationIdentifier: ({ context }) => context as object, // each operation is executed with an unique context object
-        getExecutionOptions: ({ context }: { context: any }) => {
+        getExecutionOptions: ({ context }: { context: any }): ExecutionOptions => {
             return {
                 authContext: { authRoles: ['allusers'] },
                 recordTimings: true,

spec/helpers/log4js-logger-provider.ts

@@ -2,15 +2,10 @@ import { getLogger } from 'log4js';
 import { Logger, LoggerProvider } from '../../src/config/logging';
 
 export class Log4jsLoggerProvider implements LoggerProvider {
-    constructor(
-        public readonly level: string,
-        public readonly levelByCategory: { [category: string]: string } = {},
-    ) {}
-
     getLogger(category: string): Logger {
-        const logger = getLogger(category);
-        logger.level =
-            category in this.levelByCategory ? this.levelByCategory[category] : this.level;
-        return logger;
+        // note: we used to change the level here, but that does not work because in log4js,
+        // everything is global state (you're actually changing a category's level globally if you
+        // set .level on a logger)
+        return getLogger(category);
     }
 }

spec/helpers/warn-and-error-logger-provider.ts

@@ -0,0 +1,33 @@
+import { Logger, LoggerProvider } from '../../src/config/logging';
+
+export class WarnAndErrorLoggerProvider implements LoggerProvider {
+    getLogger(category: string): Logger {
+        // note: can't use log4js's getLogger because we can't set a log level on a logger
+        // (setting .level on a logger actually changes the level globally for that category)
+        return new WarnAndErrorLogger(category);
+    }
+}
+
+export class WarnAndErrorLogger implements Logger {
+    constructor(private category?: string) {}
+
+    trace = () => {};
+    debug = () => {};
+    info = () => {};
+    warn = (message: string, ...args: unknown[]) =>
+        console.warn(`[WARN] ${this.category}: ${message}`, ...args);
+    error = (message: string, ...args: unknown[]) =>
+        console.error(`[ERROR] ${this.category}: ${message}`, ...args);
+    fatal = (message: string, ...args: unknown[]) =>
+        console.error(`[FATAL] ${this.category}: ${message}`, ...args);
+
+    level = 'warn';
+
+    isLevelEnabled = (level: string) => ['warn', 'error', 'fatal'].includes(level.toLowerCase());
+    isTraceEnabled = () => false;
+    isDebugEnabled = () => false;
+    isInfoEnabled = () => false;
+    isWarnEnabled = () => true;
+    isErrorEnabled = () => true;
+    isFatalEnabled = () => true;
+}

spec/performance/support/helpers.ts

@@ -6,10 +6,10 @@ import { ArangoDBAdapter } from '../../../src/database/arangodb';
 import { Project } from '../../../src/project/project';
 import { loadProjectFromDir } from '../../../src/project/project-from-fs';
 import { range } from '../../../src/utils/utils';
-import { Log4jsLoggerProvider } from '../../helpers/log4js-logger-provider';
 import { createTempDatabase } from '../../regression/initialization';
+import { WarnAndErrorLoggerProvider } from '../../helpers/warn-and-error-logger-provider';
 
-// arangojs typings for this are completely broken
+// arangojs typings for this are completely bro ken
 export const aql: (template: TemplateStringsArray, ...args: ReadonlyArray<any>) => any =
     require('arangojs').aql;
 
@@ -22,7 +22,7 @@ export interface TestEnvironment {
 }
 
 const schemaContext: ProjectOptions = {
-    loggerProvider: new Log4jsLoggerProvider('warn'),
+    loggerProvider: new WarnAndErrorLoggerProvider(),
     getExecutionOptions: ({}) => ({ authContext: { authRoles: ['admin'] } }),
 };
 

spec/regression/access-groups/tests/accounting/aql/allFiles.aql

@@ -0,0 +1,15 @@
+RETURN {
+  "allFiles": (
+    FOR v_file1
+    IN (
+      FOR v_item1
+      IN @@files
+      FILTER (v_item1.`accessGroup` IN @var1)
+      RETURN v_item1
+    )
+    SORT (v_file1.`name`)
+    RETURN {
+      "name": v_file1.`name`
+    }
+  )
+}

spec/regression/access-groups/tests/accounting/result.json

@@ -0,0 +1,14 @@
+{
+  "allFiles": {
+    "data": {
+      "allFiles": [
+        {
+          "name": "accounting"
+        },
+        {
+          "name": "public"
+        }
+      ]
+    }
+  }
+}

spec/regression/access-groups/tests/accounting.graphql → spec/regression/access-groups/tests/accounting/test.graphql

@@ -1,4 +1,4 @@
-{
+query allFiles {
     allFiles(orderBy: name_ASC) {
         name
     }