Override version

.github/pull_request_template.md

@@ -1,14 +1,11 @@
 [master < Epic] PR
 - [ ] Check, and update documentation if necessary
+- [ ] Update [changelog](https://docs.memgraph.com/memgraph/changelog)
 - [ ] Write E2E tests
 - [ ] Compare the [benchmarking results](https://bench-graph.memgraph.com/) between the master branch and the Epic branch
 - [ ] Provide the full content or a guide for the final git message
 
 [master < Task] PR
 - [ ] Check, and update documentation if necessary
+- [ ] Update [changelog](https://docs.memgraph.com/memgraph/changelog)
 - [ ] Provide the full content or a guide for the final git message
-
-
-To keep docs changelog up to date, one more thing to do:
-- [ ] Write a release note here
-- [ ] Tag someone from docs team in the comments

.github/workflows/daily_benchmark.yaml

@@ -3,7 +3,7 @@ name: Daily Benchmark
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   release_benchmarks:
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -67,7 +67,7 @@ jobs:
       - name: Run mgbench
         run: |
           cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
+          ./benchmark.py --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
 
       - name: Upload mgbench results
         run: |

.github/workflows/diff.yaml

@@ -14,7 +14,6 @@ on:
       - "**/*.md"
       - ".clang-format"
       - "CODEOWNERS"
-      - "licenses/*"
 
 jobs:
   community_build:
@@ -27,7 +26,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -65,7 +64,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -76,7 +75,7 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch
 
-      - name: Initialize deps
+      - name: Build combined ASAN, UBSAN and coverage binaries
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
@@ -84,32 +83,6 @@ jobs:
           # Initialize dependencies.
           ./init
 
-      - name: Set base branch
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          echo "BASE_BRANCH=origin/${{ github.base_ref }}" >> $GITHUB_ENV
-
-      - name: Set base branch # if we manually dispatch or push to master
-        if: ${{ github.event_name != 'pull_request' }}
-        run: |
-          echo "BASE_BRANCH=origin/master" >> $GITHUB_ENV
-
-      - name: Python code analysis
-        run: |
-          CHANGED_FILES=$(git diff -U0 ${{ env.BASE_BRANCH }}... --name-only)
-          for file in ${CHANGED_FILES}; do
-            echo ${file}
-            if [[ ${file} == *.py ]]; then
-              python3 -m black --check --diff ${file}
-              python3 -m isort --check-only --diff ${file}
-            fi
-          done
-
-      - name: Build combined ASAN, UBSAN and coverage binaries
-        run: |
-          # Activate toolchain.
-          source /opt/toolchain-v4/activate
-
           cd build
           cmake -DTEST_COVERAGE=ON -DASAN=ON -DUBSAN=ON ..
           make -j$THREADS memgraph__unit
@@ -137,11 +110,21 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
 
+      - name: Set base branch
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo "BASE_BRANCH=origin/${{ github.base_ref }}" >> $GITHUB_ENV
+
+      - name: Set base branch # if we manually dispatch or push to master
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          echo "BASE_BRANCH=origin/master" >> $GITHUB_ENV
+
       - name: Run clang-tidy
         run: |
           source /opt/toolchain-v4/activate
@@ -162,7 +145,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -223,7 +206,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -238,7 +221,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -263,7 +246,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |
@@ -320,13 +303,13 @@ jobs:
           cpack -G DEB --config ../CPackConfig.cmake
 
       - name: Save enterprise DEB package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise DEB package"
           path: build/output/memgraph*.deb
 
       - name: Save test data
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         if: always()
         with:
           name: "Test data"
@@ -345,7 +328,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -370,7 +353,7 @@ jobs:
           ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
           name: "Jepsen Report"
@@ -386,7 +369,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -437,7 +420,7 @@ jobs:
       - name: Run mgbench
         run: |
           cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
+          ./benchmark.py --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
 
       - name: Upload mgbench results
         run: |

.github/workflows/full_clang_tidy.yaml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)

.github/workflows/package_all.yaml

@@ -2,12 +2,7 @@ name: Package All
 
 # TODO(gitbuda): Cleanup docker container if GHA job was canceled.
 
-on:
-  workflow_dispatch:
-    inputs:
-      memgraph_version:
-        description: "Memgraph version to upload as. If empty upload is skipped. Format: 'vX.Y.Z'"
-        required: false
+on: workflow_dispatch
 
 jobs:
   centos-7:
@@ -22,7 +17,7 @@ jobs:
         run: |
           ./release/package/run.sh package centos-7
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: centos-7
           path: build/output/centos-7/memgraph*.rpm
@@ -39,7 +34,7 @@ jobs:
         run: |
           ./release/package/run.sh package centos-9
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: centos-9
           path: build/output/centos-9/memgraph*.rpm
@@ -56,7 +51,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-10
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-10
           path: build/output/debian-10/memgraph*.deb
@@ -73,7 +68,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-11
           path: build/output/debian-11/memgraph*.deb
@@ -92,7 +87,7 @@ jobs:
           ./run.sh package debian-11 --for-docker
           ./run.sh docker
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: docker
           path: build/output/docker/memgraph*.tar.gz
@@ -109,9 +104,9 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-18.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: ubuntu-18.04
+          name: ubuntu-1804
           path: build/output/ubuntu-18.04/memgraph*.deb
 
   ubuntu-2004:
@@ -126,9 +121,9 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-20.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: ubuntu-20.04
+          name: ubuntu-2004
           path: build/output/ubuntu-20.04/memgraph*.deb
 
   ubuntu-2204:
@@ -143,9 +138,9 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-22.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: ubuntu-22.04
+          name: ubuntu-2204
           path: build/output/ubuntu-22.04/memgraph*.deb
 
   debian-11-platform:
@@ -160,45 +155,11 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11 --for-platform
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-11-platform
           path: build/output/debian-11/memgraph*.deb
 
-  fedora-36:
-    runs-on: [self-hosted, DockerMgBuild, X64]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package fedora-36
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: fedora-36
-          path: build/output/fedora-36/memgraph*.rpm
-
-  amzn-2:
-    runs-on: [self-hosted, DockerMgBuild, X64]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package amzn-2
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: amzn-2
-          path: build/output/amzn-2/memgraph*.rpm
-
   debian-11-arm:
     runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
     timeout-minutes: 60
@@ -211,46 +172,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11-arm
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
-          name: debian-11-aarch64
+          name: debian-11-arm
           path: build/output/debian-11-arm/memgraph*.deb
-
-  ubuntu-2204-arm:
-    runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package ubuntu-22.04-arm
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: ubuntu-22.04-aarch64
-          path: build/output/ubuntu-22.04-arm/memgraph*.deb
-
-  upload-to-s3:
-    # only run upload if we specified version. Allows for runs without upload
-    if: "${{ github.event.inputs.memgraph_version != '' }}"
-    needs: [centos-7, centos-9, debian-10, debian-11, docker, ubuntu-1804, ubuntu-2004, ubuntu-2204, debian-11-platform, fedora-36, amzn-2, debian-11-arm, ubuntu-2204-arm]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-        with:
-          # name: # if name input parameter is not provided, all artifacts are downloaded
-                  # and put in directories named after each one.
-          path: build/output/release
-      - name: Upload to S3
-        uses: jakejarvis/s3-sync-action@v0.5.1
-        env:
-          AWS_S3_BUCKET: "download.memgraph.com"
-          AWS_ACCESS_KEY_ID: ${{ secrets.S3_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: "eu-west-1"
-          SOURCE_DIR: "build/output/release"
-          DEST_DIR: "memgraph/${{ github.event.inputs.memgraph_version }}/"

.github/workflows/release_centos8.yaml

@@ -3,7 +3,7 @@ name: Release CentOS 8
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -225,7 +225,7 @@ jobs:
           rpmlint memgraph*.rpm
 
       - name: Save enterprise RPM package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise RPM package"
           path: build/output/memgraph*.rpm
@@ -262,7 +262,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |

.github/workflows/release_debian10.yaml

@@ -3,7 +3,7 @@ name: Release Debian 10
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -224,7 +224,7 @@ jobs:
           cpack -G DEB --config ../CPackConfig.cmake
 
       - name: Save enterprise DEB package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise DEB package"
           path: build/output/memgraph*.deb
@@ -261,7 +261,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |
@@ -324,7 +324,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -349,7 +349,7 @@ jobs:
           ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
           name: "Jepsen Report"

.github/workflows/release_docker.yaml

@@ -19,20 +19,20 @@ jobs:
       DOCKER_REPOSITORY_NAME: memgraph
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download memgraph binary
         run: |

.github/workflows/release_mgbench_client.yaml

@@ -1,63 +0,0 @@
-name: "Mgbench Bolt Client Publish Docker Image"
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Mgbench bolt client version to publish on Dockerhub."
-        required: true
-      force_release:
-        type: boolean
-        required: false
-        default: false
-
-jobs:
-  mgbench_docker_publish:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_ORGANIZATION_NAME: memgraph
-      DOCKER_REPOSITORY_NAME: mgbench-client
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Check if specified version is already pushed
-        run: |
-          EXISTS=$(docker manifest inspect $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:${{ github.event.inputs.version }} > /dev/null; echo $?)
-          echo $EXISTS
-          if [[ ${EXISTS} -eq 0 ]]; then
-              echo 'The specified version has been already released to DockerHub.'
-              if [[ ${{ github.event.inputs.force_release }} = true ]]; then
-                echo 'Forcing the release!'
-              else
-                echo 'Stopping the release!'
-                exit 1
-              fi
-          else
-              echo 'All good the specified version has not been release to DockerHub.'
-          fi
-
-      - name: Build & push docker images
-        run: |
-          cd tests/mgbench
-          docker buildx build \
-          --build-arg TOOLCHAIN_VERSION=toolchain-v4 \
-          --platform linux/amd64,linux/arm64 \
-          --tag $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:${{ github.event.inputs.version }} \
-          --tag $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:latest \
-          --file Dockerfile.mgbench_client \
-          --push .

.github/workflows/release_ubuntu2004.yaml

@@ -3,7 +3,7 @@ name: Release Ubuntu 20.04
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -224,7 +224,7 @@ jobs:
           cpack -G DEB --config ../CPackConfig.cmake
 
       - name: Save enterprise DEB package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise DEB package"
           path: build/output/memgraph*.deb
@@ -261,7 +261,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |

.gitignore

@@ -34,6 +34,9 @@ TAGS
 *.fas
 *.fasl
 
+# LCP generated C++ files
+*.lcp.cpp
+
 src/database/distributed/serialization.hpp
 src/database/single_node_ha/serialization.hpp
 src/distributed/bfs_rpc_messages.hpp
@@ -47,11 +50,15 @@ src/distributed/pull_produce_rpc_messages.hpp
 src/distributed/storage_gc_rpc_messages.hpp
 src/distributed/token_sharing_rpc_messages.hpp
 src/distributed/updates_rpc_messages.hpp
+src/query/frontend/ast/ast.hpp
+src/query/distributed/frontend/ast/ast_serialization.hpp
 src/durability/distributed/state_delta.hpp
 src/durability/single_node/state_delta.hpp
 src/durability/single_node_ha/state_delta.hpp
+src/query/frontend/semantic/symbol.hpp
 src/query/distributed/frontend/semantic/symbol_serialization.hpp
 src/query/distributed/plan/ops.hpp
+src/query/plan/operator.hpp
 src/raft/log_entry.hpp
 src/raft/raft_rpc_messages.hpp
 src/raft/snapshot_metadata.hpp

.pre-commit-config.yaml

@@ -1,19 +1,23 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v2.3.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort (python)
+        args: # arguments to configure black
+          - --line-length=120
+          - --include='\.pyi?$'
+          # these folders wont be formatted by black
+          - --exclude="""\.git |
+            \.__pycache__|
+            build|
+            libs|
+            .cache"""
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v13.0.0
     hooks:

CMakeLists.txt

@@ -54,7 +54,7 @@ option(MG_ENTERPRISE "Build Memgraph Enterprise Edition" ON)
 # Set the current version here to override the automatic version detection. The
 # version must be specified as `X.Y.Z`. Primarily used when building new patch
 # versions.
-set(MEMGRAPH_OVERRIDE_VERSION "")
+set(MEMGRAPH_OVERRIDE_VERSION "2.4.2")
 
 # Custom suffix that this version should have. The suffix can be any arbitrary
 # string. Primarily used when building a version for a specific customer.
@@ -231,15 +231,7 @@ endif()
 message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
 # -----------------------------------------------------------------------------
 
-if (NOT MG_ARCH)
-    set(MG_ARCH_DESCR "Host architecture to build Memgraph on. Supported values are x86_64, ARM64.")
-    if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64")
-        set(MG_ARCH "ARM64" CACHE STRING ${MG_ARCH_DESCR})
-    else()
-        set(MG_ARCH "x86_64" CACHE STRING ${MG_ARCH_DESCR})
-    endif()
-endif()
-message(STATUS "MG_ARCH: ${MG_ARCH}")
+set(MG_ARCH "x86_64" CACHE STRING "Host architecture to build Memgraph on. Supported values are x86_64 (default), ARM64.")
 
 # setup external dependencies -------------------------------------------------
 

README.md

@@ -4,6 +4,10 @@
 
 ---
 
+<p align="center">
+Build modern, graph-based applications on top of your streaming data in minutes.
+</p>
+
 <p align="center">
   <a href="https://github.com/memgraph/memgraph/blob/master/licenses/APL.txt">
     <img src="https://img.shields.io/badge/license-APL-green" alt="license" title="license"/>
@@ -18,7 +22,7 @@
 
 <p align="center">
   <a href="https://github.com/memgraph/memgraph">
-     <img src="https://img.shields.io/github/actions/workflow/status/memgraph/memgraph/release_debian10.yaml?branch=master&label=build%20and%20test&logo=github"/>
+    <img src="https://img.shields.io/github/workflow/status/memgraph/memgraph/Release%20Ubuntu%2020.04/master" alt="build" title="build"/>
   </a>
   <a href="https://memgraph.com/docs/" alt="Documentation">
     <img src="https://img.shields.io/badge/documentation-Memgraph-orange" />
@@ -33,10 +37,9 @@
 
 ## :clipboard: Description
 
-Memgraph is an open source graph database built for real-time streaming and
-compatible with Neo4j. Whether you're a developer or a data scientist with
-interconnected data, Memgraph will get you the immediate actionable insights
-fast.
+Memgraph is a streaming graph application platform that helps you wrangle your
+streaming data, build sophisticated models that you can query in real-time, and
+develop graph applications.
 
 Memgraph directly connects to your streaming infrastructure. You can ingest data
 from sources like Kafka, SQL, or plain CSV files. Memgraph provides a standard
@@ -48,20 +51,8 @@ natural and effective way to model many real-world problems without relying on
 complex SQL schemas.
 
 Memgraph is implemented in C/C++ and leverages an in-memory first architecture
-to ensure that you’re getting the [best possible
-performance](http://memgraph.com/benchgraph) consistently and without surprises.
-It’s also ACID-compliant and highly available.
-
-## :zap: Features
-
-- Run Python, Rust, and C/C++ code natively, check out the
-  [MAGE](https://github.com/memgraph/mage) graph algorithm library
-- Native support for machine learning
-- Streaming support
-- Replication
-- Authentication and authorization
-- ACID compliance
-
+to ensure that you’re getting the best possible performance consistently and
+without surprises. It’s also ACID-compliant and highly available.
 
 ## :video_game: Memgraph Playground
 
@@ -85,49 +76,28 @@ your browser.
 ### macOS
 
 [![macOS](https://img.shields.io/badge/macOS-Docker-000000?style=for-the-badge&logo=macos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-on-macos-docker)
-[![macOS](https://img.shields.io/badge/lima-AACF41?style=for-the-badge&logo=macos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-on-ubuntu)
 
 ### Linux
 
 [![Linux](https://img.shields.io/badge/Linux-Docker-FCC624?style=for-the-badge&logo=linux&logoColor=black)](https://memgraph.com/docs/memgraph/install-memgraph-on-linux-docker)
 [![Debian](https://img.shields.io/badge/Debian-D70A53?style=for-the-badge&logo=debian&logoColor=white)](https://memgraph.com/docs/memgraph/install-memgraph-on-debian)
 [![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white)](https://memgraph.com/docs/memgraph/install-memgraph-on-ubuntu)
-[![Cent OS](https://img.shields.io/badge/cent%20os-002260?style=for-the-badge&logo=centos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
-[![Fedora](https://img.shields.io/badge/fedora-0B57A4?style=for-the-badge&logo=fedora&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
-[![RedHat](https://img.shields.io/badge/redhat-EE0000?style=for-the-badge&logo=redhat&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
+[![Cent
+OS](https://img.shields.io/badge/cent%20os-002260?style=for-the-badge&logo=centos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
 
 You can find the binaries and Docker images on the [Download
 Hub](https://memgraph.com/download) and the installation instructions in the
 [official documentation](https://memgraph.com/docs/memgraph/installation).
 
+## :zap: Features
 
-## :cloud: Memgraph Cloud
-
-Check out [Memgraph Cloud](https://memgraph.com/docs/memgraph-cloud) - a cloud service fully managed on AWS and available in 6 geographic regions around the world. Memgraph Cloud allows you to create projects with Enterprise instances of MemgraphDB from your browser.
-
-<p align="left">
-  <a href="https://memgraph.com/docs/memgraph-cloud">
-    <img width="450px" alt="Memgraph Cloud" src="https://public-assets.memgraph.com/memgraph-gifs%2Fcloud.gif">
-  </a>
-</p>
-
-## :link: Connect to Memgraph
-
-[Connect to the database](https://memgraph.com/docs/memgraph/connect-to-memgraph) using Memgraph Lab, mgconsole, various drivers (Python, C/C++ and others) and WebSocket. 
-
-### :microscope: Memgraph Lab
-
-Visualize graphs and play with queries to understand your data. [Memgraph Lab](https://memgraph.com/docs/memgraph-lab) is a user interface that helps you explore and manipulate the data stored in Memgraph. Visualize graphs, execute ad hoc queries, and optimize their performance.
-
-<p align="left">
-  <a href="https://memgraph.com/docs/memgraph-lab">
-    <img width="450px" alt="Memgraph Cloud" src="https://public-assets.memgraph.com/memgraph-gifs%2Flab.gif">
-  </a>
-</p>
-
-## :file_folder: Import data
-
-[Import data](https://memgraph.com/docs/memgraph/import-data) into Memgraph using Kafka, RedPanda or Pulsar streams, CSV and JSON files, or Cypher commands.
+- Run Python, Rust, and C/C++ code natively, check out the
+  [MAGE](https://github.com/memgraph/mage) graph algorithm library
+- Native support for machine learning
+- Streaming support
+- Replication
+- Authentication and authorization
+- ACID compliance
 
 ## :bookmark_tabs: Documentation
 
@@ -171,17 +141,8 @@ Memgraph Community is available under the [BSL
 license](./licenses/BSL.txt).</br> Memgraph Enterprise is available under the
 [MEL license](./licenses/MEL.txt).
 
-## :busts_in_silhouette: Community
-
-- :purple_heart: [**Discord**](https://discord.gg/memgraph)
-- :ocean: [**Stack Overflow**](https://stackoverflow.com/questions/tagged/memgraphdb)
-- :busts_in_silhouette: [**Discourse forum**](https://discourse.memgraph.com/)
-- :bird: [**Twitter**](https://twitter.com/memgraphdb)
-- :movie_camera:
-  [**YouTube**](https://www.youtube.com/channel/UCZ3HOJvHGxtQ_JHxOselBYg)
-
 <p align="center">
   <a href="#">
-    <img src="https://img.shields.io/badge/⬆️ back_to_top_⬆️-white" alt="Back to top" title="Back to top"/>
+    <img src="https://img.shields.io/badge/⬆️back_to_top_⬆️-white" alt="Back to top" title="Back to top"/>
   </a>
 </p>

config/flags.yaml

@@ -103,10 +103,6 @@ modifications:
     value: "true"
     override: false
 
-  - name: "storage_parallel_index_recovery"
-    value: "false"
-    override: true
-
 undocumented:
   - "flag_file"
   - "also_log_to_stderr"

config/generate.py

@@ -5,10 +5,12 @@ import os
 import subprocess
 import sys
 import textwrap
+
 import xml.etree.ElementTree as ET
 
 import yaml
 
+
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 CONFIG_FILE = os.path.join(SCRIPT_DIR, "flags.yaml")
 WIDTH = 80
@@ -16,13 +18,14 @@ WIDTH = 80
 
 def wrap_text(s, initial_indent="# "):
     return "\n#\n".join(
-        map(lambda x: textwrap.fill(x, WIDTH, initial_indent=initial_indent, subsequent_indent="# "), s.split("\n"))
-    )
+        map(lambda x: textwrap.fill(x, WIDTH, initial_indent=initial_indent,
+                                    subsequent_indent="# "), s.split("\n")))
 
 
 def extract_flags(binary_path):
     ret = {}
-    data = subprocess.run([binary_path, "--help-xml"], stdout=subprocess.PIPE).stdout.decode("utf-8")
+    data = subprocess.run([binary_path, "--help-xml"],
+                          stdout=subprocess.PIPE).stdout.decode("utf-8")
     root = ET.fromstring(data)
     for child in root:
         if child.tag == "usage" and child.text.lower().count("warning"):
@@ -43,7 +46,8 @@ def apply_config_to_flags(config, flags):
     for modification in config["modifications"]:
         name = modification["name"]
         if name not in flags:
-            print("WARNING: Flag '" + name + "' missing from binary!", file=sys.stderr)
+            print("WARNING: Flag '" + name + "' missing from binary!",
+                  file=sys.stderr)
             continue
         flags[name]["default"] = modification["value"]
         flags[name]["override"] = modification["override"]
@@ -71,9 +75,8 @@ def extract_sections(flags):
     else:
         sections.append((current_section, current_flags))
     sections.append(("other", other))
-    assert set(sum(map(lambda x: x[1], sections), [])) == set(
-        flags.keys()
-    ), "The section extraction algorithm lost some flags!"
+    assert set(sum(map(lambda x: x[1], sections), [])) == set(flags.keys()), \
+        "The section extraction algorithm lost some flags!"
     return sections
 
 
@@ -86,7 +89,8 @@ def generate_config_file(sections, flags):
             helpstr = flag["meaning"] + " [" + flag["type"] + "]"
             ret += wrap_text(helpstr) + "\n"
             prefix = "# " if not flag["override"] else ""
-            ret += prefix + "--" + flag["name"].replace("_", "-") + "=" + flag["default"] + "\n\n"
+            ret += prefix + "--" + flag["name"].replace("_", "-") + \
+                "=" + flag["default"] + "\n\n"
         ret += "\n"
     ret += wrap_text(config["footer"])
     return ret.strip() + "\n"
@@ -94,9 +98,13 @@ def generate_config_file(sections, flags):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument("memgraph_binary", help="path to Memgraph binary")
-    parser.add_argument("output_file", help="path where to store the generated Memgraph " "configuration file")
-    parser.add_argument("--config-file", default=CONFIG_FILE, help="path to generator configuration file")
+    parser.add_argument("memgraph_binary",
+                        help="path to Memgraph binary")
+    parser.add_argument("output_file",
+                        help="path where to store the generated Memgraph "
+                        "configuration file")
+    parser.add_argument("--config-file", default=CONFIG_FILE,
+                        help="path to generator configuration file")
 
     args = parser.parse_args()
     flags = extract_flags(args.memgraph_binary)

environment/os/amzn-2.sh

@@ -1,156 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-check_operating_system "amzn-2"
-check_architecture "x86_64"
-
-TOOLCHAIN_BUILD_DEPS=(
-    gcc gcc-c++ make # generic build tools
-    wget # used for archive download
-    gnupg2 # used for archive signature verification
-    tar gzip bzip2 xz unzip # used for archive unpacking
-    zlib-devel # zlib library used for all builds
-    expat-devel xz-devel python3-devel texinfo
-    curl libcurl-devel # for cmake
-    readline-devel # for cmake and llvm
-    libffi-devel libxml2-devel # for llvm
-    libedit-devel pcre-devel automake bison # for swig
-    file
-    openssl-devel
-    gmp-devel
-    gperf
-    diffutils
-    patch
-    libipt libipt-devel # intel
-    perl # for openssl
-)
-
-TOOLCHAIN_RUN_DEPS=(
-    make # generic build tools
-    tar gzip bzip2 xz # used for archive unpacking
-    zlib # zlib library used for all builds
-    expat xz-libs python3 # for gdb
-    readline # for cmake and llvm
-    libffi libxml2 # for llvm
-    openssl-devel
-)
-
-MEMGRAPH_BUILD_DEPS=(
-    git # source code control
-    make # build system
-    wget # for downloading libs
-    libuuid-devel java-11-openjdk # required by antlr
-    readline-devel # for memgraph console
-    python3-devel # for query modules
-    openssl-devel
-    libseccomp-devel
-    python3 python3-pip nmap-ncat # for tests
-    #
-    # IMPORTANT: python3-yaml does NOT exist on CentOS
-    # Install it using `pip3 install PyYAML`
-    #
-    PyYAML # Package name here does not correspond to the yum package!
-    libcurl-devel # mg-requests
-    rpm-build rpmlint # for RPM package building
-    doxygen graphviz # source documentation generators
-    which nodejs golang zip unzip java-11-openjdk-devel # for driver tests
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    local missing=""
-    # On Fedora yum/dnf and python10 use newer glibc which is not compatible
-    # with ours, so we need to momentarely disable env
-    local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-""}
-    LD_LIBRARY_PATH=""
-    for pkg in $1; do
-        if [ "$pkg" == "PyYAML" ]; then
-            if ! python3 -c "import yaml" >/dev/null 2>/dev/null; then
-                missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! yum list installed "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
-    LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
-}
-
-install() {
-    cd "$DIR"
-    if [ "$EUID" -ne 0 ]; then
-        echo "Please run as root."
-        exit 1
-    fi
-    # If GitHub Actions runner is installed, append LANG to the environment.
-    # Python related tests don't work without the LANG export.
-    if [ -d "/home/gh/actions-runner" ]; then
-        echo "LANG=en_US.utf8" >> /home/gh/actions-runner/.env
-    else
-        echo "NOTE: export LANG=en_US.utf8"
-    fi
-    yum update -y
-    for pkg in $1; do
-        if [ "$pkg" == libipt ]; then
-            if ! yum list installed libipt >/dev/null 2>/dev/null; then
-                yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/libipt-1.6.1-8.el8.x86_64.rpm
-            fi
-            continue
-        fi
-        if [ "$pkg" == libipt-devel ]; then
-            if ! yum list installed libipt-devel >/dev/null 2>/dev/null; then
-                yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/libipt-devel-1.6.1-8.el8.x86_64.rpm
-            fi
-            continue
-        fi
-        if [ "$pkg" == nodejs ]; then
-            curl -sL https://rpm.nodesource.com/setup_16.x | bash -
-            if ! yum list installed nodejs >/dev/null 2>/dev/null; then
-                yum install -y nodejs
-            fi
-            continue
-        fi
-        if [ "$pkg" == PyYAML ]; then
-            if [ -z ${SUDO_USER+x} ]; then # Running as root (e.g. Docker).
-                pip3 install --user PyYAML
-            else # Running using sudo.
-                sudo -H -u "$SUDO_USER" bash -c "pip3 install --user PyYAML"
-            fi
-            continue
-        fi
-        if [ "$pkg" == nodejs ]; then
-            curl -sL https://rpm.nodesource.com/setup_16.x | bash -
-            if ! yum list installed nodejs >/dev/null 2>/dev/null; then
-                yum install -y nodejs
-            fi
-            continue
-        fi
-        if [ "$pkg" == java-11-openjdk ]; then
-            amazon-linux-extras install -y java-openjdk11
-            continue
-        fi
-        if [ "$pkg" == java-11-openjdk-devel ]; then
-            amazon-linux-extras install -y java-openjdk11
-            yum install -y java-11-openjdk-devel
-            continue
-        fi
-        yum install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/os/fedora-36.sh

@@ -26,7 +26,6 @@ TOOLCHAIN_BUILD_DEPS=(
     diffutils
     libipt libipt-devel # intel
     patch
-    perl # for openssl
 )
 
 TOOLCHAIN_RUN_DEPS=(
@@ -37,6 +36,7 @@ TOOLCHAIN_RUN_DEPS=(
     readline # for cmake and llvm
     libffi libxml2 # for llvm
     openssl-devel
+    perl # for openssl
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -64,10 +64,6 @@ list() {
 
 check() {
     local missing=""
-    # On Fedora yum/dnf and python10 use newer glibc which is not compatible
-    # with ours, so we need to momentarely disable env
-    local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-    LD_LIBRARY_PATH=""
     for pkg in $1; do
         if ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
             missing="$pkg $missing"
@@ -77,7 +73,6 @@ check() {
         echo "MISSING PACKAGES: $missing"
         exit 1
     fi
-    LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
 }
 
 install() {

environment/os/ubuntu-22.04-arm.sh

@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-check_operating_system "ubuntu-22.04"
-check_architecture "arm64" "aarch64"
-
-TOOLCHAIN_BUILD_DEPS=(
-    coreutils gcc g++ build-essential make # generic build tools
-    wget # used for archive download
-    gnupg # used for archive signature verification
-    tar gzip bzip2 xz-utils unzip # used for archive unpacking
-    zlib1g-dev # zlib library used for all builds
-    libexpat1-dev libbabeltrace-dev liblzma-dev python3-dev texinfo # for gdb
-    libcurl4-openssl-dev # for cmake
-    libreadline-dev # for cmake and llvm
-    libffi-dev libxml2-dev # for llvm
-    curl # snappy
-    file
-    git # for thrift
-    libgmp-dev # for gdb
-    gperf # for proxygen
-    libssl-dev
-    libedit-dev libpcre3-dev automake bison # for swig
-)
-
-TOOLCHAIN_RUN_DEPS=(
-    make # generic build tools
-    tar gzip bzip2 xz-utils # used for archive unpacking
-    zlib1g # zlib library used for all builds
-    libexpat1 libbabeltrace1 liblzma5 python3 # for gdb
-    libcurl4 # for cmake
-    libreadline8 # for cmake and llvm
-    libffi7 libxml2 # for llvm
-    libssl-dev # for libevent
-)
-
-MEMGRAPH_BUILD_DEPS=(
-    git # source code control
-    make pkg-config # build system
-    curl wget # for downloading libs
-    uuid-dev default-jre-headless # required by antlr
-    libreadline-dev # for memgraph console
-    libpython3-dev python3-dev # for query modules
-    libssl-dev
-    libseccomp-dev
-    netcat # tests are using nc to wait for memgraph
-    python3 python3-virtualenv python3-pip # for qa, macro_benchmark and stress tests
-    python3-yaml # for the configuration generator
-    libcurl4-openssl-dev # mg-requests
-    sbcl # for custom Lisp C++ preprocessing
-    doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
-    dotnet-sdk-6.0 golang nodejs npm
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    check_all_dpkg "$1"
-}
-
-install() {
-    cd "$DIR"
-    apt update
-    # If GitHub Actions runner is installed, append LANG to the environment.
-    # Python related tests doesn't work the LANG export.
-    if [ -d "/home/gh/actions-runner" ]; then
-        echo "LANG=en_US.utf8" >> /home/gh/actions-runner/.env
-    else
-        echo "NOTE: export LANG=en_US.utf8"
-    fi
-    apt install -y wget
-    for pkg in $1; do
-        if [ "$pkg" == dotnet-sdk-6.0 ]; then
-            if ! dpkg -s dotnet-sdk-6.0 2>/dev/null >/dev/null; then
-                wget -nv https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-                dpkg -i packages-microsoft-prod.deb
-                apt-get update
-                apt-get install -y apt-transport-https dotnet-sdk-6.0
-            fi
-            continue
-        fi
-        apt install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/toolchain/v4.sh

@@ -51,19 +51,11 @@ CPPCHECK_VERSION=2.6
 LLVM_VERSION=13.0.0
 SWIG_VERSION=4.0.2 # used only for LLVM compilation
 
-# Set the right env script
-ENV_SCRIPT="$DIR/../os/$DISTRO.sh"
-if [[ "$for_arm" = true ]]; then
-    ENV_SCRIPT="$DIR/../os/$DISTRO-arm.sh"
-fi
-
-# Check for the toolchain build dependencies.
-echo "ALL BUILD PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_BUILD_DEPS)"
-${ENV_SCRIPT} check TOOLCHAIN_BUILD_DEPS
-
-# Check for the toolchain run dependencies.
-echo "ALL RUN PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_RUN_DEPS)"
-${ENV_SCRIPT} check TOOLCHAIN_RUN_DEPS
+# Check for the dependencies.
+echo "ALL BUILD PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
+$DIR/../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
+echo "ALL RUN PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
+$DIR/../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
 
 # check installation directory
 NAME=toolchain-v$TOOLCHAIN_VERSION
@@ -387,62 +379,6 @@ if [ ! -f $PREFIX/bin/gdb ]; then
                 --without-babeltrace \
                 --enable-tui \
                 --with-python=python3
-    elif [[ "${DISTRO}" == fedora* ]]; then
-        # Remove readline, gdb does not compile
-        env \
-            CC=gcc \
-            CXX=g++ \
-            CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CPPFLAGS="-Wdate-time -D_FORTIFY_SOURCE=2 -fPIC" \
-            LDFLAGS="-Wl,-z,relro" \
-            PYTHON="" \
-            ../configure \
-                --build=x86_64-linux-gnu \
-                --host=x86_64-linux-gnu \
-                --prefix=$PREFIX \
-                --disable-maintainer-mode \
-                --disable-dependency-tracking \
-                --disable-silent-rules \
-                --disable-gdbtk \
-                --disable-shared \
-                --without-guile \
-                --with-system-gdbinit=$PREFIX/etc/gdb/gdbinit \
-                --with-expat \
-                --with-system-zlib \
-                --with-lzma \
-                --with-babeltrace \
-                --with-intel-pt \
-                --enable-tui \
-                --with-python=python3
-    elif [[ "${DISTRO}" == "amzn-2" ]]; then
-        # Remove readline, gdb does not compile
-        env \
-            CC=gcc \
-            CXX=g++ \
-            CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CPPFLAGS="-Wdate-time -D_FORTIFY_SOURCE=2 -fPIC" \
-            LDFLAGS="-Wl,-z,relro" \
-            PYTHON="" \
-            ../configure \
-                --build=x86_64-linux-gnu \
-                --host=x86_64-linux-gnu \
-                --prefix=$PREFIX \
-                --disable-maintainer-mode \
-                --disable-dependency-tracking \
-                --disable-silent-rules \
-                --disable-gdbtk \
-                --disable-shared \
-                --without-guile \
-                --with-system-gdbinit=$PREFIX/etc/gdb/gdbinit \
-                --with-expat \
-                --with-system-zlib \
-                --with-lzma \
-                --with-babeltrace \
-                --with-intel-pt \
-                --enable-tui \
-                --with-python=python3
     else
         # https://buildd.debian.org/status/fetch.php?pkg=gdb&arch=amd64&ver=8.2.1-2&stamp=1550831554&raw=0
         env \
@@ -658,7 +594,7 @@ In order to be able to run all of these tools you should install the following
 packages:
 
 \`\`\`
-$($DIR/../os/$ENV_SCRIPT.sh list TOOLCHAIN_RUN_DEPS)
+$($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
 \`\`\`
 
 ## Usage
@@ -715,7 +651,6 @@ export PS1="($NAME) \$PS1"
 export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib64
 export CXXFLAGS=-isystem\ $PREFIX/include\ \$CXXFLAGS
 export CFLAGS=-isystem\ $PREFIX/include\ \$CFLAGS
-export VENV=$PREFIX
 
 # disable root
 function su () {
@@ -767,7 +702,7 @@ PROXYGEN_SHA256=5360a8ccdfb2f5a6c7b3eed331ec7ab0e2c792d579c6fff499c85c516c11fe14
 SNAPPY_SHA256=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
 SNAPPY_VERSION=1.1.9
 XZ_VERSION=5.2.5 # for LZMA
-ZLIB_VERSION=1.2.13
+ZLIB_VERSION=1.2.12
 ZSTD_VERSION=1.5.0
 WANGLE_SHA256=1002e9c32b6f4837f6a760016e3b3e22f3509880ef3eaad191c80dc92655f23f
 
@@ -1171,121 +1106,119 @@ if [ ! -f $PREFIX/include/libaio.h ]; then
     popd
 fi
 
-if [[ "${DISTRO}" != "amzn-2" ]]; then
-    log_tool_name "folly $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/folly ]; then
-        if [ -d folly-$FBLIBS_VERSION ]; then
-            rm -rf folly-$FBLIBS_VERSION
-        fi
-        mkdir folly-$FBLIBS_VERSION
-        tar -xzf ../archives/folly-$FBLIBS_VERSION.tar.gz -C folly-$FBLIBS_VERSION
-        pushd folly-$FBLIBS_VERSION
-        patch -p1 < ../../folly.patch
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -DBOOST_LINK_STATIC=ON \
-            -DBUILD_TESTS=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DCXX_STD="c++20"
-        make -j$CPUS install
-        popd && popd
+log_tool_name "folly $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/folly ]; then
+    if [ -d folly-$FBLIBS_VERSION ]; then
+        rm -rf folly-$FBLIBS_VERSION
     fi
+    mkdir folly-$FBLIBS_VERSION
+    tar -xzf ../archives/folly-$FBLIBS_VERSION.tar.gz -C folly-$FBLIBS_VERSION
+    pushd folly-$FBLIBS_VERSION
+    patch -p1 < ../../folly.patch
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -DBOOST_LINK_STATIC=ON \
+        -DBUILD_TESTS=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DCXX_STD="c++20"
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "fizz $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/fizz ]; then
-        if [ -d fizz-$FBLIBS_VERSION ]; then
-            rm -rf fizz-$FBLIBS_VERSION
-        fi
-        mkdir fizz-$FBLIBS_VERSION
-        tar -xzf ../archives/fizz-$FBLIBS_VERSION.tar.gz -C fizz-$FBLIBS_VERSION
-        pushd fizz-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake ../fizz $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "fizz $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/fizz ]; then
+    if [ -d fizz-$FBLIBS_VERSION ]; then
+        rm -rf fizz-$FBLIBS_VERSION
     fi
+    mkdir fizz-$FBLIBS_VERSION
+    tar -xzf ../archives/fizz-$FBLIBS_VERSION.tar.gz -C fizz-$FBLIBS_VERSION
+    pushd fizz-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake ../fizz $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_EXAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "wangle FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/wangle ]; then
-        if [ -d wangle-$FBLIBS_VERSION ]; then
-            rm -rf wangle-$FBLIBS_VERSION
-        fi
-        mkdir wangle-$FBLIBS_VERSION
-        tar -xzf ../archives/wangle-$FBLIBS_VERSION.tar.gz -C wangle-$FBLIBS_VERSION
-        pushd wangle-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake ../wangle $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "wangle FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/wangle ]; then
+    if [ -d wangle-$FBLIBS_VERSION ]; then
+        rm -rf wangle-$FBLIBS_VERSION
     fi
+    mkdir wangle-$FBLIBS_VERSION
+    tar -xzf ../archives/wangle-$FBLIBS_VERSION.tar.gz -C wangle-$FBLIBS_VERSION
+    pushd wangle-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake ../wangle $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_EXAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "proxygen $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/proxygen ]; then
-        if [ -d proxygen-$FBLIBS_VERSION ]; then
-            rm -rf proxygen-$FBLIBS_VERSION
-        fi
-        mkdir proxygen-$FBLIBS_VERSION
-        tar -xzf ../archives/proxygen-$FBLIBS_VERSION.tar.gz -C proxygen-$FBLIBS_VERSION
-        pushd proxygen-$FBLIBS_VERSION
-        patch -p1 < ../../proxygen.patch
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_SAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DBUILD_QUIC=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "proxygen $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/proxygen ]; then
+    if [ -d proxygen-$FBLIBS_VERSION ]; then
+        rm -rf proxygen-$FBLIBS_VERSION
     fi
+    mkdir proxygen-$FBLIBS_VERSION
+    tar -xzf ../archives/proxygen-$FBLIBS_VERSION.tar.gz -C proxygen-$FBLIBS_VERSION
+    pushd proxygen-$FBLIBS_VERSION
+    patch -p1 < ../../proxygen.patch
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_SAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DBUILD_QUIC=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "flex $FBLIBS_VERSION"
-    if [ ! -f $PREFIX/include/FlexLexer.h ]; then
-        if [ -d flex-$FLEX_VERSION ]; then
-            rm -rf flex-$FLEX_VERSION
-        fi
-        tar -xzf ../archives/flex-$FLEX_VERSION.tar.gz
-        pushd flex-$FLEX_VERSION
-        ./configure $COMMON_CONFIGURE_FLAGS
-        make -j$CPUS install
-        popd
+log_tool_name "flex $FBLIBS_VERSION"
+if [ ! -f $PREFIX/include/FlexLexer.h ]; then
+    if [ -d flex-$FLEX_VERSION ]; then
+        rm -rf flex-$FLEX_VERSION
     fi
+    tar -xzf ../archives/flex-$FLEX_VERSION.tar.gz
+    pushd flex-$FLEX_VERSION
+    ./configure $COMMON_CONFIGURE_FLAGS
+    make -j$CPUS install
+    popd
+fi
 
-    log_tool_name "fbthrift $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/thrift ]; then
-        if [ -d fbthrift-$FBLIBS_VERSION ]; then
-            rm -rf fbthrift-$FBLIBS_VERSION
-        fi
-        git clone --depth 1 --branch v$FBLIBS_VERSION https://github.com/facebook/fbthrift.git fbthrift-$FBLIBS_VERSION
-        pushd fbthrift-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
-            CMAKE_CXX_FLAGS="-fsized-deallocation"
-        else
-            CMAKE_CXX_FLAGS="-fsized-deallocation -stdlib=libc++"
-        fi
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -Denable_tests=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS"
-        make -j$CPUS install
-        popd
+log_tool_name "fbthrift $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/thrift ]; then
+    if [ -d fbthrift-$FBLIBS_VERSION ]; then
+        rm -rf fbthrift-$FBLIBS_VERSION
     fi
+    git clone --depth 1 --branch v$FBLIBS_VERSION https://github.com/facebook/fbthrift.git fbthrift-$FBLIBS_VERSION
+    pushd fbthrift-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
+        CMAKE_CXX_FLAGS="-fsized-deallocation"
+    else
+        CMAKE_CXX_FLAGS="-fsized-deallocation -stdlib=libc++"
+    fi
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -Denable_tests=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS"
+    make -j$CPUS install
+    popd
 fi
 
 popd
@@ -1293,7 +1226,7 @@ popd
 # create toolchain archive
 if [ ! -f $NAME-binaries-$DISTRO.tar.gz ]; then
     DISTRO_FULL_NAME=${DISTRO}
-    if [[ "${DISTRO}" == centos* ]] || [[ "${DISTRO}" == fedora* ]]; then
+    if [[ "${DISTRO}" == centos* ]]; then
         if [[ "$for_arm" = "true" ]]; then
             DISTRO_FULL_NAME="$DISTRO_FULL_NAME-aarch64"
         else

environment/util.sh

@@ -19,16 +19,13 @@ function architecture() {
 }
 
 check_architecture() {
-    local ARCH=$(architecture)
     for arch in "$@"; do
-        if [ "${ARCH}" = "$arch" ]; then
+        if [ "$(architecture)" = "$arch" ]; then
             echo "The right architecture!"
             return 0
         fi
     done
     echo "Not the right architecture!"
-    echo "Expected: $@"
-    echo "Actual: ${ARCH}"
     exit 1
 }
 

include/_mgp.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -22,7 +22,7 @@
 namespace mgp {
 
 namespace {
-inline void MgExceptionHandle(mgp_error result_code) {
+void MgExceptionHandle(mgp_error result_code) {
   switch (result_code) {
     case mgp_error::MGP_ERROR_UNKNOWN_ERROR:
       throw mg_exception::UnknownException();
@@ -62,7 +62,7 @@ TResult MgInvoke(TFunc func, TArgs... args) {
 }
 
 template <typename TFunc, typename... TArgs>
-inline void MgInvokeVoid(TFunc func, TArgs... args) {
+void MgInvokeVoid(TFunc func, TArgs... args) {
   auto result_code = func(args...);
   MgExceptionHandle(result_code);
 }
@@ -72,221 +72,211 @@ inline void MgInvokeVoid(TFunc func, TArgs... args) {
 
 // Make value
 
-inline mgp_value *value_make_null(mgp_memory *memory) { return MgInvoke<mgp_value *>(mgp_value_make_null, memory); }
+mgp_value *value_make_null(mgp_memory *memory) { return MgInvoke<mgp_value *>(mgp_value_make_null, memory); }
 
-inline mgp_value *value_make_bool(int val, mgp_memory *memory) {
+mgp_value *value_make_bool(int val, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_value_make_bool, val, memory);
 }
 
-inline mgp_value *value_make_int(int64_t val, mgp_memory *memory) {
+mgp_value *value_make_int(int64_t val, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_value_make_int, val, memory);
 }
 
-inline mgp_value *value_make_double(double val, mgp_memory *memory) {
+mgp_value *value_make_double(double val, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_value_make_double, val, memory);
 }
 
-inline mgp_value *value_make_string(const char *val, mgp_memory *memory) {
+mgp_value *value_make_string(const char *val, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_value_make_string, val, memory);
 }
 
-inline mgp_value *value_make_list(mgp_list *val) { return MgInvoke<mgp_value *>(mgp_value_make_list, val); }
+mgp_value *value_make_list(mgp_list *val) { return MgInvoke<mgp_value *>(mgp_value_make_list, val); }
 
-inline mgp_value *value_make_map(mgp_map *val) { return MgInvoke<mgp_value *>(mgp_value_make_map, val); }
+mgp_value *value_make_map(mgp_map *val) { return MgInvoke<mgp_value *>(mgp_value_make_map, val); }
 
-inline mgp_value *value_make_vertex(mgp_vertex *val) { return MgInvoke<mgp_value *>(mgp_value_make_vertex, val); }
+mgp_value *value_make_vertex(mgp_vertex *val) { return MgInvoke<mgp_value *>(mgp_value_make_vertex, val); }
 
-inline mgp_value *value_make_edge(mgp_edge *val) { return MgInvoke<mgp_value *>(mgp_value_make_edge, val); }
+mgp_value *value_make_edge(mgp_edge *val) { return MgInvoke<mgp_value *>(mgp_value_make_edge, val); }
 
-inline mgp_value *value_make_path(mgp_path *val) { return MgInvoke<mgp_value *>(mgp_value_make_path, val); }
+mgp_value *value_make_path(mgp_path *val) { return MgInvoke<mgp_value *>(mgp_value_make_path, val); }
 
-inline mgp_value *value_make_date(mgp_date *val) { return MgInvoke<mgp_value *>(mgp_value_make_date, val); }
+mgp_value *value_make_date(mgp_date *val) { return MgInvoke<mgp_value *>(mgp_value_make_date, val); }
 
-inline mgp_value *value_make_local_time(mgp_local_time *val) {
-  return MgInvoke<mgp_value *>(mgp_value_make_local_time, val);
-}
+mgp_value *value_make_local_time(mgp_local_time *val) { return MgInvoke<mgp_value *>(mgp_value_make_local_time, val); }
 
-inline mgp_value *value_make_local_date_time(mgp_local_date_time *val) {
+mgp_value *value_make_local_date_time(mgp_local_date_time *val) {
   return MgInvoke<mgp_value *>(mgp_value_make_local_date_time, val);
 }
 
-inline mgp_value *value_make_duration(mgp_duration *val) { return MgInvoke<mgp_value *>(mgp_value_make_duration, val); }
+mgp_value *value_make_duration(mgp_duration *val) { return MgInvoke<mgp_value *>(mgp_value_make_duration, val); }
 
 // Copy value
 
 // TODO: implement within MGP API
 // with primitive types ({bool, int, double, string}), create a new identical value
 // otherwise call mgp_##TYPE_copy and convert tpye
-inline mgp_value *value_copy(mgp_value *val, mgp_memory *memory) {
-  return MgInvoke<mgp_value *>(mgp_value_copy, val, memory);
-}
+mgp_value *value_copy(mgp_value *val, mgp_memory *memory) { return MgInvoke<mgp_value *>(mgp_value_copy, val, memory); }
 
 // Destroy value
 
-inline void value_destroy(mgp_value *val) { mgp_value_destroy(val); }
+void value_destroy(mgp_value *val) { mgp_value_destroy(val); }
 
 // Get value of type
 
-inline mgp_value_type value_get_type(mgp_value *val) { return MgInvoke<mgp_value_type>(mgp_value_get_type, val); }
+mgp_value_type value_get_type(mgp_value *val) { return MgInvoke<mgp_value_type>(mgp_value_get_type, val); }
 
-inline bool value_get_bool(mgp_value *val) { return MgInvoke<int>(mgp_value_get_bool, val); }
+bool value_get_bool(mgp_value *val) { return MgInvoke<int>(mgp_value_get_bool, val); }
 
-inline int64_t value_get_int(mgp_value *val) { return MgInvoke<int64_t>(mgp_value_get_int, val); }
+int64_t value_get_int(mgp_value *val) { return MgInvoke<int64_t>(mgp_value_get_int, val); }
 
-inline double value_get_double(mgp_value *val) { return MgInvoke<double>(mgp_value_get_double, val); }
+double value_get_double(mgp_value *val) { return MgInvoke<double>(mgp_value_get_double, val); }
 
-inline const char *value_get_string(mgp_value *val) { return MgInvoke<const char *>(mgp_value_get_string, val); }
+const char *value_get_string(mgp_value *val) { return MgInvoke<const char *>(mgp_value_get_string, val); }
 
-inline mgp_list *value_get_list(mgp_value *val) { return MgInvoke<mgp_list *>(mgp_value_get_list, val); }
+mgp_list *value_get_list(mgp_value *val) { return MgInvoke<mgp_list *>(mgp_value_get_list, val); }
 
-inline mgp_map *value_get_map(mgp_value *val) { return MgInvoke<mgp_map *>(mgp_value_get_map, val); }
+mgp_map *value_get_map(mgp_value *val) { return MgInvoke<mgp_map *>(mgp_value_get_map, val); }
 
-inline mgp_vertex *value_get_vertex(mgp_value *val) { return MgInvoke<mgp_vertex *>(mgp_value_get_vertex, val); }
+mgp_vertex *value_get_vertex(mgp_value *val) { return MgInvoke<mgp_vertex *>(mgp_value_get_vertex, val); }
 
-inline mgp_edge *value_get_edge(mgp_value *val) { return MgInvoke<mgp_edge *>(mgp_value_get_edge, val); }
+mgp_edge *value_get_edge(mgp_value *val) { return MgInvoke<mgp_edge *>(mgp_value_get_edge, val); }
 
-inline mgp_path *value_get_path(mgp_value *val) { return MgInvoke<mgp_path *>(mgp_value_get_path, val); }
+mgp_path *value_get_path(mgp_value *val) { return MgInvoke<mgp_path *>(mgp_value_get_path, val); }
 
-inline mgp_date *value_get_date(mgp_value *val) { return MgInvoke<mgp_date *>(mgp_value_get_date, val); }
+mgp_date *value_get_date(mgp_value *val) { return MgInvoke<mgp_date *>(mgp_value_get_date, val); }
 
-inline mgp_local_time *value_get_local_time(mgp_value *val) {
+mgp_local_time *value_get_local_time(mgp_value *val) {
   return MgInvoke<mgp_local_time *>(mgp_value_get_local_time, val);
 }
 
-inline mgp_local_date_time *value_get_local_date_time(mgp_value *val) {
+mgp_local_date_time *value_get_local_date_time(mgp_value *val) {
   return MgInvoke<mgp_local_date_time *>(mgp_value_get_local_date_time, val);
 }
 
-inline mgp_duration *value_get_duration(mgp_value *val) {
-  return MgInvoke<mgp_duration *>(mgp_value_get_duration, val);
-}
+mgp_duration *value_get_duration(mgp_value *val) { return MgInvoke<mgp_duration *>(mgp_value_get_duration, val); }
 
 // Check type of value
 
-inline bool value_is_null(mgp_value *val) { return MgInvoke<int>(mgp_value_is_null, val); }
+bool value_is_null(mgp_value *val) { return MgInvoke<int>(mgp_value_is_null, val); }
 
-inline bool value_is_bool(mgp_value *val) { return MgInvoke<int>(mgp_value_is_bool, val); }
+bool value_is_bool(mgp_value *val) { return MgInvoke<int>(mgp_value_is_bool, val); }
 
-inline bool value_is_int(mgp_value *val) { return MgInvoke<int>(mgp_value_is_int, val); }
+bool value_is_int(mgp_value *val) { return MgInvoke<int>(mgp_value_is_int, val); }
 
-inline bool value_is_double(mgp_value *val) { return MgInvoke<int>(mgp_value_is_double, val); }
+bool value_is_double(mgp_value *val) { return MgInvoke<int>(mgp_value_is_double, val); }
 
-inline bool value_is_string(mgp_value *val) { return MgInvoke<int>(mgp_value_is_string, val); }
+bool value_is_string(mgp_value *val) { return MgInvoke<int>(mgp_value_is_string, val); }
 
-inline bool value_is_list(mgp_value *val) { return MgInvoke<int>(mgp_value_is_list, val); }
+bool value_is_list(mgp_value *val) { return MgInvoke<int>(mgp_value_is_list, val); }
 
-inline bool value_is_map(mgp_value *val) { return MgInvoke<int>(mgp_value_is_map, val); }
+bool value_is_map(mgp_value *val) { return MgInvoke<int>(mgp_value_is_map, val); }
 
-inline bool value_is_vertex(mgp_value *val) { return MgInvoke<int>(mgp_value_is_vertex, val); }
+bool value_is_vertex(mgp_value *val) { return MgInvoke<int>(mgp_value_is_vertex, val); }
 
-inline bool value_is_edge(mgp_value *val) { return MgInvoke<int>(mgp_value_is_edge, val); }
+bool value_is_edge(mgp_value *val) { return MgInvoke<int>(mgp_value_is_edge, val); }
 
-inline bool value_is_path(mgp_value *val) { return MgInvoke<int>(mgp_value_is_path, val); }
+bool value_is_path(mgp_value *val) { return MgInvoke<int>(mgp_value_is_path, val); }
 
-inline bool value_is_date(mgp_value *val) { return MgInvoke<int>(mgp_value_is_date, val); }
+bool value_is_date(mgp_value *val) { return MgInvoke<int>(mgp_value_is_date, val); }
 
-inline bool value_is_local_time(mgp_value *val) { return MgInvoke<int>(mgp_value_is_local_time, val); }
+bool value_is_local_time(mgp_value *val) { return MgInvoke<int>(mgp_value_is_local_time, val); }
 
-inline bool value_is_local_date_time(mgp_value *val) { return MgInvoke<int>(mgp_value_is_local_date_time, val); }
+bool value_is_local_date_time(mgp_value *val) { return MgInvoke<int>(mgp_value_is_local_date_time, val); }
 
-inline bool value_is_duration(mgp_value *val) { return MgInvoke<int>(mgp_value_is_duration, val); }
+bool value_is_duration(mgp_value *val) { return MgInvoke<int>(mgp_value_is_duration, val); }
 
 // Get type
 
-inline mgp_type *type_any() { return MgInvoke<mgp_type *>(mgp_type_any); }
+mgp_type *type_any() { return MgInvoke<mgp_type *>(mgp_type_any); }
 
-inline mgp_type *type_bool() { return MgInvoke<mgp_type *>(mgp_type_bool); }
+mgp_type *type_bool() { return MgInvoke<mgp_type *>(mgp_type_bool); }
 
-inline mgp_type *type_string() { return MgInvoke<mgp_type *>(mgp_type_string); }
+mgp_type *type_string() { return MgInvoke<mgp_type *>(mgp_type_string); }
 
-inline mgp_type *type_int() { return MgInvoke<mgp_type *>(mgp_type_int); }
+mgp_type *type_int() { return MgInvoke<mgp_type *>(mgp_type_int); }
 
-inline mgp_type *type_float() { return MgInvoke<mgp_type *>(mgp_type_float); }
+mgp_type *type_float() { return MgInvoke<mgp_type *>(mgp_type_float); }
 
-inline mgp_type *type_number() { return MgInvoke<mgp_type *>(mgp_type_number); }
+mgp_type *type_number() { return MgInvoke<mgp_type *>(mgp_type_number); }
 
-inline mgp_type *type_list(mgp_type *element_type) { return MgInvoke<mgp_type *>(mgp_type_list, element_type); }
+mgp_type *type_list(mgp_type *element_type) { return MgInvoke<mgp_type *>(mgp_type_list, element_type); }
 
-inline mgp_type *type_map() { return MgInvoke<mgp_type *>(mgp_type_map); }
+mgp_type *type_map() { return MgInvoke<mgp_type *>(mgp_type_map); }
 
-inline mgp_type *type_node() { return MgInvoke<mgp_type *>(mgp_type_node); }
+mgp_type *type_node() { return MgInvoke<mgp_type *>(mgp_type_node); }
 
-inline mgp_type *type_relationship() { return MgInvoke<mgp_type *>(mgp_type_relationship); }
+mgp_type *type_relationship() { return MgInvoke<mgp_type *>(mgp_type_relationship); }
 
-inline mgp_type *type_path() { return MgInvoke<mgp_type *>(mgp_type_path); }
+mgp_type *type_path() { return MgInvoke<mgp_type *>(mgp_type_path); }
 
-inline mgp_type *type_date() { return MgInvoke<mgp_type *>(mgp_type_date); }
+mgp_type *type_date() { return MgInvoke<mgp_type *>(mgp_type_date); }
 
-inline mgp_type *type_local_time() { return MgInvoke<mgp_type *>(mgp_type_local_time); }
+mgp_type *type_local_time() { return MgInvoke<mgp_type *>(mgp_type_local_time); }
 
-inline mgp_type *type_local_date_time() { return MgInvoke<mgp_type *>(mgp_type_local_date_time); }
+mgp_type *type_local_date_time() { return MgInvoke<mgp_type *>(mgp_type_local_date_time); }
 
-inline mgp_type *type_duration() { return MgInvoke<mgp_type *>(mgp_type_duration); }
+mgp_type *type_duration() { return MgInvoke<mgp_type *>(mgp_type_duration); }
 
-inline mgp_type *type_nullable(mgp_type *type) { return MgInvoke<mgp_type *>(mgp_type_nullable, type); }
+mgp_type *type_nullable(mgp_type *type) { return MgInvoke<mgp_type *>(mgp_type_nullable, type); }
 
 // mgp_graph
 
-inline bool graph_is_mutable(mgp_graph *graph) { return MgInvoke<int>(mgp_graph_is_mutable, graph); }
+bool graph_is_mutable(mgp_graph *graph) { return MgInvoke<int>(mgp_graph_is_mutable, graph); }
 
-inline mgp_vertex *graph_create_vertex(mgp_graph *graph, mgp_memory *memory) {
+mgp_vertex *graph_create_vertex(mgp_graph *graph, mgp_memory *memory) {
   return MgInvoke<mgp_vertex *>(mgp_graph_create_vertex, graph, memory);
 }
 
-inline void graph_delete_vertex(mgp_graph *graph, mgp_vertex *vertex) {
-  MgInvokeVoid(mgp_graph_delete_vertex, graph, vertex);
-}
+void graph_delete_vertex(mgp_graph *graph, mgp_vertex *vertex) { MgInvokeVoid(mgp_graph_delete_vertex, graph, vertex); }
 
-inline void graph_detach_delete_vertex(mgp_graph *graph, mgp_vertex *vertex) {
+void graph_detach_delete_vertex(mgp_graph *graph, mgp_vertex *vertex) {
   MgInvokeVoid(mgp_graph_detach_delete_vertex, graph, vertex);
 }
 
-inline mgp_edge *graph_create_edge(mgp_graph *graph, mgp_vertex *from, mgp_vertex *to, mgp_edge_type type,
-                                   mgp_memory *memory) {
+mgp_edge *graph_create_edge(mgp_graph *graph, mgp_vertex *from, mgp_vertex *to, mgp_edge_type type,
+                            mgp_memory *memory) {
   return MgInvoke<mgp_edge *>(mgp_graph_create_edge, graph, from, to, type, memory);
 }
 
-inline void graph_delete_edge(mgp_graph *graph, mgp_edge *edge) { MgInvokeVoid(mgp_graph_delete_edge, graph, edge); }
+void graph_delete_edge(mgp_graph *graph, mgp_edge *edge) { MgInvokeVoid(mgp_graph_delete_edge, graph, edge); }
 
-inline mgp_vertex *graph_get_vertex_by_id(mgp_graph *g, mgp_vertex_id id, mgp_memory *memory) {
+mgp_vertex *graph_get_vertex_by_id(mgp_graph *g, mgp_vertex_id id, mgp_memory *memory) {
   return MgInvoke<mgp_vertex *>(mgp_graph_get_vertex_by_id, g, id, memory);
 }
 
-inline mgp_vertices_iterator *graph_iter_vertices(mgp_graph *g, mgp_memory *memory) {
+mgp_vertices_iterator *graph_iter_vertices(mgp_graph *g, mgp_memory *memory) {
   return MgInvoke<mgp_vertices_iterator *>(mgp_graph_iter_vertices, g, memory);
 }
 
 // mgp_vertices_iterator
 
-inline void vertices_iterator_destroy(mgp_vertices_iterator *it) { mgp_vertices_iterator_destroy(it); }
+void vertices_iterator_destroy(mgp_vertices_iterator *it) { mgp_vertices_iterator_destroy(it); }
 
-inline mgp_vertex *vertices_iterator_get(mgp_vertices_iterator *it) {
+mgp_vertex *vertices_iterator_get(mgp_vertices_iterator *it) {
   return MgInvoke<mgp_vertex *>(mgp_vertices_iterator_get, it);
 }
 
-inline mgp_vertex *vertices_iterator_next(mgp_vertices_iterator *it) {
+mgp_vertex *vertices_iterator_next(mgp_vertices_iterator *it) {
   return MgInvoke<mgp_vertex *>(mgp_vertices_iterator_next, it);
 }
 
 // mgp_edges_iterator
 
-inline void edges_iterator_destroy(mgp_edges_iterator *it) { mgp_edges_iterator_destroy(it); }
+void edges_iterator_destroy(mgp_edges_iterator *it) { mgp_edges_iterator_destroy(it); }
 
-inline mgp_edge *edges_iterator_get(mgp_edges_iterator *it) { return MgInvoke<mgp_edge *>(mgp_edges_iterator_get, it); }
+mgp_edge *edges_iterator_get(mgp_edges_iterator *it) { return MgInvoke<mgp_edge *>(mgp_edges_iterator_get, it); }
 
-inline mgp_edge *edges_iterator_next(mgp_edges_iterator *it) {
-  return MgInvoke<mgp_edge *>(mgp_edges_iterator_next, it);
-}
+mgp_edge *edges_iterator_next(mgp_edges_iterator *it) { return MgInvoke<mgp_edge *>(mgp_edges_iterator_next, it); }
 
 // mgp_properties_iterator
 
-inline void properties_iterator_destroy(mgp_properties_iterator *it) { mgp_properties_iterator_destroy(it); }
+void properties_iterator_destroy(mgp_properties_iterator *it) { mgp_properties_iterator_destroy(it); }
 
-inline mgp_property *properties_iterator_get(mgp_properties_iterator *it) {
+mgp_property *properties_iterator_get(mgp_properties_iterator *it) {
   return MgInvoke<mgp_property *>(mgp_properties_iterator_get, it);
 }
 
-inline mgp_property *properties_iterator_next(mgp_properties_iterator *it) {
+mgp_property *properties_iterator_next(mgp_properties_iterator *it) {
   return MgInvoke<mgp_property *>(mgp_properties_iterator_next, it);
 }
 
@@ -294,440 +284,409 @@ inline mgp_property *properties_iterator_next(mgp_properties_iterator *it) {
 
 // mgp_list
 
-inline mgp_list *list_make_empty(size_t capacity, mgp_memory *memory) {
+mgp_list *list_make_empty(size_t capacity, mgp_memory *memory) {
   return MgInvoke<mgp_list *>(mgp_list_make_empty, capacity, memory);
 }
 
-inline mgp_list *list_copy(mgp_list *list, mgp_memory *memory) {
-  return MgInvoke<mgp_list *>(mgp_list_copy, list, memory);
-}
+mgp_list *list_copy(mgp_list *list, mgp_memory *memory) { return MgInvoke<mgp_list *>(mgp_list_copy, list, memory); }
 
-inline void list_destroy(mgp_list *list) { mgp_list_destroy(list); }
+void list_destroy(mgp_list *list) { mgp_list_destroy(list); }
 
-inline void list_append(mgp_list *list, mgp_value *val) { MgInvokeVoid(mgp_list_append, list, val); }
+void list_append(mgp_list *list, mgp_value *val) { MgInvokeVoid(mgp_list_append, list, val); }
 
-inline void list_append_extend(mgp_list *list, mgp_value *val) { MgInvokeVoid(mgp_list_append_extend, list, val); }
+void list_append_extend(mgp_list *list, mgp_value *val) { MgInvokeVoid(mgp_list_append_extend, list, val); }
 
-inline size_t list_size(mgp_list *list) { return MgInvoke<size_t>(mgp_list_size, list); }
+size_t list_size(mgp_list *list) { return MgInvoke<size_t>(mgp_list_size, list); }
 
-inline size_t list_capacity(mgp_list *list) { return MgInvoke<size_t>(mgp_list_capacity, list); }
+size_t list_capacity(mgp_list *list) { return MgInvoke<size_t>(mgp_list_capacity, list); }
 
-inline mgp_value *list_at(mgp_list *list, size_t index) { return MgInvoke<mgp_value *>(mgp_list_at, list, index); }
+mgp_value *list_at(mgp_list *list, size_t index) { return MgInvoke<mgp_value *>(mgp_list_at, list, index); }
 
 // mgp_map
 
-inline mgp_map *map_make_empty(mgp_memory *memory) { return MgInvoke<mgp_map *>(mgp_map_make_empty, memory); }
+mgp_map *map_make_empty(mgp_memory *memory) { return MgInvoke<mgp_map *>(mgp_map_make_empty, memory); }
 
-inline mgp_map *map_copy(mgp_map *map, mgp_memory *memory) { return MgInvoke<mgp_map *>(mgp_map_copy, map, memory); }
+mgp_map *map_copy(mgp_map *map, mgp_memory *memory) { return MgInvoke<mgp_map *>(mgp_map_copy, map, memory); }
 
-inline void map_destroy(mgp_map *map) { mgp_map_destroy(map); }
+void map_destroy(mgp_map *map) { mgp_map_destroy(map); }
 
-inline void map_insert(mgp_map *map, const char *key, mgp_value *value) {
-  MgInvokeVoid(mgp_map_insert, map, key, value);
-}
+void map_insert(mgp_map *map, const char *key, mgp_value *value) { MgInvokeVoid(mgp_map_insert, map, key, value); }
 
-inline size_t map_size(mgp_map *map) { return MgInvoke<size_t>(mgp_map_size, map); }
+size_t map_size(mgp_map *map) { return MgInvoke<size_t>(mgp_map_size, map); }
 
-inline mgp_value *map_at(mgp_map *map, const char *key) { return MgInvoke<mgp_value *>(mgp_map_at, map, key); }
+mgp_value *map_at(mgp_map *map, const char *key) { return MgInvoke<mgp_value *>(mgp_map_at, map, key); }
 
-inline const char *map_item_key(mgp_map_item *item) { return MgInvoke<const char *>(mgp_map_item_key, item); }
+const char *map_item_key(mgp_map_item *item) { return MgInvoke<const char *>(mgp_map_item_key, item); }
 
-inline mgp_value *map_item_value(mgp_map_item *item) { return MgInvoke<mgp_value *>(mgp_map_item_value, item); }
+mgp_value *map_item_value(mgp_map_item *item) { return MgInvoke<mgp_value *>(mgp_map_item_value, item); }
 
-inline mgp_map_items_iterator *map_iter_items(mgp_map *map, mgp_memory *memory) {
+mgp_map_items_iterator *map_iter_items(mgp_map *map, mgp_memory *memory) {
   return MgInvoke<mgp_map_items_iterator *>(mgp_map_iter_items, map, memory);
 }
 
-inline void map_items_iterator_destroy(mgp_map_items_iterator *it) { mgp_map_items_iterator_destroy(it); }
+void map_items_iterator_destroy(mgp_map_items_iterator *it) { mgp_map_items_iterator_destroy(it); }
 
-inline mgp_map_item *map_items_iterator_get(mgp_map_items_iterator *it) {
+mgp_map_item *map_items_iterator_get(mgp_map_items_iterator *it) {
   return MgInvoke<mgp_map_item *>(mgp_map_items_iterator_get, it);
 }
 
-inline mgp_map_item *map_items_iterator_next(mgp_map_items_iterator *it) {
+mgp_map_item *map_items_iterator_next(mgp_map_items_iterator *it) {
   return MgInvoke<mgp_map_item *>(mgp_map_items_iterator_next, it);
 }
 
 // mgp_vertex
 
-inline mgp_vertex_id vertex_get_id(mgp_vertex *v) { return MgInvoke<mgp_vertex_id>(mgp_vertex_get_id, v); }
+mgp_vertex_id vertex_get_id(mgp_vertex *v) { return MgInvoke<mgp_vertex_id>(mgp_vertex_get_id, v); }
 
-inline mgp_vertex *vertex_copy(mgp_vertex *v, mgp_memory *memory) {
+mgp_vertex *vertex_copy(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_vertex *>(mgp_vertex_copy, v, memory);
 }
 
-inline void vertex_destroy(mgp_vertex *v) { mgp_vertex_destroy(v); }
+void vertex_destroy(mgp_vertex *v) { mgp_vertex_destroy(v); }
 
-inline bool vertex_equal(mgp_vertex *v1, mgp_vertex *v2) { return MgInvoke<int>(mgp_vertex_equal, v1, v2); }
+bool vertex_equal(mgp_vertex *v1, mgp_vertex *v2) { return MgInvoke<int>(mgp_vertex_equal, v1, v2); }
 
-inline size_t vertex_labels_count(mgp_vertex *v) { return MgInvoke<size_t>(mgp_vertex_labels_count, v); }
+size_t vertex_labels_count(mgp_vertex *v) { return MgInvoke<size_t>(mgp_vertex_labels_count, v); }
 
-inline mgp_label vertex_label_at(mgp_vertex *v, size_t index) {
-  return MgInvoke<mgp_label>(mgp_vertex_label_at, v, index);
-}
+mgp_label vertex_label_at(mgp_vertex *v, size_t index) { return MgInvoke<mgp_label>(mgp_vertex_label_at, v, index); }
 
-inline bool vertex_has_label(mgp_vertex *v, mgp_label label) { return MgInvoke<int>(mgp_vertex_has_label, v, label); }
+bool vertex_has_label(mgp_vertex *v, mgp_label label) { return MgInvoke<int>(mgp_vertex_has_label, v, label); }
 
-inline bool vertex_has_label_named(mgp_vertex *v, const char *label_name) {
+bool vertex_has_label_named(mgp_vertex *v, const char *label_name) {
   return MgInvoke<int>(mgp_vertex_has_label_named, v, label_name);
 }
 
-inline void vertex_add_label(mgp_vertex *vertex, mgp_label label) { MgInvokeVoid(mgp_vertex_add_label, vertex, label); }
+void vertex_add_label(mgp_vertex *vertex, mgp_label label) { MgInvokeVoid(mgp_vertex_add_label, vertex, label); }
 
-inline mgp_value *vertex_get_property(mgp_vertex *v, const char *property_name, mgp_memory *memory) {
+mgp_value *vertex_get_property(mgp_vertex *v, const char *property_name, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_vertex_get_property, v, property_name, memory);
 }
 
-inline void vertex_set_property(mgp_vertex *v, const char *property_name, mgp_value *property_value) {
-  MgInvokeVoid(mgp_vertex_set_property, v, property_name, property_value);
-}
-
-inline mgp_properties_iterator *vertex_iter_properties(mgp_vertex *v, mgp_memory *memory) {
+mgp_properties_iterator *vertex_iter_properties(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_vertex_iter_properties, v, memory);
 }
 
-inline mgp_edges_iterator *vertex_iter_in_edges(mgp_vertex *v, mgp_memory *memory) {
+mgp_edges_iterator *vertex_iter_in_edges(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_edges_iterator *>(mgp_vertex_iter_in_edges, v, memory);
 }
 
-inline mgp_edges_iterator *vertex_iter_out_edges(mgp_vertex *v, mgp_memory *memory) {
+mgp_edges_iterator *vertex_iter_out_edges(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_edges_iterator *>(mgp_vertex_iter_out_edges, v, memory);
 }
 
 // mgp_edge
 
-inline mgp_edge_id edge_get_id(mgp_edge *e) { return MgInvoke<mgp_edge_id>(mgp_edge_get_id, e); }
+mgp_edge_id edge_get_id(mgp_edge *e) { return MgInvoke<mgp_edge_id>(mgp_edge_get_id, e); }
 
-inline mgp_edge *edge_copy(mgp_edge *e, mgp_memory *memory) { return MgInvoke<mgp_edge *>(mgp_edge_copy, e, memory); }
+mgp_edge *edge_copy(mgp_edge *e, mgp_memory *memory) { return MgInvoke<mgp_edge *>(mgp_edge_copy, e, memory); }
 
-inline void edge_destroy(mgp_edge *e) { mgp_edge_destroy(e); }
+void edge_destroy(mgp_edge *e) { mgp_edge_destroy(e); }
 
-inline bool edge_equal(mgp_edge *e1, mgp_edge *e2) { return MgInvoke<int>(mgp_edge_equal, e1, e2); }
+bool edge_equal(mgp_edge *e1, mgp_edge *e2) { return MgInvoke<int>(mgp_edge_equal, e1, e2); }
 
-inline mgp_edge_type edge_get_type(mgp_edge *e) { return MgInvoke<mgp_edge_type>(mgp_edge_get_type, e); }
+mgp_edge_type edge_get_type(mgp_edge *e) { return MgInvoke<mgp_edge_type>(mgp_edge_get_type, e); }
 
-inline mgp_vertex *edge_get_from(mgp_edge *e) { return MgInvoke<mgp_vertex *>(mgp_edge_get_from, e); }
+mgp_vertex *edge_get_from(mgp_edge *e) { return MgInvoke<mgp_vertex *>(mgp_edge_get_from, e); }
 
-inline mgp_vertex *edge_get_to(mgp_edge *e) { return MgInvoke<mgp_vertex *>(mgp_edge_get_to, e); }
+mgp_vertex *edge_get_to(mgp_edge *e) { return MgInvoke<mgp_vertex *>(mgp_edge_get_to, e); }
 
-inline mgp_value *edge_get_property(mgp_edge *e, const char *property_name, mgp_memory *memory) {
+mgp_value *edge_get_property(mgp_edge *e, const char *property_name, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_edge_get_property, e, property_name, memory);
 }
 
-inline void edge_set_property(mgp_edge *e, const char *property_name, mgp_value *property_value) {
-  MgInvokeVoid(mgp_edge_set_property, e, property_name, property_value);
-}
-
-inline mgp_properties_iterator *edge_iter_properties(mgp_edge *e, mgp_memory *memory) {
+mgp_properties_iterator *edge_iter_properties(mgp_edge *e, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_edge_iter_properties, e, memory);
 }
 
 // mgp_path
 
-inline mgp_path *path_make_with_start(mgp_vertex *vertex, mgp_memory *memory) {
+mgp_path *path_make_with_start(mgp_vertex *vertex, mgp_memory *memory) {
   return MgInvoke<mgp_path *>(mgp_path_make_with_start, vertex, memory);
 }
 
-inline mgp_path *path_copy(mgp_path *path, mgp_memory *memory) {
-  return MgInvoke<mgp_path *>(mgp_path_copy, path, memory);
-}
+mgp_path *path_copy(mgp_path *path, mgp_memory *memory) { return MgInvoke<mgp_path *>(mgp_path_copy, path, memory); }
 
-inline void path_destroy(mgp_path *path) { mgp_path_destroy(path); }
+void path_destroy(mgp_path *path) { mgp_path_destroy(path); }
 
-inline void path_expand(mgp_path *path, mgp_edge *edge) { MgInvokeVoid(mgp_path_expand, path, edge); }
+void path_expand(mgp_path *path, mgp_edge *edge) { MgInvokeVoid(mgp_path_expand, path, edge); }
 
-inline size_t path_size(mgp_path *path) { return MgInvoke<size_t>(mgp_path_size, path); }
+size_t path_size(mgp_path *path) { return MgInvoke<size_t>(mgp_path_size, path); }
 
-inline mgp_vertex *path_vertex_at(mgp_path *path, size_t index) {
+mgp_vertex *path_vertex_at(mgp_path *path, size_t index) {
   return MgInvoke<mgp_vertex *>(mgp_path_vertex_at, path, index);
 }
 
-inline mgp_edge *path_edge_at(mgp_path *path, size_t index) {
-  return MgInvoke<mgp_edge *>(mgp_path_edge_at, path, index);
-}
+mgp_edge *path_edge_at(mgp_path *path, size_t index) { return MgInvoke<mgp_edge *>(mgp_path_edge_at, path, index); }
 
-inline bool path_equal(mgp_path *p1, mgp_path *p2) { return MgInvoke<int>(mgp_path_equal, p1, p2); }
+bool path_equal(mgp_path *p1, mgp_path *p2) { return MgInvoke<int>(mgp_path_equal, p1, p2); }
 
 // Temporal type {mgp_date, mgp_local_time, mgp_local_date_time, mgp_duration} methods
 
 // mgp_date
 
-inline mgp_date *date_from_string(const char *string, mgp_memory *memory) {
+mgp_date *date_from_string(const char *string, mgp_memory *memory) {
   return MgInvoke<mgp_date *>(mgp_date_from_string, string, memory);
 }
 
-inline mgp_date *date_from_parameters(mgp_date_parameters *parameters, mgp_memory *memory) {
+mgp_date *date_from_parameters(mgp_date_parameters *parameters, mgp_memory *memory) {
   return MgInvoke<mgp_date *>(mgp_date_from_parameters, parameters, memory);
 }
 
-inline mgp_date *date_copy(mgp_date *date, mgp_memory *memory) {
-  return MgInvoke<mgp_date *>(mgp_date_copy, date, memory);
-}
+mgp_date *date_copy(mgp_date *date, mgp_memory *memory) { return MgInvoke<mgp_date *>(mgp_date_copy, date, memory); }
 
-inline void date_destroy(mgp_date *date) { mgp_date_destroy(date); }
+void date_destroy(mgp_date *date) { mgp_date_destroy(date); }
 
-inline bool date_equal(mgp_date *first, mgp_date *second) { return MgInvoke<int>(mgp_date_equal, first, second); }
+bool date_equal(mgp_date *first, mgp_date *second) { return MgInvoke<int>(mgp_date_equal, first, second); }
 
-inline int date_get_year(mgp_date *date) { return MgInvoke<int>(mgp_date_get_year, date); }
+int date_get_year(mgp_date *date) { return MgInvoke<int>(mgp_date_get_year, date); }
 
-inline int date_get_month(mgp_date *date) { return MgInvoke<int>(mgp_date_get_month, date); }
+int date_get_month(mgp_date *date) { return MgInvoke<int>(mgp_date_get_month, date); }
 
-inline int date_get_day(mgp_date *date) { return MgInvoke<int>(mgp_date_get_day, date); }
+int date_get_day(mgp_date *date) { return MgInvoke<int>(mgp_date_get_day, date); }
 
-inline int64_t date_timestamp(mgp_date *date) { return MgInvoke<int64_t>(mgp_date_timestamp, date); }
+int64_t date_timestamp(mgp_date *date) { return MgInvoke<int64_t>(mgp_date_timestamp, date); }
 
-inline mgp_date *date_now(mgp_memory *memory) { return MgInvoke<mgp_date *>(mgp_date_now, memory); }
+mgp_date *date_now(mgp_memory *memory) { return MgInvoke<mgp_date *>(mgp_date_now, memory); }
 
-inline mgp_date *date_add_duration(mgp_date *date, mgp_duration *dur, mgp_memory *memory) {
+mgp_date *date_add_duration(mgp_date *date, mgp_duration *dur, mgp_memory *memory) {
   return MgInvoke<mgp_date *>(mgp_date_add_duration, date, dur, memory);
 }
 
-inline mgp_date *date_sub_duration(mgp_date *date, mgp_duration *dur, mgp_memory *memory) {
+mgp_date *date_sub_duration(mgp_date *date, mgp_duration *dur, mgp_memory *memory) {
   return MgInvoke<mgp_date *>(mgp_date_sub_duration, date, dur, memory);
 }
 
-inline mgp_duration *date_diff(mgp_date *first, mgp_date *second, mgp_memory *memory) {
+mgp_duration *date_diff(mgp_date *first, mgp_date *second, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_date_diff, first, second, memory);
 }
 
 // mgp_local_time
 
-inline mgp_local_time *local_time_from_string(const char *string, mgp_memory *memory) {
+mgp_local_time *local_time_from_string(const char *string, mgp_memory *memory) {
   return MgInvoke<mgp_local_time *>(mgp_local_time_from_string, string, memory);
 }
 
-inline mgp_local_time *local_time_from_parameters(mgp_local_time_parameters *parameters, mgp_memory *memory) {
+mgp_local_time *local_time_from_parameters(mgp_local_time_parameters *parameters, mgp_memory *memory) {
   return MgInvoke<mgp_local_time *>(mgp_local_time_from_parameters, parameters, memory);
 }
 
-inline mgp_local_time *local_time_copy(mgp_local_time *local_time, mgp_memory *memory) {
+mgp_local_time *local_time_copy(mgp_local_time *local_time, mgp_memory *memory) {
   return MgInvoke<mgp_local_time *>(mgp_local_time_copy, local_time, memory);
 }
 
-inline void local_time_destroy(mgp_local_time *local_time) { mgp_local_time_destroy(local_time); }
+void local_time_destroy(mgp_local_time *local_time) { mgp_local_time_destroy(local_time); }
 
-inline bool local_time_equal(mgp_local_time *first, mgp_local_time *second) {
+bool local_time_equal(mgp_local_time *first, mgp_local_time *second) {
   return MgInvoke<int>(mgp_local_time_equal, first, second);
 }
 
-inline int local_time_get_hour(mgp_local_time *local_time) {
-  return MgInvoke<int>(mgp_local_time_get_hour, local_time);
-}
+int local_time_get_hour(mgp_local_time *local_time) { return MgInvoke<int>(mgp_local_time_get_hour, local_time); }
 
-inline int local_time_get_minute(mgp_local_time *local_time) {
-  return MgInvoke<int>(mgp_local_time_get_minute, local_time);
-}
+int local_time_get_minute(mgp_local_time *local_time) { return MgInvoke<int>(mgp_local_time_get_minute, local_time); }
 
-inline int local_time_get_second(mgp_local_time *local_time) {
-  return MgInvoke<int>(mgp_local_time_get_second, local_time);
-}
+int local_time_get_second(mgp_local_time *local_time) { return MgInvoke<int>(mgp_local_time_get_second, local_time); }
 
-inline int local_time_get_millisecond(mgp_local_time *local_time) {
+int local_time_get_millisecond(mgp_local_time *local_time) {
   return MgInvoke<int>(mgp_local_time_get_millisecond, local_time);
 }
 
-inline int local_time_get_microsecond(mgp_local_time *local_time) {
+int local_time_get_microsecond(mgp_local_time *local_time) {
   return MgInvoke<int>(mgp_local_time_get_microsecond, local_time);
 }
 
-inline int64_t local_time_timestamp(mgp_local_time *local_time) {
+int64_t local_time_timestamp(mgp_local_time *local_time) {
   return MgInvoke<int64_t>(mgp_local_time_timestamp, local_time);
 }
 
-inline mgp_local_time *local_time_now(mgp_memory *memory) {
-  return MgInvoke<mgp_local_time *>(mgp_local_time_now, memory);
-}
+mgp_local_time *local_time_now(mgp_memory *memory) { return MgInvoke<mgp_local_time *>(mgp_local_time_now, memory); }
 
-inline mgp_local_time *local_time_add_duration(mgp_local_time *local_time, mgp_duration *dur, mgp_memory *memory) {
+mgp_local_time *local_time_add_duration(mgp_local_time *local_time, mgp_duration *dur, mgp_memory *memory) {
   return MgInvoke<mgp_local_time *>(mgp_local_time_add_duration, local_time, dur, memory);
 }
 
-inline mgp_local_time *local_time_sub_duration(mgp_local_time *local_time, mgp_duration *dur, mgp_memory *memory) {
+mgp_local_time *local_time_sub_duration(mgp_local_time *local_time, mgp_duration *dur, mgp_memory *memory) {
   return MgInvoke<mgp_local_time *>(mgp_local_time_sub_duration, local_time, dur, memory);
 }
 
-inline mgp_duration *local_time_diff(mgp_local_time *first, mgp_local_time *second, mgp_memory *memory) {
+mgp_duration *local_time_diff(mgp_local_time *first, mgp_local_time *second, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_local_time_diff, first, second, memory);
 }
 
 // mgp_local_date_time
 
-inline mgp_local_date_time *local_date_time_from_string(const char *string, mgp_memory *memory) {
+mgp_local_date_time *local_date_time_from_string(const char *string, mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_from_string, string, memory);
 }
 
-inline mgp_local_date_time *local_date_time_from_parameters(mgp_local_date_time_parameters *parameters,
-                                                            mgp_memory *memory) {
+mgp_local_date_time *local_date_time_from_parameters(mgp_local_date_time_parameters *parameters, mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_from_parameters, parameters, memory);
 }
 
-inline mgp_local_date_time *local_date_time_copy(mgp_local_date_time *local_date_time, mgp_memory *memory) {
+mgp_local_date_time *local_date_time_copy(mgp_local_date_time *local_date_time, mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_copy, local_date_time, memory);
 }
 
-inline void local_date_time_destroy(mgp_local_date_time *local_date_time) {
-  mgp_local_date_time_destroy(local_date_time);
-}
+void local_date_time_destroy(mgp_local_date_time *local_date_time) { mgp_local_date_time_destroy(local_date_time); }
 
-inline bool local_date_time_equal(mgp_local_date_time *first, mgp_local_date_time *second) {
+bool local_date_time_equal(mgp_local_date_time *first, mgp_local_date_time *second) {
   return MgInvoke<int>(mgp_local_date_time_equal, first, second);
 }
 
-inline int local_date_time_get_year(mgp_local_date_time *local_date_time) {
+int local_date_time_get_year(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_year, local_date_time);
 }
 
-inline int local_date_time_get_month(mgp_local_date_time *local_date_time) {
+int local_date_time_get_month(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_month, local_date_time);
 }
 
-inline int local_date_time_get_day(mgp_local_date_time *local_date_time) {
+int local_date_time_get_day(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_day, local_date_time);
 }
 
-inline int local_date_time_get_hour(mgp_local_date_time *local_date_time) {
+int local_date_time_get_hour(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_hour, local_date_time);
 }
 
-inline int local_date_time_get_minute(mgp_local_date_time *local_date_time) {
+int local_date_time_get_minute(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_minute, local_date_time);
 }
 
-inline int local_date_time_get_second(mgp_local_date_time *local_date_time) {
+int local_date_time_get_second(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_second, local_date_time);
 }
 
-inline int local_date_time_get_millisecond(mgp_local_date_time *local_date_time) {
+int local_date_time_get_millisecond(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_millisecond, local_date_time);
 }
 
-inline int local_date_time_get_microsecond(mgp_local_date_time *local_date_time) {
+int local_date_time_get_microsecond(mgp_local_date_time *local_date_time) {
   return MgInvoke<int>(mgp_local_date_time_get_microsecond, local_date_time);
 }
 
-inline int64_t local_date_time_timestamp(mgp_local_date_time *local_date_time) {
+int64_t local_date_time_timestamp(mgp_local_date_time *local_date_time) {
   return MgInvoke<int64_t>(mgp_local_date_time_timestamp, local_date_time);
 }
 
-inline mgp_local_date_time *local_date_time_now(mgp_memory *memory) {
+mgp_local_date_time *local_date_time_now(mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_now, memory);
 }
 
-inline mgp_local_date_time *local_date_time_add_duration(mgp_local_date_time *local_date_time, mgp_duration *dur,
-                                                         mgp_memory *memory) {
+mgp_local_date_time *local_date_time_add_duration(mgp_local_date_time *local_date_time, mgp_duration *dur,
+                                                  mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_add_duration, local_date_time, dur, memory);
 }
 
-inline mgp_local_date_time *local_date_time_sub_duration(mgp_local_date_time *local_date_time, mgp_duration *dur,
-                                                         mgp_memory *memory) {
+mgp_local_date_time *local_date_time_sub_duration(mgp_local_date_time *local_date_time, mgp_duration *dur,
+                                                  mgp_memory *memory) {
   return MgInvoke<mgp_local_date_time *>(mgp_local_date_time_sub_duration, local_date_time, dur, memory);
 }
 
-inline mgp_duration *local_date_time_diff(mgp_local_date_time *first, mgp_local_date_time *second, mgp_memory *memory) {
+mgp_duration *local_date_time_diff(mgp_local_date_time *first, mgp_local_date_time *second, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_local_date_time_diff, first, second, memory);
 }
 
 // mgp_duration
 
-inline mgp_duration *duration_from_string(const char *string, mgp_memory *memory) {
+mgp_duration *duration_from_string(const char *string, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_from_string, string, memory);
 }
 
-inline mgp_duration *duration_from_parameters(mgp_duration_parameters *parameters, mgp_memory *memory) {
+mgp_duration *duration_from_parameters(mgp_duration_parameters *parameters, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_from_parameters, parameters, memory);
 }
 
-inline mgp_duration *duration_from_microseconds(int64_t microseconds, mgp_memory *memory) {
+mgp_duration *duration_from_microseconds(int64_t microseconds, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_from_microseconds, microseconds, memory);
 }
 
-inline mgp_duration *duration_copy(mgp_duration *duration, mgp_memory *memory) {
+mgp_duration *duration_copy(mgp_duration *duration, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_copy, duration, memory);
 }
 
-inline void duration_destroy(mgp_duration *duration) { mgp_duration_destroy(duration); }
+void duration_destroy(mgp_duration *duration) { mgp_duration_destroy(duration); }
 
-inline int64_t duration_get_microseconds(mgp_duration *duration) {
+int64_t duration_get_microseconds(mgp_duration *duration) {
   return MgInvoke<int64_t>(mgp_duration_get_microseconds, duration);
 }
 
-inline bool duration_equal(mgp_duration *first, mgp_duration *second) {
+bool duration_equal(mgp_duration *first, mgp_duration *second) {
   return MgInvoke<int>(mgp_duration_equal, first, second);
 }
 
-inline mgp_duration *duration_neg(mgp_duration *duration, mgp_memory *memory) {
+mgp_duration *duration_neg(mgp_duration *duration, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_neg, duration, memory);
 }
 
-inline mgp_duration *duration_add(mgp_duration *first, mgp_duration *second, mgp_memory *memory) {
+mgp_duration *duration_add(mgp_duration *first, mgp_duration *second, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_add, first, second, memory);
 }
 
-inline mgp_duration *duration_sub(mgp_duration *first, mgp_duration *second, mgp_memory *memory) {
+mgp_duration *duration_sub(mgp_duration *first, mgp_duration *second, mgp_memory *memory) {
   return MgInvoke<mgp_duration *>(mgp_duration_sub, first, second, memory);
 }
 
 // Procedure
 
-inline mgp_proc *module_add_read_procedure(mgp_module *module, const char *name, mgp_proc_cb cb) {
+mgp_proc *module_add_read_procedure(mgp_module *module, const char *name, mgp_proc_cb cb) {
   return MgInvoke<mgp_proc *>(mgp_module_add_read_procedure, module, name, cb);
 }
 
-inline mgp_proc *module_add_write_procedure(mgp_module *module, const char *name, mgp_proc_cb cb) {
+mgp_proc *module_add_write_procedure(mgp_module *module, const char *name, mgp_proc_cb cb) {
   return MgInvoke<mgp_proc *>(mgp_module_add_write_procedure, module, name, cb);
 }
 
-inline void proc_add_arg(mgp_proc *proc, const char *name, mgp_type *type) {
+void proc_add_arg(mgp_proc *proc, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_proc_add_arg, proc, name, type);
 }
 
-inline void proc_add_opt_arg(mgp_proc *proc, const char *name, mgp_type *type, mgp_value *default_value) {
+void proc_add_opt_arg(mgp_proc *proc, const char *name, mgp_type *type, mgp_value *default_value) {
   MgInvokeVoid(mgp_proc_add_opt_arg, proc, name, type, default_value);
 }
 
-inline void proc_add_result(mgp_proc *proc, const char *name, mgp_type *type) {
+void proc_add_result(mgp_proc *proc, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_proc_add_result, proc, name, type);
 }
 
-inline void proc_add_deprecated_result(mgp_proc *proc, const char *name, mgp_type *type) {
+void proc_add_deprecated_result(mgp_proc *proc, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_proc_add_deprecated_result, proc, name, type);
 }
 
-inline bool must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
+bool must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
 
 // mgp_result
 
-inline void result_set_error_msg(mgp_result *res, const char *error_msg) {
+void result_set_error_msg(mgp_result *res, const char *error_msg) {
   MgInvokeVoid(mgp_result_set_error_msg, res, error_msg);
 }
 
-inline mgp_result_record *result_new_record(mgp_result *res) {
+mgp_result_record *result_new_record(mgp_result *res) {
   return MgInvoke<mgp_result_record *>(mgp_result_new_record, res);
 }
 
-inline void result_record_insert(mgp_result_record *record, const char *field_name, mgp_value *val) {
+void result_record_insert(mgp_result_record *record, const char *field_name, mgp_value *val) {
   MgInvokeVoid(mgp_result_record_insert, record, field_name, val);
 }
 
 // Function
 
-inline mgp_func *module_add_function(mgp_module *module, const char *name, mgp_func_cb cb) {
+mgp_func *module_add_function(mgp_module *module, const char *name, mgp_func_cb cb) {
   return MgInvoke<mgp_func *>(mgp_module_add_function, module, name, cb);
 }
 
-inline void func_add_arg(mgp_func *func, const char *name, mgp_type *type) {
+void func_add_arg(mgp_func *func, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_func_add_arg, func, name, type);
 }
 
-inline void func_add_opt_arg(mgp_func *func, const char *name, mgp_type *type, mgp_value *default_value) {
+void func_add_opt_arg(mgp_func *func, const char *name, mgp_type *type, mgp_value *default_value) {
   MgInvokeVoid(mgp_func_add_opt_arg, func, name, type, default_value);
 }
 
-inline void func_result_set_error_msg(mgp_func_result *res, const char *msg, mgp_memory *memory) {
+void func_result_set_error_msg(mgp_func_result *res, const char *msg, mgp_memory *memory) {
   MgInvokeVoid(mgp_func_result_set_error_msg, res, msg, memory);
 }
 
-inline void func_result_set_value(mgp_func_result *res, mgp_value *value, mgp_memory *memory) {
+void func_result_set_value(mgp_func_result *res, mgp_value *value, mgp_memory *memory) {
   MgInvokeVoid(mgp_func_result_set_value, res, value, memory);
 }
 

include/_mgp_mock.py

@@ -1,343 +0,0 @@
-import typing
-from enum import Enum
-
-import networkx as nx
-
-NX_LABEL_ATTR = "labels"
-NX_TYPE_ATTR = "type"
-
-SOURCE_TYPE_KAFKA = "SOURCE_TYPE_KAFKA"
-SOURCE_TYPE_PULSAR = "SOURCE_TYPE_PULSAR"
-
-"""
-This module provides helpers for the mock Python API, much like _mgp.py does for mgp.py.
-"""
-
-
-class InvalidArgumentError(Exception):
-    """
-    Signals that some of the arguments have invalid values.
-    """
-
-    pass
-
-
-class ImmutableObjectError(Exception):
-    pass
-
-
-class LogicErrorError(Exception):
-    pass
-
-
-class DeletedObjectError(Exception):
-    pass
-
-
-class EdgeConstants(Enum):
-    I_START = 0
-    I_END = 1
-    I_KEY = 2
-
-
-class Graph:
-    """Wrapper around a NetworkX MultiDiGraph instance."""
-
-    __slots__ = ("nx", "_highest_vertex_id", "_highest_edge_id", "_valid")
-
-    def __init__(self, graph: nx.MultiDiGraph) -> None:
-        if not isinstance(graph, nx.MultiDiGraph):
-            raise TypeError(f"Expected 'networkx.classes.multidigraph.MultiDiGraph', got '{type(graph)}'")
-
-        self.nx = graph
-        self._highest_vertex_id = None
-        self._highest_edge_id = None
-        self._valid = True
-
-    @property
-    def vertex_ids(self):
-        return self.nx.nodes
-
-    def vertex_is_isolate(self, vertex_id: int) -> bool:
-        return nx.is_isolate(self.nx, vertex_id)
-
-    @property
-    def vertices(self):
-        return (Vertex(node_id, self) for node_id in self.nx.nodes)
-
-    def has_node(self, node_id):
-        return self.nx.has_node(node_id)
-
-    @property
-    def edges(self):
-        return self.nx.edges
-
-    def is_valid(self) -> bool:
-        return self._valid
-
-    def get_vertex_by_id(self, vertex_id: int) -> "Vertex":
-        return Vertex(vertex_id, self)
-
-    def invalidate(self):
-        self._valid = False
-
-    def is_immutable(self) -> bool:
-        return nx.is_frozen(self.nx)
-
-    def make_immutable(self):
-        self.nx = nx.freeze(self.nx)
-
-    def _new_vertex_id(self):
-        if self._highest_vertex_id is None:
-            self._highest_vertex_id = max(vertex_id for vertex_id in self.nx.nodes)
-
-        return self._highest_vertex_id + 1
-
-    def _new_edge_id(self):
-        if self._highest_edge_id is None:
-            self._highest_edge_id = max(edge[EdgeConstants.I_KEY.value] for edge in self.nx.edges(keys=True))
-
-        return self._highest_edge_id + 1
-
-    def create_vertex(self) -> "Vertex":
-        vertex_id = self._new_vertex_id()
-
-        self.nx.add_node(vertex_id)
-        self._highest_vertex_id = vertex_id
-
-        return Vertex(vertex_id, self)
-
-    def create_edge(self, from_vertex: "Vertex", to_vertex: "Vertex", edge_type: str) -> "Edge":
-        if from_vertex.is_deleted() or to_vertex.is_deleted():
-            raise DeletedObjectError("Accessing deleted object.")
-
-        edge_id = self._new_edge_id()
-
-        from_id = from_vertex.id
-        to_id = to_vertex.id
-
-        self.nx.add_edge(from_id, to_id, key=edge_id, type=edge_type)
-        self._highest_edge_id = edge_id
-
-        return Edge((from_id, to_id, edge_id), self)
-
-    def delete_vertex(self, vertex_id: int):
-        self.nx.remove_node(vertex_id)
-
-    def delete_edge(self, from_vertex_id: int, to_vertex_id: int, edge_id: int):
-        self.nx.remove_edge(from_vertex_id, to_vertex_id, edge_id)
-
-    @property
-    def highest_vertex_id(self) -> int:
-        if self._highest_vertex_id is None:
-            self._highest_vertex_id = max(vertex_id for vertex_id in self.nx.nodes) + 1
-
-        return self._highest_vertex_id
-
-    @property
-    def highest_edge_id(self) -> int:
-        if self._highest_edge_id is None:
-            self._highest_edge_id = max(edge[EdgeConstants.I_KEY.value] for edge in self.nx.edges(keys=True))
-
-        return self._highest_edge_id + 1
-
-
-class Vertex:
-    """Represents a graph vertex."""
-
-    __slots__ = ("_id", "_graph")
-
-    def __init__(self, id: int, graph: Graph) -> None:
-        if not isinstance(id, int):
-            raise TypeError(f"Expected 'int', got '{type(id)}'")
-
-        if not isinstance(graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(graph)}'")
-
-        if not graph.nx.has_node(id):
-            raise IndexError(f"Unable to find vertex with ID {id}.")
-
-        self._id = id
-        self._graph = graph
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def is_deleted(self) -> bool:
-        return not self._graph.nx.has_node(self._id) and self._id <= self._graph.highest_vertex_id
-
-    @property
-    def underlying_graph(self) -> Graph:
-        return self._graph
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    @property
-    def labels(self) -> typing.List[int]:
-        return self._graph.nx.nodes[self._id][NX_LABEL_ATTR].split(":")
-
-    def add_label(self, label: str) -> None:
-        if nx.is_frozen(self._graph.nx):
-            raise ImmutableObjectError("Cannot modify immutable object.")
-
-        self._graph.nx.nodes[self._id][NX_LABEL_ATTR] += f":{label}"
-
-    def remove_label(self, label: str) -> None:
-        if nx.is_frozen(self._graph.nx):
-            raise ImmutableObjectError("Cannot modify immutable object.")
-
-        labels = self._graph.nx.nodes[self._id][NX_LABEL_ATTR]
-        if labels.startswith(f"{label}:"):
-            labels = "\n" + labels  # pseudo-string starter
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f"\n{label}:", "")
-        elif labels.endswith(f":{label}"):
-            labels += "\n"  # pseudo-string terminator
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f":{label}\n", "")
-        else:
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f":{label}:", ":")
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def properties(self):
-        return (
-            (key, value)
-            for key, value in self._graph.nx.nodes[self._id].items()
-            if key not in (NX_LABEL_ATTR, NX_TYPE_ATTR)
-        )
-
-    def get_property(self, property_name: str):
-        return self._graph.nx.nodes[self._id][property_name]
-
-    def set_property(self, property_name: str, value: object):
-        self._graph.nx.nodes[self._id][property_name] = value
-
-    @property
-    def in_edges(self) -> typing.Iterable["Edge"]:
-        return [Edge(edge, self._graph) for edge in self._graph.nx.in_edges(self._id, keys=True)]
-
-    @property
-    def out_edges(self) -> typing.Iterable["Edge"]:
-        return [Edge(edge, self._graph) for edge in self._graph.nx.out_edges(self._id, keys=True)]
-
-
-class Edge:
-    """Represents a graph edge."""
-
-    __slots__ = ("_edge", "_graph")
-
-    def __init__(self, edge: typing.Tuple[int, int, int], graph: Graph) -> None:
-        if not isinstance(edge, typing.Tuple):
-            raise TypeError(f"Expected 'Tuple', got '{type(edge)}'")
-
-        if not isinstance(graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(graph)}'")
-
-        if not graph.nx.has_edge(*edge):
-            raise IndexError(f"Unable to find edge with ID {edge[EdgeConstants.I_KEY.value]}.")
-
-        self._edge = edge
-        self._graph = graph
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def is_deleted(self) -> bool:
-        return (
-            not self._graph.nx.has_edge(*self._edge)
-            and self._edge[EdgeConstants.I_KEY.value] <= self._graph.highest_edge_id
-        )
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    @property
-    def id(self) -> int:
-        return self._edge[EdgeConstants.I_KEY.value]
-
-    @property
-    def edge(self) -> typing.Tuple[int, int, int]:
-        return self._edge
-
-    @property
-    def start_id(self) -> int:
-        return self._edge[EdgeConstants.I_START.value]
-
-    @property
-    def end_id(self) -> int:
-        return self._edge[EdgeConstants.I_END.value]
-
-    def get_type_name(self):
-        return self._graph.nx.get_edge_data(*self._edge)[NX_TYPE_ATTR]
-
-    def from_vertex(self) -> Vertex:
-        return Vertex(self.start_id, self._graph)
-
-    def to_vertex(self) -> Vertex:
-        return Vertex(self.end_id, self._graph)
-
-    @property
-    def properties(self):
-        return (
-            (key, value)
-            for key, value in self._graph.nx.edges[self._edge].items()
-            if key not in (NX_LABEL_ATTR, NX_TYPE_ATTR)
-        )
-
-    def get_property(self, property_name: str):
-        return self._graph.nx.edges[self._edge][property_name]
-
-    def set_property(self, property_name: str, value: object):
-        self._graph.nx.edges[self._edge][property_name] = value
-
-
-class Path:
-    """Represents a path comprised of `Vertex` and `Edge` instances."""
-
-    __slots__ = ("_vertices", "_edges", "_graph")
-    __create_key = object()
-
-    def __init__(self, create_key, vertex_id: int, graph: Graph) -> None:
-        assert create_key == Path.__create_key, "Path objects must be created using Path.make_with_start"
-
-        self._vertices = [vertex_id]
-        self._edges = []
-        self._graph = graph
-
-    @classmethod
-    def make_with_start(cls, vertex: Vertex) -> "Path":
-        if not isinstance(vertex, Vertex):
-            raise TypeError(f"Expected 'Vertex', got '{type(vertex)}'")
-
-        if not isinstance(vertex.underlying_graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(vertex.underlying_graph)}'")
-
-        if not vertex.underlying_graph.nx.has_node(vertex._id):
-            raise IndexError(f"Unable to find vertex with ID {vertex._id}.")
-
-        return Path(cls.__create_key, vertex._id, vertex.underlying_graph)
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    def expand(self, edge: Edge):
-        if edge.start_id != self._vertices[-1]:
-            raise LogicErrorError("Logic error.")
-
-        self._vertices.append(edge.end_id)
-        self._edges.append((edge.start_id, edge.end_id, edge.id))
-
-    def vertex_at(self, index: int) -> Vertex:
-        return Vertex(self._vertices[index], self._graph)
-
-    def edge_at(self, index: int) -> Edge:
-        return Edge(self._edges[index], self._graph)
-
-    def size(self) -> int:
-        return len(self._edges)

include/mgp.py

@@ -1283,7 +1283,7 @@ class Graph:
             raise InvalidContextError()
         self._graph.detach_delete_vertex(vertex._vertex)
 
-    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex, edge_type: EdgeType) -> Edge:
+    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex, edge_type: EdgeType) -> None:
         """
         Create an edge.
 
@@ -1292,16 +1292,13 @@ class Graph:
             to_vertex: `Vertex'  to where edge is directed.
             edge_type:  `EdgeType` defines the type of edge.
 
-        Returns:
-            Created `Edge`.
-
         Raises:
             ImmutableObjectError: If `graph` is immutable.
             UnableToAllocateError: If unable to allocate an edge.
             DeletedObjectError: If `from_vertex` or `to_vertex` has been deleted.
             SerializationError: If `from_vertex` or `to_vertex` has been modified by another transaction.
         Examples:
-            ```edge = graph.create_edge(from_vertex, vertex, edge_type)```
+            ```graph.create_edge(from_vertex, vertex, edge_type)```
         """
         if not self.is_valid():
             raise InvalidContextError()

init

@@ -14,6 +14,7 @@ function print_help () {
     echo "Optional arguments:"
     echo -e "  -h\tdisplay this help and exit"
     echo -e "  --without-libs-setup\tskip the step for setting up libs"
+    echo -e "  --wsl-quicklisp-proxy \"host:port\"\tquicklist HTTP proxy (this flag + HTTP proxy are required on WSL)"
 }
 
 function setup_virtualenv () {
@@ -34,6 +35,7 @@ function setup_virtualenv () {
     popd > /dev/null
 }
 
+wsl_quicklisp_proxy=""
 setup_libs=true
 if [[ $# -eq 1 && "$1" == "-h" ]]; then
     print_help
@@ -41,6 +43,16 @@ if [[ $# -eq 1 && "$1" == "-h" ]]; then
 else
     while(($#)); do
         case "$1" in
+          --wsl-quicklisp-proxy)
+              shift
+              if [[ $# -eq 0 ]]; then
+                  echo "Missing proxy URL"
+                  print_help
+                  exit 1
+              fi
+              wsl_quicklisp_proxy=":proxy \"http://$1/\""
+              shift
+          ;;
           --without-libs-setup)
               shift
               setup_libs=false
@@ -67,17 +79,42 @@ echo "All packages are in-place..."
 # create a default build directory
 mkdir -p ./build
 
+# quicklisp package manager for Common Lisp
+quicklisp_install_dir="$HOME/quicklisp"
+if [[ -v QUICKLISP_HOME ]]; then
+  quicklisp_install_dir="${QUICKLISP_HOME}"
+fi
+
+if [[ ! -f "${quicklisp_install_dir}/setup.lisp" ]]; then
+  wget -nv https://beta.quicklisp.org/quicklisp.lisp -O quicklisp.lisp || exit 1
+  echo \
+  "
+  (load \"${DIR}/quicklisp.lisp\")
+  (quicklisp-quickstart:install $wsl_quicklisp_proxy :path \"${quicklisp_install_dir}\")
+  " | sbcl --script || exit 1
+  rm -rf quicklisp.lisp || exit 1
+fi
+ln -Tfs "$DIR/src/lisp" "${quicklisp_install_dir}/local-projects/lcp"
+# Install LCP dependencies
+# TODO: We should at some point cache or have a mirror of packages we use.
+# TODO: move the installation of LCP's dependencies into ./setup.sh
+echo \
+  "
+  (load \"${quicklisp_install_dir}/setup.lisp\")
+  (ql:quickload '(:lcp :lcp/test) :silent t)
+  " | sbcl --script
+
 if [[ "$setup_libs" == "true" ]]; then
-  # Setup libs (download).
-  cd libs
-  ./cleanup.sh
-  ./setup.sh
-  cd ..
+    # Setup libs (download).
+    cd libs
+    ./cleanup.sh
+    ./setup.sh
+    cd ..
 fi
 
 # Fix for centos 7 during release
-if [ "${DISTRO}" = "centos-7" ] || [ "${DISTRO}" = "debian-11" ] || [ "${DISTRO}" = "amzn-2" ]; then
-  python3 -m pip uninstall -y virtualenv
+if [ "${ARCHITECTURE}" = "centos-7" ]; then
+  python3 -m pip uninstall virtualenv
   python3 -m pip install virtualenv
 fi
 
@@ -106,18 +143,9 @@ for hook in $(find $DIR/.githooks -type f -printf "%f\n"); do
   echo "Added $hook hook"
 done;
 
-# Install precommit hook except on old operating systems because we don't
-# develop on them -> pre-commit hook not required -> we can use latest
-# packages.
-if [ "${DISTRO}" != "centos-7" ] && [ "$DISTRO" != "debian-10" ] && [ "${DISTRO}" != "ubuntu-18.04" ] && [ "${DISTRO}" != "amzn-2" ]; then
-  python3 -m pip install pre-commit
-  python3 -m pre_commit install
-  # Install py format tools for usage during the development.
-  echo "Install black formatter"
-  python3 -m pip install black==23.1.*
-  echo "Install isort"
-  python3 -m pip install isort==5.12.*
-fi
+# Install precommit hook
+python3 -m pip install pre-commit
+python3 -m pre_commit install
 
 # Link `include/mgp.py` with `release/mgp/mgp.py`
 ln -v -f include/mgp.py release/mgp/mgp.py

libs/setup.sh

@@ -117,7 +117,7 @@ declare -A primary_urls=(
   ["mgconsole"]="http://$local_cache_host/git/mgconsole.git"
   ["spdlog"]="http://$local_cache_host/git/spdlog"
   ["nlohmann"]="http://$local_cache_host/file/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
-  ["neo4j"]="http://$local_cache_host/file/neo4j-community-5.6.0-unix.tar.gz"
+  ["neo4j"]="http://$local_cache_host/file/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="http://$local_cache_host/git/librdkafka.git"
   ["protobuf"]="http://$local_cache_host/git/protobuf.git"
   ["pulsar"]="http://$local_cache_host/git/pulsar.git"
@@ -142,7 +142,7 @@ declare -A secondary_urls=(
   ["mgconsole"]="http://github.com/memgraph/mgconsole.git"
   ["spdlog"]="https://github.com/gabime/spdlog"
   ["nlohmann"]="https://raw.githubusercontent.com/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
-  ["neo4j"]="https://dist.neo4j.org/neo4j-community-5.6.0-unix.tar.gz"
+  ["neo4j"]="https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="https://github.com/edenhill/librdkafka.git"
   ["protobuf"]="https://github.com/protocolbuffers/protobuf.git"
   ["pulsar"]="https://github.com/apache/pulsar.git"
@@ -180,9 +180,9 @@ repo_clone_try_double "${primary_urls[libbcrypt]}" "${secondary_urls[libbcrypt]}
 
 # neo4j
 file_get_try_double "${primary_urls[neo4j]}" "${secondary_urls[neo4j]}"
-tar -xzf neo4j-community-5.6.0-unix.tar.gz
-mv neo4j-community-5.6.0 neo4j
-rm neo4j-community-5.6.0-unix.tar.gz
+tar -xzf neo4j-community-3.2.3-unix.tar.gz
+mv neo4j-community-3.2.3 neo4j
+rm neo4j-community-3.2.3-unix.tar.gz
 
 # nlohmann json
 # We wget header instead of cloning repo since repo is huge (lots of test data).
@@ -208,7 +208,7 @@ pymgclient_tag="4f85c179e56302d46a1e3e2cf43509db65f062b3" # (2021-01-15)
 repo_clone_try_double "${primary_urls[pymgclient]}" "${secondary_urls[pymgclient]}" "pymgclient" "$pymgclient_tag"
 
 # mgconsole
-mgconsole_tag="v1.3.0" # (2022-11-20)
+mgconsole_tag="v1.1.0" # (2021-10-07)
 repo_clone_try_double "${primary_urls[mgconsole]}" "${secondary_urls[mgconsole]}" "mgconsole" "$mgconsole_tag" true
 
 spdlog_tag="v1.9.2" # (2021-08-12)

licenses/BSL.txt

@@ -36,7 +36,7 @@ ADDITIONAL USE GRANT:   You may use the Licensed Work in accordance with the
                         3. using the Licensed Work to create a work or solution
                         which competes (or might reasonably be expected to
                         compete) with the Licensed Work.
-CHANGE DATE:            2027-05-04
+CHANGE DATE:            2026-07-11
 CHANGE LICENSE:         Apache License, Version 2.0
 
 For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.

licenses/third-party/ldbc/LICENSE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

pyproject.toml

@@ -1,12 +0,0 @@
-[tool.black]
-line-length = 120
-include = '\.pyi?$'
-extend-exclude = '''
-/(
-    | .git
-    | .__pycache__
-    | build
-    | libs
-    | .cache
-)/
-'''

query_modules/example.cpp

@@ -69,7 +69,7 @@ extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *mem
   try {
     mgp::memory = memory;
 
-    AddProcedure(SampleReadProc, "return_true", mgp::ProcedureType::Read,
+    AddProcedure(SampleReadProc, "return_true", mgp::ProdecureType::Read,
                  {mgp::Parameter("param_1", mgp::Type::Int), mgp::Parameter("param_2", mgp::Type::Double, 2.3)},
                  {mgp::Return("out", mgp::Type::Bool)}, module, memory);
   } catch (const std::exception &e) {
@@ -79,7 +79,7 @@ extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *mem
   try {
     mgp::memory = memory;
 
-    mgp::AddProcedure(AddXNodes, "add_x_nodes", mgp::ProcedureType::Write, {mgp::Parameter("param_1", mgp::Type::Int)},
+    mgp::AddProcedure(AddXNodes, "add_x_nodes", mgp::ProdecureType::Write, {mgp::Parameter("param_1", mgp::Type::Int)},
                       {}, module, memory);
 
   } catch (const std::exception &e) {

release/CMakeLists.txt

@@ -1,10 +1,6 @@
 # Install systemd service (must use absolute path).
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/memgraph.service
-    DESTINATION /lib/systemd/system)
-
-# Set parameters to recognize the host distro
-cmake_host_system_information(RESULT DISTRO QUERY DISTRIB_NAME)
-cmake_host_system_information(RESULT DISTRO_VERSION QUERY DISTRIB_VERSION)
+        DESTINATION /lib/systemd/system)
 
 # ---- Setup CPack --------
 
@@ -16,11 +12,10 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 
 # Setting arhitecture extension for deb packages
 set(MG_ARCH_EXTENSION_DEB "all")
-
-if(${MG_ARCH} STREQUAL "x86_64")
+if (${MG_ARCH} STREQUAL "x86_64")
     set(MG_ARCH_EXTENSION_DEB "amd64")
-elseif(${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_DEB "arm64")
+elseif (${MG_ARCH} STREQUAL "ARM64")
+    set(MG_ARCH_EXTENSION_DEB  "arm64")
 endif()
 
 # DEB specific
@@ -39,24 +34,21 @@ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;"
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
 # Description formatting is important, summary must be followed with a newline and 1 space.
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
  Contains Memgraph, the graph database. It aims to deliver developers the
  speed, simplicity and scale required to build the next generation of
  applications driver by real-time connected data.")
-
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0), libstdc++6")
 
 # Setting arhitecture extension for rpm packages
 set(MG_ARCH_EXTENSION_RPM "noarch")
-
-if(${MG_ARCH} STREQUAL "x86_64")
+if (${MG_ARCH} STREQUAL "x86_64")
     set(MG_ARCH_EXTENSION_RPM "x86_64")
-elseif(${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_RPM "aarch64")
+elseif (${MG_ARCH} STREQUAL "ARM64")
+    set(MG_ARCH_EXTENSION_RPM  "aarch64")
 endif()
 
 # RPM specific
@@ -64,26 +56,18 @@ set(CPACK_RPM_PACKAGE_URL https://memgraph.com)
 set(CPACK_RPM_PACKAGE_VERSION "${MEMGRAPH_VERSION_RPM}")
 set(CPACK_RPM_FILE_NAME "memgraph-${MEMGRAPH_VERSION_RPM}-1.${MG_ARCH_EXTENSION_RPM}.rpm")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
-    /var /var/lib /var/log /etc/logrotate.d
-    /lib /lib/systemd /lib/systemd/system /lib/systemd/system/memgraph.service)
+  /var /var/lib /var/log /etc/logrotate.d
+  /lib /lib/systemd /lib/systemd/system /lib/systemd/system/memgraph.service)
 set(CPACK_RPM_PACKAGE_REQUIRES_PRE "shadow-utils")
 set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm/memgraph.spec.in")
 set(CPACK_RPM_PACKAGE_LICENSE "Memgraph License")
-
 # Description formatting is important, no line must be greater than 80 characters.
 set(CPACK_RPM_PACKAGE_DESCRIPTION "Contains Memgraph, the graph database.
 It aims to deliver developers the speed, simplicity and scale required to build
 the next generation of applications driver by real-time connected data.")
-
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc++ >= 3.4.29, logrotate")
-
-# If amzn-2
-if(DISTRO STREQUAL "Amazon Linux" AND DISTRO_VERSION STREQUAL "2")
-    # It causes issues with glibcxx 2.4
-    set(CPACK_RPM_PACKAGE_AUTOREQ " no")
-endif()
+set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc >= 6, logrotate")
 
 # All variables must be set before including.
 include(CPack)

release/mgp/.gitignore

@@ -1,4 +1,3 @@
 .venv
 dist
 mgp.py
-poetry.lock

release/mgp/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mgp"
-version = "1.1.1"
+version = "1.1.0"
 description = "Memgraph's module for developing MAGE modules. Used only for type hinting!"
 authors = [
     "katarinasupe <katarina.supe@memgraph.io>",

release/package/amzn-2/Dockerfile

@@ -1,14 +0,0 @@
-FROM amazonlinux:2
-
-ARG TOOLCHAIN_VERSION
-
-RUN yum -y update \
-    && yum install -y wget git tar
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz \
-    -O ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz -C /opt
-
-ENTRYPOINT ["sleep", "infinity"]

release/package/arm-builders.yml

@@ -1,11 +0,0 @@
-version: "3"
-
-services:
-  debian-11-arm:
-    build:
-      context: debian-11-arm
-    container_name: "mgbuild_debian-11-arm"
-  ubuntu-2204-arm:
-    build:
-      context: ubuntu-22.04-arm
-    container_name: "mgbuild_ubuntu-22.04-arm"

release/package/docker-compose.yml

@@ -28,11 +28,3 @@ services:
     build:
       context: ubuntu-22.04
     container_name: "mgbuild_ubuntu-22.04"
-  mgbuild_fedora-36:
-    build:
-      context: fedora-36
-    container_name: "mgbuild_fedora-36"
-  mgbuild_amzn-2:
-    build:
-      context: amzn-2
-    container_name: "mgbuild_amzn-2"

release/package/fedora-36/Dockerfile

@@ -1,15 +0,0 @@
-FROM fedora:36
-
-ARG TOOLCHAIN_VERSION
-
-# Stops tzdata interactive configuration.
-RUN yum -y update \
-    && yum install -y wget git
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz \
-    -O ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz -C /opt
-
-ENTRYPOINT ["sleep", "infinity"]

release/package/run.sh

@@ -3,14 +3,7 @@
 set -Eeuo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SUPPORTED_OS=(
-    centos-7 centos-9
-    debian-10 debian-11 debian-11-arm
-    ubuntu-18.04 ubuntu-20.04 ubuntu-22.04 ubuntu-22.04-arm
-    fedora-36
-    amzn-2
-)
-
+SUPPORTED_OS=(centos-7 centos-9 debian-10 debian-11 ubuntu-18.04 ubuntu-20.04 ubuntu-22.04 debian-11-arm)
 PROJECT_ROOT="$SCRIPT_DIR/../.."
 TOOLCHAIN_VERSION="toolchain-v4"
 ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate"
@@ -30,9 +23,9 @@ make_package () {
     echo "Building Memgraph for $os on $build_container..."
 
     package_command=""
-    if [[ "$os" =~ ^"centos".* ]] || [[ "$os" =~ ^"fedora".* ]] || [[ "$os" =~ ^"amzn".* ]]; then
+    if [[ "$os" =~ ^"centos".* ]]; then
         docker exec "$build_container" bash -c "yum -y update"
-        package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint --file='../../release/rpm/rpmlintrc' memgraph*.rpm "
+        package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint memgraph*.rpm "
     fi
     if [[ "$os" =~ ^"debian".* ]]; then
         docker exec "$build_container" bash -c "apt update"
@@ -83,7 +76,7 @@ make_package () {
     docker exec "$build_container" bash -c "cd /memgraph && git config --global --add safe.directory '*'"
     docker exec "$build_container" bash -c "cd /memgraph && $ACTIVATE_TOOLCHAIN && ./init"
     docker exec "$build_container" bash -c "cd $container_build_dir && rm -rf ./*"
-    if [[ "$os" =~ "-arm" ]]; then
+    if [[ "$os" == "debian-11-arm" ]]; then
         docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release -DMG_ARCH="ARM64" $telemetry_id_override_flag .."
     else
         docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release $telemetry_id_override_flag .."

release/package/ubuntu-22.04-arm/Dockerfile

@@ -1,17 +0,0 @@
-FROM ubuntu:22.04
-
-ARG TOOLCHAIN_VERSION
-
-# Stops tzdata interactive configuration.
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt update && apt install -y \
-    ca-certificates wget git
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz \
-    -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz -C /opt
-
-ENTRYPOINT ["sleep", "infinity"]

release/rpm/memgraph.spec.in

@@ -30,7 +30,7 @@ BuildRequires: systemd
 # This is needed to prevent Python compilation errors when building the RPM
 # package
 # https://github.com/scylladb/scylla/issues/2235
-%if 0%{?rhel} && 0%{?rhel} < 8
+%if 0%{?rhel} < 8
 %global __os_install_post    \
     /usr/lib/rpm/redhat/brp-compress \
     %{!?__debug_package:\
@@ -40,9 +40,7 @@ BuildRequires: systemd
     /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
 %{nil}
-%endif
-
-%if 0%{?fedora} && 0%{?fedora} < 35
+%else
 %global __os_install_post    \
     /usr/lib/rpm/brp-compress \
     %{!?__debug_package:\

release/rpm/rpmlintrc

@@ -1,4 +0,0 @@
-# from https://github.com/google/earthenterprise/blob/master/earth_enterprise/rpmlintrc
-
-# We are not packaging log dir
-addFilter("E: logrotate-log-dir-not-packaged")

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 # CMake configuration for the main memgraph library and executable
 
 # add memgraph sub libraries, ordered by dependency
+add_subdirectory(lisp)
 add_subdirectory(utils)
 add_subdirectory(requests)
 add_subdirectory(io)
@@ -105,10 +106,6 @@ install(PROGRAMS $<TARGET_FILE:memgraph>
 # Install Python source for supporting our embedded Python.
 install(FILES ${CMAKE_SOURCE_DIR}/include/mgp.py
         DESTINATION lib/memgraph/python_support)
-install(FILES ${CMAKE_SOURCE_DIR}/include/mgp_mock.py
-        DESTINATION lib/memgraph/python_support)
-install(FILES ${CMAKE_SOURCE_DIR}/include/_mgp_mock.py
-        DESTINATION lib/memgraph/python_support)
 
 # Install the includes file for writing custom procedures in C and C++>
 install(FILES ${CMAKE_SOURCE_DIR}/include/mg_procedure.h

src/auth/CMakeLists.txt

@@ -16,10 +16,6 @@ target_link_libraries(mg-auth mg-utils mg-kvstore mg-license )
 target_link_libraries(mg-auth ${Seccomp_LIBRARIES})
 target_include_directories(mg-auth SYSTEM PRIVATE ${Seccomp_INCLUDE_DIRS})
 
-find_package(OpenSSL REQUIRED)
-target_link_libraries(mg-auth ${OPENSSL_LIBRARIES})
-target_include_directories(mg-auth SYSTEM PUBLIC ${OPENSSL_INCLUDE_DIR})
-
 # Install reference auth modules and their configuration files.
 install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/reference_modules/example.py
         DESTINATION lib/memgraph/auth_module)

src/auth/crypto.cpp

@@ -1,64 +1,19 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
 // this file except in compliance with the License. You may obtain a copy of the License at https://memgraph.com/legal.
 //
 //
+
 #include "auth/crypto.hpp"
 
-#include <iomanip>
-#include <sstream>
-
-#include <gflags/gflags.h>
 #include <libbcrypt/bcrypt.h>
-#include <openssl/evp.h>
-#include <openssl/opensslv.h>
-#include <openssl/sha.h>
 
 #include "auth/exceptions.hpp"
-#include "utils/enum.hpp"
-#include "utils/flag_validation.hpp"
-
-namespace {
-using namespace std::literals;
-inline constexpr std::array password_encryption_mappings{
-    std::pair{"bcrypt"sv, memgraph::auth::PasswordEncryptionAlgorithm::BCRYPT},
-    std::pair{"sha256"sv, memgraph::auth::PasswordEncryptionAlgorithm::SHA256},
-    std::pair{"sha256-multiple"sv, memgraph::auth::PasswordEncryptionAlgorithm::SHA256_MULTIPLE}};
-
-inline constexpr uint64_t ONE_SHA_ITERATION = 1;
-inline constexpr uint64_t MULTIPLE_SHA_ITERATIONS = 1024;
-}  // namespace
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables,misc-unused-parameters)
-DEFINE_VALIDATED_string(password_encryption_algorithm, "bcrypt",
-                        "The password encryption algorithm used for authentication.", {
-                          if (const auto result =
-                                  memgraph::utils::IsValidEnumValueString(value, password_encryption_mappings);
-                              result.HasError()) {
-                            const auto error = result.GetError();
-                            switch (error) {
-                              case memgraph::utils::ValidationError::EmptyValue: {
-                                std::cout << "Password encryption algorithm cannot be empty." << std::endl;
-                                break;
-                              }
-                              case memgraph::utils::ValidationError::InvalidValue: {
-                                std::cout << "Invalid value for password encryption algorithm. Allowed values: "
-                                          << memgraph::utils::GetAllowedEnumValuesString(password_encryption_mappings)
-                                          << std::endl;
-                                break;
-                              }
-                            }
-                            return false;
-                          }
-
-                          return true;
-                        });
 
 namespace memgraph::auth {
-namespace BCrypt {
-std::string EncryptPassword(const std::string &password) {
+const std::string EncryptPassword(const std::string &password) {
   char salt[BCRYPT_HASHSIZE];
   char hash[BCRYPT_HASHSIZE];
 
@@ -73,7 +28,7 @@ std::string EncryptPassword(const std::string &password) {
     throw AuthException("Couldn't hash password!");
   }
 
-  return {hash};
+  return std::string(hash);
 }
 
 bool VerifyPassword(const std::string &password, const std::string &hash) {
@@ -83,102 +38,5 @@ bool VerifyPassword(const std::string &password, const std::string &hash) {
   }
   return ret == 0;
 }
-}  // namespace BCrypt
-
-namespace SHA {
-#if OPENSSL_VERSION_MAJOR >= 3
-std::string EncryptPasswordOpenSSL3(const std::string &password, const uint64_t number_of_iterations) {
-  unsigned char hash[SHA256_DIGEST_LENGTH];
-
-  EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-  EVP_MD *md = EVP_MD_fetch(nullptr, "SHA2-256", nullptr);
-
-  EVP_DigestInit_ex(ctx, md, nullptr);
-  for (auto i = 0; i < number_of_iterations; i++) {
-    EVP_DigestUpdate(ctx, password.c_str(), password.size());
-  }
-  EVP_DigestFinal_ex(ctx, hash, nullptr);
-
-  EVP_MD_free(md);
-  EVP_MD_CTX_free(ctx);
-
-  std::stringstream result_stream;
-  for (auto hash_char : hash) {
-    result_stream << std::hex << std::setw(2) << std::setfill('0') << (int)hash_char;
-  }
-
-  return result_stream.str();
-}
-#else
-std::string EncryptPasswordOpenSSL1_1(const std::string &password, const uint64_t number_of_iterations) {
-  unsigned char hash[SHA256_DIGEST_LENGTH];
-
-  SHA256_CTX sha256;
-  SHA256_Init(&sha256);
-  for (auto i = 0; i < number_of_iterations; i++) {
-    SHA256_Update(&sha256, password.c_str(), password.size());
-  }
-  SHA256_Final(hash, &sha256);
-
-  std::stringstream ss;
-  for (auto hash_char : hash) {
-    ss << std::hex << std::setw(2) << std::setfill('0') << (int)hash_char;
-  }
-
-  return ss.str();
-}
-#endif
-
-std::string EncryptPassword(const std::string &password, const uint64_t number_of_iterations) {
-#if OPENSSL_VERSION_MAJOR >= 3
-  return EncryptPasswordOpenSSL3(password, number_of_iterations);
-#else
-  return EncryptPasswordOpenSSL1_1(password, number_of_iterations);
-#endif
-}
-
-bool VerifyPassword(const std::string &password, const std::string &hash, const uint64_t number_of_iterations) {
-  auto password_hash = EncryptPassword(password, number_of_iterations);
-  return password_hash == hash;
-}
-}  // namespace SHA
-
-bool VerifyPassword(const std::string &password, const std::string &hash) {
-  const auto password_encryption_algorithm = utils::StringToEnum<PasswordEncryptionAlgorithm>(
-      FLAGS_password_encryption_algorithm, password_encryption_mappings);
-
-  if (!password_encryption_algorithm.has_value()) {
-    throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-  }
-
-  switch (password_encryption_algorithm.value()) {
-    case PasswordEncryptionAlgorithm::BCRYPT:
-      return BCrypt::VerifyPassword(password, hash);
-    case PasswordEncryptionAlgorithm::SHA256:
-      return SHA::VerifyPassword(password, hash, ONE_SHA_ITERATION);
-    case PasswordEncryptionAlgorithm::SHA256_MULTIPLE:
-      return SHA::VerifyPassword(password, hash, MULTIPLE_SHA_ITERATIONS);
-  }
-
-  throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-}
-
-std::string EncryptPassword(const std::string &password) {
-  const auto password_encryption_algorithm = utils::StringToEnum<PasswordEncryptionAlgorithm>(
-      FLAGS_password_encryption_algorithm, password_encryption_mappings);
-
-  if (!password_encryption_algorithm.has_value()) {
-    throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-  }
-
-  switch (password_encryption_algorithm.value()) {
-    case PasswordEncryptionAlgorithm::BCRYPT:
-      return BCrypt::EncryptPassword(password);
-    case PasswordEncryptionAlgorithm::SHA256:
-      return SHA::EncryptPassword(password, ONE_SHA_ITERATION);
-    case PasswordEncryptionAlgorithm::SHA256_MULTIPLE:
-      return SHA::EncryptPassword(password, MULTIPLE_SHA_ITERATIONS);
-  }
-}
 
 }  // namespace memgraph::auth

src/auth/crypto.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -11,11 +11,10 @@
 #include <string>
 
 namespace memgraph::auth {
-enum class PasswordEncryptionAlgorithm : uint8_t { BCRYPT, SHA256, SHA256_MULTIPLE };
-
 /// @throw AuthException if unable to encrypt the password.
-std::string EncryptPassword(const std::string &password);
+const std::string EncryptPassword(const std::string &password);
 
 /// @throw AuthException if unable to verify the password.
 bool VerifyPassword(const std::string &password, const std::string &hash);
+
 }  // namespace memgraph::auth

src/auth/models.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -16,7 +16,6 @@
 #include "auth/crypto.hpp"
 #include "auth/exceptions.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 #include "utils/cast.hpp"
 #include "utils/logging.hpp"
 #include "utils/settings.hpp"
@@ -35,19 +34,13 @@ namespace memgraph::auth {
 namespace {
 
 // Constant list of all available permissions.
-const std::vector<Permission> kPermissionsAll = {Permission::MATCH,       Permission::CREATE,
-                                                 Permission::MERGE,       Permission::DELETE,
-                                                 Permission::SET,         Permission::REMOVE,
-                                                 Permission::INDEX,       Permission::STATS,
-                                                 Permission::CONSTRAINT,  Permission::DUMP,
-                                                 Permission::AUTH,        Permission::REPLICATION,
-                                                 Permission::DURABILITY,  Permission::READ_FILE,
-                                                 Permission::FREE_MEMORY, Permission::TRIGGER,
-                                                 Permission::CONFIG,      Permission::STREAM,
-                                                 Permission::MODULE_READ, Permission::MODULE_WRITE,
-                                                 Permission::WEBSOCKET,   Permission::TRANSACTION_MANAGEMENT,
-                                                 Permission::STORAGE_MODE};
-
+const std::vector<Permission> kPermissionsAll = {
+    Permission::MATCH,      Permission::CREATE,    Permission::MERGE,       Permission::DELETE,
+    Permission::SET,        Permission::REMOVE,    Permission::INDEX,       Permission::STATS,
+    Permission::CONSTRAINT, Permission::DUMP,      Permission::AUTH,        Permission::REPLICATION,
+    Permission::DURABILITY, Permission::READ_FILE, Permission::FREE_MEMORY, Permission::TRIGGER,
+    Permission::CONFIG,     Permission::STREAM,    Permission::MODULE_READ, Permission::MODULE_WRITE,
+    Permission::WEBSOCKET};
 }  // namespace
 
 std::string PermissionToString(Permission permission) {
@@ -94,10 +87,6 @@ std::string PermissionToString(Permission permission) {
       return "MODULE_WRITE";
     case Permission::WEBSOCKET:
       return "WEBSOCKET";
-    case Permission::TRANSACTION_MANAGEMENT:
-      return "TRANSACTION_MANAGEMENT";
-    case Permission::STORAGE_MODE:
-      return "STORAGE_MODE";
   }
 }
 
@@ -275,7 +264,7 @@ PermissionLevel FineGrainedAccessPermissions::Has(const std::string &permission,
 
 void FineGrainedAccessPermissions::Grant(const std::string &permission,
                                          const FineGrainedPermission fine_grained_permission) {
-  if (permission == query::kAsterisk) {
+  if (permission == kAsterisk) {
     global_permission_ = CalculateGrant(fine_grained_permission);
   } else {
     permissions_[permission] = CalculateGrant(fine_grained_permission);
@@ -283,7 +272,7 @@ void FineGrainedAccessPermissions::Grant(const std::string &permission,
 }
 
 void FineGrainedAccessPermissions::Revoke(const std::string &permission) {
-  if (permission == query::kAsterisk) {
+  if (permission == kAsterisk) {
     permissions_.clear();
     global_permission_ = std::nullopt;
   } else {

src/auth/models.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -15,6 +15,7 @@
 #include <json/json.hpp>
 
 namespace memgraph::auth {
+const std::string kAsterisk = "*";
 // These permissions must have values that are applicable for usage in a
 // bitmask.
 // clang-format off
@@ -39,9 +40,7 @@ enum class Permission : uint64_t {
   STREAM       = 1U << 17U,
   MODULE_READ  = 1U << 18U,
   MODULE_WRITE = 1U << 19U,
-  WEBSOCKET    = 1U << 20U,
-  TRANSACTION_MANAGEMENT = 1U << 21U,
-  STORAGE_MODE    = 1U << 22U
+  WEBSOCKET    = 1U << 20U
 };
 // clang-format on
 

src/communication/bolt/client.cpp

@@ -90,7 +90,7 @@ QueryData Client::Execute(const std::string &query, const std::map<std::string,
   // It is super critical from performance point of view to send the pull message right after the run message. Otherwise
   // the performance will degrade multiple magnitudes.
   encoder_.MessageRun(query, parameters, {});
-  encoder_.MessagePull({{"n", Value(-1)}});
+  encoder_.MessagePull({});
 
   spdlog::debug("Reading run message response");
   Signature signature{};
@@ -146,10 +146,9 @@ QueryData Client::Execute(const std::string &query, const std::map<std::string,
     throw ServerMalformedDataException();
   }
 
-  auto &header = fields.ValueMap();
-
   QueryData ret{{}, std::move(records), std::move(metadata.ValueMap())};
 
+  auto &header = fields.ValueMap();
   if (header.find("fields") == header.end()) {
     throw ServerMalformedDataException();
   }
@@ -165,10 +164,6 @@ QueryData Client::Execute(const std::string &query, const std::map<std::string,
     ret.fields.emplace_back(std::move(field_item.ValueString()));
   }
 
-  if (header.contains("qid")) {
-    ret.metadata["qid"] = header["qid"];
-  }
-
   return ret;
 }
 

src/communication/bolt/v1/states/handlers.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -73,6 +73,40 @@ inline std::pair<std::string, std::string> ExceptionToErrorMessage(const std::ex
 
 namespace details {
 
+template <typename TSession>
+State HandleRun(TSession &session, const State state, const Value &query, const Value &params) {
+  if (state != State::Idle) {
+    // Client could potentially recover if we move to error state, but there is
+    // no legitimate situation in which well working client would end up in this
+    // situation.
+    spdlog::trace("Unexpected RUN command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  spdlog::debug("[Run] '{}'", query.ValueString());
+
+  try {
+    // Interpret can throw.
+    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap());
+    // Convert std::string to Value
+    std::vector<Value> vec;
+    std::map<std::string, Value> data;
+    vec.reserve(header.size());
+    for (auto &i : header) vec.emplace_back(std::move(i));
+    data.emplace("fields", std::move(vec));
+    // Send the header.
+    if (!session.encoder_.MessageSuccess(data)) {
+      spdlog::trace("Couldn't send query header!");
+      return State::Close;
+    }
+    return State::Result;
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
+  }
+}
+
 template <bool is_pull, typename TSession>
 State HandlePullDiscard(TSession &session, std::optional<int> n, std::optional<int> qid) {
   try {
@@ -195,36 +229,7 @@ State HandleRunV1(TSession &session, const State state, const Marker marker) {
     return State::Close;
   }
 
-  if (state != State::Idle) {
-    // Client could potentially recover if we move to error state, but there is
-    // no legitimate situation in which well working client would end up in this
-    // situation.
-    spdlog::trace("Unexpected RUN command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  spdlog::debug("[Run] '{}'", query.ValueString());
-
-  try {
-    // Interpret can throw.
-    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap());
-    // Convert std::string to Value
-    std::vector<Value> vec;
-    std::map<std::string, Value> data;
-    vec.reserve(header.size());
-    for (auto &i : header) vec.emplace_back(std::move(i));
-    data.emplace("fields", std::move(vec));
-    // Send the header.
-    if (!session.encoder_.MessageSuccess(data)) {
-      spdlog::trace("Couldn't send query header!");
-      return State::Close;
-    }
-    return State::Result;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
+  return details::HandleRun(session, state, query, params);
 }
 
 template <typename TSession>
@@ -252,40 +257,7 @@ State HandleRunV4(TSession &session, const State state, const Marker marker) {
     spdlog::trace("Couldn't read extra field!");
   }
 
-  if (state != State::Idle) {
-    // Client could potentially recover if we move to error state, but there is
-    // no legitimate situation in which well working client would end up in this
-    // situation.
-    spdlog::trace("Unexpected RUN command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  spdlog::debug("[Run] '{}'", query.ValueString());
-
-  try {
-    // Interpret can throw.
-    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap());
-    // Convert std::string to Value
-    std::vector<Value> vec;
-    std::map<std::string, Value> data;
-    vec.reserve(header.size());
-    for (auto &i : header) vec.emplace_back(std::move(i));
-    data.emplace("fields", std::move(vec));
-    if (qid.has_value()) {
-      data.emplace("qid", Value{*qid});
-    }
-
-    // Send the header.
-    if (!session.encoder_.MessageSuccess(data)) {
-      spdlog::trace("Couldn't send query header!");
-      return State::Close;
-    }
-    return State::Result;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
+  return details::HandleRun(session, state, query, params);
 }
 
 template <typename TSession>

src/communication/v2/session.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -41,7 +41,6 @@
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/system/detail/error_code.hpp>
 
-#include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/exceptions.hpp"
 #include "utils/logging.hpp"

src/glue/auth.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -58,10 +58,6 @@ auth::Permission PrivilegeToPermission(query::AuthQuery::Privilege privilege) {
       return auth::Permission::MODULE_WRITE;
     case query::AuthQuery::Privilege::WEBSOCKET:
       return auth::Permission::WEBSOCKET;
-    case query::AuthQuery::Privilege::STORAGE_MODE:
-      return auth::Permission::STORAGE_MODE;
-    case query::AuthQuery::Privilege::TRANSACTION_MANAGEMENT:
-      return auth::Permission::TRANSACTION_MANAGEMENT;
   }
 }
 

src/glue/auth_checker.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -15,7 +15,6 @@
 #include "auth/models.hpp"
 #include "glue/auth.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 #include "query/frontend/ast/ast.hpp"
 #include "utils/synchronized.hpp"
 
@@ -39,7 +38,7 @@ bool IsUserAuthorizedGloballyLabels(const memgraph::auth::User &user,
   if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     return true;
   }
-  return user.GetFineGrainedAccessLabelPermissions().Has(memgraph::query::kAsterisk, fine_grained_permission) ==
+  return user.GetFineGrainedAccessLabelPermissions().Has(memgraph::auth::kAsterisk, fine_grained_permission) ==
          memgraph::auth::PermissionLevel::GRANT;
 }
 
@@ -48,7 +47,7 @@ bool IsUserAuthorizedGloballyEdges(const memgraph::auth::User &user,
   if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     return true;
   }
-  return user.GetFineGrainedAccessEdgeTypePermissions().Has(memgraph::query::kAsterisk, fine_grained_permission) ==
+  return user.GetFineGrainedAccessEdgeTypePermissions().Has(memgraph::auth::kAsterisk, fine_grained_permission) ==
          memgraph::auth::PermissionLevel::GRANT;
 }
 
@@ -85,7 +84,6 @@ bool AuthChecker::IsUserAuthorized(const std::optional<std::string> &username,
 
   return maybe_user.has_value() && IsUserAuthorized(*maybe_user, privileges);
 }
-
 #ifdef MG_ENTERPRISE
 std::unique_ptr<memgraph::query::FineGrainedAuthChecker> AuthChecker::GetFineGrainedAuthChecker(
     const std::string &username, const memgraph::query::DbAccessor *dba) const {
@@ -120,9 +118,9 @@ bool AuthChecker::IsUserAuthorized(const memgraph::auth::User &user,
 FineGrainedAuthChecker::FineGrainedAuthChecker(auth::User user, const memgraph::query::DbAccessor *dba)
     : user_{std::move(user)}, dba_(dba){};
 
-bool FineGrainedAuthChecker::Has(const memgraph::query::VertexAccessor *vertex, const memgraph::storage::View view,
+bool FineGrainedAuthChecker::Has(const memgraph::query::VertexAccessor &vertex, const memgraph::storage::View view,
                                  const memgraph::query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const {
-  auto maybe_labels = vertex->Labels(view);
+  auto maybe_labels = vertex.Labels(view);
   if (maybe_labels.HasError()) {
     switch (maybe_labels.GetError()) {
       case memgraph::storage::Error::DELETED_OBJECT:

src/glue/auth_checker.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -26,11 +26,9 @@ class AuthChecker : public query::AuthChecker {
 
   bool IsUserAuthorized(const std::optional<std::string> &username,
                         const std::vector<query::AuthQuery::Privilege> &privileges) const override;
-
 #ifdef MG_ENTERPRISE
   std::unique_ptr<memgraph::query::FineGrainedAuthChecker> GetFineGrainedAuthChecker(
       const std::string &username, const memgraph::query::DbAccessor *dba) const override;
-
 #endif
   [[nodiscard]] static bool IsUserAuthorized(const memgraph::auth::User &user,
                                              const std::vector<memgraph::query::AuthQuery::Privilege> &privileges);
@@ -43,13 +41,8 @@ class FineGrainedAuthChecker : public query::FineGrainedAuthChecker {
  public:
   explicit FineGrainedAuthChecker(auth::User user, const memgraph::query::DbAccessor *dba);
 
-  bool Has(const query::VertexAccessor *vertex, memgraph::storage::View view,
-           query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const override;
-
   bool Has(const query::VertexAccessor &vertex, memgraph::storage::View view,
-           query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const {
-    return Has(&vertex, view, fine_grained_privilege);
-  }
+           query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const override;
 
   bool Has(const query::EdgeAccessor &edge,
            query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const override;

src/glue/auth_handler.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,7 +18,6 @@
 #include "auth/models.hpp"
 #include "glue/auth.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 
 namespace {
 
@@ -254,18 +253,19 @@ bool AuthQueryHandler::CreateUser(const std::string &username, const std::option
 
     if (first_user) {
       spdlog::info("{} is first created user. Granting all privileges.", username);
-      GrantPrivilege(
-          username, memgraph::query::kPrivilegesAll
+      GrantPrivilege(username, memgraph::query::kPrivilegesAll
 #ifdef MG_ENTERPRISE
-          ,
-          {{{memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {memgraph::query::kAsterisk}}}},
-          {
-            {
-              {
-                memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, { memgraph::query::kAsterisk }
-              }
-            }
-          }
+                     ,
+                     {{{memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {memgraph::auth::kAsterisk}}}},
+                     {
+                       {
+                         {
+                           memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {
+                             memgraph::auth::kAsterisk
+                           }
+                         }
+                       }
+                     }
 #endif
       );
     }

src/glue/communication.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -65,12 +65,12 @@ query::TypedValue ToTypedValue(const Value &value) {
 
 storage::Result<communication::bolt::Vertex> ToBoltVertex(const query::VertexAccessor &vertex,
                                                           const storage::Storage &db, storage::View view) {
-  return ToBoltVertex(*vertex.impl_, db, view);
+  return ToBoltVertex(vertex.impl_, db, view);
 }
 
 storage::Result<communication::bolt::Edge> ToBoltEdge(const query::EdgeAccessor &edge, const storage::Storage &db,
                                                       storage::View view) {
-  return ToBoltEdge(*edge.impl_, db, view);
+  return ToBoltEdge(edge.impl_, db, view);
 }
 
 storage::Result<Value> ToBoltValue(const query::TypedValue &value, const storage::Storage &db, storage::View view) {
@@ -156,8 +156,8 @@ storage::Result<communication::bolt::Vertex> ToBoltVertex(const storage::VertexA
 storage::Result<communication::bolt::Edge> ToBoltEdge(const storage::EdgeAccessor &edge, const storage::Storage &db,
                                                       storage::View view) {
   auto id = communication::bolt::Id::FromUint(edge.Gid().AsUint());
-  auto from = communication::bolt::Id::FromUint(edge.FromVertex()->Gid().AsUint());
-  auto to = communication::bolt::Id::FromUint(edge.ToVertex()->Gid().AsUint());
+  auto from = communication::bolt::Id::FromUint(edge.FromVertex().Gid().AsUint());
+  auto to = communication::bolt::Id::FromUint(edge.ToVertex().Gid().AsUint());
   auto type = db.EdgeTypeToName(edge.EdgeType());
   auto maybe_properties = edge.Properties(view);
   if (maybe_properties.HasError()) return maybe_properties.GetError();

src/helpers.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <filesystem>
-#include <fstream>
 #include <string>
 #include <vector>
 
@@ -62,42 +61,3 @@ inline void LoadConfig(const std::string &product_name) {
   for (int i = 0; i < custom_argc; ++i) free(custom_argv[i]);
   delete[] custom_argv;
 }
-
-std::pair<std::string, std::string> LoadUsernameAndPassword(const std::string &pass_file) {
-  std::ifstream file(pass_file);
-  if (file.fail()) {
-    spdlog::warn("Problem with opening MG_PASSFILE, memgraph server will start without user");
-    return {};
-  }
-  std::vector<std::string> result;
-
-  std::string line;
-  std::getline(file, line);
-  size_t pos = 0;
-  std::string token;
-  static constexpr std::string_view delimiter{":"};
-  while ((pos = line.find(delimiter)) != std::string::npos) {
-    if (line[pos - 1] == '\\') {
-      line.erase(pos - 1, 1);
-      token += line.substr(0, pos);
-      line.erase(0, pos);
-
-    } else {
-      token += line.substr(0, pos);
-      result.push_back(token);
-      line.erase(0, pos + delimiter.length());
-      token = "";
-    }
-  }
-  result.push_back(line);
-  file.close();
-
-  if (result.size() != 2) {
-    spdlog::warn(
-        "Wrong data format. Data should be store in format: username:password, memgraph server will start without "
-        "user");
-    return {};
-  }
-
-  return {result[0], result[1]};
-}

src/memgraph.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -26,7 +26,6 @@
 #include <string_view>
 #include <thread>
 
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <gflags/gflags.h>
 #include <spdlog/common.h>
@@ -53,12 +52,10 @@
 #include "query/procedure/module.hpp"
 #include "query/procedure/py_module.hpp"
 #include "requests/requests.hpp"
-#include "storage/v2/inmemory/storage.hpp"
 #include "storage/v2/isolation_level.hpp"
 #include "storage/v2/storage.hpp"
 #include "storage/v2/view.hpp"
 #include "telemetry/telemetry.hpp"
-#include "utils/enum.hpp"
 #include "utils/event_counter.hpp"
 #include "utils/file.hpp"
 #include "utils/flag_validation.hpp"
@@ -101,13 +98,41 @@
 #include "audit/log.hpp"
 #endif
 
-constexpr const char *kMgUser = "MEMGRAPH_USER";
-constexpr const char *kMgPassword = "MEMGRAPH_PASSWORD";
-constexpr const char *kMgPassfile = "MEMGRAPH_PASSFILE";
+namespace {
+std::string GetAllowedEnumValuesString(const auto &mappings) {
+  std::vector<std::string> allowed_values;
+  allowed_values.reserve(mappings.size());
+  std::transform(mappings.begin(), mappings.end(), std::back_inserter(allowed_values),
+                 [](const auto &mapping) { return std::string(mapping.first); });
+  return memgraph::utils::Join(allowed_values, ", ");
+}
 
-// Short help flag.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_bool(h, false, "Print usage and exit.");
+enum class ValidationError : uint8_t { EmptyValue, InvalidValue };
+
+memgraph::utils::BasicResult<ValidationError> IsValidEnumValueString(const auto &value, const auto &mappings) {
+  if (value.empty()) {
+    return ValidationError::EmptyValue;
+  }
+
+  if (std::find_if(mappings.begin(), mappings.end(), [&](const auto &mapping) { return mapping.first == value; }) ==
+      mappings.cend()) {
+    return ValidationError::InvalidValue;
+  }
+
+  return {};
+}
+
+template <typename Enum>
+std::optional<Enum> StringToEnum(const auto &value, const auto &mappings) {
+  const auto mapping_iter =
+      std::find_if(mappings.begin(), mappings.end(), [&](const auto &mapping) { return mapping.first == value; });
+  if (mapping_iter == mappings.cend()) {
+    return std::nullopt;
+  }
+
+  return mapping_iter->second;
+}
+}  // namespace
 
 // Bolt server flags.
 DEFINE_string(bolt_address, "0.0.0.0", "IP address on which the Bolt server should listen.");
@@ -138,11 +163,6 @@ DEFINE_string(bolt_key_file, "", "Key file which should be used for the Bolt ser
 DEFINE_string(bolt_server_name_for_init, "",
               "Server name which the database should send to the client in the "
               "Bolt INIT message.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(init_file, "",
-              "Path to cypherl file that is used for configuring users and database schema before server starts.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(init_data_file, "", "Path to cypherl file that is used for creating data after server starts.");
 
 // General purpose flags.
 // NOTE: The `data_directory` flag must be the same here and in
@@ -193,20 +213,6 @@ DEFINE_VALIDATED_uint64(storage_wal_file_flush_every_n_tx,
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(storage_snapshot_on_exit, false, "Controls whether the storage creates another snapshot on exit.");
 
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_items_per_batch, memgraph::storage::Config::Durability().items_per_batch,
-              "The number of edges and vertices stored in a batch in a snapshot file.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_parallel_index_recovery, false,
-            "Controls whether the index creation can be done in a multithreaded fashion.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_recovery_thread_count,
-              std::max(static_cast<uint64_t>(std::thread::hardware_concurrency()),
-                       memgraph::storage::Config::Durability().recovery_thread_count),
-              "The number of threads used to recover persisted data from disk.");
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(telemetry_enabled, false,
             "Set to true to enable telemetry. We collect information about the "
@@ -270,21 +276,21 @@ inline constexpr std::array isolation_level_mappings{
 
 const std::string isolation_level_help_string =
     fmt::format("Default isolation level used for the transactions. Allowed values: {}",
-                memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings));
+                GetAllowedEnumValuesString(isolation_level_mappings));
 }  // namespace
 
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_VALIDATED_string(isolation_level, "SNAPSHOT_ISOLATION", isolation_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, isolation_level_mappings); result.HasError()) {
+  if (const auto result = IsValidEnumValueString(value, isolation_level_mappings); result.HasError()) {
     const auto error = result.GetError();
     switch (error) {
-      case memgraph::utils::ValidationError::EmptyValue: {
+      case ValidationError::EmptyValue: {
         std::cout << "Isolation level cannot be empty." << std::endl;
         break;
       }
-      case memgraph::utils::ValidationError::InvalidValue: {
+      case ValidationError::InvalidValue: {
         std::cout << "Invalid value for isolation level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings) << std::endl;
+                  << GetAllowedEnumValuesString(isolation_level_mappings) << std::endl;
         break;
       }
     }
@@ -297,7 +303,7 @@ DEFINE_VALIDATED_string(isolation_level, "SNAPSHOT_ISOLATION", isolation_level_h
 namespace {
 memgraph::storage::IsolationLevel ParseIsolationLevel() {
   const auto isolation_level =
-      memgraph::utils::StringToEnum<memgraph::storage::IsolationLevel>(FLAGS_isolation_level, isolation_level_mappings);
+      StringToEnum<memgraph::storage::IsolationLevel>(FLAGS_isolation_level, isolation_level_mappings);
   MG_ASSERT(isolation_level, "Invalid isolation level");
   return *isolation_level;
 }
@@ -357,21 +363,21 @@ inline constexpr std::array log_level_mappings{
     std::pair{"INFO"sv, spdlog::level::info},   std::pair{"WARNING"sv, spdlog::level::warn},
     std::pair{"ERROR"sv, spdlog::level::err},   std::pair{"CRITICAL"sv, spdlog::level::critical}};
 
-const std::string log_level_help_string = fmt::format("Minimum log level. Allowed values: {}",
-                                                      memgraph::utils::GetAllowedEnumValuesString(log_level_mappings));
+const std::string log_level_help_string =
+    fmt::format("Minimum log level. Allowed values: {}", GetAllowedEnumValuesString(log_level_mappings));
 }  // namespace
 
 DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
+  if (const auto result = IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
     const auto error = result.GetError();
     switch (error) {
-      case memgraph::utils::ValidationError::EmptyValue: {
+      case ValidationError::EmptyValue: {
         std::cout << "Log level cannot be empty." << std::endl;
         break;
       }
-      case memgraph::utils::ValidationError::InvalidValue: {
-        std::cout << "Invalid value for log level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(log_level_mappings) << std::endl;
+      case ValidationError::InvalidValue: {
+        std::cout << "Invalid value for log level. Allowed values: " << GetAllowedEnumValuesString(log_level_mappings)
+                  << std::endl;
         break;
       }
     }
@@ -383,7 +389,7 @@ DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(), {
 
 namespace {
 spdlog::level::level_enum ParseLogLevel() {
-  const auto log_level = memgraph::utils::StringToEnum<spdlog::level::level_enum>(FLAGS_log_level, log_level_mappings);
+  const auto log_level = StringToEnum<spdlog::level::level_enum>(FLAGS_log_level, log_level_mappings);
   MG_ASSERT(log_level, "Invalid log level");
   return *log_level;
 }
@@ -466,33 +472,6 @@ struct SessionData {
 DEFINE_string(auth_user_or_role_name_regex, memgraph::glue::kDefaultUserRoleRegex.data(),
               "Set to the regular expression that each user or role name must fulfill.");
 
-void InitFromCypherlFile(memgraph::query::InterpreterContext &ctx, std::string cypherl_file_path
-#ifdef MG_ENTERPRISE
-                         ,
-                         memgraph::audit::Log *audit_log
-#endif
-) {
-  memgraph::query::Interpreter interpreter(&ctx);
-  std::ifstream file(cypherl_file_path);
-  if (file.is_open()) {
-    std::string line;
-    while (std::getline(file, line)) {
-      if (!line.empty()) {
-        auto results = interpreter.Prepare(line, {}, {});
-        memgraph::query::DiscardValueResultStream stream;
-        interpreter.Pull(&stream, {}, results.qid);
-
-#ifdef MG_ENTERPRISE
-        if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-          audit_log->Record("", "", line, {});
-        }
-#endif
-      }
-    }
-    file.close();
-  }
-}
-
 class BoltSession final : public memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                                         memgraph::communication::v2::OutputStream> {
  public:
@@ -502,7 +481,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
       : memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                memgraph::communication::v2::OutputStream>(input_stream, output_stream),
         db_(data->db),
-        interpreter_context_(data->interpreter_context),
         interpreter_(data->interpreter_context),
         auth_(data->auth),
 #if MG_ENTERPRISE
@@ -510,11 +488,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
 #endif
         endpoint_(endpoint),
         run_id_(data->run_id) {
-    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.insert(&interpreter_); });
-  }
-
-  ~BoltSession() override {
-    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.erase(&interpreter_); });
   }
 
   using memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
@@ -660,7 +633,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
 
   // NOTE: Needed only for ToBoltValue conversions
   const memgraph::storage::Storage *db_;
-  memgraph::query::InterpreterContext *interpreter_context_;
   memgraph::query::Interpreter interpreter_;
   memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
   std::optional<memgraph::auth::User> user_;
@@ -715,11 +687,6 @@ int main(int argc, char **argv) {
   LoadConfig("memgraph");
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
-  if (FLAGS_h) {
-    gflags::ShowUsageWithFlags(argv[0]);
-    exit(1);
-  }
-
   InitializeLogger();
 
   // Unhandled exception handler init.
@@ -867,10 +834,7 @@ int main(int argc, char **argv) {
                      .wal_file_size_kibibytes = FLAGS_storage_wal_file_size_kib,
                      .wal_file_flush_every_n_tx = FLAGS_storage_wal_file_flush_every_n_tx,
                      .snapshot_on_exit = FLAGS_storage_snapshot_on_exit,
-                     .restore_replicas_on_startup = true,
-                     .items_per_batch = FLAGS_storage_items_per_batch,
-                     .recovery_thread_count = FLAGS_storage_recovery_thread_count,
-                     .allow_parallel_index_creation = FLAGS_storage_parallel_index_recovery},
+                     .restore_replicas_on_startup = true},
       .transaction = {.isolation_level = ParseIsolationLevel()}};
   if (FLAGS_storage_snapshot_interval_sec == 0) {
     if (FLAGS_storage_wal_enabled) {
@@ -890,10 +854,10 @@ int main(int argc, char **argv) {
     }
     db_config.durability.snapshot_interval = std::chrono::seconds(FLAGS_storage_snapshot_interval_sec);
   }
-  std::unique_ptr<memgraph::storage::Storage> db = std::make_unique<memgraph::storage::InMemoryStorage>(db_config);
+  memgraph::storage::Storage db(db_config);
 
   memgraph::query::InterpreterContext interpreter_context{
-      db.get(),
+      &db,
       {.query = {.allow_load_csv = FLAGS_allow_load_csv},
        .execution_timeout_sec = FLAGS_query_execution_timeout_sec,
        .replication_replica_check_frequency = std::chrono::seconds(FLAGS_replication_replica_check_frequency_sec),
@@ -903,9 +867,9 @@ int main(int argc, char **argv) {
        .stream_transaction_retry_interval = std::chrono::milliseconds(FLAGS_stream_transaction_retry_interval)},
       FLAGS_data_directory};
 #ifdef MG_ENTERPRISE
-  SessionData session_data{db.get(), &interpreter_context, &auth, &audit_log};
+  SessionData session_data{&db, &interpreter_context, &auth, &audit_log};
 #else
-  SessionData session_data{db.get(), &interpreter_context, &auth};
+  SessionData session_data{&db, &interpreter_context, &auth};
 #endif
 
   memgraph::query::procedure::gModuleRegistry.SetModulesDirectory(query_modules_directories, FLAGS_data_directory);
@@ -916,34 +880,11 @@ int main(int argc, char **argv) {
   interpreter_context.auth = &auth_handler;
   interpreter_context.auth_checker = &auth_checker;
 
-  if (!FLAGS_init_file.empty()) {
-    spdlog::info("Running init file.");
-#ifdef MG_ENTERPRISE
-    if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-      InitFromCypherlFile(interpreter_context, FLAGS_init_file, &audit_log);
-    }
-#else
-    InitFromCypherlFile(interpreter_context, FLAGS_init_file);
-#endif
-  }
-
-  auto *maybe_username = std::getenv(kMgUser);
-  auto *maybe_password = std::getenv(kMgPassword);
-  auto *maybe_pass_file = std::getenv(kMgPassfile);
-  if (maybe_username && maybe_password) {
-    auth_handler.CreateUser(maybe_username, maybe_password);
-  } else if (maybe_pass_file) {
-    const auto [username, password] = LoadUsernameAndPassword(maybe_pass_file);
-    if (!username.empty() && !password.empty()) {
-      auth_handler.CreateUser(username, password);
-    }
-  }
-
   {
     // Triggers can execute query procedures, so we need to reload the modules first and then
     // the triggers
     auto storage_accessor = interpreter_context.db->Access();
-    auto dba = memgraph::query::DbAccessor{storage_accessor.get()};
+    auto dba = memgraph::query::DbAccessor{&storage_accessor};
     interpreter_context.trigger_store.RestoreTriggers(
         &interpreter_context.ast_cache, &dba, interpreter_context.config.query, interpreter_context.auth_checker);
   }
@@ -977,7 +918,7 @@ int main(int argc, char **argv) {
   if (FLAGS_telemetry_enabled) {
     telemetry.emplace(telemetry_server, data_directory / "telemetry", run_id, machine_id, std::chrono::minutes(10));
     telemetry->AddCollector("storage", [&db]() -> nlohmann::json {
-      auto info = db->GetInfo();
+      auto info = db.GetInfo();
       return {{"vertices", info.vertex_count}, {"edges", info.edge_count}};
     });
     telemetry->AddCollector("event_counters", []() -> nlohmann::json {
@@ -1016,17 +957,6 @@ int main(int argc, char **argv) {
   MG_ASSERT(server.Start(), "Couldn't start the Bolt server!");
   websocket_server.Start();
 
-  if (!FLAGS_init_data_file.empty()) {
-    spdlog::info("Running init data file.");
-#ifdef MG_ENTERPRISE
-    if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-      InitFromCypherlFile(interpreter_context, FLAGS_init_data_file, &audit_log);
-    }
-#else
-    InitFromCypherlFile(interpreter_context, FLAGS_init_data_file);
-#endif
-  }
-
   server.AwaitShutdown();
   websocket_server.AwaitShutdown();
 

src/mg_import_csv.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -20,7 +20,7 @@
 #include <unordered_map>
 
 #include "helpers.hpp"
-#include "storage/v2/inmemory/storage.hpp"
+#include "storage/v2/storage.hpp"
 #include "utils/exceptions.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
@@ -421,7 +421,7 @@ void ProcessNodeRow(memgraph::storage::Storage *store, const std::vector<std::st
                     std::unordered_map<NodeId, memgraph::storage::Gid> *node_id_map) {
   std::optional<NodeId> id;
   auto acc = store->Access();
-  auto node = acc->CreateVertex();
+  auto node = acc.CreateVertex();
   for (size_t i = 0; i < row.size(); ++i) {
     const auto &field = fields[i];
     const auto &value = row[i];
@@ -442,7 +442,7 @@ void ProcessNodeRow(memgraph::storage::Storage *store, const std::vector<std::st
           throw LoadException("Node with ID '{}' already exists", node_id);
         }
       }
-      node_id_map->emplace(node_id, node->Gid());
+      node_id_map->emplace(node_id, node.Gid());
       if (!field.name.empty()) {
         memgraph::storage::PropertyValue pv_id;
         if (FLAGS_id_type == "INTEGER") {
@@ -450,29 +450,29 @@ void ProcessNodeRow(memgraph::storage::Storage *store, const std::vector<std::st
         } else {
           pv_id = memgraph::storage::PropertyValue(node_id.id);
         }
-        auto old_node_property = node->SetProperty(acc->NameToProperty(field.name), pv_id);
+        auto old_node_property = node.SetProperty(acc.NameToProperty(field.name), pv_id);
         if (!old_node_property.HasValue()) throw LoadException("Couldn't add property '{}' to the node", field.name);
         if (!old_node_property->IsNull()) throw LoadException("The property '{}' already exists", field.name);
       }
       id = node_id;
     } else if (field.type == "LABEL") {
       for (const auto &label : memgraph::utils::Split(value, FLAGS_array_delimiter)) {
-        auto node_label = node->AddLabel(acc->NameToLabel(label));
+        auto node_label = node.AddLabel(acc.NameToLabel(label));
         if (!node_label.HasValue()) throw LoadException("Couldn't add label '{}' to the node", label);
         if (!*node_label) throw LoadException("The label '{}' already exists", label);
       }
     } else if (field.type != "IGNORE") {
-      auto old_node_property = node->SetProperty(acc->NameToProperty(field.name), StringToValue(value, field.type));
+      auto old_node_property = node.SetProperty(acc.NameToProperty(field.name), StringToValue(value, field.type));
       if (!old_node_property.HasValue()) throw LoadException("Couldn't add property '{}' to the node", field.name);
       if (!old_node_property->IsNull()) throw LoadException("The property '{}' already exists", field.name);
     }
   }
   for (const auto &label : additional_labels) {
-    auto node_label = node->AddLabel(acc->NameToLabel(label));
+    auto node_label = node.AddLabel(acc.NameToLabel(label));
     if (!node_label.HasValue()) throw LoadException("Couldn't add label '{}' to the node", label);
     if (!*node_label) throw LoadException("The label '{}' already exists", label);
   }
-  if (acc->Commit().HasError()) throw LoadException("Couldn't store the node");
+  if (acc.Commit().HasError()) throw LoadException("Couldn't store the node");
 }
 
 void ProcessNodes(memgraph::storage::Storage *store, const std::string &nodes_path,
@@ -567,16 +567,16 @@ void ProcessRelationshipsRow(memgraph::storage::Storage *store, const std::vecto
   if (!relationship_type) throw LoadException("Relationship TYPE must be set");
 
   auto acc = store->Access();
-  auto from_node = acc->FindVertex(*start_id, memgraph::storage::View::NEW);
+  auto from_node = acc.FindVertex(*start_id, memgraph::storage::View::NEW);
   if (!from_node) throw LoadException("From node must be in the storage");
-  auto to_node = acc->FindVertex(*end_id, memgraph::storage::View::NEW);
+  auto to_node = acc.FindVertex(*end_id, memgraph::storage::View::NEW);
   if (!to_node) throw LoadException("To node must be in the storage");
 
-  auto relationship = acc->CreateEdge(from_node.get(), to_node.get(), acc->NameToEdgeType(*relationship_type));
+  auto relationship = acc.CreateEdge(&*from_node, &*to_node, acc.NameToEdgeType(*relationship_type));
   if (!relationship.HasValue()) throw LoadException("Couldn't create the relationship");
 
   for (const auto &property : properties) {
-    auto ret = relationship.GetValue()->SetProperty(acc->NameToProperty(property.first), property.second);
+    auto ret = relationship->SetProperty(acc.NameToProperty(property.first), property.second);
     if (!ret.HasValue()) {
       if (ret.GetError() != memgraph::storage::Error::PROPERTIES_DISABLED) {
         throw LoadException("Couldn't add property '{}' to the relationship", property.first);
@@ -589,7 +589,7 @@ void ProcessRelationshipsRow(memgraph::storage::Storage *store, const std::vecto
     }
   }
 
-  if (acc->Commit().HasError()) throw LoadException("Couldn't store the relationship");
+  if (acc.Commit().HasError()) throw LoadException("Couldn't store the relationship");
 }
 
 void ProcessRelationships(memgraph::storage::Storage *store, const std::string &relationships_path,
@@ -699,14 +699,13 @@ int main(int argc, char *argv[]) {
   }
 
   std::unordered_map<NodeId, memgraph::storage::Gid> node_id_map;
-  std::unique_ptr<memgraph::storage::Storage> store =
-      std::make_unique<memgraph::storage::InMemoryStorage>(memgraph::storage::Config{
-          .items = {.properties_on_edges = FLAGS_storage_properties_on_edges},
-          .durability = {.storage_directory = FLAGS_data_directory,
-                         .recover_on_startup = false,
-                         .snapshot_wal_mode = memgraph::storage::Config::Durability::SnapshotWalMode::DISABLED,
-                         .snapshot_on_exit = true},
-      });
+  memgraph::storage::Storage store{{
+      .items = {.properties_on_edges = FLAGS_storage_properties_on_edges},
+      .durability = {.storage_directory = FLAGS_data_directory,
+                     .recover_on_startup = false,
+                     .snapshot_wal_mode = memgraph::storage::Config::Durability::SnapshotWalMode::DISABLED,
+                     .snapshot_on_exit = true},
+  }};
 
   memgraph::utils::Timer load_timer;
 
@@ -716,7 +715,7 @@ int main(int argc, char *argv[]) {
     std::optional<std::vector<Field>> header;
     for (const auto &nodes_file : files) {
       spdlog::info("Loading {}", nodes_file);
-      ProcessNodes(store.get(), nodes_file, &header, &node_id_map, additional_labels);
+      ProcessNodes(&store, nodes_file, &header, &node_id_map, additional_labels);
     }
   }
 
@@ -726,7 +725,7 @@ int main(int argc, char *argv[]) {
     std::optional<std::vector<Field>> header;
     for (const auto &relationships_file : files) {
       spdlog::info("Loading {}", relationships_file);
-      ProcessRelationships(store.get(), relationships_file, type, &header, node_id_map);
+      ProcessRelationships(&store, relationships_file, type, &header, node_id_map);
     }
   }
 

src/query/CMakeLists.txt

@@ -1,7 +1,13 @@
+define_add_lcp(add_lcp_query lcp_query_cpp_files generated_lcp_query_files)
+
+add_lcp_query(frontend/ast/ast.lcp)
+add_lcp_query(frontend/semantic/symbol.lcp)
+add_lcp_query(plan/operator.lcp)
+
+add_custom_target(generate_lcp_query DEPENDS ${generated_lcp_query_files})
+
 set(mg_query_sources
-    frontend/ast/ast.cpp
-    frontend/semantic/symbol.cpp
-    plan/operator_type_info.cpp
+    ${lcp_query_cpp_files}
     common.cpp
     cypher_query_interpreter.cpp
     dump.cpp
@@ -40,6 +46,7 @@ set(mg_query_sources
 find_package(Boost REQUIRED)
 
 add_library(mg-query STATIC ${mg_query_sources})
+add_dependencies(mg-query generate_lcp_query)
 target_include_directories(mg-query PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(mg-query dl cppitertools Boost::headers)
 target_link_libraries(mg-query mg-integrations-pulsar mg-integrations-kafka mg-storage-v2 mg-license mg-utils mg-kvstore mg-memory)

src/query/auth_checker.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -36,14 +36,9 @@ class FineGrainedAuthChecker {
  public:
   virtual ~FineGrainedAuthChecker() = default;
 
-  [[nodiscard]] virtual bool Has(const query::VertexAccessor *vertex, memgraph::storage::View view,
+  [[nodiscard]] virtual bool Has(const query::VertexAccessor &vertex, memgraph::storage::View view,
                                  query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const = 0;
 
-  bool Has(const query::VertexAccessor &vertex, memgraph::storage::View view,
-           query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const {
-    return Has(&vertex, view, fine_grained_privilege);
-  }
-
   [[nodiscard]] virtual bool Has(const query::EdgeAccessor &edge,
                                  query::AuthQuery::FineGrainedPrivilege fine_grained_privilege) const = 0;
 
@@ -62,7 +57,7 @@ class FineGrainedAuthChecker {
 
 class AllowEverythingFineGrainedAuthChecker final : public query::FineGrainedAuthChecker {
  public:
-  bool Has(const VertexAccessor * /*vertex*/, const memgraph::storage::View /*view*/,
+  bool Has(const VertexAccessor & /*vertex*/, const memgraph::storage::View /*view*/,
            const query::AuthQuery::FineGrainedPrivilege /*fine_grained_privilege*/) const override {
     return true;
   }

src/query/common.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -107,37 +107,5 @@ storage::PropertyValue PropsSetChecked(T *record, const storage::PropertyId &key
   }
 }
 
-template <typename T>
-concept AccessorWithInitProperties = requires(T accessor,
-                                              const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-  { accessor.InitProperties(properties) } -> std::same_as<storage::Result<bool>>;
-};
-
-/// Set property `values` mapped with given `key` on a `record`.
-///
-/// @throw QueryRuntimeException if value cannot be set as a property value
-template <AccessorWithInitProperties T>
-bool MultiPropsInitChecked(T *record, std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-  try {
-    auto maybe_values = record->InitProperties(properties);
-    if (maybe_values.HasError()) {
-      switch (maybe_values.GetError()) {
-        case storage::Error::SERIALIZATION_ERROR:
-          throw TransactionSerializationException();
-        case storage::Error::DELETED_OBJECT:
-          throw QueryRuntimeException("Trying to set properties on a deleted object.");
-        case storage::Error::PROPERTIES_DISABLED:
-          throw QueryRuntimeException("Can't set property because properties on edges are disabled.");
-        case storage::Error::VERTEX_HAS_EDGES:
-        case storage::Error::NONEXISTENT_OBJECT:
-          throw QueryRuntimeException("Unexpected error when setting a property.");
-      }
-    }
-    return std::move(*maybe_values);
-  } catch (const TypedValueException &) {
-    throw QueryRuntimeException("Cannot set properties.");
-  }
-}
-
 int64_t QueryTimestamp();
 }  // namespace memgraph::query

src/query/constants.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -16,6 +16,4 @@
 namespace memgraph::query {
 inline constexpr uint16_t kDefaultReplicationPort = 10000;
 inline constexpr auto *kDefaultReplicationServerIp = "0.0.0.0";
-inline const std::string kAsterisk = "*";
-inline constexpr uint16_t kDeleteStatisticsNumResults = 6;
 }  // namespace memgraph::query

src/query/context.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -24,15 +24,6 @@
 
 namespace memgraph::query {
 
-enum class TransactionStatus {
-  IDLE,
-  ACTIVE,
-  VERIFYING,
-  TERMINATED,
-  STARTED_COMMITTING,
-  STARTED_ROLLBACK,
-};
-
 struct EvaluationContext {
   /// Memory for allocations during evaluation of a *single* Pull call.
   ///
@@ -75,7 +66,6 @@ struct ExecutionContext {
   SymbolTable symbol_table;
   EvaluationContext evaluation_context;
   std::atomic<bool> *is_shutting_down{nullptr};
-  std::atomic<TransactionStatus> *transaction_status{nullptr};
   bool is_profile_query{false};
   std::chrono::duration<double> profile_execution_time;
   plan::ProfilingStats stats;
@@ -92,9 +82,7 @@ static_assert(std::is_move_assignable_v<ExecutionContext>, "ExecutionContext mus
 static_assert(std::is_move_constructible_v<ExecutionContext>, "ExecutionContext must be move constructible!");
 
 inline bool MustAbort(const ExecutionContext &context) noexcept {
-  return (context.transaction_status != nullptr &&
-          context.transaction_status->load(std::memory_order_acquire) == TransactionStatus::TERMINATED) ||
-         (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) ||
+  return (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) ||
          context.timer.IsExpired();
 }
 

src/query/db_accessor.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -112,25 +112,37 @@ query::Graph *SubgraphDbAccessor::getGraph() { return graph_; }
 VertexAccessor SubgraphVertexAccessor::GetVertexAccessor() const { return impl_; }
 
 auto SubgraphVertexAccessor::OutEdges(storage::View view) const -> decltype(impl_.OutEdges(view)) {
-  auto edges = impl_.OutEdges(view, {});
-  std::vector<std::unique_ptr<storage::EdgeAccessor>> filteredOutEdges;
-  for (auto edge : *edges) {
-    if (graph_->ContainsEdge(edge)) {
-      filteredOutEdges.push_back(std::move(edge.impl_));
+  auto maybe_edges = impl_.impl_.OutEdges(view, {});
+  if (maybe_edges.HasError()) return maybe_edges.GetError();
+  auto edges = std::move(*maybe_edges);
+  auto graph_edges = graph_->edges();
+
+  std::vector<storage::EdgeAccessor> filteredOutEdges;
+  for (auto &edge : edges) {
+    auto edge_q = EdgeAccessor(edge);
+    if (graph_edges.contains(edge_q)) {
+      filteredOutEdges.push_back(edge);
     }
   }
+
   return iter::imap(VertexAccessor::MakeEdgeAccessor, std::move(filteredOutEdges));
 }
 
 auto SubgraphVertexAccessor::InEdges(storage::View view) const -> decltype(impl_.InEdges(view)) {
-  auto edges = impl_.InEdges(view, {});
-  std::vector<std::unique_ptr<storage::EdgeAccessor>> filteredEdges;
-  for (auto edge : *edges) {
-    if (graph_->ContainsEdge(edge)) {
-      filteredEdges.push_back(std::move(edge.impl_));
+  auto maybe_edges = impl_.impl_.InEdges(view, {});
+  if (maybe_edges.HasError()) return maybe_edges.GetError();
+  auto edges = std::move(*maybe_edges);
+  auto graph_edges = graph_->edges();
+
+  std::vector<storage::EdgeAccessor> filteredOutEdges;
+  for (auto &edge : edges) {
+    auto edge_q = EdgeAccessor(edge);
+    if (graph_edges.contains(edge_q)) {
+      filteredOutEdges.push_back(edge);
     }
   }
-  return iter::imap(VertexAccessor::MakeEdgeAccessor, std::move(filteredEdges));
+
+  return iter::imap(VertexAccessor::MakeEdgeAccessor, std::move(filteredOutEdges));
 }
 
 }  // namespace memgraph::query

src/query/db_accessor.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <optional>
-#include <type_traits>
 
 #include <cppitertools/filter.hpp>
 #include <cppitertools/imap.hpp>
@@ -36,7 +35,6 @@
 // This cannot be avoided by simple include orderings so we
 // simply undefine those macros as we're sure that libkrb5
 // won't and can't be used anywhere in the query engine.
-#include "storage/v2/edge_accessor.hpp"
 #include "storage/v2/storage.hpp"
 
 #undef FALSE
@@ -54,36 +52,23 @@ class VertexAccessor;
 
 class EdgeAccessor final {
  public:
-  std::unique_ptr<storage::EdgeAccessor> impl_;
+  storage::EdgeAccessor impl_;
 
  public:
-  explicit EdgeAccessor(std::unique_ptr<storage::EdgeAccessor> impl) : impl_(std::move(impl)) {}
-  explicit EdgeAccessor(storage::EdgeAccessor *impl) : impl_(impl) {}
-  EdgeAccessor(const EdgeAccessor &impl) : impl_(impl.impl_->Copy()){};
+  explicit EdgeAccessor(storage::EdgeAccessor impl) : impl_(std::move(impl)) {}
 
-  EdgeAccessor &operator=(EdgeAccessor other) {
-    impl_ = other.impl_->Copy();
-    return *this;
-  }
+  bool IsVisible(storage::View view) const { return impl_.IsVisible(view); }
 
-  ~EdgeAccessor() = default;
+  storage::EdgeTypeId EdgeType() const { return impl_.EdgeType(); }
 
-  bool IsVisible(storage::View view) const { return impl_->IsVisible(view); }
-
-  storage::EdgeTypeId EdgeType() const { return impl_->EdgeType(); }
-
-  auto Properties(storage::View view) const { return impl_->Properties(view); }
+  auto Properties(storage::View view) const { return impl_.Properties(view); }
 
   storage::Result<storage::PropertyValue> GetProperty(storage::View view, storage::PropertyId key) const {
-    return impl_->GetProperty(key, view);
+    return impl_.GetProperty(key, view);
   }
 
   storage::Result<storage::PropertyValue> SetProperty(storage::PropertyId key, const storage::PropertyValue &value) {
-    return impl_->SetProperty(key, value);
-  }
-
-  storage::Result<bool> InitProperties(const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-    return impl_->InitProperties(properties);
+    return impl_.SetProperty(key, value);
   }
 
   storage::Result<storage::PropertyValue> RemoveProperty(storage::PropertyId key) {
@@ -91,7 +76,7 @@ class EdgeAccessor final {
   }
 
   storage::Result<std::map<storage::PropertyId, storage::PropertyValue>> ClearProperties() {
-    return impl_->ClearProperties();
+    return impl_.ClearProperties();
   }
 
   VertexAccessor To() const;
@@ -100,81 +85,44 @@ class EdgeAccessor final {
 
   bool IsCycle() const;
 
-  int64_t CypherId() const { return impl_->Gid().AsInt(); }
+  int64_t CypherId() const { return impl_.Gid().AsInt(); }
 
-  storage::Gid Gid() const noexcept { return impl_->Gid(); }
+  storage::Gid Gid() const noexcept { return impl_.Gid(); }
 
-  bool operator==(const EdgeAccessor &e) const noexcept { return *impl_ == *e.impl_; }
+  bool operator==(const EdgeAccessor &e) const noexcept { return impl_ == e.impl_; }
 
   bool operator!=(const EdgeAccessor &e) const noexcept { return !(*this == e); }
 };
 
 class VertexAccessor final {
- private:
-  // We make this class a friend so that we can access the private MakeEdgeAccessor function.
-  friend class SubgraphVertexAccessor;
+ public:
+  storage::VertexAccessor impl_;
 
-  static EdgeAccessor MakeEdgeAccessor(std::unique_ptr<storage::EdgeAccessor> &impl) {
-    return EdgeAccessor(impl->Copy());
-  }
+  static EdgeAccessor MakeEdgeAccessor(const storage::EdgeAccessor impl) { return EdgeAccessor(impl); }
 
  public:
-  // It can affect performance if we use std::unique_ptr here.
-  std::unique_ptr<storage::VertexAccessor> impl_;
+  explicit VertexAccessor(storage::VertexAccessor impl) : impl_(impl) {}
 
-  VertexAccessor() : impl_(nullptr) {}
-  explicit VertexAccessor(std::unique_ptr<storage::VertexAccessor> va) : impl_(std::move(va)) {}
-  VertexAccessor(const VertexAccessor &va) : impl_(va.impl_ ? va.impl_->Copy() : nullptr){};
-  VertexAccessor(VertexAccessor &&va) noexcept : impl_(va.impl_ ? std::move(va.impl_) : nullptr){};
-  explicit VertexAccessor(const VertexAccessor *va) : VertexAccessor(*va) {}
+  bool IsVisible(storage::View view) const { return impl_.IsVisible(view); }
 
-  ~VertexAccessor() = default;
+  auto Labels(storage::View view) const { return impl_.Labels(view); }
 
-  VertexAccessor &operator=(const VertexAccessor &other) {
-    if (this == &other) {
-      return *this;
-    }
-    if (other.impl_) {
-      impl_ = other.impl_->Copy();
-    } else {
-      impl_ = nullptr;
-    }
-    return *this;
-  }
+  storage::Result<bool> AddLabel(storage::LabelId label) { return impl_.AddLabel(label); }
 
-  VertexAccessor &operator=(VertexAccessor &&other) {
-    if (other.impl_) {
-      impl_ = std::move(other.impl_);
-    } else {
-      impl_ = nullptr;
-    }
-    return *this;
-  }
-
-  bool IsVisible(storage::View view) const { return impl_->IsVisible(view); }
-
-  auto Labels(storage::View view) const { return impl_->Labels(view); }
-
-  storage::Result<bool> AddLabel(storage::LabelId label) { return impl_->AddLabel(label); }
-
-  storage::Result<bool> RemoveLabel(storage::LabelId label) { return impl_->RemoveLabel(label); }
+  storage::Result<bool> RemoveLabel(storage::LabelId label) { return impl_.RemoveLabel(label); }
 
   storage::Result<bool> HasLabel(storage::View view, storage::LabelId label) const {
-    return impl_->HasLabel(label, view);
+    return impl_.HasLabel(label, view);
   }
 
-  auto Properties(storage::View view) const { return impl_->Properties(view); }
+  auto Properties(storage::View view) const { return impl_.Properties(view); }
 
   storage::Result<storage::PropertyValue> GetProperty(storage::View view, storage::PropertyId key) const {
-    return impl_->GetProperty(key, view);
+    return impl_.GetProperty(key, view);
   }
 
   storage::Result<storage::PropertyValue> SetProperty(storage::PropertyId key, const storage::PropertyValue &value) {
-    return impl_->SetProperty(key, value);
-  }
-
-  storage::Result<bool> InitProperties(const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-    return impl_->InitProperties(properties);
+    return impl_.SetProperty(key, value);
   }
 
   storage::Result<storage::PropertyValue> RemoveProperty(storage::PropertyId key) {
@@ -182,12 +130,12 @@ class VertexAccessor final {
   }
 
   storage::Result<std::map<storage::PropertyId, storage::PropertyValue>> ClearProperties() {
-    return impl_->ClearProperties();
+    return impl_.ClearProperties();
   }
 
   auto InEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types) const
-      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *(impl_->InEdges(view))))> {
-    auto maybe_edges = impl_->InEdges(view, edge_types);
+      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.InEdges(view)))> {
+    auto maybe_edges = impl_.InEdges(view, edge_types);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
@@ -195,15 +143,15 @@ class VertexAccessor final {
   auto InEdges(storage::View view) const { return InEdges(view, {}); }
 
   auto InEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types, const VertexAccessor &dest) const
-      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *(impl_->InEdges(view))))> {
-    auto maybe_edges = impl_->InEdges(view, edge_types, dest.impl_.get());
+      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.InEdges(view)))> {
+    auto maybe_edges = impl_.InEdges(view, edge_types, &dest.impl_);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
 
   auto OutEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types) const
-      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *(impl_->OutEdges(view))))> {
-    auto maybe_edges = impl_->OutEdges(view, edge_types);
+      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.OutEdges(view)))> {
+    auto maybe_edges = impl_.OutEdges(view, edge_types);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
@@ -212,28 +160,31 @@ class VertexAccessor final {
 
   auto OutEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types,
                 const VertexAccessor &dest) const
-      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *(impl_->OutEdges(view))))> {
-    auto maybe_edges = impl_->OutEdges(view, edge_types, dest.impl_.get());
+      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.OutEdges(view)))> {
+    auto maybe_edges = impl_.OutEdges(view, edge_types, &dest.impl_);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
 
-  storage::Result<size_t> InDegree(storage::View view) const { return impl_->InDegree(view); }
+  storage::Result<size_t> InDegree(storage::View view) const { return impl_.InDegree(view); }
 
-  storage::Result<size_t> OutDegree(storage::View view) const { return impl_->OutDegree(view); }
+  storage::Result<size_t> OutDegree(storage::View view) const { return impl_.OutDegree(view); }
 
-  int64_t CypherId() const { return impl_->Gid().AsInt(); }
+  int64_t CypherId() const { return impl_.Gid().AsInt(); }
 
-  storage::Gid Gid() const noexcept { return impl_->Gid(); }
+  storage::Gid Gid() const noexcept { return impl_.Gid(); }
 
-  bool operator==(const VertexAccessor &v) const { return *impl_ == *v.impl_; }
+  bool operator==(const VertexAccessor &v) const noexcept {
+    static_assert(noexcept(impl_ == v.impl_));
+    return impl_ == v.impl_;
+  }
 
-  bool operator!=(const VertexAccessor &v) const { return !(*this == v); }
+  bool operator!=(const VertexAccessor &v) const noexcept { return !(*this == v); }
 };
 
-inline VertexAccessor EdgeAccessor::To() const { return VertexAccessor(impl_->ToVertex()); }
+inline VertexAccessor EdgeAccessor::To() const { return VertexAccessor(impl_.ToVertex()); }
 
-inline VertexAccessor EdgeAccessor::From() const { return VertexAccessor(impl_->FromVertex()); }
+inline VertexAccessor EdgeAccessor::From() const { return VertexAccessor(impl_.FromVertex()); }
 
 inline bool EdgeAccessor::IsCycle() const { return To() == From(); }
 
@@ -244,9 +195,12 @@ class SubgraphVertexAccessor final {
 
   explicit SubgraphVertexAccessor(query::VertexAccessor impl, query::Graph *graph_) : impl_(impl), graph_(graph_) {}
 
-  bool operator==(const SubgraphVertexAccessor &v) const { return impl_ == v.impl_; }
+  bool operator==(const SubgraphVertexAccessor &v) const noexcept {
+    static_assert(noexcept(impl_ == v.impl_));
+    return impl_ == v.impl_;
+  }
 
-  auto InEdges(storage::View view) const -> decltype(impl_.InEdges(view));
+  auto InEdges(storage::View view) const -> decltype(impl_.OutEdges(view));
 
   auto OutEdges(storage::View view) const -> decltype(impl_.OutEdges(view));
 
@@ -303,58 +257,18 @@ class VerticesIterable final {
                                     utils::Allocator<VertexAccessor>>::iterator>
         it_;
 
-    VertexAccessor curr_vertex_accessor_;
-    bool is_initialized_;
-
    public:
-    explicit Iterator(storage::VerticesIterable::Iterator it) : it_(it), is_initialized_(false) {
-      std::visit(memgraph::utils::Overloaded{
-                     [this](storage::VerticesIterable::Iterator &it_) {
-                       if (*it_ != nullptr) {
-                         curr_vertex_accessor_ = VertexAccessor((*it_)->Copy());
-                         is_initialized_ = true;
-                       }
-                     },
-                     [this](std::unordered_set<VertexAccessor, std::hash<VertexAccessor>, std::equal_to<void>,
-                                               utils::Allocator<VertexAccessor>>::iterator &it_) {
-                       curr_vertex_accessor_ = *it_;
-                       is_initialized_ = true;
-                     }},
-                 it_);
-    }
+    explicit Iterator(storage::VerticesIterable::Iterator it) : it_(it) {}
     explicit Iterator(std::unordered_set<VertexAccessor, std::hash<VertexAccessor>, std::equal_to<void>,
                                          utils::Allocator<VertexAccessor>>::iterator it)
-        : it_(it), is_initialized_(true) {
-      std::visit(memgraph::utils::Overloaded{
-                     [this](storage::VerticesIterable::Iterator it_) {
-                       curr_vertex_accessor_ = VertexAccessor((*it_)->Copy());
-                     },
-                     [this](std::unordered_set<VertexAccessor, std::hash<VertexAccessor>, std::equal_to<void>,
-                                               utils::Allocator<VertexAccessor>>::iterator it_) {
-                       curr_vertex_accessor_ = *it_;
-                     }},
-                 it_);
-    }
+        : it_(it) {}
 
-    VertexAccessor *operator*() {
-      if (!is_initialized_) {
-        std::visit(memgraph::utils::Overloaded{
-                       [this](storage::VerticesIterable::Iterator it_) {
-                         curr_vertex_accessor_ = VertexAccessor((*it_)->Copy());
-                       },
-                       [this](std::unordered_set<VertexAccessor, std::hash<VertexAccessor>, std::equal_to<void>,
-                                                 utils::Allocator<VertexAccessor>>::iterator it_) {
-                         curr_vertex_accessor_ = *it_;
-                       }},
-                   it_);
-        is_initialized_ = true;
-      }
-      return &curr_vertex_accessor_;
+    VertexAccessor operator*() const {
+      return std::visit([](auto it_) { return VertexAccessor(*it_); }, it_);
     }
 
     Iterator &operator++() {
-      std::visit([](auto &it_) { ++it_; }, it_);
-      is_initialized_ = false;
+      std::visit([this](auto it_) { this->it_ = ++it_; }, it_);
       return *this;
     }
 
@@ -396,7 +310,7 @@ class DbAccessor final {
 
   std::optional<VertexAccessor> FindVertex(storage::Gid gid, storage::View view) {
     auto maybe_vertex = accessor_->FindVertex(gid, view);
-    if (maybe_vertex) return std::make_optional(VertexAccessor(std::move(maybe_vertex)));
+    if (maybe_vertex) return VertexAccessor(*maybe_vertex);
     return std::nullopt;
   }
 
@@ -427,61 +341,61 @@ class DbAccessor final {
 
   storage::Result<EdgeAccessor> InsertEdge(VertexAccessor *from, VertexAccessor *to,
                                            const storage::EdgeTypeId &edge_type) {
-    auto maybe_edge = accessor_->CreateEdge(from->impl_.get(), to->impl_.get(), edge_type);
+    auto maybe_edge = accessor_->CreateEdge(&from->impl_, &to->impl_, edge_type);
     if (maybe_edge.HasError()) return storage::Result<EdgeAccessor>(maybe_edge.GetError());
-    return EdgeAccessor(std::move(*maybe_edge));
+    return EdgeAccessor(*maybe_edge);
   }
 
   storage::Result<std::optional<EdgeAccessor>> RemoveEdge(EdgeAccessor *edge) {
-    auto res = accessor_->DeleteEdge(edge->impl_.get());
+    auto res = accessor_->DeleteEdge(&edge->impl_);
     if (res.HasError()) {
       return res.GetError();
     }
 
-    auto &value = res.GetValue();
+    const auto &value = res.GetValue();
     if (!value) {
       return std::optional<EdgeAccessor>{};
     }
 
-    return std::make_optional<EdgeAccessor>(std::move(value));
+    return std::make_optional<EdgeAccessor>(*value);
   }
 
   storage::Result<std::optional<std::pair<VertexAccessor, std::vector<EdgeAccessor>>>> DetachRemoveVertex(
       VertexAccessor *vertex_accessor) {
     using ReturnType = std::pair<VertexAccessor, std::vector<EdgeAccessor>>;
 
-    auto res = accessor_->DetachDeleteVertex(vertex_accessor->impl_.get());
+    auto res = accessor_->DetachDeleteVertex(&vertex_accessor->impl_);
     if (res.HasError()) {
       return res.GetError();
     }
 
-    auto &value = res.GetValue();
+    const auto &value = res.GetValue();
     if (!value) {
       return std::optional<ReturnType>{};
     }
 
-    auto &[vertex, edges] = *value;
+    const auto &[vertex, edges] = *value;
 
     std::vector<EdgeAccessor> deleted_edges;
     deleted_edges.reserve(edges.size());
     std::transform(edges.begin(), edges.end(), std::back_inserter(deleted_edges),
-                   [](auto &deleted_edge) { return EdgeAccessor{std::move(deleted_edge)}; });
+                   [](const auto &deleted_edge) { return EdgeAccessor{deleted_edge}; });
 
-    return std::make_optional<ReturnType>(std::move(vertex), std::move(deleted_edges));
+    return std::make_optional<ReturnType>(vertex, std::move(deleted_edges));
   }
 
   storage::Result<std::optional<VertexAccessor>> RemoveVertex(VertexAccessor *vertex_accessor) {
-    auto res = accessor_->DeleteVertex(vertex_accessor->impl_.get());
+    auto res = accessor_->DeleteVertex(&vertex_accessor->impl_);
     if (res.HasError()) {
       return res.GetError();
     }
 
-    auto &value = res.GetValue();
+    const auto &value = res.GetValue();
     if (!value) {
       return std::optional<VertexAccessor>{};
     }
 
-    return std::make_optional<VertexAccessor>(std::move(value));
+    return std::make_optional<VertexAccessor>(*value);
   }
 
   storage::PropertyId NameToProperty(const std::string_view name) { return accessor_->NameToProperty(name); }
@@ -508,25 +422,6 @@ class DbAccessor final {
     return accessor_->LabelPropertyIndexExists(label, prop);
   }
 
-  std::optional<storage::IndexStats> GetIndexStats(const storage::LabelId &label,
-                                                   const storage::PropertyId &property) const {
-    return accessor_->GetIndexStats(label, property);
-  }
-
-  std::vector<std::pair<storage::LabelId, storage::PropertyId>> ClearIndexStats() {
-    return accessor_->ClearIndexStats();
-  }
-
-  std::vector<std::pair<storage::LabelId, storage::PropertyId>> DeleteIndexStatsForLabels(
-      const std::span<std::string> labels) {
-    return accessor_->DeleteIndexStatsForLabels(labels);
-  }
-
-  void SetIndexStats(const storage::LabelId &label, const storage::PropertyId &property,
-                     const storage::IndexStats &stats) {
-    accessor_->SetIndexStats(label, property, stats);
-  }
-
   int64_t VerticesCount() const { return accessor_->ApproximateVertexCount(); }
 
   int64_t VerticesCount(storage::LabelId label) const { return accessor_->ApproximateVertexCount(label); }

src/query/dump.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -168,10 +168,10 @@ void DumpProperties(std::ostream *os, query::DbAccessor *dba,
   *os << "}";
 }
 
-void DumpVertex(std::ostream *os, query::DbAccessor *dba, const query::VertexAccessor *vertex) {
+void DumpVertex(std::ostream *os, query::DbAccessor *dba, const query::VertexAccessor &vertex) {
   *os << "CREATE (";
   *os << ":" << kInternalVertexLabel;
-  auto maybe_labels = vertex->Labels(storage::View::OLD);
+  auto maybe_labels = vertex.Labels(storage::View::OLD);
   if (maybe_labels.HasError()) {
     switch (maybe_labels.GetError()) {
       case storage::Error::DELETED_OBJECT:
@@ -188,7 +188,7 @@ void DumpVertex(std::ostream *os, query::DbAccessor *dba, const query::VertexAcc
     *os << ":" << EscapeName(dba->LabelToName(label));
   }
   *os << " ";
-  auto maybe_props = vertex->Properties(storage::View::OLD);
+  auto maybe_props = vertex.Properties(storage::View::OLD);
   if (maybe_props.HasError()) {
     switch (maybe_props.GetError()) {
       case storage::Error::DELETED_OBJECT:
@@ -201,7 +201,7 @@ void DumpVertex(std::ostream *os, query::DbAccessor *dba, const query::VertexAcc
         throw query::QueryRuntimeException("Unexpected error when getting properties.");
     }
   }
-  DumpProperties(os, dba, *maybe_props, vertex->CypherId());
+  DumpProperties(os, dba, *maybe_props, vertex.CypherId());
   *os << ");";
 }
 
@@ -478,11 +478,11 @@ PullPlanDump::PullChunk PullPlanDump::CreateEdgePullChunk() {
     auto &current_vertex_iter{*maybe_current_vertex_iter};
     size_t local_counter = 0U;
     for (; current_vertex_iter != vertices_iterable_.end() && (!n || local_counter < *n); ++current_vertex_iter) {
-      const auto *vertex = *current_vertex_iter;
+      const auto &vertex = *current_vertex_iter;
       // If we have a saved iterable from a previous pull
       // we need to use the same iterable
       if (!maybe_edge_iterable) {
-        maybe_edge_iterable = std::make_shared<EdgeAccessorIterable>(vertex->OutEdges(storage::View::OLD));
+        maybe_edge_iterable = std::make_shared<EdgeAccessorIterable>(vertex.OutEdges(storage::View::OLD));
       }
       auto &maybe_edges = *maybe_edge_iterable;
       MG_ASSERT(maybe_edges.HasValue(), "Invalid database state!");

src/query/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -120,8 +120,9 @@ class HintedAbortError : public utils::BasicException {
   using utils::BasicException::BasicException;
   HintedAbortError()
       : utils::BasicException(
-            "Transaction was asked to abort either because it was executing longer than time specified or another user "
-            "asked it to abort.") {}
+            "Transaction was asked to abort, most likely because it was "
+            "executing longer than time specified by "
+            "--query-execution-timeout-sec flag.") {}
 };
 
 class ExplicitTransactionUsageException : public QueryRuntimeException {
@@ -211,21 +212,6 @@ class IsolationLevelModificationInMulticommandTxException : public QueryExceptio
       : QueryException("Isolation level cannot be modified in multicommand transactions.") {}
 };
 
-class IsolationLevelModificationInAnalyticsException : public QueryException {
- public:
-  IsolationLevelModificationInAnalyticsException()
-      : QueryException(
-            "Isolation level cannot be modified when storage mode is set to IN_MEMORY_ANALYTICAL."
-            "IN_MEMORY_ANALYTICAL mode doesn't provide any isolation guarantees, "
-            "you can think about it as an equivalent to READ_UNCOMMITED.") {}
-};
-
-class StorageModeModificationInMulticommandTxException : public QueryException {
- public:
-  StorageModeModificationInMulticommandTxException()
-      : QueryException("Storage mode cannot be modified in multicommand transactions.") {}
-};
-
 class CreateSnapshotInMulticommandTxException final : public QueryException {
  public:
   CreateSnapshotInMulticommandTxException()
@@ -244,12 +230,6 @@ class VersionInfoInMulticommandTxException : public QueryException {
       : QueryException("Version info query not allowed in multicommand transactions.") {}
 };
 
-class AnalyzeGraphInMulticommandTxException : public QueryException {
- public:
-  AnalyzeGraphInMulticommandTxException()
-      : QueryException("Analyze graph query not allowed in multicommand transactions.") {}
-};
-
 class ReplicationException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
@@ -257,11 +237,4 @@ class ReplicationException : public utils::BasicException {
       : utils::BasicException("Replication Exception: {} Check the status of the replicas using 'SHOW REPLICA' query.",
                               message) {}
 };
-
-class TransactionQueueInMulticommandTxException : public QueryException {
- public:
-  TransactionQueueInMulticommandTxException()
-      : QueryException("Transaction queue queries not allowed in multicommand transactions.") {}
-};
-
 }  // namespace memgraph::query

src/query/frontend/ast/ast.cpp

@@ -1,276 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#include "query/frontend/ast/ast.hpp"
-#include "query/frontend/ast/ast_visitor.hpp"
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-constexpr utils::TypeInfo query::LabelIx::kType{utils::TypeId::AST_LABELIX, "LabelIx", nullptr};
-
-constexpr utils::TypeInfo query::PropertyIx::kType{utils::TypeId::AST_PROPERTYIX, "PropertyIx", nullptr};
-
-constexpr utils::TypeInfo query::EdgeTypeIx::kType{utils::TypeId::AST_EDGETYPEIX, "EdgeTypeIx", nullptr};
-
-constexpr utils::TypeInfo query::Tree::kType{utils::TypeId::AST_TREE, "Tree", nullptr};
-
-constexpr utils::TypeInfo query::Expression::kType{utils::TypeId::AST_EXPRESSION, "Expression", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Where::kType{utils::TypeId::AST_WHERE, "Where", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::BinaryOperator::kType{utils::TypeId::AST_BINARY_OPERATOR, "BinaryOperator",
-                                                       &query::Expression::kType};
-
-constexpr utils::TypeInfo query::UnaryOperator::kType{utils::TypeId::AST_UNARY_OPERATOR, "UnaryOperator",
-                                                      &query::Expression::kType};
-
-constexpr utils::TypeInfo query::OrOperator::kType{utils::TypeId::AST_OR_OPERATOR, "OrOperator",
-                                                   &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::XorOperator::kType{utils::TypeId::AST_XOR_OPERATOR, "XorOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::AndOperator::kType{utils::TypeId::AST_AND_OPERATOR, "AndOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::AdditionOperator::kType{utils::TypeId::AST_ADDITION_OPERATOR, "AdditionOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::SubtractionOperator::kType{utils::TypeId::AST_SUBTRACTION_OPERATOR,
-                                                            "SubtractionOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::MultiplicationOperator::kType{utils::TypeId::AST_MULTIPLICATION_OPERATOR,
-                                                               "MultiplicationOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::DivisionOperator::kType{utils::TypeId::AST_DIVISION_OPERATOR, "DivisionOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::ModOperator::kType{utils::TypeId::AST_MOD_OPERATOR, "ModOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::NotEqualOperator::kType{utils::TypeId::AST_NOT_EQUAL_OPERATOR, "NotEqualOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::EqualOperator::kType{utils::TypeId::AST_EQUAL_OPERATOR, "EqualOperator",
-                                                      &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::LessOperator::kType{utils::TypeId::AST_LESS_OPERATOR, "LessOperator",
-                                                     &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::GreaterOperator::kType{utils::TypeId::AST_GREATER_OPERATOR, "GreaterOperator",
-                                                        &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::LessEqualOperator::kType{utils::TypeId::AST_LESS_EQUAL_OPERATOR, "LessEqualOperator",
-                                                          &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::GreaterEqualOperator::kType{utils::TypeId::AST_GREATER_EQUAL_OPERATOR,
-                                                             "GreaterEqualOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::InListOperator::kType{utils::TypeId::AST_IN_LIST_OPERATOR, "InListOperator",
-                                                       &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::SubscriptOperator::kType{utils::TypeId::AST_SUBSCRIPT_OPERATOR, "SubscriptOperator",
-                                                          &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::NotOperator::kType{utils::TypeId::AST_NOT_OPERATOR, "NotOperator",
-                                                    &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::UnaryPlusOperator::kType{utils::TypeId::AST_UNARY_PLUS_OPERATOR, "UnaryPlusOperator",
-                                                          &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::UnaryMinusOperator::kType{utils::TypeId::AST_UNARY_MINUS_OPERATOR,
-                                                           "UnaryMinusOperator", &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::IsNullOperator::kType{utils::TypeId::AST_IS_NULL_OPERATOR, "IsNullOperator",
-                                                       &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::Aggregation::kType{utils::TypeId::AST_AGGREGATION, "Aggregation",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::ListSlicingOperator::kType{utils::TypeId::AST_LIST_SLICING_OPERATOR,
-                                                            "ListSlicingOperator", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::IfOperator::kType{utils::TypeId::AST_IF_OPERATOR, "IfOperator",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::BaseLiteral::kType{utils::TypeId::AST_BASE_LITERAL, "BaseLiteral",
-                                                    &query::Expression::kType};
-
-constexpr utils::TypeInfo query::PrimitiveLiteral::kType{utils::TypeId::AST_PRIMITIVE_LITERAL, "PrimitiveLiteral",
-                                                         &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::ListLiteral::kType{utils::TypeId::AST_LIST_LITERAL, "ListLiteral",
-                                                    &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::MapLiteral::kType{utils::TypeId::AST_MAP_LITERAL, "MapLiteral",
-                                                   &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::Identifier::kType{utils::TypeId::AST_IDENTIFIER, "Identifier",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::PropertyLookup::kType{utils::TypeId::AST_PROPERTY_LOOKUP, "PropertyLookup",
-                                                       &query::Expression::kType};
-
-constexpr utils::TypeInfo query::LabelsTest::kType{utils::TypeId::AST_LABELS_TEST, "LabelsTest",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Function::kType{utils::TypeId::AST_FUNCTION, "Function", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Reduce::kType{utils::TypeId::AST_REDUCE, "Reduce", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Coalesce::kType{utils::TypeId::AST_COALESCE, "Coalesce", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Extract::kType{utils::TypeId::AST_EXTRACT, "Extract", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::All::kType{utils::TypeId::AST_ALL, "All", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Single::kType{utils::TypeId::AST_SINGLE, "Single", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Any::kType{utils::TypeId::AST_ANY, "Any", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::None::kType{utils::TypeId::AST_NONE, "None", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::ParameterLookup::kType{utils::TypeId::AST_PARAMETER_LOOKUP, "ParameterLookup",
-                                                        &query::Expression::kType};
-
-constexpr utils::TypeInfo query::RegexMatch::kType{utils::TypeId::AST_REGEX_MATCH, "RegexMatch",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::NamedExpression::kType{utils::TypeId::AST_NAMED_EXPRESSION, "NamedExpression",
-                                                        &query::Tree::kType};
-
-constexpr utils::TypeInfo query::PatternAtom::kType{utils::TypeId::AST_PATTERN_ATOM, "PatternAtom",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::NodeAtom::kType{utils::TypeId::AST_NODE_ATOM, "NodeAtom", &query::PatternAtom::kType};
-
-constexpr utils::TypeInfo query::EdgeAtom::Lambda::kType{utils::TypeId::AST_EDGE_ATOM_LAMBDA, "Lambda", nullptr};
-
-constexpr utils::TypeInfo query::EdgeAtom::kType{utils::TypeId::AST_EDGE_ATOM, "EdgeAtom", &query::PatternAtom::kType};
-
-constexpr utils::TypeInfo query::Pattern::kType{utils::TypeId::AST_PATTERN, "Pattern", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Clause::kType{utils::TypeId::AST_CLAUSE, "Clause", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::SingleQuery::kType{utils::TypeId::AST_SINGLE_QUERY, "SingleQuery",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::CypherUnion::kType{utils::TypeId::AST_CYPHER_UNION, "CypherUnion",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Query::kType{utils::TypeId::AST_QUERY, "Query", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::CypherQuery::kType{utils::TypeId::AST_CYPHER_QUERY, "CypherQuery",
-                                                    &query::Query::kType};
-
-constexpr utils::TypeInfo query::ExplainQuery::kType{utils::TypeId::AST_EXPLAIN_QUERY, "ExplainQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::ProfileQuery::kType{utils::TypeId::AST_PROFILE_QUERY, "ProfileQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::IndexQuery::kType{utils::TypeId::AST_INDEX_QUERY, "IndexQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Create::kType{utils::TypeId::AST_CREATE, "Create", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::CallProcedure::kType{utils::TypeId::AST_CALL_PROCEDURE, "CallProcedure",
-                                                      &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Match::kType{utils::TypeId::AST_MATCH, "Match", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SortItem::kType{utils::TypeId::AST_SORT_ITEM, "SortItem", nullptr};
-
-constexpr utils::TypeInfo query::ReturnBody::kType{utils::TypeId::AST_RETURN_BODY, "ReturnBody", nullptr};
-
-constexpr utils::TypeInfo query::Return::kType{utils::TypeId::AST_RETURN, "Return", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::With::kType{utils::TypeId::AST_WITH, "With", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Delete::kType{utils::TypeId::AST_DELETE, "Delete", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetProperty::kType{utils::TypeId::AST_SET_PROPERTY, "SetProperty",
-                                                    &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetProperties::kType{utils::TypeId::AST_SET_PROPERTIES, "SetProperties",
-                                                      &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetLabels::kType{utils::TypeId::AST_SET_LABELS, "SetLabels", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::RemoveProperty::kType{utils::TypeId::AST_REMOVE_PROPERTY, "RemoveProperty",
-                                                       &query::Clause::kType};
-
-constexpr utils::TypeInfo query::RemoveLabels::kType{utils::TypeId::AST_REMOVE_LABELS, "RemoveLabels",
-                                                     &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Merge::kType{utils::TypeId::AST_MERGE, "Merge", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Unwind::kType{utils::TypeId::AST_UNWIND, "Unwind", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::AuthQuery::kType{utils::TypeId::AST_AUTH_QUERY, "AuthQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::InfoQuery::kType{utils::TypeId::AST_INFO_QUERY, "InfoQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Constraint::kType{utils::TypeId::AST_CONSTRAINT, "Constraint", nullptr};
-
-constexpr utils::TypeInfo query::ConstraintQuery::kType{utils::TypeId::AST_CONSTRAINT_QUERY, "ConstraintQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::DumpQuery::kType{utils::TypeId::AST_DUMP_QUERY, "DumpQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::ReplicationQuery::kType{utils::TypeId::AST_REPLICATION_QUERY, "ReplicationQuery",
-                                                         &query::Query::kType};
-
-constexpr utils::TypeInfo query::LockPathQuery::kType{utils::TypeId::AST_LOCK_PATH_QUERY, "LockPathQuery",
-                                                      &query::Query::kType};
-
-constexpr utils::TypeInfo query::LoadCsv::kType{utils::TypeId::AST_LOAD_CSV, "LoadCsv", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::FreeMemoryQuery::kType{utils::TypeId::AST_FREE_MEMORY_QUERY, "FreeMemoryQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::TriggerQuery::kType{utils::TypeId::AST_TRIGGER_QUERY, "TriggerQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::IsolationLevelQuery::kType{utils::TypeId::AST_ISOLATION_LEVEL_QUERY,
-                                                            "IsolationLevelQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::StorageModeQuery::kType{utils::TypeId::AST_STORAGE_MODE_QUERY, "StorageModeQuery",
-                                                         &query::Query::kType};
-
-constexpr utils::TypeInfo query::CreateSnapshotQuery::kType{utils::TypeId::AST_CREATE_SNAPSHOT_QUERY,
-                                                            "CreateSnapshotQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::StreamQuery::kType{utils::TypeId::AST_STREAM_QUERY, "StreamQuery",
-                                                    &query::Query::kType};
-
-constexpr utils::TypeInfo query::SettingQuery::kType{utils::TypeId::AST_SETTING_QUERY, "SettingQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::VersionQuery::kType{utils::TypeId::AST_VERSION_QUERY, "VersionQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::Foreach::kType{utils::TypeId::AST_FOREACH, "Foreach", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::ShowConfigQuery::kType{utils::TypeId::AST_SHOW_CONFIG_QUERY, "ShowConfigQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::AnalyzeGraphQuery::kType{utils::TypeId::AST_ANALYZE_GRAPH_QUERY, "AnalyzeGraphQuery",
-                                                          &query::Query::kType};
-
-constexpr utils::TypeInfo query::TransactionQueueQuery::kType{utils::TypeId::AST_TRANSACTION_QUEUE_QUERY,
-                                                              "TransactionQueueQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Exists::kType{utils::TypeId::AST_EXISTS, "Exists", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::CallSubquery::kType{utils::TypeId::AST_CALL_SUBQUERY, "CallSubquery",
-                                                     &query::Clause::kType};
-}  // namespace memgraph

src/query/frontend/ast/ast.lcp

@@ -301,7 +301,6 @@ cpp<#
 
 (lcp:define-class expression (tree "::utils::Visitable<HierarchicalTreeVisitor>"
                                    "::utils::Visitable<ExpressionVisitor<TypedValue>>"
-                                   "::utils::Visitable<ExpressionVisitor<TypedValue*>>"
                                    "::utils::Visitable<ExpressionVisitor<void>>")
   ()
   (:abstractp t)
@@ -309,7 +308,6 @@ cpp<#
     #>cpp
     using utils::Visitable<HierarchicalTreeVisitor>::Accept;
     using utils::Visitable<ExpressionVisitor<TypedValue>>::Accept;
-    using utils::Visitable<ExpressionVisitor<TypedValue*>>::Accept;
     using utils::Visitable<ExpressionVisitor<void>>::Accept;
 
     Expression() = default;
@@ -409,7 +407,6 @@ cpp<#
                           (:public
                             #>cpp
                             DEFVISITABLE(ExpressionVisitor<TypedValue>);
-                            DEFVISITABLE(ExpressionVisitor<TypedValue*>);
                             DEFVISITABLE(ExpressionVisitor<void>);
                             bool Accept(HierarchicalTreeVisitor &visitor) override {
                               if (visitor.PreVisit(*this)) {
@@ -441,7 +438,6 @@ cpp<#
                           (:public
                             #>cpp
                             DEFVISITABLE(ExpressionVisitor<TypedValue>);
-                            DEFVISITABLE(ExpressionVisitor<TypedValue*>);
                             DEFVISITABLE(ExpressionVisitor<void>);
                             bool Accept(HierarchicalTreeVisitor &visitor) override {
                               if (visitor.PreVisit(*this)) {
@@ -465,8 +461,7 @@ cpp<#
 (lcp:define-class aggregation (binary-operator)
   ((op "Op" :scope :public)
    (symbol-pos :int32_t :initval -1 :scope :public
-               :documentation "Symbol table position of the symbol this Aggregation is mapped to.")
-    (distinct :bool :initval "false" :scope :public))
+               :documentation "Symbol table position of the symbol this Aggregation is mapped to."))
   (:public
     (lcp:define-enum op
       (count min max sum avg collect-list collect-map project)
@@ -489,7 +484,6 @@ cpp<#
     }
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -511,8 +505,8 @@ cpp<#
 
     /// Aggregation's first expression is the value being aggregated. The second
     /// expression is the key used only in COLLECT_MAP.
-    Aggregation(Expression *expression1, Expression *expression2, Op op, bool distinct)
-        : BinaryOperator(expression1, expression2), op_(op), distinct_(distinct) {
+    Aggregation(Expression *expression1, Expression *expression2, Op op)
+        : BinaryOperator(expression1, expression2), op_(op) {
       // COUNT without expression denotes COUNT(*) in cypher.
       DMG_ASSERT(expression1 || op == Aggregation::Op::COUNT,
                  "All aggregations, except COUNT require expression");
@@ -543,7 +537,6 @@ cpp<#
     ListSlicingOperator() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -587,7 +580,6 @@ cpp<#
     IfOperator() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -635,7 +627,6 @@ cpp<#
     PrimitiveLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
     cpp<#)
@@ -664,7 +655,6 @@ cpp<#
     ListLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -697,7 +687,6 @@ cpp<#
     MapLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -730,7 +719,6 @@ cpp<#
     Identifier() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
 
@@ -768,7 +756,6 @@ cpp<#
     PropertyLookup() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -809,7 +796,6 @@ cpp<#
     LabelsTest() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -850,7 +836,6 @@ cpp<#
     Function() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -906,7 +891,6 @@ cpp<#
     Reduce() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -945,7 +929,6 @@ cpp<#
    Coalesce() = default;
 
    DEFVISITABLE(ExpressionVisitor<TypedValue>);
-   DEFVISITABLE(ExpressionVisitor<TypedValue*>);
    DEFVISITABLE(ExpressionVisitor<void>);
    bool Accept(HierarchicalTreeVisitor &visitor) override {
      if (visitor.PreVisit(*this)) {
@@ -985,7 +968,6 @@ cpp<#
     Extract() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1022,7 +1004,6 @@ cpp<#
     All() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1064,7 +1045,6 @@ cpp<#
     Single() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1106,7 +1086,6 @@ cpp<#
     Any() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1148,7 +1127,6 @@ cpp<#
     None() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1180,7 +1158,6 @@ cpp<#
     ParameterLookup() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
     cpp<#)
@@ -1208,7 +1185,6 @@ cpp<#
     RegexMatch() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1228,7 +1204,6 @@ cpp<#
 
 (lcp:define-class named-expression (tree "::utils::Visitable<HierarchicalTreeVisitor>"
                                          "::utils::Visitable<ExpressionVisitor<TypedValue>>"
-                                         "::utils::Visitable<ExpressionVisitor<TypedValue*>>"
                                          "::utils::Visitable<ExpressionVisitor<void>>")
   ((name "std::string" :scope :public)
    (expression "Expression *" :initval "nullptr" :scope :public
@@ -1237,9 +1212,7 @@ cpp<#
    (token-position :int32_t :initval -1 :scope :public
                    :documentation "This field contains token position of first token in named expression used to create name_. If NamedExpression object is not created from query or it is aliased leave this value at -1.")
    (symbol-pos :int32_t :initval -1 :scope :public
-               :documentation "Symbol table position of the symbol this NamedExpression is mapped to.")
-   (is-aliased :bool :initval "false" :scope :public
-               :documentation "True if the variable is aliased"))
+               :documentation "Symbol table position of the symbol this NamedExpression is mapped to."))
   (:public
     #>cpp
     using utils::Visitable<ExpressionVisitor<TypedValue>>::Accept;
@@ -1249,7 +1222,6 @@ cpp<#
     NamedExpression() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1622,7 +1594,7 @@ cpp<#
   (:clone :ignore-other-base-classes t)
   (:type-info :ignore-other-base-classes t))
 
-(lcp:define-class cypher-query (query "::utils::Visitable<HierarchicalTreeVisitor>")
+(lcp:define-class cypher-query (query)
   ((single-query "SingleQuery *" :initval "nullptr" :scope :public
                  :slk-save #'slk-save-ast-pointer
                  :slk-load (slk-load-ast-pointer "SingleQuery")
@@ -1641,25 +1613,13 @@ cpp<#
     CypherQuery() = default;
 
     DEFVISITABLE(QueryVisitor<void>);
-
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        single_query_->Accept(visitor);
-        for (auto *cypher_union : cypher_unions_) {
-          cypher_union->Accept(visitor);
-        }
-      }
-
-      return visitor.PostVisit(*this);
-    }
     cpp<#)
   (:private
     #>cpp
     friend class AstStorage;
     cpp<#)
-  (:serialize (:slk :ignore-other-base-classes t))
-  (:clone :ignore-other-base-classes t)
-  (:type-info :ignore-other-base-classes t))
+  (:serialize (:slk))
+  (:clone))
 
 (lcp:define-class explain-query (query)
   ((cypher-query "CypherQuery *" :initval "nullptr" :scope :public
@@ -2298,7 +2258,7 @@ cpp<#
     (lcp:define-enum privilege
         (create delete match merge set remove index stats auth constraint
          dump replication durability read_file free_memory trigger config stream module_read module_write
-         websocket transaction_management)
+         websocket)
       (:serialize))
     (lcp:define-enum fine-grained-privilege
         (nothing read update create_delete)
@@ -2347,7 +2307,7 @@ const std::vector<AuthQuery::Privilege> kPrivilegesAll = {
     AuthQuery::Privilege::FREE_MEMORY, AuthQuery::Privilege::TRIGGER,
     AuthQuery::Privilege::CONFIG,      AuthQuery::Privilege::STREAM,
     AuthQuery::Privilege::MODULE_READ, AuthQuery::Privilege::MODULE_WRITE,
-    AuthQuery::Privilege::WEBSOCKET,   AuthQuery::Privilege::TRANSACTION_MANAGEMENT};
+    AuthQuery::Privilege::WEBSOCKET};
 cpp<#
 
 (lcp:define-class info-query (query)
@@ -2417,26 +2377,6 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class analyze-graph-query (query)
-  ((action "Action" :scope :public)
-  (labels "std::vector<std::string>" :scope :public))
-
-  (:public
-    (lcp:define-enum action
-        (analyze delete)
-      (:serialize))
-    #>cpp
-    AnalyzeGraphQuery() = default;
-
-    DEFVISITABLE(QueryVisitor<void>);
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:define-class replication-query (query)
   ((action "Action" :scope :public)
    (role "ReplicationRole" :scope :public)
@@ -2695,26 +2635,6 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class transaction-queue-query (query)
-  ((action "Action" :scope :public)
-  (transaction_id_list "std::vector<Expression*>" :scope :public))
-
-  (:public
-    (lcp:define-enum action
-        (show-transactions terminate-transactions)
-      (:serialize))
-    #>cpp
-    TransactionQueueQuery() = default;
-
-    DEFVISITABLE(QueryVisitor<void>);
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:define-class version-query (query) ()
   (:public
     #>cpp
@@ -2765,64 +2685,5 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class exists (expression)
-  ((pattern "Pattern *" :initval "nullptr" :scope :public
-             :slk-save #'slk-save-ast-pointer
-             :slk-load (slk-load-ast-pointer "Pattern"))
-   (symbol-pos :int32_t :initval -1 :scope :public
-               :documentation "Symbol table position of the symbol this Aggregation is mapped to."))
-
-  (:public
-    #>cpp
-    Exists() = default;
-
-    DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
-    DEFVISITABLE(ExpressionVisitor<void>);
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        pattern_->Accept(visitor);
-      }
-      return visitor.PostVisit(*this);
-    }
-    Exists *MapTo(const Symbol &symbol) {
-      symbol_pos_ = symbol.position();
-      return this;
-    }
-    cpp<#)
-  (:protected
-    #>cpp
-    Exists(Pattern * pattern) : pattern_(pattern) {}
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
-(lcp:define-class call-subquery (clause)
-  ((cypher-query "CypherQuery *" :scope :public
-          :slk-save #'slk-save-ast-pointer
-          :slk-load (slk-load-ast-pointer "CypherQuery")))
-  (:public
-    #>cpp
-    CallSubquery() = default;
-
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        cypher_query_->Accept(visitor);
-      }
-      return visitor.PostVisit(*this);
-    }
-
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:pop-namespace) ;; namespace query
 (lcp:pop-namespace) ;; namespace memgraph

src/query/frontend/ast/ast_visitor.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -89,17 +89,12 @@ class LoadCsv;
 class FreeMemoryQuery;
 class TriggerQuery;
 class IsolationLevelQuery;
-class StorageModeQuery;
 class CreateSnapshotQuery;
 class StreamQuery;
 class SettingQuery;
 class VersionQuery;
 class Foreach;
 class ShowConfigQuery;
-class CallSubquery;
-class AnalyzeGraphQuery;
-class TransactionQueueQuery;
-class Exists;
 
 using TreeCompositeVisitor = utils::CompositeVisitor<
     SingleQuery, CypherUnion, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator, AdditionOperator,
@@ -108,7 +103,7 @@ using TreeCompositeVisitor = utils::CompositeVisitor<
     ListSlicingOperator, IfOperator, UnaryPlusOperator, UnaryMinusOperator, IsNullOperator, ListLiteral, MapLiteral,
     PropertyLookup, LabelsTest, Aggregation, Function, Reduce, Coalesce, Extract, All, Single, Any, None, CallProcedure,
     Create, Match, Return, With, Pattern, NodeAtom, EdgeAtom, Delete, Where, SetProperty, SetProperties, SetLabels,
-    RemoveProperty, RemoveLabels, Merge, Unwind, RegexMatch, LoadCsv, Foreach, Exists, CallSubquery, CypherQuery>;
+    RemoveProperty, RemoveLabels, Merge, Unwind, RegexMatch, LoadCsv, Foreach>;
 
 using TreeLeafVisitor = utils::LeafVisitor<Identifier, PrimitiveLiteral, ParameterLookup>;
 
@@ -128,13 +123,12 @@ class ExpressionVisitor
           LessOperator, GreaterOperator, LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
           ListSlicingOperator, IfOperator, UnaryPlusOperator, UnaryMinusOperator, IsNullOperator, ListLiteral,
           MapLiteral, PropertyLookup, LabelsTest, Aggregation, Function, Reduce, Coalesce, Extract, All, Single, Any,
-          None, ParameterLookup, Identifier, PrimitiveLiteral, RegexMatch, Exists> {};
+          None, ParameterLookup, Identifier, PrimitiveLiteral, RegexMatch> {};
 
 template <class TResult>
-class QueryVisitor
-    : public utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery, InfoQuery,
-                            ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery, FreeMemoryQuery, TriggerQuery,
-                            IsolationLevelQuery, CreateSnapshotQuery, StreamQuery, SettingQuery, VersionQuery,
-                            ShowConfigQuery, TransactionQueueQuery, StorageModeQuery, AnalyzeGraphQuery> {};
+class QueryVisitor : public utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery,
+                                           InfoQuery, ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery,
+                                           FreeMemoryQuery, TriggerQuery, IsolationLevelQuery, CreateSnapshotQuery,
+                                           StreamQuery, SettingQuery, VersionQuery, ShowConfigQuery> {};
 
 }  // namespace memgraph::query

src/query/frontend/ast/cypher_main_visitor.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -11,10 +11,8 @@
 
 #include "query/frontend/ast/cypher_main_visitor.hpp"
 #include <support/Any.h>
-#include <tree/ParseTreeVisitor.h>
 
 #include <algorithm>
-#include <any>
 #include <climits>
 #include <codecvt>
 #include <cstring>
@@ -241,23 +239,6 @@ antlrcpp::Any CypherMainVisitor::visitDumpQuery(MemgraphCypher::DumpQueryContext
   return dump_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitAnalyzeGraphQuery(MemgraphCypher::AnalyzeGraphQueryContext *ctx) {
-  auto *analyze_graph_query = storage_->Create<AnalyzeGraphQuery>();
-  if (ctx->listOfColonSymbolicNames()) {
-    analyze_graph_query->labels_ =
-        std::any_cast<std::vector<std::string>>(ctx->listOfColonSymbolicNames()->accept(this));
-  } else {
-    analyze_graph_query->labels_.emplace_back("*");
-  }
-  if (ctx->DELETE()) {
-    analyze_graph_query->action_ = AnalyzeGraphQuery::Action::DELETE;
-  } else {
-    analyze_graph_query->action_ = AnalyzeGraphQuery::Action::ANALYZE;
-  }
-  query_ = analyze_graph_query;
-  return analyze_graph_query;
-}
-
 antlrcpp::Any CypherMainVisitor::visitReplicationQuery(MemgraphCypher::ReplicationQueryContext *ctx) {
   MG_ASSERT(ctx->children.size() == 1, "ReplicationQuery should have exactly one child!");
   auto *replication_query = std::any_cast<ReplicationQuery *>(ctx->children[0]->accept(this));
@@ -487,20 +468,6 @@ antlrcpp::Any CypherMainVisitor::visitIsolationLevelQuery(MemgraphCypher::Isolat
   return isolation_level_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitStorageModeQuery(MemgraphCypher::StorageModeQueryContext *ctx) {
-  auto *storage_mode_query = storage_->Create<StorageModeQuery>();
-
-  storage_mode_query->storage_mode_ = std::invoke([mode = ctx->storageMode()]() {
-    if (mode->IN_MEMORY_ANALYTICAL()) {
-      return StorageModeQuery::StorageMode::IN_MEMORY_ANALYTICAL;
-    }
-    return StorageModeQuery::StorageMode::IN_MEMORY_TRANSACTIONAL;
-  });
-
-  query_ = storage_mode_query;
-  return storage_mode_query;
-}
-
 antlrcpp::Any CypherMainVisitor::visitCreateSnapshotQuery(MemgraphCypher::CreateSnapshotQueryContext *ctx) {
   query_ = storage_->Create<CreateSnapshotQuery>();
   return query_;
@@ -664,7 +631,6 @@ void GetTopicNames(auto &destination, MemgraphCypher::TopicNamesContext *topic_n
     destination = std::any_cast<Expression *>(topic_names_ctx->accept(&visitor));
   }
 }
-
 }  // namespace
 
 antlrcpp::Any CypherMainVisitor::visitKafkaCreateStreamConfig(MemgraphCypher::KafkaCreateStreamConfigContext *ctx) {
@@ -917,34 +883,6 @@ antlrcpp::Any CypherMainVisitor::visitShowSettings(MemgraphCypher::ShowSettingsC
   return setting_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitTransactionQueueQuery(MemgraphCypher::TransactionQueueQueryContext *ctx) {
-  MG_ASSERT(ctx->children.size() == 1, "TransactionQueueQuery should have exactly one child!");
-  auto *transaction_queue_query = std::any_cast<TransactionQueueQuery *>(ctx->children[0]->accept(this));
-  query_ = transaction_queue_query;
-  return transaction_queue_query;
-}
-
-antlrcpp::Any CypherMainVisitor::visitShowTransactions(MemgraphCypher::ShowTransactionsContext * /*ctx*/) {
-  auto *transaction_shower = storage_->Create<TransactionQueueQuery>();
-  transaction_shower->action_ = TransactionQueueQuery::Action::SHOW_TRANSACTIONS;
-  return transaction_shower;
-}
-
-antlrcpp::Any CypherMainVisitor::visitTerminateTransactions(MemgraphCypher::TerminateTransactionsContext *ctx) {
-  auto *terminator = storage_->Create<TransactionQueueQuery>();
-  terminator->action_ = TransactionQueueQuery::Action::TERMINATE_TRANSACTIONS;
-  terminator->transaction_id_list_ = std::any_cast<std::vector<Expression *>>(ctx->transactionIdList()->accept(this));
-  return terminator;
-}
-
-antlrcpp::Any CypherMainVisitor::visitTransactionIdList(MemgraphCypher::TransactionIdListContext *ctx) {
-  std::vector<Expression *> transaction_ids;
-  for (auto *transaction_id : ctx->transactionId()) {
-    transaction_ids.push_back(std::any_cast<Expression *>(transaction_id->accept(this)));
-  }
-  return transaction_ids;
-}
-
 antlrcpp::Any CypherMainVisitor::visitVersionQuery(MemgraphCypher::VersionQueryContext * /*ctx*/) {
   auto *version_query = storage_->Create<VersionQuery>();
   query_ = version_query;
@@ -1003,10 +941,6 @@ antlrcpp::Any CypherMainVisitor::visitSingleQuery(MemgraphCypher::SingleQueryCon
         calls_write_procedure = true;
         has_update = true;
       }
-    } else if (const auto *call_subquery = utils::Downcast<CallSubquery>(clause); call_subquery != nullptr) {
-      if (has_return) {
-        throw SemanticException("CALL can't be put after RETURN clause.");
-      }
     } else if (utils::IsSubtype(clause_type, Unwind::kType)) {
       check_write_procedure("UNWIND");
       if (has_update || has_return) {
@@ -1119,9 +1053,6 @@ antlrcpp::Any CypherMainVisitor::visitClause(MemgraphCypher::ClauseContext *ctx)
   if (ctx->foreach ()) {
     return static_cast<Clause *>(std::any_cast<Foreach *>(ctx->foreach ()->accept(this)));
   }
-  if (ctx->callSubquery()) {
-    return static_cast<Clause *>(std::any_cast<CallSubquery *>(ctx->callSubquery()->accept(this)));
-  }
   // TODO: implement other clauses.
   throw utils::NotYetImplemented("clause '{}'", ctx->getText());
   return 0;
@@ -1479,23 +1410,19 @@ antlrcpp::Any CypherMainVisitor::visitEntityPrivilegeList(MemgraphCypher::Entity
   return result;
 }
 
-antlrcpp::Any CypherMainVisitor::visitListOfColonSymbolicNames(MemgraphCypher::ListOfColonSymbolicNamesContext *ctx) {
-  std::vector<std::string> symbolic_names;
-  for (auto *symbolic_name : ctx->colonSymbolicName()) {
-    symbolic_names.push_back(std::any_cast<std::string>(symbolic_name->symbolicName()->accept(this)));
-  }
-  return symbolic_names;
-}
-
 /**
  * @return std::vector<std::string>
  */
 antlrcpp::Any CypherMainVisitor::visitEntitiesList(MemgraphCypher::EntitiesListContext *ctx) {
   std::vector<std::string> entities;
-  if (ctx->listOfColonSymbolicNames()) {
-    return ctx->listOfColonSymbolicNames()->accept(this);
+  if (ctx->listOfEntities()) {
+    for (auto *entity : ctx->listOfEntities()->entity()) {
+      entities.push_back(std::any_cast<std::string>(entity->symbolicName()->accept(this)));
+    }
+  } else {
+    entities.emplace_back("*");
   }
-  entities.emplace_back("*");
+
   return entities;
 }
 
@@ -1524,8 +1451,6 @@ antlrcpp::Any CypherMainVisitor::visitPrivilege(MemgraphCypher::PrivilegeContext
   if (ctx->MODULE_READ()) return AuthQuery::Privilege::MODULE_READ;
   if (ctx->MODULE_WRITE()) return AuthQuery::Privilege::MODULE_WRITE;
   if (ctx->WEBSOCKET()) return AuthQuery::Privilege::WEBSOCKET;
-  if (ctx->TRANSACTION_MANAGEMENT()) return AuthQuery::Privilege::TRANSACTION_MANAGEMENT;
-  if (ctx->STORAGE_MODE()) return AuthQuery::Privilege::STORAGE_MODE;
   LOG_FATAL("Should not get here - unknown privilege!");
 }
 
@@ -1618,7 +1543,6 @@ antlrcpp::Any CypherMainVisitor::visitReturnItem(MemgraphCypher::ReturnItemConte
   named_expr->expression_ = std::any_cast<Expression *>(ctx->expression()->accept(this));
   MG_ASSERT(named_expr->expression_);
   if (ctx->variable()) {
-    named_expr->is_aliased_ = true;
     named_expr->name_ = std::string(std::any_cast<std::string>(ctx->variable()->accept(this)));
     users_identifiers.insert(named_expr->name_);
   } else {
@@ -2182,7 +2106,7 @@ antlrcpp::Any CypherMainVisitor::visitAtom(MemgraphCypher::AtomContext *ctx) {
     // Here we handle COUNT(*). COUNT(expression) is handled in
     // visitFunctionInvocation with other aggregations. This is visible in
     // functionInvocation and atom producions in opencypher grammar.
-    return static_cast<Expression *>(storage_->Create<Aggregation>(nullptr, nullptr, Aggregation::Op::COUNT, false));
+    return static_cast<Expression *>(storage_->Create<Aggregation>(nullptr, nullptr, Aggregation::Op::COUNT));
   } else if (ctx->ALL()) {
     auto *ident = storage_->Create<Identifier>(
         std::any_cast<std::string>(ctx->filterExpression()->idInColl()->variable()->accept(this)));
@@ -2236,10 +2160,7 @@ antlrcpp::Any CypherMainVisitor::visitAtom(MemgraphCypher::AtomContext *ctx) {
     auto *list = std::any_cast<Expression *>(ctx->extractExpression()->idInColl()->expression()->accept(this));
     auto *expr = std::any_cast<Expression *>(ctx->extractExpression()->expression()->accept(this));
     return static_cast<Expression *>(storage_->Create<Extract>(ident, list, expr));
-  } else if (ctx->existsExpression()) {
-    return std::any_cast<Expression *>(ctx->existsExpression()->accept(this));
   }
-
   // TODO: Implement this. We don't support comprehensions, filtering... at
   // the moment.
   throw utils::NotYetImplemented("atom expression '{}'", ctx->getText());
@@ -2283,17 +2204,6 @@ antlrcpp::Any CypherMainVisitor::visitLiteral(MemgraphCypher::LiteralContext *ct
   return visitChildren(ctx);
 }
 
-antlrcpp::Any CypherMainVisitor::visitExistsExpression(MemgraphCypher::ExistsExpressionContext *ctx) {
-  auto *exists = storage_->Create<Exists>();
-  exists->pattern_ = std::any_cast<Pattern *>(ctx->patternPart()->accept(this));
-
-  if (exists->pattern_->identifier_) {
-    throw SyntaxException("Identifiers are not supported in exists(...).");
-  }
-
-  return static_cast<Expression *>(exists);
-}
-
 antlrcpp::Any CypherMainVisitor::visitParenthesizedExpression(MemgraphCypher::ParenthesizedExpressionContext *ctx) {
   return std::any_cast<Expression *>(ctx->expression()->accept(this));
 }
@@ -2312,7 +2222,9 @@ antlrcpp::Any CypherMainVisitor::visitNumberLiteral(MemgraphCypher::NumberLitera
 }
 
 antlrcpp::Any CypherMainVisitor::visitFunctionInvocation(MemgraphCypher::FunctionInvocationContext *ctx) {
-  const auto is_distinct = ctx->DISTINCT() != nullptr;
+  if (ctx->DISTINCT()) {
+    throw utils::NotYetImplemented("DISTINCT function call");
+  }
   auto function_name = std::any_cast<std::string>(ctx->functionName()->accept(this));
   std::vector<Expression *> expressions;
   for (auto *expression : ctx->expression()) {
@@ -2320,38 +2232,33 @@ antlrcpp::Any CypherMainVisitor::visitFunctionInvocation(MemgraphCypher::Functio
   }
   if (expressions.size() == 1U) {
     if (function_name == Aggregation::kCount) {
-      return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::COUNT, is_distinct));
+      return static_cast<Expression *>(storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::COUNT));
     }
     if (function_name == Aggregation::kMin) {
-      return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::MIN, is_distinct));
+      return static_cast<Expression *>(storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::MIN));
     }
     if (function_name == Aggregation::kMax) {
-      return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::MAX, is_distinct));
+      return static_cast<Expression *>(storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::MAX));
     }
     if (function_name == Aggregation::kSum) {
-      return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::SUM, is_distinct));
+      return static_cast<Expression *>(storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::SUM));
     }
     if (function_name == Aggregation::kAvg) {
-      return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::AVG, is_distinct));
+      return static_cast<Expression *>(storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::AVG));
     }
     if (function_name == Aggregation::kCollect) {
       return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::COLLECT_LIST, is_distinct));
+          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::COLLECT_LIST));
     }
     if (function_name == Aggregation::kProject) {
       return static_cast<Expression *>(
-          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::PROJECT, is_distinct));
+          storage_->Create<Aggregation>(expressions[0], nullptr, Aggregation::Op::PROJECT));
     }
   }
 
   if (expressions.size() == 2U && function_name == Aggregation::kCollect) {
     return static_cast<Expression *>(
-        storage_->Create<Aggregation>(expressions[1], expressions[0], Aggregation::Op::COLLECT_MAP, is_distinct));
+        storage_->Create<Aggregation>(expressions[1], expressions[0], Aggregation::Op::COLLECT_MAP));
   }
 
   auto is_user_defined_function = [](const std::string &function_name) {
@@ -2588,20 +2495,6 @@ antlrcpp::Any CypherMainVisitor::visitShowConfigQuery(MemgraphCypher::ShowConfig
   return query_;
 }
 
-antlrcpp::Any CypherMainVisitor::visitCallSubquery(MemgraphCypher::CallSubqueryContext *ctx) {
-  auto *call_subquery = storage_->Create<CallSubquery>();
-
-  MG_ASSERT(ctx->cypherQuery(), "Expected query inside subquery clause");
-
-  if (ctx->cypherQuery()->queryMemoryLimit()) {
-    throw SyntaxException("Memory limit cannot be set on subqueries!");
-  }
-
-  call_subquery->cypher_query_ = std::any_cast<CypherQuery *>(ctx->cypherQuery()->accept(this));
-
-  return call_subquery;
-}
-
 LabelIx CypherMainVisitor::AddLabel(const std::string &name) { return storage_->GetLabelIx(name); }
 
 PropertyIx CypherMainVisitor::AddProperty(const std::string &name) { return storage_->GetPropertyIx(name); }

src/query/frontend/ast/cypher_main_visitor.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -183,16 +183,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitDumpQuery(MemgraphCypher::DumpQueryContext *ctx) override;
 
-  /**
-  @return std::vector<std::string>
-  */
-  antlrcpp::Any visitListOfColonSymbolicNames(MemgraphCypher::ListOfColonSymbolicNamesContext *ctx) override;
-
-  /**
-   * @return AnalyzeGraphQuery*
-   */
-  antlrcpp::Any visitAnalyzeGraphQuery(MemgraphCypher::AnalyzeGraphQueryContext *ctx) override;
-
   /**
    * @return ReplicationQuery*
    */
@@ -263,11 +253,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitIsolationLevelQuery(MemgraphCypher::IsolationLevelQueryContext *ctx) override;
 
-  /**
-   * @return StorageModeQuery*
-   */
-  antlrcpp::Any visitStorageModeQuery(MemgraphCypher::StorageModeQueryContext *ctx) override;
-
   /**
    * @return CreateSnapshotQuery*
    */
@@ -373,26 +358,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitShowSettings(MemgraphCypher::ShowSettingsContext *ctx) override;
 
-  /**
-   * @return TransactionQueueQuery*
-   */
-  antlrcpp::Any visitTransactionQueueQuery(MemgraphCypher::TransactionQueueQueryContext *ctx) override;
-
-  /**
-   * @return ShowTransactions*
-   */
-  antlrcpp::Any visitShowTransactions(MemgraphCypher::ShowTransactionsContext *ctx) override;
-
-  /**
-   * @return TerminateTransactions*
-   */
-  antlrcpp::Any visitTerminateTransactions(MemgraphCypher::TerminateTransactionsContext *ctx) override;
-
-  /**
-   * @return TransactionIdList*
-   */
-  antlrcpp::Any visitTransactionIdList(MemgraphCypher::TransactionIdListContext *ctx) override;
-
   /**
    * @return VersionQuery*
    */
@@ -798,11 +763,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitParameter(MemgraphCypher::ParameterContext *ctx) override;
 
-  /**
-   * @return Exists* (Expression)
-   */
-  antlrcpp::Any visitExistsExpression(MemgraphCypher::ExistsExpressionContext *ctx) override;
-
   /**
    * @return Expression*
    */
@@ -927,11 +887,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitShowConfigQuery(MemgraphCypher::ShowConfigQueryContext *ctx) override;
 
-  /**
-   * @return CallSubquery*
-   */
-  antlrcpp::Any visitCallSubquery(MemgraphCypher::CallSubqueryContext *ctx) override;
-
  public:
   Query *query() { return query_; }
   const static std::string kAnonPrefix;

src/query/frontend/ast/pretty_print.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -60,7 +60,6 @@ class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
   void Visit(Reduce &op) override;
   void Visit(Coalesce &op) override;
   void Visit(Extract &op) override;
-  void Visit(Exists &op) override;
   void Visit(All &op) override;
   void Visit(Single &op) override;
   void Visit(Any &op) override;
@@ -265,8 +264,6 @@ void ExpressionPrettyPrinter::Visit(Extract &op) {
   PrintOperator(out_, "Extract", op.identifier_, op.list_, op.expression_);
 }
 
-void ExpressionPrettyPrinter::Visit(Exists & /*op*/) { PrintOperator(out_, "Exists", "expression"); }
-
 void ExpressionPrettyPrinter::Visit(All &op) {
   PrintOperator(out_, "All", op.identifier_, op.list_expression_, op.where_->expression_);
 }

src/query/frontend/opencypher/grammar/Cypher.g4

@@ -236,7 +236,6 @@ atom : literal
      | ( ANY '(' filterExpression ')' )
      | ( NONE '(' filterExpression ')' )
      | ( SINGLE '(' filterExpression ')' )
-     | ( EXISTS '(' existsExpression ')' )
      | relationshipsPattern
      | parenthesizedExpression
      | functionInvocation
@@ -276,8 +275,6 @@ reduceExpression : accumulator=variable '=' initial=expression ',' idInColl '|'
 
 extractExpression : idInColl '|' expression ;
 
-existsExpression : patternPart ;
-
 idInColl : variable IN expression ;
 
 functionInvocation : functionName '(' ( DISTINCT )? ( expression ( ',' expression )* )? ')' ;

src/query/frontend/opencypher/grammar/MemgraphCypher.g4

@@ -22,7 +22,6 @@ import Cypher ;
 memgraphCypherKeyword : cypherKeyword
                       | AFTER
                       | ALTER
-                      | ANALYZE
                       | ASYNC
                       | AUTH
                       | BAD
@@ -54,13 +53,10 @@ memgraphCypherKeyword : cypherKeyword
                       | FREE
                       | FROM
                       | GLOBAL
-                      | GRAPH
                       | GRANT
                       | HEADER
                       | IDENTIFIED
                       | ISOLATION
-                      | IN_MEMORY_ANALYTICAL
-                      | IN_MEMORY_TRANSACTIONAL
                       | KAFKA
                       | LABELS
                       | LEVEL
@@ -90,7 +86,6 @@ memgraphCypherKeyword : cypherKeyword
                       | SNAPSHOT
                       | START
                       | STATS
-                      | STORAGE
                       | STREAM
                       | STREAMS
                       | SYNC
@@ -107,8 +102,6 @@ memgraphCypherKeyword : cypherKeyword
                       | USER
                       | USERS
                       | VERSION
-                      | TERMINATE
-                      | TRANSACTIONS
                       ;
 
 symbolicName : UnescapedSymbolicName
@@ -124,19 +117,16 @@ query : cypherQuery
       | constraintQuery
       | authQuery
       | dumpQuery
-      | analyzeGraphQuery
       | replicationQuery
       | lockPathQuery
       | freeMemoryQuery
       | triggerQuery
       | isolationLevelQuery
-      | storageModeQuery
       | createSnapshotQuery
       | streamQuery
       | settingQuery
       | versionQuery
       | showConfigQuery
-      | transactionQueueQuery
       ;
 
 authQuery : createRole
@@ -180,7 +170,6 @@ clause : cypherMatch
        | callProcedure
        | loadCsv
        | foreach
-       | callSubquery
        ;
 
 updateClause : set
@@ -193,8 +182,6 @@ updateClause : set
 
 foreach :  FOREACH '(' variable IN expression '|' updateClause+  ')' ;
 
-callSubquery : CALL '{' cypherQuery '}' ;
-
 streamQuery : checkStream
             | createStream
             | dropStream
@@ -210,14 +197,6 @@ settingQuery : setSetting
              | showSettings
              ;
 
-transactionQueueQuery : showTransactions
-                      | terminateTransactions
-                      ;
-
-showTransactions : SHOW TRANSACTIONS ;
-
-terminateTransactions : TERMINATE TRANSACTIONS transactionIdList;
-
 loadCsv : LOAD CSV FROM csvFile ( WITH | NO ) HEADER
          ( IGNORE BAD ) ?
          ( DELIMITER delimiter ) ?
@@ -280,8 +259,6 @@ privilege : CREATE
           | MODULE_READ
           | MODULE_WRITE
           | WEBSOCKET
-          | TRANSACTION_MANAGEMENT
-          | STORAGE_MODE
           ;
 
 granularPrivilege : NOTHING | READ | UPDATE | CREATE_DELETE ;
@@ -302,11 +279,11 @@ revokePrivilegesList : privilegeOrEntities ( ',' privilegeOrEntities )* ;
 
 privilegesList : privilege ( ',' privilege )* ;
 
-entitiesList : ASTERISK | listOfColonSymbolicNames ;
+entitiesList : ASTERISK | listOfEntities ;
 
-listOfColonSymbolicNames : colonSymbolicName ( ',' colonSymbolicName )* ;
+listOfEntities : entity ( ',' entity )* ;
 
-colonSymbolicName : COLON symbolicName ;
+entity : COLON symbolicName ;
 
 showPrivileges : SHOW PRIVILEGES FOR userOrRole=userOrRoleName ;
 
@@ -316,8 +293,6 @@ showUsersForRole : SHOW USERS FOR role=userOrRoleName ;
 
 dumpQuery: DUMP DATABASE ;
 
-analyzeGraphQuery: ANALYZE GRAPH ( ON LABELS ( listOfColonSymbolicNames | ASTERISK ) ) ? ( DELETE STATISTICS ) ? ;
-
 setReplicationRole  : SET REPLICATION ROLE TO ( MAIN | REPLICA )
                       ( WITH PORT port=literal ) ? ;
 
@@ -359,10 +334,6 @@ isolationLevelScope : GLOBAL | SESSION | NEXT ;
 
 isolationLevelQuery : SET isolationLevelScope TRANSACTION ISOLATION LEVEL isolationLevel ;
 
-storageMode : IN_MEMORY_ANALYTICAL | IN_MEMORY_TRANSACTIONAL ;
-
-storageModeQuery : STORAGE MODE storageMode ;
-
 createSnapshotQuery : CREATE SNAPSHOT ;
 
 streamName : symbolicName ;
@@ -431,7 +402,3 @@ showSettings : SHOW DATABASE SETTINGS ;
 showConfigQuery : SHOW CONFIG ;
 
 versionQuery : SHOW VERSION ;
-
-transactionIdList : transactionId ( ',' transactionId )* ;
-
-transactionId : literal ;

src/query/frontend/opencypher/grammar/MemgraphCypherLexer.g4

@@ -25,107 +25,96 @@ import CypherLexer ;
 
 UNDERSCORE : '_' ;
 
-AFTER                   : A F T E R ;
-ALTER                   : A L T E R ;
-ANALYZE                 : A N A L Y Z E ;
-ASYNC                   : A S Y N C ;
-AUTH                    : A U T H ;
-BAD                     : B A D ;
-BATCH_INTERVAL          : B A T C H UNDERSCORE I N T E R V A L ;
-BATCH_LIMIT             : B A T C H UNDERSCORE L I M I T ;
-BATCH_SIZE              : B A T C H UNDERSCORE S I Z E ;
-BEFORE                  : B E F O R E ;
-BOOTSTRAP_SERVERS       : B O O T S T R A P UNDERSCORE S E R V E R S ;
-CALL                    : C A L L ;
-CHECK                   : C H E C K ;
-CLEAR                   : C L E A R ;
-COMMIT                  : C O M M I T ;
-COMMITTED               : C O M M I T T E D ;
-CONFIG                  : C O N F I G ;
-CONFIGS                 : C O N F I G S;
-CONSUMER_GROUP          : C O N S U M E R UNDERSCORE G R O U P ;
-CREATE_DELETE           : C R E A T E UNDERSCORE D E L E T E ;
-CREDENTIALS             : C R E D E N T I A L S ;
-CSV                     : C S V ;
-DATA                    : D A T A ;
-DELIMITER               : D E L I M I T E R ;
-DATABASE                : D A T A B A S E ;
-DENY                    : D E N Y ;
-DIRECTORY               : D I R E C T O R Y ;
-DROP                    : D R O P ;
-DUMP                    : D U M P ;
-DURABILITY              : D U R A B I L I T Y ;
-EDGE_TYPES              : E D G E UNDERSCORE T Y P E S ;
-EXECUTE                 : E X E C U T E ;
-FOR                     : F O R ;
-FOREACH                 : F O R E A C H;
-FREE                    : F R E E ;
-FREE_MEMORY             : F R E E UNDERSCORE M E M O R Y ;
-FROM                    : F R O M ;
-GLOBAL                  : G L O B A L ;
-GRANT                   : G R A N T ;
-GRAPH                   : G R A P H ;
-GRANTS                  : G R A N T S ;
-HEADER                  : H E A D E R ;
-IDENTIFIED              : I D E N T I F I E D ;
-IGNORE                  : I G N O R E ;
-ISOLATION               : I S O L A T I O N ;
-IN_MEMORY_ANALYTICAL    : I N UNDERSCORE M E M O R Y UNDERSCORE A N A L Y T I C A L ;
-IN_MEMORY_TRANSACTIONAL : I N UNDERSCORE M E M O R Y UNDERSCORE T R A N S A C T I O N A L ;
-KAFKA                   : K A F K A ;
-LABELS                  : L A B E L S ;
-LEVEL                   : L E V E L ;
-LOAD                    : L O A D ;
-LOCK                    : L O C K ;
-MAIN                    : M A I N ;
-MODE                    : M O D E ;
-MODULE_READ             : M O D U L E UNDERSCORE R E A D ;
-MODULE_WRITE            : M O D U L E UNDERSCORE W R I T E ;
-NEXT                    : N E X T ;
-NO                      : N O ;
-NOTHING                 : N O T H I N G ;
-PASSWORD                : P A S S W O R D ;
-PORT                    : P O R T ;
-PRIVILEGES              : P R I V I L E G E S ;
-PULSAR                  : P U L S A R ;
-READ                    : R E A D ;
-READ_FILE               : R E A D UNDERSCORE F I L E ;
-REGISTER                : R E G I S T E R ;
-REPLICA                 : R E P L I C A ;
-REPLICAS                : R E P L I C A S ;
-REPLICATION             : R E P L I C A T I O N ;
-REVOKE                  : R E V O K E ;
-ROLE                    : R O L E ;
-ROLES                   : R O L E S ;
-QUOTE                   : Q U O T E ;
-SERVICE_URL             : S E R V I C E UNDERSCORE U R L ;
-SESSION                 : S E S S I O N ;
-SETTING                 : S E T T I N G ;
-SETTINGS                : S E T T I N G S ;
-SNAPSHOT                : S N A P S H O T ;
-START                   : S T A R T ;
-STATISTICS              : S T A T I S T I C S ;
-STATS                   : S T A T S ;
-STOP                    : S T O P ;
-STORAGE                 : S T O R A G E;
-STORAGE_MODE            : S T O R A G E UNDERSCORE MODE;
-STREAM                  : S T R E A M ;
-STREAMS                 : S T R E A M S ;
-SYNC                    : S Y N C ;
-TERMINATE               : T E R M I N A T E ;
-TIMEOUT                 : T I M E O U T ;
-TO                      : T O ;
-TOPICS                  : T O P I C S;
-TRANSACTION             : T R A N S A C T I O N ;
-TRANSACTION_MANAGEMENT  : T R A N S A C T I O N UNDERSCORE M A N A G E M E N T ;
-TRANSACTIONS            : T R A N S A C T I O N S ;
-TRANSFORM               : T R A N S F O R M ;
-TRIGGER                 : T R I G G E R ;
-TRIGGERS                : T R I G G E R S ;
-UNCOMMITTED             : U N C O M M I T T E D ;
-UNLOCK                  : U N L O C K ;
-UPDATE                  : U P D A T E ;
-USER                    : U S E R ;
-USERS                   : U S E R S ;
-VERSION                 : V E R S I O N ;
-WEBSOCKET               : W E B S O C K E T ;
+AFTER               : A F T E R ;
+ALTER               : A L T E R ;
+ASYNC               : A S Y N C ;
+AUTH                : A U T H ;
+BAD                 : B A D ;
+BATCH_INTERVAL      : B A T C H UNDERSCORE I N T E R V A L ;
+BATCH_LIMIT         : B A T C H UNDERSCORE L I M I T ;
+BATCH_SIZE          : B A T C H UNDERSCORE S I Z E ;
+BEFORE              : B E F O R E ;
+BOOTSTRAP_SERVERS   : B O O T S T R A P UNDERSCORE S E R V E R S ;
+CHECK               : C H E C K ;
+CLEAR               : C L E A R ;
+COMMIT              : C O M M I T ;
+COMMITTED           : C O M M I T T E D ;
+CONFIG              : C O N F I G ;
+CONFIGS             : C O N F I G S;
+CONSUMER_GROUP      : C O N S U M E R UNDERSCORE G R O U P ;
+CREATE_DELETE       : C R E A T E UNDERSCORE D E L E T E ;
+CREDENTIALS         : C R E D E N T I A L S ;
+CSV                 : C S V ;
+DATA                : D A T A ;
+DELIMITER           : D E L I M I T E R ;
+DATABASE            : D A T A B A S E ;
+DENY                : D E N Y ;
+DIRECTORY           : D I R E C T O R Y ;
+DROP                : D R O P ;
+DUMP                : D U M P ;
+DURABILITY          : D U R A B I L I T Y ;
+EXECUTE             : E X E C U T E ;
+FOR                 : F O R ;
+FOREACH             : F O R E A C H;
+FREE                : F R E E ;
+FREE_MEMORY         : F R E E UNDERSCORE M E M O R Y ;
+FROM                : F R O M ;
+GLOBAL              : G L O B A L ;
+GRANT               : G R A N T ;
+GRANTS              : G R A N T S ;
+HEADER              : H E A D E R ;
+IDENTIFIED          : I D E N T I F I E D ;
+IGNORE              : I G N O R E ;
+ISOLATION           : I S O L A T I O N ;
+KAFKA               : K A F K A ;
+LABELS              : L A B E L S ;
+LEVEL               : L E V E L ;
+LOAD                : L O A D ;
+LOCK                : L O C K ;
+MAIN                : M A I N ;
+MODE                : M O D E ;
+MODULE_READ         : M O D U L E UNDERSCORE R E A D ;
+MODULE_WRITE        : M O D U L E UNDERSCORE W R I T E ;
+NEXT                : N E X T ;
+NO                  : N O ;
+NOTHING             : N O T H I N G ;
+PASSWORD            : P A S S W O R D ;
+PORT                : P O R T ;
+PRIVILEGES          : P R I V I L E G E S ;
+PULSAR              : P U L S A R ;
+READ                : R E A D ;
+READ_FILE           : R E A D UNDERSCORE F I L E ;
+REGISTER            : R E G I S T E R ;
+REPLICA             : R E P L I C A ;
+REPLICAS            : R E P L I C A S ;
+REPLICATION         : R E P L I C A T I O N ;
+REVOKE              : R E V O K E ;
+ROLE                : R O L E ;
+ROLES               : R O L E S ;
+QUOTE               : Q U O T E ;
+SERVICE_URL         : S E R V I C E UNDERSCORE U R L ;
+SESSION             : S E S S I O N ;
+SETTING             : S E T T I N G ;
+SETTINGS            : S E T T I N G S ;
+SNAPSHOT            : S N A P S H O T ;
+START               : S T A R T ;
+STATS               : S T A T S ;
+STOP                : S T O P ;
+STREAM              : S T R E A M ;
+STREAMS             : S T R E A M S ;
+SYNC                : S Y N C ;
+TIMEOUT             : T I M E O U T ;
+TO                  : T O ;
+TOPICS              : T O P I C S;
+TRANSACTION         : T R A N S A C T I O N ;
+TRANSFORM           : T R A N S F O R M ;
+TRIGGER             : T R I G G E R ;
+TRIGGERS            : T R I G G E R S ;
+UNCOMMITTED         : U N C O M M I T T E D ;
+UNLOCK              : U N L O C K ;
+UPDATE              : U P D A T E ;
+USER                : U S E R ;
+USERS               : U S E R S ;
+VERSION             : V E R S I O N ;
+WEBSOCKET           : W E B S O C K E T ;
+EDGE_TYPES          : E D G E UNDERSCORE T Y P E S ;

src/query/frontend/semantic/required_privileges.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -25,15 +25,13 @@ class PrivilegeExtractor : public QueryVisitor<void>, public HierarchicalTreeVis
 
   std::vector<AuthQuery::Privilege> privileges() { return privileges_; }
 
-  void Visit(IndexQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
+  void Visit(IndexQuery &) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
 
-  void Visit(AnalyzeGraphQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
+  void Visit(AuthQuery &) override { AddPrivilege(AuthQuery::Privilege::AUTH); }
 
-  void Visit(AuthQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::AUTH); }
+  void Visit(ExplainQuery &query) override { query.cypher_query_->Accept(*this); }
 
-  void Visit(ExplainQuery &query) override { query.cypher_query_->Accept(dynamic_cast<QueryVisitor &>(*this)); }
-
-  void Visit(ProfileQuery &query) override { query.cypher_query_->Accept(dynamic_cast<QueryVisitor &>(*this)); }
+  void Visit(ProfileQuery &query) override { query.cypher_query_->Accept(*this); }
 
   void Visit(InfoQuery &info_query) override {
     switch (info_query.info_type_) {
@@ -78,14 +76,10 @@ class PrivilegeExtractor : public QueryVisitor<void>, public HierarchicalTreeVis
 
   void Visit(IsolationLevelQuery &isolation_level_query) override { AddPrivilege(AuthQuery::Privilege::CONFIG); }
 
-  void Visit(StorageModeQuery & /*storage_mode_query*/) override { AddPrivilege(AuthQuery::Privilege::STORAGE_MODE); }
-
   void Visit(CreateSnapshotQuery &create_snapshot_query) override { AddPrivilege(AuthQuery::Privilege::DURABILITY); }
 
   void Visit(SettingQuery & /*setting_query*/) override { AddPrivilege(AuthQuery::Privilege::CONFIG); }
 
-  void Visit(TransactionQueueQuery & /*transaction_queue_query*/) override {}
-
   void Visit(VersionQuery & /*version_query*/) override { AddPrivilege(AuthQuery::Privilege::STATS); }
 
   bool PreVisit(Create & /*unused*/) override {

src/query/frontend/semantic/symbol.cpp

@@ -1,18 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#include "query/frontend/semantic/symbol.hpp"
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-constexpr utils::TypeInfo query::Symbol::kType{utils::TypeId::SYMBOL, "Symbol", nullptr};
-}  // namespace memgraph

src/query/frontend/semantic/symbol.hpp

@@ -1,75 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#include <string>
-
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-namespace query {
-
-class Symbol {
- public:
-  static const utils::TypeInfo kType;
-  static const utils::TypeInfo &GetTypeInfo() { return kType; }
-
-  enum class Type { ANY, VERTEX, EDGE, PATH, NUMBER, EDGE_LIST };
-
-  // TODO: Generate enum to string conversion from LCP. Note, that this is
-  // displayed to the end user, so we may want to have a pretty name of each
-  // value.
-  static std::string TypeToString(Type type) {
-    const char *enum_string[] = {"Any", "Vertex", "Edge", "Path", "Number", "EdgeList"};
-    return enum_string[static_cast<int>(type)];
-  }
-
-  Symbol() {}
-  Symbol(const std::string &name, int position, bool user_declared, Type type = Type::ANY, int token_position = -1)
-      : name_(name), position_(position), user_declared_(user_declared), type_(type), token_position_(token_position) {}
-
-  bool operator==(const Symbol &other) const {
-    return position_ == other.position_ && name_ == other.name_ && type_ == other.type_;
-  }
-  bool operator!=(const Symbol &other) const { return !operator==(other); }
-
-  // TODO: Remove these since members are public
-  const auto &name() const { return name_; }
-  int position() const { return position_; }
-  Type type() const { return type_; }
-  bool user_declared() const { return user_declared_; }
-  int token_position() const { return token_position_; }
-
-  std::string name_;
-  int64_t position_;
-  bool user_declared_{true};
-  memgraph::query::Symbol::Type type_{Type::ANY};
-  int64_t token_position_{-1};
-};
-
-}  // namespace query
-}  // namespace memgraph
-namespace std {
-
-template <>
-struct hash<memgraph::query::Symbol> {
-  size_t operator()(const memgraph::query::Symbol &symbol) const {
-    size_t prime = 265443599u;
-    size_t hash = std::hash<int>{}(symbol.position());
-    hash ^= prime * std::hash<std::string>{}(symbol.name());
-    hash ^= prime * std::hash<int>{}(static_cast<int>(symbol.type()));
-    return hash;
-  }
-};
-
-}  // namespace std

src/query/frontend/semantic/symbol_generator.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -64,9 +64,12 @@ auto SymbolGenerator::CreateSymbol(const std::string &name, bool user_declared,
   return symbol;
 }
 
-auto SymbolGenerator::CreateAnonymousSymbol(Symbol::Type /*type*/) {
-  auto symbol = symbol_table_->CreateAnonymousSymbol();
-  return symbol;
+auto SymbolGenerator::GetOrCreateSymbolLocalScope(const std::string &name, bool user_declared, Symbol::Type type) {
+  auto &scope = scopes_.back();
+  if (auto maybe_symbol = FindSymbolInScope(name, scope, type); maybe_symbol) {
+    return *maybe_symbol;
+  }
+  return CreateSymbol(name, user_declared, type);
 }
 
 auto SymbolGenerator::GetOrCreateSymbol(const std::string &name, bool user_declared, Symbol::Type type) {
@@ -203,7 +206,7 @@ bool SymbolGenerator::PreVisit(CallProcedure &call_proc) {
 
 bool SymbolGenerator::PostVisit(CallProcedure &call_proc) {
   for (auto *ident : call_proc.result_identifiers_) {
-    if (HasSymbol(ident->name_)) {
+    if (HasSymbolLocalScope(ident->name_)) {
       throw RedeclareVariableError(ident->name_);
     }
     ident->MapTo(CreateSymbol(ident->name_, true));
@@ -211,37 +214,10 @@ bool SymbolGenerator::PostVisit(CallProcedure &call_proc) {
   return true;
 }
 
-bool SymbolGenerator::PreVisit(CallSubquery & /*call_sub*/) {
-  scopes_.emplace_back(Scope{.in_call_subquery = true});
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(CallSubquery & /*call_sub*/) {
-  // no need to set the flag to true as we are popping the scope
-  auto subquery_scope = scopes_.back();
-  scopes_.pop_back();
-  auto &main_query_scope = scopes_.back();
-
-  if (!subquery_scope.has_return) {
-    return true;
-  }
-
-  // append symbols returned in from subquery to outer scope
-  for (const auto &[symbol_name, symbol] : subquery_scope.symbols) {
-    if (main_query_scope.symbols.find(symbol_name) != main_query_scope.symbols.end()) {
-      throw SemanticException("Variable in subquery already declared in outer scope!");
-    }
-
-    main_query_scope.symbols[symbol_name] = symbol;
-  }
-
-  return true;
-}
-
 bool SymbolGenerator::PreVisit(LoadCsv &load_csv) { return false; }
 
 bool SymbolGenerator::PostVisit(LoadCsv &load_csv) {
-  if (HasSymbol(load_csv.row_var_->name_)) {
+  if (HasSymbolLocalScope(load_csv.row_var_->name_)) {
     throw RedeclareVariableError(load_csv.row_var_->name_);
   }
   load_csv.row_var_->MapTo(CreateSymbol(load_csv.row_var_->name_, true));
@@ -251,8 +227,6 @@ bool SymbolGenerator::PostVisit(LoadCsv &load_csv) {
 bool SymbolGenerator::PreVisit(Return &ret) {
   auto &scope = scopes_.back();
   scope.in_return = true;
-  scope.has_return = true;
-
   VisitReturnBody(ret.body_);
   scope.in_return = false;
   return false;  // We handled the traversal ourselves.
@@ -291,7 +265,7 @@ bool SymbolGenerator::PostVisit(Merge &) {
 
 bool SymbolGenerator::PostVisit(Unwind &unwind) {
   const auto &name = unwind.named_expression_->name_;
-  if (HasSymbol(name)) {
+  if (HasSymbolLocalScope(name)) {
     throw RedeclareVariableError(name);
   }
   unwind.named_expression_->MapTo(CreateSymbol(name, true));
@@ -308,7 +282,7 @@ bool SymbolGenerator::PostVisit(Match &) {
   // Check variables in property maps after visiting Match, so that they can
   // reference symbols out of bind order.
   for (auto &ident : scope.identifiers_in_match) {
-    if (!HasSymbol(ident->name_) && !ConsumePredefinedIdentifier(ident->name_))
+    if (!HasSymbolLocalScope(ident->name_) && !ConsumePredefinedIdentifier(ident->name_))
       throw UnboundVariableError(ident->name_);
     ident->MapTo(scope.symbols[ident->name_]);
   }
@@ -336,19 +310,11 @@ SymbolGenerator::ReturnType SymbolGenerator::Visit(Identifier &ident) {
   if (scope.in_skip || scope.in_limit) {
     throw SemanticException("Variables are not allowed in {}.", scope.in_skip ? "SKIP" : "LIMIT");
   }
-
-  if (scope.in_exists && (scope.visiting_edge || scope.in_node_atom)) {
-    auto has_symbol = HasSymbol(ident.name_);
-    if (!has_symbol && !ConsumePredefinedIdentifier(ident.name_) && ident.user_declared_) {
-      throw SemanticException("Unbounded variables are not allowed in exists!");
-    }
-  }
-
   Symbol symbol;
   if (scope.in_pattern && !(scope.in_node_atom || scope.visiting_edge)) {
     // If we are in the pattern, and outside of a node or an edge, the
     // identifier is the pattern name.
-    symbol = GetOrCreateSymbol(ident.name_, ident.user_declared_, Symbol::Type::PATH);
+    symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, Symbol::Type::PATH);
   } else if (scope.in_pattern && scope.in_pattern_atom_identifier) {
     //  Patterns used to create nodes and edges cannot redeclare already
     //  established bindings. Declaration only happens in single node
@@ -356,22 +322,21 @@ SymbolGenerator::ReturnType SymbolGenerator::Visit(Identifier &ident) {
     //  `MATCH (n) CREATE (n)` should throw an error that `n` is already
     //  declared. While `MATCH (n) CREATE (n) -[:R]-> (n)` is allowed,
     //  since `n` now references the bound node instead of declaring it.
-    if ((scope.in_create_node || scope.in_create_edge) && HasSymbol(ident.name_)) {
+    if ((scope.in_create_node || scope.in_create_edge) && HasSymbolLocalScope(ident.name_)) {
       throw RedeclareVariableError(ident.name_);
     }
     auto type = Symbol::Type::VERTEX;
     if (scope.visiting_edge) {
       // Edge referencing is not allowed (like in Neo4j):
       // `MATCH (n) - [r] -> (n) - [r] -> (n) RETURN r` is not allowed.
-      if (HasSymbol(ident.name_)) {
+      if (HasSymbolLocalScope(ident.name_)) {
         throw RedeclareVariableError(ident.name_);
       }
       type = scope.visiting_edge->IsVariable() ? Symbol::Type::EDGE_LIST : Symbol::Type::EDGE;
     }
-    symbol = GetOrCreateSymbol(ident.name_, ident.user_declared_, type);
+    symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, type);
   } else if (scope.in_pattern && !scope.in_pattern_atom_identifier && scope.in_match) {
-    if (scope.in_edge_range && scope.visiting_edge && scope.visiting_edge->identifier_ &&
-        scope.visiting_edge->identifier_->name_ == ident.name_) {
+    if (scope.in_edge_range && scope.visiting_edge->identifier_->name_ == ident.name_) {
       // Prevent variable path bounds to reference the identifier which is bound
       // by the variable path itself.
       throw UnboundVariableError(ident.name_);
@@ -473,55 +438,6 @@ bool SymbolGenerator::PreVisit(Extract &extract) {
   return false;
 }
 
-bool SymbolGenerator::PreVisit(Exists &exists) {
-  auto &scope = scopes_.back();
-
-  if (scope.in_set_property) {
-    throw utils::NotYetImplemented("Set property can not be used with exists, but only during matching!");
-  }
-
-  if (scope.in_with) {
-    throw utils::NotYetImplemented("WITH can not be used with exists, but only during matching!");
-  }
-
-  scope.in_exists = true;
-
-  const auto &symbol = CreateAnonymousSymbol();
-  exists.MapTo(symbol);
-
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(Exists & /*exists*/) {
-  auto &scope = scopes_.back();
-  scope.in_exists = false;
-
-  return true;
-}
-
-bool SymbolGenerator::PreVisit(NamedExpression &named_expression) {
-  if (auto &scope = scopes_.back(); scope.in_call_subquery && scope.in_return &&
-                                    !utils::Downcast<Identifier>(named_expression.expression_) &&
-                                    !named_expression.is_aliased_) {
-    throw SemanticException("Expression returned from subquery must be aliased (use AS)!");
-  }
-  return true;
-}
-
-bool SymbolGenerator::PreVisit(SetProperty & /*set_property*/) {
-  auto &scope = scopes_.back();
-  scope.in_set_property = true;
-
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(SetProperty & /*set_property*/) {
-  auto &scope = scopes_.back();
-  scope.in_set_property = false;
-
-  return true;
-}
-
 // Pattern and its subparts.
 
 bool SymbolGenerator::PreVisit(Pattern &pattern) {
@@ -531,7 +447,6 @@ bool SymbolGenerator::PreVisit(Pattern &pattern) {
     MG_ASSERT(utils::IsSubtype(*pattern.atoms_[0], NodeAtom::kType), "Expected a single NodeAtom in Pattern");
     scope.in_create_node = true;
   }
-
   return true;
 }
 
@@ -546,7 +461,7 @@ bool SymbolGenerator::PreVisit(NodeAtom &node_atom) {
   auto &scope = scopes_.back();
   auto check_node_semantic = [&node_atom, &scope, this](const bool props_or_labels) {
     const auto &node_name = node_atom.identifier_->name_;
-    if ((scope.in_create || scope.in_merge) && props_or_labels && HasSymbol(node_name)) {
+    if ((scope.in_create || scope.in_merge) && props_or_labels && HasSymbolLocalScope(node_name)) {
       throw SemanticException("Cannot create node '" + node_name +
                               "' with labels or properties, because it is already declared.");
     }
@@ -640,11 +555,11 @@ bool SymbolGenerator::PreVisit(EdgeAtom &edge_atom) {
   edge_atom.identifier_->Accept(*this);
   scope.in_pattern_atom_identifier = false;
   if (edge_atom.total_weight_) {
-    if (HasSymbol(edge_atom.total_weight_->name_)) {
+    if (HasSymbolLocalScope(edge_atom.total_weight_->name_)) {
       throw RedeclareVariableError(edge_atom.total_weight_->name_);
     }
-    edge_atom.total_weight_->MapTo(GetOrCreateSymbol(edge_atom.total_weight_->name_,
-                                                     edge_atom.total_weight_->user_declared_, Symbol::Type::NUMBER));
+    edge_atom.total_weight_->MapTo(GetOrCreateSymbolLocalScope(
+        edge_atom.total_weight_->name_, edge_atom.total_weight_->user_declared_, Symbol::Type::NUMBER));
   }
   return false;
 }
@@ -687,6 +602,10 @@ bool SymbolGenerator::HasSymbol(const std::string &name) const {
   return std::ranges::any_of(scopes_, [&name](const auto &scope) { return scope.symbols.contains(name); });
 }
 
+bool SymbolGenerator::HasSymbolLocalScope(const std::string &name) const {
+  return scopes_.back().symbols.contains(name);
+}
+
 bool SymbolGenerator::ConsumePredefinedIdentifier(const std::string &name) {
   auto it = predefined_identifiers_.find(name);
 

src/query/frontend/semantic/symbol_generator.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -50,8 +50,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PostVisit(Create &) override;
   bool PreVisit(CallProcedure &) override;
   bool PostVisit(CallProcedure &) override;
-  bool PreVisit(CallSubquery & /*unused*/) override;
-  bool PostVisit(CallSubquery & /*unused*/) override;
   bool PreVisit(LoadCsv &) override;
   bool PostVisit(LoadCsv &) override;
   bool PreVisit(Return &) override;
@@ -66,8 +64,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PostVisit(Match &) override;
   bool PreVisit(Foreach &) override;
   bool PostVisit(Foreach &) override;
-  bool PreVisit(SetProperty & /*set_property*/) override;
-  bool PostVisit(SetProperty & /*set_property*/) override;
 
   // Expressions
   ReturnType Visit(Identifier &) override;
@@ -83,9 +79,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PreVisit(None &) override;
   bool PreVisit(Reduce &) override;
   bool PreVisit(Extract &) override;
-  bool PreVisit(Exists & /*exists*/) override;
-  bool PostVisit(Exists & /*exists*/) override;
-  bool PreVisit(NamedExpression & /*unused*/) override;
 
   // Pattern and its subparts.
   bool PreVisit(Pattern &) override;
@@ -120,10 +113,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
     bool in_where{false};
     bool in_match{false};
     bool in_foreach{false};
-    bool in_exists{false};
-    bool in_set_property{false};
-    bool in_call_subquery{false};
-    bool has_return{false};
     // True when visiting a pattern atom (node or edge) identifier, which can be
     // reused or created in the pattern itself.
     bool in_pattern_atom_identifier{false};
@@ -145,6 +134,7 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   static std::optional<Symbol> FindSymbolInScope(const std::string &name, const Scope &scope, Symbol::Type type);
 
   bool HasSymbol(const std::string &name) const;
+  bool HasSymbolLocalScope(const std::string &name) const;
 
   // @return true if it added a predefined identifier with that name
   bool ConsumePredefinedIdentifier(const std::string &name);
@@ -154,12 +144,10 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   auto CreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY,
                     int token_position = -1);
 
-  // Returns a freshly generated anonymous symbol.
-  auto CreateAnonymousSymbol(Symbol::Type type = Symbol::Type::ANY);
-
   auto GetOrCreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY);
   // Returns the symbol by name. If the mapping already exists, checks if the
   // types match. Otherwise, returns a new symbol.
+  auto GetOrCreateSymbolLocalScope(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY);
 
   void VisitReturnBody(ReturnBody &body, Where *where = nullptr);
 

src/query/frontend/semantic/symbol_table.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -51,7 +51,6 @@ class SymbolTable final {
   const Symbol &at(const Identifier &ident) const { return table_.at(ident.symbol_pos_); }
   const Symbol &at(const NamedExpression &nexpr) const { return table_.at(nexpr.symbol_pos_); }
   const Symbol &at(const Aggregation &aggr) const { return table_.at(aggr.symbol_pos_); }
-  const Symbol &at(const Exists &exists) const { return table_.at(exists.symbol_pos_); }
 
   // TODO: Remove these since members are public
   int32_t max_position() const { return static_cast<int32_t>(table_.size()); }

src/query/frontend/stripped_lexer_constants.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -208,10 +208,7 @@ const trie::Trie kKeywords = {"union",
                               "websocket",
                               "foreach",
                               "labels",
-                              "edge_types",
-                              "off",
-                              "in_memory_transactional",
-                              "in_memory_analytical"};
+                              "edge_types"};
 
 // Unicode codepoints that are allowed at the start of the unescaped name.
 const std::bitset<kBitsetSize> kUnescapedNameAllowedStarts(

src/query/interpret/eval.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -31,72 +31,6 @@
 
 namespace memgraph::query {
 
-class ReferenceExpressionEvaluator : public ExpressionVisitor<TypedValue *> {
- public:
-  ReferenceExpressionEvaluator(Frame *frame, const SymbolTable *symbol_table, const EvaluationContext *ctx)
-      : frame_(frame), symbol_table_(symbol_table), ctx_(ctx) {}
-
-  using ExpressionVisitor<TypedValue *>::Visit;
-
-  utils::MemoryResource *GetMemoryResource() const { return ctx_->memory; }
-
-#define UNSUCCESSFUL_VISIT(expr_name) \
-  TypedValue *Visit(expr_name &expr) override { return nullptr; }
-
-  TypedValue *Visit(Identifier &ident) override { return &frame_->at(symbol_table_->at(ident)); }
-
-  UNSUCCESSFUL_VISIT(NamedExpression);
-  UNSUCCESSFUL_VISIT(OrOperator);
-  UNSUCCESSFUL_VISIT(XorOperator);
-  UNSUCCESSFUL_VISIT(AdditionOperator);
-  UNSUCCESSFUL_VISIT(SubtractionOperator);
-  UNSUCCESSFUL_VISIT(MultiplicationOperator);
-  UNSUCCESSFUL_VISIT(DivisionOperator);
-  UNSUCCESSFUL_VISIT(ModOperator);
-  UNSUCCESSFUL_VISIT(NotEqualOperator);
-  UNSUCCESSFUL_VISIT(EqualOperator);
-  UNSUCCESSFUL_VISIT(LessOperator);
-  UNSUCCESSFUL_VISIT(GreaterOperator);
-  UNSUCCESSFUL_VISIT(LessEqualOperator);
-  UNSUCCESSFUL_VISIT(GreaterEqualOperator);
-
-  UNSUCCESSFUL_VISIT(NotOperator);
-  UNSUCCESSFUL_VISIT(UnaryPlusOperator);
-  UNSUCCESSFUL_VISIT(UnaryMinusOperator);
-
-  UNSUCCESSFUL_VISIT(AndOperator);
-  UNSUCCESSFUL_VISIT(IfOperator);
-  UNSUCCESSFUL_VISIT(InListOperator);
-
-  UNSUCCESSFUL_VISIT(SubscriptOperator);
-
-  UNSUCCESSFUL_VISIT(ListSlicingOperator);
-  UNSUCCESSFUL_VISIT(IsNullOperator);
-  UNSUCCESSFUL_VISIT(PropertyLookup);
-  UNSUCCESSFUL_VISIT(LabelsTest);
-
-  UNSUCCESSFUL_VISIT(PrimitiveLiteral);
-  UNSUCCESSFUL_VISIT(ListLiteral);
-  UNSUCCESSFUL_VISIT(MapLiteral);
-  UNSUCCESSFUL_VISIT(Aggregation);
-  UNSUCCESSFUL_VISIT(Coalesce);
-  UNSUCCESSFUL_VISIT(Function);
-  UNSUCCESSFUL_VISIT(Reduce);
-  UNSUCCESSFUL_VISIT(Extract);
-  UNSUCCESSFUL_VISIT(All);
-  UNSUCCESSFUL_VISIT(Single);
-  UNSUCCESSFUL_VISIT(Any);
-  UNSUCCESSFUL_VISIT(None);
-  UNSUCCESSFUL_VISIT(ParameterLookup);
-  UNSUCCESSFUL_VISIT(RegexMatch);
-  UNSUCCESSFUL_VISIT(Exists);
-
- private:
-  Frame *frame_;
-  const SymbolTable *symbol_table_;
-  const EvaluationContext *ctx_;
-};
-
 class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
  public:
   ExpressionEvaluator(Frame *frame, const SymbolTable &symbol_table, const EvaluationContext &ctx, DbAccessor *dba,
@@ -225,53 +159,50 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   }
 
   TypedValue Visit(SubscriptOperator &list_indexing) override {
-    ReferenceExpressionEvaluator referenceExpressionEvaluator(frame_, symbol_table_, ctx_);
-
-    TypedValue *lhs_ptr = list_indexing.expression1_->Accept(referenceExpressionEvaluator);
-    TypedValue lhs;
-    const auto referenced = nullptr != lhs_ptr;
-    if (!referenced) {
-      lhs = list_indexing.expression1_->Accept(*this);
-      lhs_ptr = &lhs;
-    }
+    auto lhs = list_indexing.expression1_->Accept(*this);
     auto index = list_indexing.expression2_->Accept(*this);
-    if (!lhs_ptr->IsList() && !lhs_ptr->IsMap() && !lhs_ptr->IsVertex() && !lhs_ptr->IsEdge() && !lhs_ptr->IsNull())
+    if (!lhs.IsList() && !lhs.IsMap() && !lhs.IsVertex() && !lhs.IsEdge() && !lhs.IsNull())
       throw QueryRuntimeException(
           "Expected a list, a map, a node or an edge to index with '[]', got "
           "{}.",
-          lhs_ptr->type());
-    if (lhs_ptr->IsNull() || index.IsNull()) return TypedValue(ctx_->memory);
-    if (lhs_ptr->IsList()) {
+          lhs.type());
+    if (lhs.IsNull() || index.IsNull()) return TypedValue(ctx_->memory);
+    if (lhs.IsList()) {
       if (!index.IsInt()) throw QueryRuntimeException("Expected an integer as a list index, got {}.", index.type());
       auto index_int = index.ValueInt();
-      auto &list = lhs_ptr->ValueList();
+      // NOTE: Take non-const reference to list, so that we can move out the
+      // indexed element as the result.
+      auto &list = lhs.ValueList();
       if (index_int < 0) {
         index_int += static_cast<int64_t>(list.size());
       }
       if (index_int >= static_cast<int64_t>(list.size()) || index_int < 0) return TypedValue(ctx_->memory);
-      return referenced ? TypedValue(list[index_int], ctx_->memory)
-                        : TypedValue(std::move(list[index_int]), ctx_->memory);
+      // NOTE: Explicit move is needed, so that we return the move constructed
+      // value and preserve the correct MemoryResource.
+      return std::move(list[index_int]);
     }
 
-    if (lhs_ptr->IsMap()) {
+    if (lhs.IsMap()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a map index, got {}.", index.type());
       // NOTE: Take non-const reference to map, so that we can move out the
       // looked-up element as the result.
-      auto &map = lhs_ptr->ValueMap();
+      auto &map = lhs.ValueMap();
       auto found = map.find(index.ValueString());
       if (found == map.end()) return TypedValue(ctx_->memory);
-      return referenced ? TypedValue(found->second, ctx_->memory) : TypedValue(std::move(found->second), ctx_->memory);
+      // NOTE: Explicit move is needed, so that we return the move constructed
+      // value and preserve the correct MemoryResource.
+      return std::move(found->second);
     }
 
-    if (lhs_ptr->IsVertex()) {
+    if (lhs.IsVertex()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a property name, got {}.", index.type());
-      return {GetProperty(lhs_ptr->ValueVertex(), index.ValueString()), ctx_->memory};
+      return TypedValue(GetProperty(lhs.ValueVertex(), index.ValueString()), ctx_->memory);
     }
 
-    if (lhs_ptr->IsEdge()) {
+    if (lhs.IsEdge()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a property name, got {}.", index.type());
-      return {GetProperty(lhs_ptr->ValueEdge(), index.ValueString()), ctx_->memory};
-    };
+      return TypedValue(GetProperty(lhs.ValueEdge(), index.ValueString()), ctx_->memory);
+    }
 
     // lhs is Null
     return TypedValue(ctx_->memory);
@@ -327,15 +258,7 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   }
 
   TypedValue Visit(PropertyLookup &property_lookup) override {
-    ReferenceExpressionEvaluator referenceExpressionEvaluator(frame_, symbol_table_, ctx_);
-
-    TypedValue *expression_result_ptr = property_lookup.expression_->Accept(referenceExpressionEvaluator);
-    TypedValue expression_result;
-
-    if (nullptr == expression_result_ptr) {
-      expression_result = property_lookup.expression_->Accept(*this);
-      expression_result_ptr = &expression_result;
-    }
+    auto expression_result = property_lookup.expression_->Accept(*this);
     auto maybe_date = [this](const auto &date, const auto &prop_name) -> std::optional<TypedValue> {
       if (prop_name == "year") {
         return TypedValue(date.year, ctx_->memory);
@@ -409,38 +332,42 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
       }
       return std::nullopt;
     };
-    switch (expression_result_ptr->type()) {
+    switch (expression_result.type()) {
       case TypedValue::Type::Null:
         return TypedValue(ctx_->memory);
       case TypedValue::Type::Vertex:
-        return TypedValue(GetProperty(expression_result_ptr->ValueVertex(), property_lookup.property_), ctx_->memory);
+        return TypedValue(GetProperty(expression_result.ValueVertex(), property_lookup.property_), ctx_->memory);
       case TypedValue::Type::Edge:
-        return TypedValue(GetProperty(expression_result_ptr->ValueEdge(), property_lookup.property_), ctx_->memory);
+        return TypedValue(GetProperty(expression_result.ValueEdge(), property_lookup.property_), ctx_->memory);
       case TypedValue::Type::Map: {
-        auto &map = expression_result_ptr->ValueMap();
+        // NOTE: Take non-const reference to map, so that we can move out the
+        // looked-up element as the result.
+        auto &map = expression_result.ValueMap();
         auto found = map.find(property_lookup.property_.name.c_str());
         if (found == map.end()) return TypedValue(ctx_->memory);
-        return TypedValue(found->second, ctx_->memory);
+        // NOTE: Explicit move is needed, so that we return the move constructed
+        // value and preserve the correct MemoryResource.
+        return std::move(found->second);
       }
       case TypedValue::Type::Duration: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &dur = expression_result_ptr->ValueDuration();
+        const auto &dur = expression_result.ValueDuration();
         if (auto dur_field = maybe_duration(dur, prop_name); dur_field) {
-          return TypedValue(*dur_field, ctx_->memory);
+          return std::move(*dur_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Duration", prop_name);
       }
       case TypedValue::Type::Date: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &date = expression_result_ptr->ValueDate();
+        const auto &date = expression_result.ValueDate();
         if (auto date_field = maybe_date(date, prop_name); date_field) {
-          return TypedValue(*date_field, ctx_->memory);
+          return std::move(*date_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Date", prop_name);
       }
       case TypedValue::Type::LocalTime: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &lt = expression_result_ptr->ValueLocalTime();
+        const auto &lt = expression_result.ValueLocalTime();
         if (auto lt_field = maybe_local_time(lt, prop_name); lt_field) {
           return std::move(*lt_field);
         }
@@ -448,20 +375,20 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
       }
       case TypedValue::Type::LocalDateTime: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &ldt = expression_result_ptr->ValueLocalDateTime();
+        const auto &ldt = expression_result.ValueLocalDateTime();
         if (auto date_field = maybe_date(ldt.date, prop_name); date_field) {
           return std::move(*date_field);
         }
         if (auto lt_field = maybe_local_time(ldt.local_time, prop_name); lt_field) {
-          return TypedValue(*lt_field, ctx_->memory);
+          return std::move(*lt_field);
         }
         throw QueryRuntimeException("Invalid property name {} for LocalDateTime", prop_name);
       }
       case TypedValue::Type::Graph: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &graph = expression_result_ptr->ValueGraph();
+        const auto &graph = expression_result.ValueGraph();
         if (auto graph_field = maybe_graph(graph, prop_name); graph_field) {
-          return TypedValue(*graph_field, ctx_->memory);
+          return std::move(*graph_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Graph", prop_name);
       }
@@ -620,8 +547,6 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
     return TypedValue(result, ctx_->memory);
   }
 
-  TypedValue Visit(Exists &exists) override { return TypedValue{frame_->at(symbol_table_->at(exists)), ctx_->memory}; }
-
   TypedValue Visit(All &all) override {
     auto list_value = all.list_expression_->Accept(*this);
     if (list_value.IsNull()) {

src/query/interpreter.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,13 +18,9 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <iterator>
 #include <limits>
-#include <memory>
 #include <optional>
-#include <thread>
 #include <unordered_map>
-#include <utility>
 #include <variant>
 
 #include "auth/models.hpp"
@@ -63,13 +59,10 @@
 #include "utils/logging.hpp"
 #include "utils/memory.hpp"
 #include "utils/memory_tracker.hpp"
-#include "utils/message.hpp"
-#include "utils/on_scope_exit.hpp"
 #include "utils/readable_size.hpp"
 #include "utils/settings.hpp"
 #include "utils/string.hpp"
 #include "utils/tsc.hpp"
-#include "utils/typeinfo.hpp"
 #include "utils/variant_helpers.hpp"
 
 namespace EventCounter {
@@ -334,11 +327,11 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
           auth->GrantPrivilege(username, kPrivilegesAll
 #ifdef MG_ENTERPRISE
                                ,
-                               {{{AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {query::kAsterisk}}}},
+                               {{{AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {auth::kAsterisk}}}},
                                {
                                  {
                                    {
-                                     AuthQuery::FineGrainedPrivilege::CREATE_DELETE, { query::kAsterisk }
+                                     AuthQuery::FineGrainedPrivilege::CREATE_DELETE, { auth::kAsterisk }
                                    }
                                  }
                                }
@@ -982,10 +975,8 @@ struct PullPlanVector {
 struct PullPlan {
   explicit PullPlan(std::shared_ptr<CachedPlan> plan, const Parameters &parameters, bool is_profile_query,
                     DbAccessor *dba, InterpreterContext *interpreter_context, utils::MemoryResource *execution_memory,
-                    std::optional<std::string> username, std::atomic<TransactionStatus> *transaction_status,
-                    TriggerContextCollector *trigger_context_collector = nullptr,
-                    std::optional<size_t> memory_limit = {}, bool use_monotonic_memory = true);
-
+                    std::optional<std::string> username, TriggerContextCollector *trigger_context_collector = nullptr,
+                    std::optional<size_t> memory_limit = {});
   std::optional<plan::ProfilingStatsWithTotalTime> Pull(AnyStream *stream, std::optional<int> n,
                                                         const std::vector<Symbol> &output_symbols,
                                                         std::map<std::string, TypedValue> *summary);
@@ -1009,25 +1000,16 @@ struct PullPlan {
   // we have to keep track of any unsent results from previous `PullPlan::Pull`
   // manually by using this flag.
   bool has_unsent_results_ = false;
-
-  // In the case of LOAD CSV, we want to use only PoolResource without MonotonicMemoryResource
-  // to reuse allocated memory. As LOAD CSV is processing row by row
-  // it is possible to reduce memory usage significantly if MemoryResource deals with memory allocation
-  // can reuse memory that was allocated on processing the first row on all subsequent rows.
-  // This flag signals to `PullPlan::Pull` which MemoryResource to use
-  bool use_monotonic_memory_;
 };
 
 PullPlan::PullPlan(const std::shared_ptr<CachedPlan> plan, const Parameters &parameters, const bool is_profile_query,
                    DbAccessor *dba, InterpreterContext *interpreter_context, utils::MemoryResource *execution_memory,
-                   std::optional<std::string> username, std::atomic<TransactionStatus> *transaction_status,
-                   TriggerContextCollector *trigger_context_collector, const std::optional<size_t> memory_limit,
-                   bool use_monotonic_memory)
+                   std::optional<std::string> username, TriggerContextCollector *trigger_context_collector,
+                   const std::optional<size_t> memory_limit)
     : plan_(plan),
       cursor_(plan->plan().MakeCursor(execution_memory)),
       frame_(plan->symbol_table().max_position(), execution_memory),
-      memory_limit_(memory_limit),
-      use_monotonic_memory_(use_monotonic_memory) {
+      memory_limit_(memory_limit) {
   ctx_.db_accessor = dba;
   ctx_.symbol_table = plan->symbol_table();
   ctx_.evaluation_context.timestamp = QueryTimestamp();
@@ -1036,21 +1018,13 @@ PullPlan::PullPlan(const std::shared_ptr<CachedPlan> plan, const Parameters &par
   ctx_.evaluation_context.labels = NamesToLabels(plan->ast_storage().labels_, dba);
 #ifdef MG_ENTERPRISE
   if (license::global_license_checker.IsEnterpriseValidFast() && username.has_value() && dba) {
-    auto auth_checker = interpreter_context->auth_checker->GetFineGrainedAuthChecker(*username, dba);
-
-    // if the user has global privileges to read, edit and write anything, we don't need to perform authorization
-    // otherwise, we do assign the auth checker to check for label access control
-    if (!auth_checker->HasGlobalPrivilegeOnVertices(AuthQuery::FineGrainedPrivilege::CREATE_DELETE) ||
-        !auth_checker->HasGlobalPrivilegeOnEdges(AuthQuery::FineGrainedPrivilege::CREATE_DELETE)) {
-      ctx_.auth_checker = std::move(auth_checker);
-    }
+    ctx_.auth_checker = interpreter_context->auth_checker->GetFineGrainedAuthChecker(*username, dba);
   }
 #endif
   if (interpreter_context->config.execution_timeout_sec > 0) {
     ctx_.timer = utils::AsyncTimer{interpreter_context->config.execution_timeout_sec};
   }
   ctx_.is_shutting_down = &interpreter_context->is_shutting_down;
-  ctx_.transaction_status = transaction_status;
   ctx_.is_profile_query = is_profile_query;
   ctx_.trigger_context_collector = trigger_context_collector;
 }
@@ -1063,30 +1037,21 @@ std::optional<plan::ProfilingStatsWithTotalTime> PullPlan::Pull(AnyStream *strea
   // single `Pull`.
   static constexpr size_t stack_size = 256UL * 1024UL;
   char stack_data[stack_size];
-
   utils::ResourceWithOutOfMemoryException resource_with_exception;
-  utils::MonotonicBufferResource monotonic_memory{&stack_data[0], stack_size, &resource_with_exception};
-  std::optional<utils::PoolResource> pool_memory;
-  static constexpr auto kMaxBlockPerChunks = 128;
-
-  if (!use_monotonic_memory_) {
-    pool_memory.emplace(kMaxBlockPerChunks, kExecutionPoolMaxBlockSize, &resource_with_exception,
-                        &resource_with_exception);
-  } else {
-    // We can throw on every query because a simple queries for deleting will use only
-    // the stack allocated buffer.
-    // Also, we want to throw only when the query engine requests more memory and not the storage
-    // so we add the exception to the allocator.
-    // TODO (mferencevic): Tune the parameters accordingly.
-    pool_memory.emplace(kMaxBlockPerChunks, 1024, &monotonic_memory, &resource_with_exception);
-  }
-
+  utils::MonotonicBufferResource monotonic_memory(&stack_data[0], stack_size, &resource_with_exception);
+  // We can throw on every query because a simple queries for deleting will use only
+  // the stack allocated buffer.
+  // Also, we want to throw only when the query engine requests more memory and not the storage
+  // so we add the exception to the allocator.
+  // TODO (mferencevic): Tune the parameters accordingly.
+  utils::PoolResource pool_memory(128, 1024, &monotonic_memory);
   std::optional<utils::LimitedMemoryResource> maybe_limited_resource;
+
   if (memory_limit_) {
-    maybe_limited_resource.emplace(&*pool_memory, *memory_limit_);
+    maybe_limited_resource.emplace(&pool_memory, *memory_limit_);
     ctx_.evaluation_context.memory = &*maybe_limited_resource;
   } else {
-    ctx_.evaluation_context.memory = &*pool_memory;
+    ctx_.evaluation_context.memory = &pool_memory;
   }
 
   // Returns true if a result was pulled.
@@ -1175,9 +1140,9 @@ PreparedQuery Interpreter::PrepareTransactionQuery(std::string_view query_upper)
       in_explicit_transaction_ = true;
       expect_rollback_ = false;
 
-      db_accessor_ = interpreter_context_->db->Access(GetIsolationLevelOverride());
+      db_accessor_ =
+          std::make_unique<storage::Storage::Accessor>(interpreter_context_->db->Access(GetIsolationLevelOverride()));
       execution_db_accessor_.emplace(db_accessor_.get());
-      transaction_status_.store(TransactionStatus::ACTIVE, std::memory_order_release);
 
       if (interpreter_context_->trigger_store.HasTriggers()) {
         trigger_context_collector_.emplace(interpreter_context_->trigger_store.GetEventTypes());
@@ -1229,7 +1194,7 @@ PreparedQuery Interpreter::PrepareTransactionQuery(std::string_view query_upper)
 PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string, TypedValue> *summary,
                                  InterpreterContext *interpreter_context, DbAccessor *dba,
                                  utils::MemoryResource *execution_memory, std::vector<Notification> *notifications,
-                                 const std::string *username, std::atomic<TransactionStatus> *transaction_status,
+                                 const std::string *username,
                                  TriggerContextCollector *trigger_context_collector = nullptr) {
   auto *cypher_query = utils::Downcast<CypherQuery>(parsed_query.query);
 
@@ -1244,19 +1209,16 @@ PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string,
   if (memory_limit) {
     spdlog::info("Running query with memory limit of {}", utils::GetReadableSize(*memory_limit));
   }
-  auto clauses = cypher_query->single_query_->clauses_;
-  bool contains_csv = false;
-  if (std::any_of(clauses.begin(), clauses.end(),
-                  [](const auto *clause) { return clause->GetTypeInfo() == LoadCsv::kType; })) {
+
+  if (const auto &clauses = cypher_query->single_query_->clauses_; std::any_of(
+          clauses.begin(), clauses.end(), [](const auto *clause) { return clause->GetTypeInfo() == LoadCsv::kType; })) {
     notifications->emplace_back(
         SeverityLevel::INFO, NotificationCode::LOAD_CSV_TIP,
         "It's important to note that the parser parses the values as strings. It's up to the user to "
         "convert the parsed row values to the appropriate type. This can be done using the built-in "
         "conversion functions such as ToInteger, ToFloat, ToBoolean etc.");
-    contains_csv = true;
   }
-  // If this is LOAD CSV query, use PoolResource without MonotonicMemoryResource as we want to reuse allocated memory
-  auto use_monotonic_memory = !contains_csv;
+
   auto plan = CypherQueryToPlan(parsed_query.stripped_query.hash(), std::move(parsed_query.ast_storage), cypher_query,
                                 parsed_query.parameters,
                                 parsed_query.is_cacheable ? &interpreter_context->plan_cache : nullptr, dba);
@@ -1277,9 +1239,9 @@ PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string,
     header.push_back(
         utils::FindOr(parsed_query.stripped_query.named_expressions(), symbol.token_position(), symbol.name()).first);
   }
-  auto pull_plan = std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context,
-                                              execution_memory, StringPointerToOptional(username), transaction_status,
-                                              trigger_context_collector, memory_limit, use_monotonic_memory);
+  auto pull_plan =
+      std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context, execution_memory,
+                                 StringPointerToOptional(username), trigger_context_collector, memory_limit);
   return PreparedQuery{std::move(header), std::move(parsed_query.required_privileges),
                        [pull_plan = std::move(pull_plan), output_symbols = std::move(output_symbols), summary](
                            AnyStream *stream, std::optional<int> n) -> std::optional<QueryHandlerResult> {
@@ -1339,8 +1301,8 @@ PreparedQuery PrepareExplainQuery(ParsedQuery parsed_query, std::map<std::string
 
 PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                   std::map<std::string, TypedValue> *summary, InterpreterContext *interpreter_context,
-                                  DbAccessor *dba, utils::MemoryResource *execution_memory, const std::string *username,
-                                  std::atomic<TransactionStatus> *transaction_status) {
+                                  DbAccessor *dba, utils::MemoryResource *execution_memory,
+                                  const std::string *username) {
   const std::string kProfileQueryStart = "profile ";
 
   MG_ASSERT(utils::StartsWith(utils::ToLowerCase(parsed_query.stripped_query.query()), kProfileQueryStart),
@@ -1377,16 +1339,6 @@ PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_tra
                  &interpreter_context->ast_cache, interpreter_context->config.query);
 
   auto *cypher_query = utils::Downcast<CypherQuery>(parsed_inner_query.query);
-
-  bool contains_csv = false;
-  auto clauses = cypher_query->single_query_->clauses_;
-  if (std::any_of(clauses.begin(), clauses.end(),
-                  [](const auto *clause) { return clause->GetTypeInfo() == LoadCsv::kType; })) {
-    contains_csv = true;
-  }
-  // If this is LOAD CSV query, use PoolResource without MonotonicMemoryResource as we want to reuse allocated memory
-  auto use_monotonic_memory = !contains_csv;
-
   MG_ASSERT(cypher_query, "Cypher grammar should not allow other queries in PROFILE");
   Frame frame(0);
   SymbolTable symbol_table;
@@ -1411,13 +1363,12 @@ PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_tra
                         // We want to execute the query we are profiling lazily, so we delay
                         // the construction of the corresponding context.
                         stats_and_total_time = std::optional<plan::ProfilingStatsWithTotalTime>{},
-                        pull_plan = std::shared_ptr<PullPlanVector>(nullptr), transaction_status, use_monotonic_memory](
+                        pull_plan = std::shared_ptr<PullPlanVector>(nullptr)](
                            AnyStream *stream, std::optional<int> n) mutable -> std::optional<QueryHandlerResult> {
                          // No output symbols are given so that nothing is streamed.
                          if (!stats_and_total_time) {
                            stats_and_total_time = PullPlan(plan, parameters, true, dba, interpreter_context,
-                                                           execution_memory, optional_username, transaction_status,
-                                                           nullptr, memory_limit, use_monotonic_memory)
+                                                           execution_memory, optional_username, nullptr, memory_limit)
                                                       .Pull(stream, {}, {}, summary);
                            pull_plan = std::make_shared<PullPlanVector>(ProfilingStatsToTable(*stats_and_total_time));
                          }
@@ -1448,139 +1399,6 @@ PreparedQuery PrepareDumpQuery(ParsedQuery parsed_query, std::map<std::string, T
                        RWType::R};
 }
 
-std::vector<std::vector<TypedValue>> AnalyzeGraphQueryHandler::AnalyzeGraphCreateStatistics(
-    const std::span<std::string> labels, DbAccessor *execution_db_accessor) {
-  using LPIndex = std::pair<storage::LabelId, storage::PropertyId>;
-
-  std::vector<std::vector<TypedValue>> results;
-  std::map<LPIndex, std::map<storage::PropertyValue, int64_t>> counter;
-
-  // Preprocess labels to avoid later checks
-  std::vector<LPIndex> indices_info = execution_db_accessor->ListAllIndices().label_property;
-  if (labels[0] != kAsterisk) {
-    for (auto it = indices_info.cbegin(); it != indices_info.cend();) {
-      if (std::find(labels.begin(), labels.end(), execution_db_accessor->LabelToName(it->first)) == labels.end()) {
-        it = indices_info.erase(it);
-      } else {
-        ++it;
-      }
-    }
-  }
-  // Iterate over all indexed vertices
-  std::for_each(indices_info.begin(), indices_info.end(), [execution_db_accessor, &counter](const LPIndex &index_info) {
-    auto vertices = execution_db_accessor->Vertices(storage::View::OLD, index_info.first, index_info.second);
-    std::for_each(vertices.begin(), vertices.end(), [&index_info, &counter](const auto *vertex) {
-      counter[index_info][*vertex->GetProperty(storage::View::OLD, index_info.second)]++;
-    });
-  });
-
-  results.reserve(counter.size());
-  std::for_each(counter.begin(), counter.end(), [&results, execution_db_accessor](const auto &counter_entry) {
-    const auto &[label_property, values_map] = counter_entry;
-    std::vector<TypedValue> result;
-    result.reserve(kDeleteStatisticsNumResults);
-    // Extract info
-    int64_t count_property_value = std::accumulate(
-        values_map.begin(), values_map.end(), 0,
-        [](int64_t prev_value, const auto &prop_value_count) { return prev_value + prop_value_count.second; });
-    // num_distinc_values will never be 0
-    double avg_group_size = static_cast<double>(count_property_value) / static_cast<double>(values_map.size());
-    double chi_squared_stat = std::accumulate(
-        values_map.begin(), values_map.end(), 0.0, [avg_group_size](double prev_result, const auto &value_entry) {
-          return prev_result + utils::ChiSquaredValue(value_entry.second, avg_group_size);
-        });
-    execution_db_accessor->SetIndexStats(
-        label_property.first, label_property.second,
-        storage::IndexStats{.statistic = chi_squared_stat, .avg_group_size = avg_group_size});
-    // Save result
-    result.emplace_back(execution_db_accessor->LabelToName(label_property.first));
-    result.emplace_back(execution_db_accessor->PropertyToName(label_property.second));
-    result.emplace_back(count_property_value);
-    result.emplace_back(static_cast<int64_t>(values_map.size()));
-    result.emplace_back(avg_group_size);
-    result.emplace_back(chi_squared_stat);
-    results.push_back(std::move(result));
-  });
-  return results;
-}
-
-std::vector<std::vector<TypedValue>> AnalyzeGraphQueryHandler::AnalyzeGraphDeleteStatistics(
-    const std::span<std::string> labels, DbAccessor *execution_db_accessor) {
-  std::vector<std::pair<storage::LabelId, storage::PropertyId>> loc_results;
-  if (labels[0] == kAsterisk) {
-    loc_results = execution_db_accessor->ClearIndexStats();
-  } else {
-    loc_results = execution_db_accessor->DeleteIndexStatsForLabels(labels);
-  }
-  std::vector<std::vector<TypedValue>> results;
-  std::transform(loc_results.begin(), loc_results.end(), std::back_inserter(results),
-                 [execution_db_accessor](const auto &label_property_index) {
-                   return std::vector<TypedValue>{
-                       TypedValue(execution_db_accessor->LabelToName(label_property_index.first)),
-                       TypedValue(execution_db_accessor->PropertyToName(label_property_index.second))};
-                 });
-  return results;
-}
-
-Callback HandleAnalyzeGraphQuery(AnalyzeGraphQuery *analyze_graph_query, DbAccessor *execution_db_accessor) {
-  Callback callback;
-  switch (analyze_graph_query->action_) {
-    case AnalyzeGraphQuery::Action::ANALYZE: {
-      callback.header = {"label",      "property",       "num estimation nodes",
-                         "num groups", "avg group size", "chi-squared value"};
-      callback.fn = [handler = AnalyzeGraphQueryHandler(), labels = analyze_graph_query->labels_,
-                     execution_db_accessor]() mutable {
-        return handler.AnalyzeGraphCreateStatistics(labels, execution_db_accessor);
-      };
-      break;
-    }
-    case AnalyzeGraphQuery::Action::DELETE: {
-      callback.header = {"label", "property"};
-      callback.fn = [handler = AnalyzeGraphQueryHandler(), labels = analyze_graph_query->labels_,
-                     execution_db_accessor]() mutable {
-        return handler.AnalyzeGraphDeleteStatistics(labels, execution_db_accessor);
-      };
-      break;
-    }
-  }
-
-  return callback;
-}
-
-PreparedQuery PrepareAnalyzeGraphQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
-                                       DbAccessor *execution_db_accessor, InterpreterContext *interpreter_context) {
-  if (in_explicit_transaction) {
-    throw AnalyzeGraphInMulticommandTxException();
-  }
-
-  // Creating an index influences computed plan costs.
-  auto invalidate_plan_cache = [plan_cache = &interpreter_context->plan_cache] {
-    auto access = plan_cache->access();
-    for (auto &kv : access) {
-      access.remove(kv.first);
-    }
-  };
-  utils::OnScopeExit cache_invalidator(invalidate_plan_cache);
-
-  auto *analyze_graph_query = utils::Downcast<AnalyzeGraphQuery>(parsed_query.query);
-  MG_ASSERT(analyze_graph_query);
-  auto callback = HandleAnalyzeGraphQuery(analyze_graph_query, execution_db_accessor);
-
-  return PreparedQuery{std::move(callback.header), std::move(parsed_query.required_privileges),
-                       [callback_fn = std::move(callback.fn), pull_plan = std::shared_ptr<PullPlanVector>{nullptr}](
-                           AnyStream *stream, std::optional<int> n) mutable -> std::optional<QueryHandlerResult> {
-                         if (UNLIKELY(!pull_plan)) {
-                           pull_plan = std::make_shared<PullPlanVector>(callback_fn());
-                         }
-
-                         if (pull_plan->Pull(stream, n)) {
-                           return QueryHandlerResult::COMMIT;
-                         }
-                         return std::nullopt;
-                       },
-                       RWType::NONE};
-}
-
 PreparedQuery PrepareIndexQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                 std::vector<Notification> *notifications, InterpreterContext *interpreter_context) {
   if (in_explicit_transaction) {
@@ -1706,8 +1524,7 @@ PreparedQuery PrepareIndexQuery(ParsedQuery parsed_query, bool in_explicit_trans
 
 PreparedQuery PrepareAuthQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                std::map<std::string, TypedValue> *summary, InterpreterContext *interpreter_context,
-                               DbAccessor *dba, utils::MemoryResource *execution_memory, const std::string *username,
-                               std::atomic<TransactionStatus> *transaction_status) {
+                               DbAccessor *dba, utils::MemoryResource *execution_memory, const std::string *username) {
   if (in_explicit_transaction) {
     throw UserModificationInMulticommandTxException();
   }
@@ -1728,7 +1545,7 @@ PreparedQuery PrepareAuthQuery(ParsedQuery parsed_query, bool in_explicit_transa
       0.0, AstStorage{}, symbol_table));
 
   auto pull_plan = std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context,
-                                              execution_memory, StringPointerToOptional(username), transaction_status);
+                                              execution_memory, StringPointerToOptional(username));
   return PreparedQuery{
       callback.header, std::move(parsed_query.required_privileges),
       [pull_plan = std::move(pull_plan), callback = std::move(callback), output_symbols = std::move(output_symbols),
@@ -1741,7 +1558,7 @@ PreparedQuery PrepareAuthQuery(ParsedQuery parsed_query, bool in_explicit_transa
       RWType::NONE};
 }
 
-PreparedQuery PrepareReplicationQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
+PreparedQuery PrepareReplicationQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                       std::vector<Notification> *notifications, InterpreterContext *interpreter_context,
                                       DbAccessor *dba) {
   if (in_explicit_transaction) {
@@ -1769,7 +1586,7 @@ PreparedQuery PrepareReplicationQuery(ParsedQuery parsed_query, bool in_explicit
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
-PreparedQuery PrepareLockPathQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
+PreparedQuery PrepareLockPathQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                    InterpreterContext *interpreter_context, DbAccessor *dba) {
   if (in_explicit_transaction) {
     throw LockPathModificationInMulticommandTxException();
@@ -1798,7 +1615,7 @@ PreparedQuery PrepareLockPathQuery(ParsedQuery parsed_query, bool in_explicit_tr
                        RWType::NONE};
 }
 
-PreparedQuery PrepareFreeMemoryQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
+PreparedQuery PrepareFreeMemoryQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                      InterpreterContext *interpreter_context) {
   if (in_explicit_transaction) {
     throw FreeMemoryModificationInMulticommandTxException();
@@ -1815,7 +1632,7 @@ PreparedQuery PrepareFreeMemoryQuery(ParsedQuery parsed_query, bool in_explicit_
       RWType::NONE};
 }
 
-PreparedQuery PrepareShowConfigQuery(ParsedQuery parsed_query, bool in_explicit_transaction) {
+PreparedQuery PrepareShowConfigQuery(ParsedQuery parsed_query, const bool in_explicit_transaction) {
   if (in_explicit_transaction) {
     throw ShowConfigModificationInMulticommandTxException();
   }
@@ -1919,7 +1736,7 @@ Callback ShowTriggers(InterpreterContext *interpreter_context) {
           }};
 }
 
-PreparedQuery PrepareTriggerQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
+PreparedQuery PrepareTriggerQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                   std::vector<Notification> *notifications, InterpreterContext *interpreter_context,
                                   DbAccessor *dba, const std::map<std::string, storage::PropertyValue> &user_parameters,
                                   const std::string *username) {
@@ -1969,7 +1786,7 @@ PreparedQuery PrepareTriggerQuery(ParsedQuery parsed_query, bool in_explicit_tra
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
-PreparedQuery PrepareStreamQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
+PreparedQuery PrepareStreamQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                  std::vector<Notification> *notifications, InterpreterContext *interpreter_context,
                                  DbAccessor *dba,
                                  const std::map<std::string, storage::PropertyValue> & /*user_parameters*/,
@@ -2011,15 +1828,6 @@ constexpr auto ToStorageIsolationLevel(const IsolationLevelQuery::IsolationLevel
   }
 }
 
-constexpr auto ToStorageMode(const StorageModeQuery::StorageMode storage_mode) noexcept {
-  switch (storage_mode) {
-    case StorageModeQuery::StorageMode::IN_MEMORY_TRANSACTIONAL:
-      return storage::StorageMode::IN_MEMORY_TRANSACTIONAL;
-    case StorageModeQuery::StorageMode::IN_MEMORY_ANALYTICAL:
-      return storage::StorageMode::IN_MEMORY_ANALYTICAL;
-  }
-}
-
 PreparedQuery PrepareIsolationLevelQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
                                          InterpreterContext *interpreter_context, Interpreter *interpreter) {
   if (in_explicit_transaction) {
@@ -2035,15 +1843,7 @@ PreparedQuery PrepareIsolationLevelQuery(ParsedQuery parsed_query, const bool in
                    interpreter]() -> std::function<void()> {
     switch (isolation_level_query->isolation_level_scope_) {
       case IsolationLevelQuery::IsolationLevelScope::GLOBAL:
-        return [interpreter_context, isolation_level] {
-          if (auto maybe_error = interpreter_context->db->SetIsolationLevel(isolation_level); maybe_error.HasError()) {
-            switch (maybe_error.GetError()) {
-              case storage::Storage::SetIsolationLevelError::DisabledForAnalyticalMode:
-                throw IsolationLevelModificationInAnalyticsException();
-                break;
-            }
-          }
-        };
+        return [interpreter_context, isolation_level] { interpreter_context->db->SetIsolationLevel(isolation_level); };
       case IsolationLevelQuery::IsolationLevelScope::SESSION:
         return [interpreter, isolation_level] { interpreter->SetSessionIsolationLevel(isolation_level); };
       case IsolationLevelQuery::IsolationLevelScope::NEXT:
@@ -2061,41 +1861,6 @@ PreparedQuery PrepareIsolationLevelQuery(ParsedQuery parsed_query, const bool in
       RWType::NONE};
 }
 
-PreparedQuery PrepareStorageModeQuery(ParsedQuery parsed_query, const bool in_explicit_transaction,
-                                      InterpreterContext *interpreter_context) {
-  if (in_explicit_transaction) {
-    throw StorageModeModificationInMulticommandTxException();
-  }
-
-  auto *storage_mode_query = utils::Downcast<StorageModeQuery>(parsed_query.query);
-  MG_ASSERT(storage_mode_query);
-  const auto storage_mode = ToStorageMode(storage_mode_query->storage_mode_);
-
-  auto exists_active_transaction = interpreter_context->interpreters.WithLock([](const auto &interpreters_) {
-    return std::any_of(interpreters_.begin(), interpreters_.end(), [](const auto &interpreter) {
-      return interpreter->transaction_status_.load() != TransactionStatus::IDLE;
-    });
-  });
-  if (exists_active_transaction) {
-    spdlog::info(
-        "Storage mode will be modified when there are no other active transactions. Check the status of the "
-        "transactions using 'SHOW TRANSACTIONS' query and ensure no other transactions are active.");
-  }
-
-  auto callback = [storage_mode, interpreter_context]() -> std::function<void()> {
-    return [interpreter_context, storage_mode] { interpreter_context->db->SetStorageMode(storage_mode); };
-  }();
-
-  return PreparedQuery{{},
-                       std::move(parsed_query.required_privileges),
-                       [callback = std::move(callback)](AnyStream * /*stream*/,
-                                                        std::optional<int> /*n*/) -> std::optional<QueryHandlerResult> {
-                         callback();
-                         return QueryHandlerResult::COMMIT;
-                       },
-                       RWType::NONE};
-}
-
 PreparedQuery PrepareCreateSnapshotQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                          InterpreterContext *interpreter_context) {
   if (in_explicit_transaction) {
@@ -2106,18 +1871,11 @@ PreparedQuery PrepareCreateSnapshotQuery(ParsedQuery parsed_query, bool in_expli
       {},
       std::move(parsed_query.required_privileges),
       [interpreter_context](AnyStream *stream, std::optional<int> n) -> std::optional<QueryHandlerResult> {
-        if (auto maybe_error = interpreter_context->db->CreateSnapshot({}); maybe_error.HasError()) {
+        if (auto maybe_error = interpreter_context->db->CreateSnapshot(); maybe_error.HasError()) {
           switch (maybe_error.GetError()) {
             case storage::Storage::CreateSnapshotError::DisabledForReplica:
               throw utils::BasicException(
                   "Failed to create a snapshot. Replica instances are not allowed to create them.");
-            case storage::Storage::CreateSnapshotError::DisabledForAnalyticsPeriodicCommit:
-              spdlog::warn(utils::MessageWithLink("Periodic snapshots are disabled for analytical mode.",
-                                                  "https://memgr.ph/replication"));
-              break;
-            case storage::Storage::CreateSnapshotError::ReachedMaxNumTries:
-              spdlog::warn("Failed to create snapshot. Reached max number of tries. Please contact support");
-              break;
           }
         }
         return QueryHandlerResult::COMMIT;
@@ -2125,7 +1883,7 @@ PreparedQuery PrepareCreateSnapshotQuery(ParsedQuery parsed_query, bool in_expli
       RWType::NONE};
 }
 
-PreparedQuery PrepareSettingQuery(ParsedQuery parsed_query, bool in_explicit_transaction, DbAccessor *dba) {
+PreparedQuery PrepareSettingQuery(ParsedQuery parsed_query, const bool in_explicit_transaction, DbAccessor *dba) {
   if (in_explicit_transaction) {
     throw SettingConfigInMulticommandTxException{};
   }
@@ -2151,155 +1909,7 @@ PreparedQuery PrepareSettingQuery(ParsedQuery parsed_query, bool in_explicit_tra
   // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
 }
 
-std::vector<std::vector<TypedValue>> TransactionQueueQueryHandler::ShowTransactions(
-    const std::unordered_set<Interpreter *> &interpreters, const std::optional<std::string> &username,
-    bool hasTransactionManagementPrivilege) {
-  std::vector<std::vector<TypedValue>> results;
-  results.reserve(interpreters.size());
-  for (Interpreter *interpreter : interpreters) {
-    TransactionStatus alive_status = TransactionStatus::ACTIVE;
-    // if it is just checking status, commit and abort should wait for the end of the check
-    // ignore interpreters that already started committing or rollback
-    if (!interpreter->transaction_status_.compare_exchange_strong(alive_status, TransactionStatus::VERIFYING)) {
-      continue;
-    }
-    utils::OnScopeExit clean_status([interpreter]() {
-      interpreter->transaction_status_.store(TransactionStatus::ACTIVE, std::memory_order_release);
-    });
-    std::optional<uint64_t> transaction_id = interpreter->GetTransactionId();
-    if (transaction_id.has_value() && (interpreter->username_ == username || hasTransactionManagementPrivilege)) {
-      const auto &typed_queries = interpreter->GetQueries();
-      results.push_back({TypedValue(interpreter->username_.value_or("")),
-                         TypedValue(std::to_string(transaction_id.value())), TypedValue(typed_queries)});
-    }
-  }
-  return results;
-}
-
-std::vector<std::vector<TypedValue>> TransactionQueueQueryHandler::KillTransactions(
-    InterpreterContext *interpreter_context, const std::vector<std::string> &maybe_kill_transaction_ids,
-    const std::optional<std::string> &username, bool hasTransactionManagementPrivilege) {
-  std::vector<std::vector<TypedValue>> results;
-  for (const std::string &transaction_id : maybe_kill_transaction_ids) {
-    bool killed = false;
-    bool transaction_found = false;
-    // Multiple simultaneous TERMINATE TRANSACTIONS aren't allowed
-    // TERMINATE and SHOW TRANSACTIONS are mutually exclusive
-    interpreter_context->interpreters.WithLock([&transaction_id, &killed, &transaction_found, username,
-                                                hasTransactionManagementPrivilege](const auto &interpreters) {
-      for (Interpreter *interpreter : interpreters) {
-        TransactionStatus alive_status = TransactionStatus::ACTIVE;
-        // if it is just checking kill, commit and abort should wait for the end of the check
-        // The only way to start checking if the transaction will get killed is if the transaction_status is
-        // active
-        if (!interpreter->transaction_status_.compare_exchange_strong(alive_status, TransactionStatus::VERIFYING)) {
-          continue;
-        }
-        utils::OnScopeExit clean_status([interpreter, &killed]() {
-          if (killed) {
-            interpreter->transaction_status_.store(TransactionStatus::TERMINATED, std::memory_order_release);
-          } else {
-            interpreter->transaction_status_.store(TransactionStatus::ACTIVE, std::memory_order_release);
-          }
-        });
-
-        std::optional<uint64_t> intr_trans = interpreter->GetTransactionId();
-        if (intr_trans.has_value() && std::to_string(intr_trans.value()) == transaction_id) {
-          transaction_found = true;
-          if (interpreter->username_ == username || hasTransactionManagementPrivilege) {
-            killed = true;
-            spdlog::warn("Transaction {} successfully killed", transaction_id);
-          } else {
-            spdlog::warn("Not enough rights to kill the transaction");
-          }
-          break;
-        }
-      }
-    });
-    if (!transaction_found) {
-      spdlog::warn("Transaction {} not found", transaction_id);
-    }
-    results.push_back({TypedValue(transaction_id), TypedValue(killed)});
-  }
-  return results;
-}
-
-Callback HandleTransactionQueueQuery(TransactionQueueQuery *transaction_query,
-                                     const std::optional<std::string> &username, const Parameters &parameters,
-                                     InterpreterContext *interpreter_context, DbAccessor *db_accessor) {
-  Frame frame(0);
-  SymbolTable symbol_table;
-  EvaluationContext evaluation_context;
-  evaluation_context.timestamp = QueryTimestamp();
-  evaluation_context.parameters = parameters;
-  ExpressionEvaluator evaluator(&frame, symbol_table, evaluation_context, db_accessor, storage::View::OLD);
-
-  bool hasTransactionManagementPrivilege = interpreter_context->auth_checker->IsUserAuthorized(
-      username, {query::AuthQuery::Privilege::TRANSACTION_MANAGEMENT});
-
-  Callback callback;
-  switch (transaction_query->action_) {
-    case TransactionQueueQuery::Action::SHOW_TRANSACTIONS: {
-      callback.header = {"username", "transaction_id", "query"};
-      callback.fn = [handler = TransactionQueueQueryHandler(), interpreter_context, username,
-                     hasTransactionManagementPrivilege]() mutable {
-        std::vector<std::vector<TypedValue>> results;
-        // Multiple simultaneous SHOW TRANSACTIONS aren't allowed
-        interpreter_context->interpreters.WithLock(
-            [&results, handler, username, hasTransactionManagementPrivilege](const auto &interpreters) {
-              results = handler.ShowTransactions(interpreters, username, hasTransactionManagementPrivilege);
-            });
-        return results;
-      };
-      break;
-    }
-    case TransactionQueueQuery::Action::TERMINATE_TRANSACTIONS: {
-      std::vector<std::string> maybe_kill_transaction_ids;
-      std::transform(transaction_query->transaction_id_list_.begin(), transaction_query->transaction_id_list_.end(),
-                     std::back_inserter(maybe_kill_transaction_ids), [&evaluator](Expression *expression) {
-                       return std::string(expression->Accept(evaluator).ValueString());
-                     });
-      callback.header = {"transaction_id", "killed"};
-      callback.fn = [handler = TransactionQueueQueryHandler(), interpreter_context, maybe_kill_transaction_ids,
-                     username, hasTransactionManagementPrivilege]() mutable {
-        return handler.KillTransactions(interpreter_context, maybe_kill_transaction_ids, username,
-                                        hasTransactionManagementPrivilege);
-      };
-      break;
-    }
-  }
-
-  return callback;
-}
-
-PreparedQuery PrepareTransactionQueueQuery(ParsedQuery parsed_query, const std::optional<std::string> &username,
-                                           bool in_explicit_transaction, InterpreterContext *interpreter_context,
-                                           DbAccessor *dba) {
-  if (in_explicit_transaction) {
-    throw TransactionQueueInMulticommandTxException();
-  }
-
-  auto *transaction_queue_query = utils::Downcast<TransactionQueueQuery>(parsed_query.query);
-  MG_ASSERT(transaction_queue_query);
-  auto callback =
-      HandleTransactionQueueQuery(transaction_queue_query, username, parsed_query.parameters, interpreter_context, dba);
-
-  return PreparedQuery{std::move(callback.header), std::move(parsed_query.required_privileges),
-                       [callback_fn = std::move(callback.fn), pull_plan = std::shared_ptr<PullPlanVector>{nullptr}](
-                           AnyStream *stream, std::optional<int> n) mutable -> std::optional<QueryHandlerResult> {
-                         if (UNLIKELY(!pull_plan)) {
-                           pull_plan = std::make_shared<PullPlanVector>(callback_fn());
-                         }
-
-                         if (pull_plan->Pull(stream, n)) {
-                           return QueryHandlerResult::COMMIT;
-                         }
-                         return std::nullopt;
-                       },
-                       RWType::NONE};
-}
-
-PreparedQuery PrepareVersionQuery(ParsedQuery parsed_query, bool in_explicit_transaction) {
+PreparedQuery PrepareVersionQuery(ParsedQuery parsed_query, const bool in_explicit_transaction) {
   if (in_explicit_transaction) {
     throw VersionInfoInMulticommandTxException();
   }
@@ -2653,13 +2263,6 @@ PreparedQuery PrepareConstraintQuery(ParsedQuery parsed_query, bool in_explicit_
                        RWType::NONE};
 }
 
-std::optional<uint64_t> Interpreter::GetTransactionId() const {
-  if (db_accessor_) {
-    return db_accessor_->GetTransactionId();
-  }
-  return {};
-}
-
 void Interpreter::BeginTransaction() {
   const auto prepared_query = PrepareTransactionQuery("BEGIN");
   prepared_query.query_handler(nullptr, {});
@@ -2669,14 +2272,12 @@ void Interpreter::CommitTransaction() {
   const auto prepared_query = PrepareTransactionQuery("COMMIT");
   prepared_query.query_handler(nullptr, {});
   query_executions_.clear();
-  transaction_queries_->clear();
 }
 
 void Interpreter::RollbackTransaction() {
   const auto prepared_query = PrepareTransactionQuery("ROLLBACK");
   prepared_query.query_handler(nullptr, {});
   query_executions_.clear();
-  transaction_queries_->clear();
 }
 
 Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
@@ -2684,13 +2285,12 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
                                                 const std::string *username) {
   if (!in_explicit_transaction_) {
     query_executions_.clear();
-    transaction_queries_->clear();
   }
 
-  // This will be done in the handle transaction query. Our handler can save username and then send it to the kill and
-  // show transactions.
-  std::optional<std::string> user = StringPointerToOptional(username);
-  username_ = user;
+  query_executions_.emplace_back(std::make_unique<QueryExecution>());
+  auto &query_execution = query_executions_.back();
+  std::optional<int> qid =
+      in_explicit_transaction_ ? static_cast<int>(query_executions_.size() - 1) : std::optional<int>{};
 
   // Handle transaction control queries.
 
@@ -2698,19 +2298,10 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
   const auto trimmed_query = utils::Trim(upper_case_query);
 
   if (trimmed_query == "BEGIN" || trimmed_query == "COMMIT" || trimmed_query == "ROLLBACK") {
-    query_executions_.emplace_back(
-        std::make_unique<QueryExecution>(utils::MonotonicBufferResource(kExecutionMemoryBlockSize)));
-    auto &query_execution = query_executions_.back();
-    std::optional<int> qid =
-        in_explicit_transaction_ ? static_cast<int>(query_executions_.size() - 1) : std::optional<int>{};
-
     query_execution->prepared_query.emplace(PrepareTransactionQuery(trimmed_query));
     return {query_execution->prepared_query->header, query_execution->prepared_query->privileges, qid};
   }
 
-  // Don't save BEGIN, COMMIT or ROLLBACK
-  transaction_queries_->push_back(query_string);
-
   // All queries other than transaction control queries advance the command in
   // an explicit transaction block.
   if (in_explicit_transaction_) {
@@ -2719,60 +2310,27 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
   // If we're not in an explicit transaction block and we have an open
   // transaction, abort it since we're about to prepare a new query.
   else if (db_accessor_) {
-    query_executions_.emplace_back(
-        std::make_unique<QueryExecution>(utils::MonotonicBufferResource(kExecutionMemoryBlockSize)));
-    AbortCommand(&query_executions_.back());
+    AbortCommand(&query_execution);
   }
-  std::unique_ptr<QueryExecution> *query_execution_ptr = nullptr;
+
   try {
-    query_executions_.emplace_back(
-        std::make_unique<QueryExecution>(utils::MonotonicBufferResource(kExecutionMemoryBlockSize)));
-    query_execution_ptr = &query_executions_.back();
-    utils::Timer parsing_timer;
-    ParsedQuery parsed_query =
-        ParseQuery(query_string, params, &interpreter_context_->ast_cache, interpreter_context_->config.query);
-    TypedValue parsing_time{parsing_timer.Elapsed().count()};
-
-    if ((utils::Downcast<CypherQuery>(parsed_query.query) || utils::Downcast<ProfileQuery>(parsed_query.query))) {
-      CypherQuery *cypher_query = nullptr;
-      if (utils::Downcast<CypherQuery>(parsed_query.query)) {
-        cypher_query = utils::Downcast<CypherQuery>(parsed_query.query);
-      } else {
-        auto *profile_query = utils::Downcast<ProfileQuery>(parsed_query.query);
-        cypher_query = profile_query->cypher_query_;
-      }
-
-      if (const auto &clauses = cypher_query->single_query_->clauses_;
-          std::any_of(clauses.begin(), clauses.end(),
-                      [](const auto *clause) { return clause->GetTypeInfo() == LoadCsv::kType; })) {
-        // Using PoolResource without MonotonicMemoryResouce for LOAD CSV reduces memory usage.
-        // QueryExecution MemoryResource is mostly used for allocations done on Frame and storing `row`s
-        query_executions_[query_executions_.size() - 1] = std::make_unique<QueryExecution>(
-            utils::PoolResource(8, kExecutionPoolMaxBlockSize, utils::NewDeleteResource(), utils::NewDeleteResource()));
-        query_execution_ptr = &query_executions_.back();
-      }
-    }
-
-    auto &query_execution = query_executions_.back();
-
-    std::optional<int> qid =
-        in_explicit_transaction_ ? static_cast<int>(query_executions_.size() - 1) : std::optional<int>{};
-
-    query_execution->summary["parsing_time"] = std::move(parsing_time);
-
     // Set a default cost estimate of 0. Individual queries can overwrite this
     // field with an improved estimate.
     query_execution->summary["cost_estimate"] = 0.0;
 
+    utils::Timer parsing_timer;
+    ParsedQuery parsed_query =
+        ParseQuery(query_string, params, &interpreter_context_->ast_cache, interpreter_context_->config.query);
+    query_execution->summary["parsing_time"] = parsing_timer.Elapsed().count();
+
     // Some queries require an active transaction in order to be prepared.
     if (!in_explicit_transaction_ &&
         (utils::Downcast<CypherQuery>(parsed_query.query) || utils::Downcast<ExplainQuery>(parsed_query.query) ||
          utils::Downcast<ProfileQuery>(parsed_query.query) || utils::Downcast<DumpQuery>(parsed_query.query) ||
-         utils::Downcast<TriggerQuery>(parsed_query.query) || utils::Downcast<AnalyzeGraphQuery>(parsed_query.query) ||
-         utils::Downcast<TransactionQueueQuery>(parsed_query.query))) {
-      db_accessor_ = interpreter_context_->db->Access(GetIsolationLevelOverride());
+         utils::Downcast<TriggerQuery>(parsed_query.query))) {
+      db_accessor_ =
+          std::make_unique<storage::Storage::Accessor>(interpreter_context_->db->Access(GetIsolationLevelOverride()));
       execution_db_accessor_.emplace(db_accessor_.get());
-      transaction_status_.store(TransactionStatus::ACTIVE, std::memory_order_release);
 
       if (utils::Downcast<CypherQuery>(parsed_query.query) && interpreter_context_->trigger_store.HasTriggers()) {
         trigger_context_collector_.emplace(interpreter_context_->trigger_store.GetEventTypes());
@@ -2781,34 +2339,29 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
 
     utils::Timer planning_timer;
     PreparedQuery prepared_query;
-    utils::MemoryResource *memory_resource =
-        std::visit([](auto &execution_memory) -> utils::MemoryResource * { return &execution_memory; },
-                   query_execution->execution_memory);
+
     if (utils::Downcast<CypherQuery>(parsed_query.query)) {
-      prepared_query =
-          PrepareCypherQuery(std::move(parsed_query), &query_execution->summary, interpreter_context_,
-                             &*execution_db_accessor_, memory_resource, &query_execution->notifications, username,
-                             &transaction_status_, trigger_context_collector_ ? &*trigger_context_collector_ : nullptr);
+      prepared_query = PrepareCypherQuery(std::move(parsed_query), &query_execution->summary, interpreter_context_,
+                                          &*execution_db_accessor_, &query_execution->execution_memory,
+                                          &query_execution->notifications, username,
+                                          trigger_context_collector_ ? &*trigger_context_collector_ : nullptr);
     } else if (utils::Downcast<ExplainQuery>(parsed_query.query)) {
       prepared_query = PrepareExplainQuery(std::move(parsed_query), &query_execution->summary, interpreter_context_,
                                            &*execution_db_accessor_, &query_execution->execution_memory_with_exception);
     } else if (utils::Downcast<ProfileQuery>(parsed_query.query)) {
-      prepared_query = PrepareProfileQuery(
-          std::move(parsed_query), in_explicit_transaction_, &query_execution->summary, interpreter_context_,
-          &*execution_db_accessor_, &query_execution->execution_memory_with_exception, username, &transaction_status_);
+      prepared_query = PrepareProfileQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
+                                           interpreter_context_, &*execution_db_accessor_,
+                                           &query_execution->execution_memory_with_exception, username);
     } else if (utils::Downcast<DumpQuery>(parsed_query.query)) {
       prepared_query = PrepareDumpQuery(std::move(parsed_query), &query_execution->summary, &*execution_db_accessor_,
-                                        memory_resource);
+                                        &query_execution->execution_memory);
     } else if (utils::Downcast<IndexQuery>(parsed_query.query)) {
       prepared_query = PrepareIndexQuery(std::move(parsed_query), in_explicit_transaction_,
                                          &query_execution->notifications, interpreter_context_);
-    } else if (utils::Downcast<AnalyzeGraphQuery>(parsed_query.query)) {
-      prepared_query = PrepareAnalyzeGraphQuery(std::move(parsed_query), in_explicit_transaction_,
-                                                &*execution_db_accessor_, interpreter_context_);
     } else if (utils::Downcast<AuthQuery>(parsed_query.query)) {
-      prepared_query = PrepareAuthQuery(
-          std::move(parsed_query), in_explicit_transaction_, &query_execution->summary, interpreter_context_,
-          &*execution_db_accessor_, &query_execution->execution_memory_with_exception, username, &transaction_status_);
+      prepared_query = PrepareAuthQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
+                                        interpreter_context_, &*execution_db_accessor_,
+                                        &query_execution->execution_memory_with_exception, username);
     } else if (utils::Downcast<InfoQuery>(parsed_query.query)) {
       prepared_query = PrepareInfoQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
                                         interpreter_context_, interpreter_context_->db,
@@ -2845,11 +2398,6 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
       prepared_query = PrepareSettingQuery(std::move(parsed_query), in_explicit_transaction_, &*execution_db_accessor_);
     } else if (utils::Downcast<VersionQuery>(parsed_query.query)) {
       prepared_query = PrepareVersionQuery(std::move(parsed_query), in_explicit_transaction_);
-    } else if (utils::Downcast<StorageModeQuery>(parsed_query.query)) {
-      prepared_query = PrepareStorageModeQuery(std::move(parsed_query), in_explicit_transaction_, interpreter_context_);
-    } else if (utils::Downcast<TransactionQueueQuery>(parsed_query.query)) {
-      prepared_query = PrepareTransactionQueueQuery(std::move(parsed_query), username_, in_explicit_transaction_,
-                                                    interpreter_context_, &*execution_db_accessor_);
     } else {
       LOG_FATAL("Should not get here -- unknown query type!");
     }
@@ -2872,34 +2420,12 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
     return {query_execution->prepared_query->header, query_execution->prepared_query->privileges, qid};
   } catch (const utils::BasicException &) {
     EventCounter::IncrementCounter(EventCounter::FailedQuery);
-    AbortCommand(query_execution_ptr);
+    AbortCommand(&query_execution);
     throw;
   }
 }
 
-std::vector<TypedValue> Interpreter::GetQueries() {
-  auto typed_queries = std::vector<TypedValue>();
-  transaction_queries_.WithLock([&typed_queries](const auto &transaction_queries) {
-    std::for_each(transaction_queries.begin(), transaction_queries.end(),
-                  [&typed_queries](const auto &query) { typed_queries.emplace_back(query); });
-  });
-  return typed_queries;
-}
-
 void Interpreter::Abort() {
-  auto expected = TransactionStatus::ACTIVE;
-  while (!transaction_status_.compare_exchange_weak(expected, TransactionStatus::STARTED_ROLLBACK)) {
-    if (expected == TransactionStatus::TERMINATED || expected == TransactionStatus::IDLE) {
-      transaction_status_.store(TransactionStatus::STARTED_ROLLBACK);
-      break;
-    }
-    expected = TransactionStatus::ACTIVE;
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-
-  utils::OnScopeExit clean_status(
-      [this]() { transaction_status_.store(TransactionStatus::IDLE, std::memory_order_release); });
-
   expect_rollback_ = false;
   in_explicit_transaction_ = false;
   if (!db_accessor_) return;
@@ -2911,20 +2437,19 @@ void Interpreter::Abort() {
 
 namespace {
 void RunTriggersIndividually(const utils::SkipList<Trigger> &triggers, InterpreterContext *interpreter_context,
-                             TriggerContext trigger_context, std::atomic<TransactionStatus> *transaction_status) {
+                             TriggerContext trigger_context) {
   // Run the triggers
   for (const auto &trigger : triggers.access()) {
     utils::MonotonicBufferResource execution_memory{kExecutionMemoryBlockSize};
 
     // create a new transaction for each trigger
     auto storage_acc = interpreter_context->db->Access();
-    DbAccessor db_accessor{storage_acc.get()};
+    DbAccessor db_accessor{&storage_acc};
 
     trigger_context.AdaptForAccessor(&db_accessor);
     try {
       trigger.Execute(&db_accessor, &execution_memory, interpreter_context->config.execution_timeout_sec,
-                      &interpreter_context->is_shutting_down, transaction_status, trigger_context,
-                      interpreter_context->auth_checker);
+                      &interpreter_context->is_shutting_down, trigger_context, interpreter_context->auth_checker);
     } catch (const utils::BasicException &exception) {
       spdlog::warn("Trigger '{}' failed with exception:\n{}", trigger.Name(), exception.what());
       db_accessor.Abort();
@@ -2979,25 +2504,6 @@ void Interpreter::Commit() {
   // a query.
   if (!db_accessor_) return;
 
-  /*
-  At this point we must check that the transaction is alive to start committing. The only other possible state is
-  verifying and in that case we must check if the transaction was terminated and if yes abort committing. Exception
-  should suffice.
-  */
-  auto expected = TransactionStatus::ACTIVE;
-  while (!transaction_status_.compare_exchange_weak(expected, TransactionStatus::STARTED_COMMITTING)) {
-    if (expected == TransactionStatus::TERMINATED) {
-      throw memgraph::utils::BasicException(
-          "Aborting transaction commit because the transaction was requested to stop from other session. ");
-    }
-    expected = TransactionStatus::ACTIVE;
-    std::this_thread::sleep_for(std::chrono::milliseconds(1));
-  }
-
-  // Clean transaction status if something went wrong
-  utils::OnScopeExit clean_status(
-      [this]() { transaction_status_.store(TransactionStatus::IDLE, std::memory_order_release); });
-
   std::optional<TriggerContext> trigger_context = std::nullopt;
   if (trigger_context_collector_) {
     trigger_context.emplace(std::move(*trigger_context_collector_).TransformToTriggerContext());
@@ -3011,8 +2517,7 @@ void Interpreter::Commit() {
       AdvanceCommand();
       try {
         trigger.Execute(&*execution_db_accessor_, &execution_memory, interpreter_context_->config.execution_timeout_sec,
-                        &interpreter_context_->is_shutting_down, &transaction_status_, *trigger_context,
-                        interpreter_context_->auth_checker);
+                        &interpreter_context_->is_shutting_down, *trigger_context, interpreter_context_->auth_checker);
       } catch (const utils::BasicException &e) {
         throw utils::BasicException(
             fmt::format("Trigger '{}' caused the transaction to fail.\nException: {}", trigger.Name(), e.what()));
@@ -3074,10 +2579,10 @@ void Interpreter::Commit() {
   // This means the ordered execution of after commit triggers are not guaranteed.
   if (trigger_context && interpreter_context_->trigger_store.AfterCommitTriggers().size() > 0) {
     interpreter_context_->after_commit_trigger_pool.AddTask(
-        [this, trigger_context = std::move(*trigger_context),
+        [trigger_context = std::move(*trigger_context), interpreter_context = this->interpreter_context_,
          user_transaction = std::shared_ptr(std::move(db_accessor_))]() mutable {
-          RunTriggersIndividually(this->interpreter_context_->trigger_store.AfterCommitTriggers(),
-                                  this->interpreter_context_, std::move(trigger_context), &this->transaction_status_);
+          RunTriggersIndividually(interpreter_context->trigger_store.AfterCommitTriggers(), interpreter_context,
+                                  std::move(trigger_context));
           user_transaction->FinalizeTransaction();
           SPDLOG_DEBUG("Finished executing after commit triggers");  // NOLINT(bugprone-lambda-function-name)
         });

src/query/interpreter.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include <unordered_set>
-
 #include <gflags/gflags.h>
 
 #include "query/auth_checker.hpp"
@@ -39,7 +37,6 @@
 #include "utils/settings.hpp"
 #include "utils/skip_list.hpp"
 #include "utils/spin_lock.hpp"
-#include "utils/synchronized.hpp"
 #include "utils/thread_pool.hpp"
 #include "utils/timer.hpp"
 #include "utils/tsc.hpp"
@@ -51,7 +48,6 @@ extern const Event FailedQuery;
 namespace memgraph::query {
 
 inline constexpr size_t kExecutionMemoryBlockSize = 1UL * 1024UL * 1024UL;
-inline constexpr size_t kExecutionPoolMaxBlockSize = 2048UL;  // 2 ^ 11
 
 class AuthQueryHandler {
  public:
@@ -173,24 +169,6 @@ class ReplicationQueryHandler {
   virtual std::vector<Replica> ShowReplicas() const = 0;
 };
 
-class AnalyzeGraphQueryHandler {
- public:
-  AnalyzeGraphQueryHandler() = default;
-  virtual ~AnalyzeGraphQueryHandler() = default;
-
-  AnalyzeGraphQueryHandler(const AnalyzeGraphQueryHandler &) = default;
-  AnalyzeGraphQueryHandler &operator=(const AnalyzeGraphQueryHandler &) = default;
-
-  AnalyzeGraphQueryHandler(AnalyzeGraphQueryHandler &&) = default;
-  AnalyzeGraphQueryHandler &operator=(AnalyzeGraphQueryHandler &&) = default;
-
-  static std::vector<std::vector<TypedValue>> AnalyzeGraphCreateStatistics(const std::span<std::string> labels,
-                                                                           DbAccessor *execution_db_accessor);
-
-  static std::vector<std::vector<TypedValue>> AnalyzeGraphDeleteStatistics(const std::span<std::string> labels,
-                                                                           DbAccessor *execution_db_accessor);
-};
-
 /**
  * A container for data related to the preparation of a query.
  */
@@ -201,12 +179,12 @@ struct PreparedQuery {
   plan::ReadWriteTypeChecker::RWType rw_type;
 };
 
-class Interpreter;
-
 /**
  * Holds data shared between multiple `Interpreter` instances (which might be
  * running concurrently).
  *
+ * Users should initialize the context but should not modify it after it has
+ * been passed to an `Interpreter` instance.
  */
 struct InterpreterContext {
   explicit InterpreterContext(storage::Storage *db, InterpreterConfig config,
@@ -236,7 +214,6 @@ struct InterpreterContext {
   const InterpreterConfig config;
 
   query::stream::Streams streams;
-  utils::Synchronized<std::unordered_set<Interpreter *>, utils::SpinLock> interpreters;
 };
 
 /// Function that is used to tell all active interpreters that they should stop
@@ -258,10 +235,6 @@ class Interpreter final {
     std::optional<int> qid;
   };
 
-  std::optional<std::string> username_;
-  bool in_explicit_transaction_{false};
-  bool expect_rollback_{false};
-
   /**
    * Prepare a query for execution.
    *
@@ -317,11 +290,6 @@ class Interpreter final {
 
   void BeginTransaction();
 
-  /*
-  Returns transaction id or empty if the db_accessor is not initialized.
-  */
-  std::optional<uint64_t> GetTransactionId() const;
-
   void CommitTransaction();
 
   void RollbackTransaction();
@@ -329,41 +297,21 @@ class Interpreter final {
   void SetNextTransactionIsolationLevel(storage::IsolationLevel isolation_level);
   void SetSessionIsolationLevel(storage::IsolationLevel isolation_level);
 
-  std::vector<TypedValue> GetQueries();
-
   /**
    * Abort the current multicommand transaction.
    */
   void Abort();
 
-  std::atomic<TransactionStatus> transaction_status_{TransactionStatus::IDLE};
-
  private:
   struct QueryExecution {
     std::optional<PreparedQuery> prepared_query;
-    std::variant<utils::MonotonicBufferResource, utils::PoolResource> execution_memory;
-    utils::ResourceWithOutOfMemoryException execution_memory_with_exception;
+    utils::MonotonicBufferResource execution_memory{kExecutionMemoryBlockSize};
+    utils::ResourceWithOutOfMemoryException execution_memory_with_exception{&execution_memory};
 
     std::map<std::string, TypedValue> summary;
     std::vector<Notification> notifications;
 
-    explicit QueryExecution(utils::MonotonicBufferResource monotonic_memory)
-        : execution_memory(std::move(monotonic_memory)) {
-      std::visit(
-          [&](auto &memory_resource) {
-            execution_memory_with_exception = utils::ResourceWithOutOfMemoryException(&memory_resource);
-          },
-          execution_memory);
-    };
-
-    explicit QueryExecution(utils::PoolResource pool_resource) : execution_memory(std::move(pool_resource)) {
-      std::visit(
-          [&](auto &memory_resource) {
-            execution_memory_with_exception = utils::ResourceWithOutOfMemoryException(&memory_resource);
-          },
-          execution_memory);
-    };
-
+    explicit QueryExecution() = default;
     QueryExecution(const QueryExecution &) = delete;
     QueryExecution(QueryExecution &&) = default;
     QueryExecution &operator=(const QueryExecution &) = delete;
@@ -374,7 +322,7 @@ class Interpreter final {
       // destroy the prepared query which is using that instance
       // of execution memory.
       prepared_query.reset();
-      std::visit([](auto &memory_resource) { memory_resource.Release(); }, execution_memory);
+      execution_memory.Release();
     }
   };
 
@@ -390,8 +338,6 @@ class Interpreter final {
   // and deletion of a single query execution, i.e. when a query finishes,
   // we reset the corresponding unique_ptr.
   std::vector<std::unique_ptr<QueryExecution>> query_executions_;
-  // all queries that are run as part of the current transaction
-  utils::Synchronized<std::vector<std::string>, utils::SpinLock> transaction_queries_;
 
   InterpreterContext *interpreter_context_;
 
@@ -401,6 +347,8 @@ class Interpreter final {
   std::unique_ptr<storage::Storage::Accessor> db_accessor_;
   std::optional<DbAccessor> execution_db_accessor_;
   std::optional<TriggerContextCollector> trigger_context_collector_;
+  bool in_explicit_transaction_{false};
+  bool expect_rollback_{false};
 
   std::optional<storage::IsolationLevel> interpreter_isolation_level;
   std::optional<storage::IsolationLevel> next_transaction_isolation_level;
@@ -417,32 +365,12 @@ class Interpreter final {
   }
 };
 
-class TransactionQueueQueryHandler {
- public:
-  TransactionQueueQueryHandler() = default;
-  virtual ~TransactionQueueQueryHandler() = default;
-
-  TransactionQueueQueryHandler(const TransactionQueueQueryHandler &) = default;
-  TransactionQueueQueryHandler &operator=(const TransactionQueueQueryHandler &) = default;
-
-  TransactionQueueQueryHandler(TransactionQueueQueryHandler &&) = default;
-  TransactionQueueQueryHandler &operator=(TransactionQueueQueryHandler &&) = default;
-
-  static std::vector<std::vector<TypedValue>> ShowTransactions(const std::unordered_set<Interpreter *> &interpreters,
-                                                               const std::optional<std::string> &username,
-                                                               bool hasTransactionManagementPrivilege);
-
-  static std::vector<std::vector<TypedValue>> KillTransactions(
-      InterpreterContext *interpreter_context, const std::vector<std::string> &maybe_kill_transaction_ids,
-      const std::optional<std::string> &username, bool hasTransactionManagementPrivilege);
-};
-
 template <typename TStream>
 std::map<std::string, TypedValue> Interpreter::Pull(TStream *result_stream, std::optional<int> n,
                                                     std::optional<int> qid) {
   MG_ASSERT(in_explicit_transaction_ || !qid, "qid can be only used in explicit transaction!");
-
   const int qid_value = qid ? *qid : static_cast<int>(query_executions_.size() - 1);
+
   if (qid_value < 0 || qid_value >= query_executions_.size()) {
     throw InvalidArgumentsException("qid", "Query with specified ID does not exist!");
   }
@@ -462,9 +390,7 @@ std::map<std::string, TypedValue> Interpreter::Pull(TStream *result_stream, std:
   try {
     // Wrap the (statically polymorphic) stream type into a common type which
     // the handler knows.
-    AnyStream stream{result_stream,
-                     std::visit([](auto &execution_memory) -> utils::MemoryResource * { return &execution_memory; },
-                                query_execution->execution_memory)};
+    AnyStream stream{result_stream, &query_execution->execution_memory};
     const auto maybe_res = query_execution->prepared_query->query_handler(&stream, n);
     // Stream is using execution memory of the query_execution which
     // can be deleted after its execution so the stream should be cleared
@@ -504,7 +430,6 @@ std::map<std::string, TypedValue> Interpreter::Pull(TStream *result_stream, std:
         // methods as we will delete summary contained in them which we need
         // after our query finished executing.
         query_executions_.clear();
-        transaction_queries_->clear();
       } else {
         // We can only clear this execution as some of the queries
         // in the transaction can be in unfinished state

src/query/plan/cost_estimator.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -62,8 +62,6 @@ class CostEstimator : public HierarchicalLogicalOperatorVisitor {
     static constexpr double kEdgeUniquenessFilter{1.5};
     static constexpr double kUnwind{1.3};
     static constexpr double kForeach{1.0};
-    static constexpr double kUnion{1.0};
-    static constexpr double kSubquery{1.0};
   };
 
   struct CardParam {
@@ -214,31 +212,6 @@ class CostEstimator : public HierarchicalLogicalOperatorVisitor {
     return true;
   }
 
-  bool PreVisit(Union &op) override {
-    double left_cost = EstimateCostOnBranch(&op.left_op_);
-    double right_cost = EstimateCostOnBranch(&op.right_op_);
-
-    // the number of hits in the previous operator should be the joined number of results of both parts of the union
-    cardinality_ *= (left_cost + right_cost);
-    IncrementCost(CostParam::kUnion);
-
-    return false;
-  }
-
-  bool PreVisit(Apply &op) override {
-    double input_cost = EstimateCostOnBranch(&op.input_);
-    double subquery_cost = EstimateCostOnBranch(&op.subquery_);
-
-    // if the query is a unit subquery, we don't want the cost to be zero but 1xN
-    input_cost = input_cost == 0 ? 1 : input_cost;
-    subquery_cost = subquery_cost == 0 ? 1 : subquery_cost;
-
-    cardinality_ *= input_cost * subquery_cost;
-    IncrementCost(CostParam::kSubquery);
-
-    return false;
-  }
-
   bool Visit(Once &) override { return true; }
 
   auto cost() const { return cost_; }
@@ -259,12 +232,6 @@ class CostEstimator : public HierarchicalLogicalOperatorVisitor {
 
   void IncrementCost(double param) { cost_ += param * cardinality_; }
 
-  double EstimateCostOnBranch(std::shared_ptr<LogicalOperator> *branch) {
-    CostEstimator<TDbAccessor> cost_estimator(db_accessor_, parameters);
-    (*branch)->Accept(cost_estimator);
-    return cost_estimator.cost();
-  }
-
   // converts an optional ScanAll range bound into a property value
   // if the bound is present and is a constant expression convertible to
   // a property value. otherwise returns nullopt

src/query/plan/operator.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -25,7 +25,6 @@
 
 #include <cppitertools/chain.hpp>
 #include <cppitertools/imap.hpp>
-#include "query/common.hpp"
 #include "spdlog/spdlog.h"
 
 #include "license/license.hpp"
@@ -42,7 +41,6 @@
 #include "query/procedure/cypher_types.hpp"
 #include "query/procedure/mg_procedure_impl.hpp"
 #include "query/procedure/module.hpp"
-#include "query/typed_value.hpp"
 #include "storage/v2/property_value.hpp"
 #include "storage/v2/view.hpp"
 #include "utils/algorithm.hpp"
@@ -53,8 +51,6 @@
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 #include "utils/memory.hpp"
-#include "utils/message.hpp"
-#include "utils/pmr/deque.hpp"
 #include "utils/pmr/list.hpp"
 #include "utils/pmr/unordered_map.hpp"
 #include "utils/pmr/unordered_set.hpp"
@@ -117,9 +113,6 @@ extern const Event UnionOperator;
 extern const Event CartesianOperator;
 extern const Event CallProcedureOperator;
 extern const Event ForeachOperator;
-extern const Event EmptyResultOperator;
-extern const Event EvaluatePatternFilterOperator;
-extern const Event ApplyOperator;
 }  // namespace EventCounter
 
 namespace memgraph::query::plan {
@@ -213,18 +206,17 @@ VertexAccessor &CreateLocalVertex(const NodeCreationInfo &node_info, Frame *fram
                                 storage::View::NEW);
   // TODO: PropsSetChecked allocates a PropertyValue, make it use context.memory
   // when we update PropertyValue with custom allocator.
-  std::map<storage::PropertyId, storage::PropertyValue> properties;
   if (const auto *node_info_properties = std::get_if<PropertiesMapList>(&node_info.properties)) {
     for (const auto &[key, value_expression] : *node_info_properties) {
-      properties.emplace(key, value_expression->Accept(evaluator));
+      PropsSetChecked(&new_node, key, value_expression->Accept(evaluator));
     }
   } else {
     auto property_map = evaluator.Visit(*std::get<ParameterLookup *>(node_info.properties));
     for (const auto &[key, value] : property_map.ValueMap()) {
-      properties.emplace(dba.NameToProperty(key), value);
+      auto property_id = dba.NameToProperty(key);
+      PropsSetChecked(&new_node, property_id, value);
     }
   }
-  MultiPropsInitChecked(&new_node, properties);
 
   (*frame)[node_info.symbol] = new_node;
   return (*frame)[node_info.symbol].ValueVertex();
@@ -305,18 +297,17 @@ EdgeAccessor CreateEdge(const EdgeCreationInfo &edge_info, DbAccessor *dba, Vert
   auto maybe_edge = dba->InsertEdge(from, to, edge_info.edge_type);
   if (maybe_edge.HasValue()) {
     auto &edge = *maybe_edge;
-    std::map<storage::PropertyId, storage::PropertyValue> properties;
-    if (const auto *edge_info_properties = std::get_if<PropertiesMapList>(&edge_info.properties)) {
-      for (const auto &[key, value_expression] : *edge_info_properties) {
-        properties.emplace(key, value_expression->Accept(*evaluator));
+    if (const auto *properties = std::get_if<PropertiesMapList>(&edge_info.properties)) {
+      for (const auto &[key, value_expression] : *properties) {
+        PropsSetChecked(&edge, key, value_expression->Accept(*evaluator));
       }
     } else {
       auto property_map = evaluator->Visit(*std::get<ParameterLookup *>(edge_info.properties));
       for (const auto &[key, value] : property_map.ValueMap()) {
-        properties.emplace(dba->NameToProperty(key), value);
+        auto property_id = dba->NameToProperty(key);
+        PropsSetChecked(&edge, property_id, value);
       }
     }
-    if (!properties.empty()) MultiPropsInitChecked(&edge, properties);
 
     (*frame)[edge_info.symbol] = edge;
   } else {
@@ -417,11 +408,10 @@ VertexAccessor &CreateExpand::CreateExpandCursor::OtherVertex(Frame &frame, Exec
 template <class TVerticesFun>
 class ScanAllCursor : public Cursor {
  public:
-  explicit ScanAllCursor(Symbol output_symbol, UniqueCursorPtr input_cursor, storage::View view,
-                         TVerticesFun get_vertices, const char *op_name)
+  explicit ScanAllCursor(Symbol output_symbol, UniqueCursorPtr input_cursor, TVerticesFun get_vertices,
+                         const char *op_name)
       : output_symbol_(output_symbol),
         input_cursor_(std::move(input_cursor)),
-        view_(view),
         get_vertices_(std::move(get_vertices)),
         op_name_(op_name) {}
 
@@ -440,7 +430,7 @@ class ScanAllCursor : public Cursor {
       // the roundabout assignment + emplace, instead of simple:
       // vertices _ = get_vertices_(frame, context);
       vertices_.emplace(std::move(next_vertices.value()));
-      vertices_it_ = vertices_.value().begin();
+      vertices_it_.emplace(vertices_.value().begin());
     }
 #ifdef MG_ENTERPRISE
     if (license::global_license_checker.IsEnterpriseValidFast() && context.auth_checker && !FindNextVertex(context)) {
@@ -456,7 +446,7 @@ class ScanAllCursor : public Cursor {
 #ifdef MG_ENTERPRISE
   bool FindNextVertex(const ExecutionContext &context) {
     while (vertices_it_.value() != vertices_.value().end()) {
-      if (context.auth_checker->Has(*vertices_it_.value(), view_,
+      if (context.auth_checker->Has(*vertices_it_.value(), memgraph::storage::View::OLD,
                                     memgraph::query::AuthQuery::FineGrainedPrivilege::READ)) {
         return true;
       }
@@ -477,7 +467,6 @@ class ScanAllCursor : public Cursor {
  private:
   const Symbol output_symbol_;
   const UniqueCursorPtr input_cursor_;
-  storage::View view_;
   TVerticesFun get_vertices_;
   std::optional<typename std::result_of<TVerticesFun(Frame &, ExecutionContext &)>::type::value_type> vertices_;
   std::optional<decltype(vertices_.value().begin())> vertices_it_;
@@ -496,7 +485,7 @@ UniqueCursorPtr ScanAll::MakeCursor(utils::MemoryResource *mem) const {
     auto *db = context.db_accessor;
     return std::make_optional(db->Vertices(view_));
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAll");
 }
 
@@ -519,7 +508,7 @@ UniqueCursorPtr ScanAllByLabel::MakeCursor(utils::MemoryResource *mem) const {
     auto *db = context.db_accessor;
     return std::make_optional(db->Vertices(view_, label_));
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAllByLabel");
 }
 
@@ -584,7 +573,7 @@ UniqueCursorPtr ScanAllByLabelPropertyRange::MakeCursor(utils::MemoryResource *m
     if (maybe_upper && maybe_upper->value().IsNull()) return std::nullopt;
     return std::make_optional(db->Vertices(view_, label_, property_, maybe_lower, maybe_upper));
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAllByLabelPropertyRange");
 }
 
@@ -616,7 +605,7 @@ UniqueCursorPtr ScanAllByLabelPropertyValue::MakeCursor(utils::MemoryResource *m
     }
     return std::make_optional(db->Vertices(view_, label_, property_, storage::PropertyValue(value)));
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAllByLabelPropertyValue");
 }
 
@@ -634,7 +623,7 @@ UniqueCursorPtr ScanAllByLabelProperty::MakeCursor(utils::MemoryResource *mem) c
     auto *db = context.db_accessor;
     return std::make_optional(db->Vertices(view_, label_, property_));
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAllByLabelProperty");
 }
 
@@ -660,7 +649,7 @@ UniqueCursorPtr ScanAllById::MakeCursor(utils::MemoryResource *mem) const {
     if (!maybe_vertex) return std::nullopt;
     return std::vector<VertexAccessor>{*maybe_vertex};
   };
-  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem), view_,
+  return MakeUniqueCursorPtr<ScanAllCursor<decltype(vertices)>>(mem, output_symbol_, input_->MakeCursor(mem),
                                                                 std::move(vertices), "ScanAllById");
 }
 
@@ -1837,7 +1826,7 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
       : self_(self),
         input_cursor_(self_.input_->MakeCursor(mem)),
         visited_cost_(mem),
-        total_cost_(mem),
+        expanded_(mem),
         next_edges_(mem),
         traversal_stack_(mem),
         pq_(mem) {}
@@ -1847,9 +1836,6 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
 
     ExpressionEvaluator evaluator(&frame, context.symbol_table, context.evaluation_context, context.db_accessor,
                                   storage::View::OLD);
-    auto create_state = [this](const VertexAccessor &vertex, int64_t depth) {
-      return std::make_pair(vertex, upper_bound_set_ ? depth : 0);
-    };
 
     // For the given (edge, direction, weight, depth) tuple checks if they
     // satisfy the "where" condition. if so, places them in the priority
@@ -1941,118 +1927,73 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
       }
     };
 
-    std::optional<VertexAccessor> start_vertex;
-    auto *memory = context.evaluation_context.memory;
-
-    auto create_path = [this, &frame, &memory]() {
-      auto &current_level = traversal_stack_.back();
-      auto &edges_on_frame = frame[self_.common_.edge_symbol].ValueList();
-
-      // Clean out the current stack
-      if (current_level.empty()) {
-        if (!edges_on_frame.empty()) {
-          if (!self_.is_reverse_)
-            edges_on_frame.erase(edges_on_frame.end());
-          else
-            edges_on_frame.erase(edges_on_frame.begin());
-        }
-        traversal_stack_.pop_back();
-        return false;
-      }
-
-      auto [current_edge, current_edge_direction, current_weight] = current_level.back();
-      current_level.pop_back();
-
-      // Edges order depends on direction of expansion
-      if (!self_.is_reverse_)
-        edges_on_frame.emplace_back(current_edge);
-      else
-        edges_on_frame.emplace(edges_on_frame.begin(), current_edge);
-
-      auto next_vertex = current_edge_direction == EdgeAtom::Direction::IN ? current_edge.From() : current_edge.To();
-      frame[self_.total_weight_.value()] = current_weight;
-
-      if (next_edges_.find({next_vertex, traversal_stack_.size()}) != next_edges_.end()) {
-        auto next_vertex_edges = next_edges_[{next_vertex, traversal_stack_.size()}];
-        traversal_stack_.emplace_back(std::move(next_vertex_edges));
-      } else {
-        // Signal the end of iteration
-        utils::pmr::list<DirectedEdge> empty(memory);
-        traversal_stack_.emplace_back(std::move(empty));
-      }
-
-      if ((current_weight > visited_cost_.at(next_vertex)).ValueBool()) return false;
-
-      // Place destination node on the frame, handle existence flag
-      if (self_.common_.existing_node) {
-        const auto &node = frame[self_.common_.node_symbol];
-        ExpectType(self_.common_.node_symbol, node, TypedValue::Type::Vertex);
-        if (node.ValueVertex() != next_vertex) return false;
-      } else {
-        frame[self_.common_.node_symbol] = next_vertex;
-      }
-      return true;
-    };
-
-    auto create_DFS_traversal_tree = [this, &context, &memory, &create_state, &expand_from_vertex]() {
-      while (!pq_.empty()) {
-        if (MustAbort(context)) throw HintedAbortError();
-
-        const auto [current_weight, current_depth, current_vertex, directed_edge] = pq_.top();
-        pq_.pop();
-
-        const auto &[current_edge, direction, weight] = directed_edge;
-        auto current_state = create_state(current_vertex, current_depth);
-
-        auto position = total_cost_.find(current_state);
-        if (position != total_cost_.end()) {
-          if ((position->second < current_weight).ValueBool()) continue;
-        } else {
-          total_cost_.emplace(current_state, current_weight);
-          if (current_depth < upper_bound_) {
-            expand_from_vertex(current_vertex, current_weight, current_depth);
-          }
-        }
-
-        // Searching for a previous vertex in the expansion
-        auto prev_vertex = direction == EdgeAtom::Direction::IN ? current_edge.To() : current_edge.From();
-
-        // Update the parent
-        if (next_edges_.find({prev_vertex, current_depth - 1}) == next_edges_.end()) {
-          utils::pmr::list<DirectedEdge> empty(memory);
-          next_edges_[{prev_vertex, current_depth - 1}] = std::move(empty);
-        }
-        next_edges_.at({prev_vertex, current_depth - 1}).emplace_back(directed_edge);
-      }
-    };
-
-    // upper_bound_set is used when storing visited edges, because with an upper bound we also consider suboptimal paths
-    // if they are shorter in depth
-    if (self_.upper_bound_) {
-      upper_bound_ = EvaluateInt(&evaluator, self_.upper_bound_, "Max depth in all shortest path expansion");
-      upper_bound_set_ = true;
-    } else {
-      upper_bound_ = std::numeric_limits<int64_t>::max();
-      upper_bound_set_ = false;
-    }
+    // Check if upper bound exists
+    upper_bound_ = self_.upper_bound_
+                       ? EvaluateInt(&evaluator, self_.upper_bound_, "Max depth in all shortest paths expansion")
+                       : std::numeric_limits<int64_t>::max();
 
     // Check if upper bound is valid
     if (upper_bound_ < 1) {
       throw QueryRuntimeException("Maximum depth in all shortest paths expansion must be at least 1.");
     }
 
-    // On first Pull run, traversal stack and priority queue are empty, so we start a pulling stream
-    // and create a DFS traversal tree (main part of algorithm). Then we return the first path
-    // created from the DFS traversal tree (basically a DFS algorithm).
-    // On each subsequent Pull run, paths are created from the traversal stack and returned.
+    std::optional<VertexAccessor> start_vertex;
+    auto *memory = context.evaluation_context.memory;
+
     while (true) {
       // Check if there is an external error.
       if (MustAbort(context)) throw HintedAbortError();
 
-      // The algorithm is run all at once by create_DFS_traversal_tree, after which we
-      // traverse the tree iteratively by preserving the traversal state on stack.
+      // If traversal stack if filled, the DFS traversal tree is created. Traverse the tree iteratively by
+      // preserving the traversal state on stack.
       while (!traversal_stack_.empty()) {
-        if (create_path()) return true;
+        auto &current_level = traversal_stack_.back();
+        auto &edges_on_frame = frame[self_.common_.edge_symbol].ValueList();
+
+        // Clean out the current stack
+        if (current_level.empty()) {
+          if (!edges_on_frame.empty()) {
+            if (!self_.is_reverse_)
+              edges_on_frame.erase(edges_on_frame.end());
+            else
+              edges_on_frame.erase(edges_on_frame.begin());
+          }
+          traversal_stack_.pop_back();
+          continue;
+        }
+
+        auto [current_edge, current_edge_direction, current_weight] = current_level.back();
+        current_level.pop_back();
+
+        // Edges order depends on direction of expansion
+        if (!self_.is_reverse_)
+          edges_on_frame.emplace_back(current_edge);
+        else
+          edges_on_frame.emplace(edges_on_frame.begin(), current_edge);
+
+        auto next_vertex = current_edge_direction == EdgeAtom::Direction::IN ? current_edge.From() : current_edge.To();
+        frame[self_.total_weight_.value()] = current_weight;
+
+        if (next_edges_.find({next_vertex, traversal_stack_.size()}) != next_edges_.end()) {
+          auto next_vertex_edges = next_edges_[{next_vertex, traversal_stack_.size()}];
+          traversal_stack_.emplace_back(std::move(next_vertex_edges));
+        } else {
+          // Signal the end of iteration
+          utils::pmr::list<DirectedEdge> empty(memory);
+          traversal_stack_.emplace_back(std::move(empty));
+        }
+
+        if ((current_weight > visited_cost_.at(next_vertex)).ValueBool()) continue;
+
+        // Place destination node on the frame, handle existence flag
+        if (self_.common_.existing_node) {
+          const auto &node = frame[self_.common_.node_symbol];
+          ExpectType(self_.common_.node_symbol, node, TypedValue::Type::Vertex);
+          if (node.ValueVertex() != next_vertex) continue;
+        } else {
+          frame[self_.common_.node_symbol] = next_vertex;
+        }
+        return true;
       }
 
       // If priority queue is empty start new pulling stream.
@@ -2073,19 +2014,48 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
 
         // Clear existing data structures.
         visited_cost_.clear();
+        expanded_.clear();
         next_edges_.clear();
         traversal_stack_.clear();
-        total_cost_.clear();
 
-        expand_from_vertex(*start_vertex, TypedValue(), 0);
+        pq_.push({TypedValue(), 0, *start_vertex, std::nullopt});
         visited_cost_.emplace(*start_vertex, 0);
         frame[self_.common_.edge_symbol] = TypedValue::TVector(memory);
       }
 
       // Create a DFS traversal tree from the start node
-      create_DFS_traversal_tree();
+      while (!pq_.empty()) {
+        if (MustAbort(context)) throw HintedAbortError();
+
+        auto [current_weight, current_depth, current_vertex, maybe_directed_edge] = pq_.top();
+        pq_.pop();
+
+        // Expand only if what we've just expanded is less than max depth.
+        if (current_depth < upper_bound_) {
+          if (maybe_directed_edge) {
+            auto &[current_edge, direction, weight] = *maybe_directed_edge;
+            if (expanded_.find(current_edge) != expanded_.end()) continue;
+            expanded_.emplace(current_edge);
+          }
+          expand_from_vertex(current_vertex, current_weight, current_depth);
+        }
+
+        // if current vertex is not starting vertex, maybe_directed_edge will not be nullopt
+        if (maybe_directed_edge) {
+          auto &[current_edge, direction, weight] = *maybe_directed_edge;
+          // Searching for a previous vertex in the expansion
+          auto prev_vertex = direction == EdgeAtom::Direction::IN ? current_edge.To() : current_edge.From();
+
+          // Update the parent
+          if (next_edges_.find({prev_vertex, current_depth - 1}) == next_edges_.end()) {
+            utils::pmr::list<DirectedEdge> empty(memory);
+            next_edges_[{prev_vertex, current_depth - 1}] = std::move(empty);
+          }
+
+          next_edges_.at({prev_vertex, current_depth - 1}).emplace_back(*maybe_directed_edge);
+        }
+      }
 
-      // DFS traversal tree is create,
       if (start_vertex && next_edges_.find({*start_vertex, 0}) != next_edges_.end()) {
         auto start_vertex_edges = next_edges_[{*start_vertex, 0}];
         traversal_stack_.emplace_back(std::move(start_vertex_edges));
@@ -2098,9 +2068,9 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
   void Reset() override {
     input_cursor_->Reset();
     visited_cost_.clear();
+    expanded_.clear();
     next_edges_.clear();
     traversal_stack_.clear();
-    total_cost_.clear();
     ClearQueue();
   }
 
@@ -2110,7 +2080,6 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
 
   // Upper bound on the path length.
   int64_t upper_bound_{-1};
-  bool upper_bound_set_{false};
 
   struct AspStateHash {
     size_t operator()(const std::pair<VertexAccessor, int64_t> &key) const {
@@ -2122,8 +2091,8 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
   using NextEdgesState = std::pair<VertexAccessor, int64_t>;
   // Maps vertices to minimum weights they got in expansion.
   utils::pmr::unordered_map<VertexAccessor, TypedValue> visited_cost_;
-  // Maps vertices to weights they got in expansion.
-  utils::pmr::unordered_map<NextEdgesState, TypedValue, AspStateHash> total_cost_;
+  // Marking the expanded edges to prevent multiple visits.
+  utils::pmr::unordered_set<EdgeAccessor> expanded_;
   // Maps the vertex with the potential expansion edge.
   utils::pmr::unordered_map<NextEdgesState, utils::pmr::list<DirectedEdge>, AspStateHash> next_edges_;
   // Stack indicating the traversal level.
@@ -2141,8 +2110,8 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
   // Priority queue comparator. Keep lowest weight on top of the queue.
   class PriorityQueueComparator {
    public:
-    bool operator()(const std::tuple<TypedValue, int64_t, VertexAccessor, DirectedEdge> &lhs,
-                    const std::tuple<TypedValue, int64_t, VertexAccessor, DirectedEdge> &rhs) {
+    bool operator()(const std::tuple<TypedValue, int64_t, VertexAccessor, std::optional<DirectedEdge>> &lhs,
+                    const std::tuple<TypedValue, int64_t, VertexAccessor, std::optional<DirectedEdge>> &rhs) {
       const auto &lhs_weight = std::get<0>(lhs);
       const auto &rhs_weight = std::get<0>(rhs);
       // Null defines minimum value for all types
@@ -2161,8 +2130,8 @@ class ExpandAllShortestPathsCursor : public query::plan::Cursor {
 
   // Priority queue - core element of the algorithm.
   // Stores: {weight, depth, next vertex, edge and direction}
-  std::priority_queue<std::tuple<TypedValue, int64_t, VertexAccessor, DirectedEdge>,
-                      utils::pmr::vector<std::tuple<TypedValue, int64_t, VertexAccessor, DirectedEdge>>,
+  std::priority_queue<std::tuple<TypedValue, int64_t, VertexAccessor, std::optional<DirectedEdge>>,
+                      utils::pmr::vector<std::tuple<TypedValue, int64_t, VertexAccessor, std::optional<DirectedEdge>>>,
                       PriorityQueueComparator>
       pq_;
 
@@ -2286,19 +2255,10 @@ std::vector<Symbol> ConstructNamedPath::ModifiedSymbols(const SymbolTable &table
   return symbols;
 }
 
-Filter::Filter(const std::shared_ptr<LogicalOperator> &input,
-               const std::vector<std::shared_ptr<LogicalOperator>> &pattern_filters, Expression *expression)
-    : input_(input ? input : std::make_shared<Once>()), pattern_filters_(pattern_filters), expression_(expression) {}
+Filter::Filter(const std::shared_ptr<LogicalOperator> &input, Expression *expression)
+    : input_(input ? input : std::make_shared<Once>()), expression_(expression) {}
 
-bool Filter::Accept(HierarchicalLogicalOperatorVisitor &visitor) {
-  if (visitor.PreVisit(*this)) {
-    input_->Accept(visitor);
-    for (const auto &pattern_filter : pattern_filters_) {
-      pattern_filter->Accept(visitor);
-    }
-  }
-  return visitor.PostVisit(*this);
-}
+ACCEPT_WITH_INPUT(Filter)
 
 UniqueCursorPtr Filter::MakeCursor(utils::MemoryResource *mem) const {
   EventCounter::IncrementCounter(EventCounter::FilterOperator);
@@ -2308,24 +2268,8 @@ UniqueCursorPtr Filter::MakeCursor(utils::MemoryResource *mem) const {
 
 std::vector<Symbol> Filter::ModifiedSymbols(const SymbolTable &table) const { return input_->ModifiedSymbols(table); }
 
-static std::vector<UniqueCursorPtr> MakeCursorVector(const std::vector<std::shared_ptr<LogicalOperator>> &ops,
-                                                     utils::MemoryResource *mem) {
-  std::vector<UniqueCursorPtr> cursors;
-  cursors.reserve(ops.size());
-
-  if (!ops.empty()) {
-    for (const auto &op : ops) {
-      cursors.push_back(op->MakeCursor(mem));
-    }
-  }
-
-  return cursors;
-}
-
 Filter::FilterCursor::FilterCursor(const Filter &self, utils::MemoryResource *mem)
-    : self_(self),
-      input_cursor_(self_.input_->MakeCursor(mem)),
-      pattern_filter_cursors_(MakeCursorVector(self_.pattern_filters_, mem)) {}
+    : self_(self), input_cursor_(self_.input_->MakeCursor(mem)) {}
 
 bool Filter::FilterCursor::Pull(Frame &frame, ExecutionContext &context) {
   SCOPED_PROFILE_OP("Filter");
@@ -2335,10 +2279,6 @@ bool Filter::FilterCursor::Pull(Frame &frame, ExecutionContext &context) {
   ExpressionEvaluator evaluator(&frame, context.symbol_table, context.evaluation_context, context.db_accessor,
                                 storage::View::OLD);
   while (input_cursor_->Pull(frame, context)) {
-    for (const auto &pattern_filter_cursor : pattern_filter_cursors_) {
-      pattern_filter_cursor->Pull(frame, context);
-    }
-
     if (EvaluateFilter(evaluator, self_.expression_)) return true;
   }
   return false;
@@ -2348,39 +2288,6 @@ void Filter::FilterCursor::Shutdown() { input_cursor_->Shutdown(); }
 
 void Filter::FilterCursor::Reset() { input_cursor_->Reset(); }
 
-EvaluatePatternFilter::EvaluatePatternFilter(const std::shared_ptr<LogicalOperator> &input, Symbol output_symbol)
-    : input_(input), output_symbol_(output_symbol) {}
-
-ACCEPT_WITH_INPUT(EvaluatePatternFilter);
-
-UniqueCursorPtr EvaluatePatternFilter::MakeCursor(utils::MemoryResource *mem) const {
-  EventCounter::IncrementCounter(EventCounter::EvaluatePatternFilterOperator);
-
-  return MakeUniqueCursorPtr<EvaluatePatternFilterCursor>(mem, *this, mem);
-}
-
-EvaluatePatternFilter::EvaluatePatternFilterCursor::EvaluatePatternFilterCursor(const EvaluatePatternFilter &self,
-                                                                                utils::MemoryResource *mem)
-    : self_(self), input_cursor_(self_.input_->MakeCursor(mem)) {}
-
-std::vector<Symbol> EvaluatePatternFilter::ModifiedSymbols(const SymbolTable &table) const {
-  return input_->ModifiedSymbols(table);
-}
-
-bool EvaluatePatternFilter::EvaluatePatternFilterCursor::Pull(Frame &frame, ExecutionContext &context) {
-  SCOPED_PROFILE_OP("EvaluatePatternFilter");
-
-  input_cursor_->Reset();
-
-  frame[self_.output_symbol_] = TypedValue(input_cursor_->Pull(frame, context), context.evaluation_context.memory);
-
-  return true;
-}
-
-void EvaluatePatternFilter::EvaluatePatternFilterCursor::Shutdown() { input_cursor_->Shutdown(); }
-
-void EvaluatePatternFilter::EvaluatePatternFilterCursor::Reset() { input_cursor_->Reset(); }
-
 Produce::Produce(const std::shared_ptr<LogicalOperator> &input, const std::vector<NamedExpression *> &named_expressions)
     : input_(input ? input : std::make_shared<Once>()), named_expressions_(named_expressions) {}
 
@@ -3150,56 +3057,6 @@ void EdgeUniquenessFilter::EdgeUniquenessFilterCursor::Shutdown() { input_cursor
 
 void EdgeUniquenessFilter::EdgeUniquenessFilterCursor::Reset() { input_cursor_->Reset(); }
 
-EmptyResult::EmptyResult(const std::shared_ptr<LogicalOperator> &input)
-    : input_(input ? input : std::make_shared<Once>()) {}
-
-ACCEPT_WITH_INPUT(EmptyResult)
-
-std::vector<Symbol> EmptyResult::OutputSymbols(const SymbolTable &) const {  // NOLINT(hicpp-named-parameter)
-  return {};
-}
-
-std::vector<Symbol> EmptyResult::ModifiedSymbols(const SymbolTable &) const {  // NOLINT(hicpp-named-parameter)
-  return {};
-}
-
-class EmptyResultCursor : public Cursor {
- public:
-  EmptyResultCursor(const EmptyResult &self, utils::MemoryResource *mem)
-      : input_cursor_(self.input_->MakeCursor(mem)) {}
-
-  bool Pull(Frame &frame, ExecutionContext &context) override {
-    SCOPED_PROFILE_OP("EmptyResult");
-
-    if (!pulled_all_input_) {
-      while (input_cursor_->Pull(frame, context)) {
-        if (MustAbort(context)) {
-          throw HintedAbortError();
-        }
-      }
-      pulled_all_input_ = true;
-    }
-    return false;
-  }
-
-  void Shutdown() override { input_cursor_->Shutdown(); }
-
-  void Reset() override {
-    input_cursor_->Reset();
-    pulled_all_input_ = false;
-  }
-
- private:
-  const UniqueCursorPtr input_cursor_;
-  bool pulled_all_input_{false};
-};
-
-UniqueCursorPtr EmptyResult::MakeCursor(utils::MemoryResource *mem) const {
-  EventCounter::IncrementCounter(EventCounter::EmptyResultOperator);
-
-  return MakeUniqueCursorPtr<EmptyResultCursor>(mem, *this, mem);
-}
-
 Accumulate::Accumulate(const std::shared_ptr<LogicalOperator> &input, const std::vector<Symbol> &symbols,
                        bool advance_command)
     : input_(input), symbols_(symbols), advance_command_(advance_command) {}
@@ -3250,7 +3107,7 @@ class AccumulateCursor : public Cursor {
  private:
   const Accumulate &self_;
   const UniqueCursorPtr input_cursor_;
-  utils::pmr::deque<utils::pmr::vector<TypedValue>> cache_;
+  utils::pmr::vector<utils::pmr::vector<TypedValue>> cache_;
   decltype(cache_.begin()) cache_it_ = cache_.begin();
   bool pulled_all_input_{false};
 };
@@ -3354,8 +3211,7 @@ class AggregateCursor : public Cursor {
   // aggregation map. The vectors in an AggregationValue contain one element for
   // each aggregation in this LogicalOp.
   struct AggregationValue {
-    explicit AggregationValue(utils::MemoryResource *mem)
-        : counts_(mem), values_(mem), remember_(mem), unique_values_(mem) {}
+    explicit AggregationValue(utils::MemoryResource *mem) : counts_(mem), values_(mem), remember_(mem) {}
 
     // how many input rows have been aggregated in respective values_ element so
     // far
@@ -3368,10 +3224,6 @@ class AggregateCursor : public Cursor {
     utils::pmr::vector<TypedValue> values_;
     // remember values.
     utils::pmr::vector<TypedValue> remember_;
-
-    using TSet = utils::pmr::unordered_set<TypedValue, TypedValue::Hash, TypedValue::BoolEqual>;
-
-    utils::pmr::vector<TSet> unique_values_;
   };
 
   const Aggregate &self_;
@@ -3447,7 +3299,6 @@ class AggregateCursor : public Cursor {
     for (const auto &agg_elem : self_.aggregations_) {
       auto *mem = agg_value->values_.get_allocator().GetMemoryResource();
       agg_value->values_.emplace_back(DefaultAggregationOpValue(agg_elem, mem));
-      agg_value->unique_values_.emplace_back(AggregationValue::TSet(mem));
     }
     agg_value->counts_.resize(self_.aggregations_.size(), 0);
 
@@ -3466,9 +3317,8 @@ class AggregateCursor : public Cursor {
 
     auto count_it = agg_value->counts_.begin();
     auto value_it = agg_value->values_.begin();
-    auto unique_values_it = agg_value->unique_values_.begin();
     auto agg_elem_it = self_.aggregations_.begin();
-    for (; count_it < agg_value->counts_.end(); count_it++, value_it++, unique_values_it++, agg_elem_it++) {
+    for (; count_it < agg_value->counts_.end(); count_it++, value_it++, agg_elem_it++) {
       // COUNT(*) is the only case where input expression is optional
       // handle it here
       auto input_expr_ptr = agg_elem_it->value;
@@ -3483,12 +3333,6 @@ class AggregateCursor : public Cursor {
       // Aggregations skip Null input values.
       if (input_value.IsNull()) continue;
       const auto &agg_op = agg_elem_it->op;
-      if (agg_elem_it->distinct) {
-        auto insert_result = unique_values_it->insert(input_value);
-        if (!insert_result.second) {
-          break;
-        }
-      }
       *count_it += 1;
       if (*count_it == 1) {
         // first value, nothing to aggregate. check type, set and continue.
@@ -4073,14 +3917,8 @@ class DistinctCursor : public Cursor {
 
       utils::pmr::vector<TypedValue> row(seen_rows_.get_allocator().GetMemoryResource());
       row.reserve(self_.value_symbols_.size());
-
-      for (const auto &symbol : self_.value_symbols_) {
-        row.emplace_back(frame.at(symbol));
-      }
-
-      if (seen_rows_.insert(std::move(row)).second) {
-        return true;
-      }
+      for (const auto &symbol : self_.value_symbols_) row.emplace_back(frame[symbol]);
+      if (seen_rows_.insert(std::move(row)).second) return true;
     }
   }
 
@@ -4625,24 +4463,24 @@ auto ToOptionalString(ExpressionEvaluator *evaluator, Expression *expression) ->
   return std::nullopt;
 };
 
-TypedValue CsvRowToTypedList(csv::Reader::Row &row) {
+TypedValue CsvRowToTypedList(csv::Reader::Row row) {
   auto *mem = row.get_allocator().GetMemoryResource();
   auto typed_columns = utils::pmr::vector<TypedValue>(mem);
   typed_columns.reserve(row.size());
   for (auto &column : row) {
     typed_columns.emplace_back(std::move(column));
   }
-  return {std::move(typed_columns), mem};
+  return TypedValue(typed_columns, mem);
 }
 
-TypedValue CsvRowToTypedMap(csv::Reader::Row &row, csv::Reader::Header header) {
+TypedValue CsvRowToTypedMap(csv::Reader::Row row, csv::Reader::Header header) {
   // a valid row has the same number of elements as the header
   auto *mem = row.get_allocator().GetMemoryResource();
   utils::pmr::map<utils::pmr::string, TypedValue> m(mem);
   for (auto i = 0; i < row.size(); ++i) {
     m.emplace(std::move(header[i]), std::move(row[i]));
   }
-  return {std::move(m), mem};
+  return TypedValue(m, mem);
 }
 
 }  // namespace
@@ -4681,17 +4519,18 @@ class LoadCsvCursor : public Cursor {
     // have to read at most cardinality(n) rows (but we can read less and stop
     // pulling MATCH).
     if (!input_is_once_ && !input_pulled) return false;
-    auto row = reader_->GetNextRow(context.evaluation_context.memory);
-    if (!row) {
-      return false;
+
+    if (auto row = reader_->GetNextRow(context.evaluation_context.memory)) {
+      if (!reader_->HasHeader()) {
+        frame[self_->row_var_] = CsvRowToTypedList(std::move(*row));
+      } else {
+        frame[self_->row_var_] = CsvRowToTypedMap(
+            std::move(*row), csv::Reader::Header(reader_->GetHeader(), context.evaluation_context.memory));
+      }
+      return true;
     }
-    if (!reader_->HasHeader()) {
-      frame[self_->row_var_] = CsvRowToTypedList(*row);
-    } else {
-      frame[self_->row_var_] =
-          CsvRowToTypedMap(*row, csv::Reader::Header(reader_->GetHeader(), context.evaluation_context.memory));
-    }
-    return true;
+
+    return false;
   }
 
   void Reset() override { input_cursor_->Reset(); }
@@ -4805,72 +4644,4 @@ bool Foreach::Accept(HierarchicalLogicalOperatorVisitor &visitor) {
   return visitor.PostVisit(*this);
 }
 
-Apply::Apply(const std::shared_ptr<LogicalOperator> input, const std::shared_ptr<LogicalOperator> subquery,
-             bool subquery_has_return)
-    : input_(input ? input : std::make_shared<Once>()),
-      subquery_(subquery),
-      subquery_has_return_(subquery_has_return) {}
-
-bool Apply::Accept(HierarchicalLogicalOperatorVisitor &visitor) {
-  if (visitor.PreVisit(*this)) {
-    input_->Accept(visitor) && subquery_->Accept(visitor);
-  }
-  return visitor.PostVisit(*this);
-}
-
-UniqueCursorPtr Apply::MakeCursor(utils::MemoryResource *mem) const {
-  EventCounter::IncrementCounter(EventCounter::ApplyOperator);
-
-  return MakeUniqueCursorPtr<ApplyCursor>(mem, *this, mem);
-}
-
-Apply::ApplyCursor::ApplyCursor(const Apply &self, utils::MemoryResource *mem)
-    : self_(self),
-      input_(self.input_->MakeCursor(mem)),
-      subquery_(self.subquery_->MakeCursor(mem)),
-      subquery_has_return_(self.subquery_has_return_) {}
-
-std::vector<Symbol> Apply::ModifiedSymbols(const SymbolTable &table) const {
-  // Since Apply is the Cartesian product, modified symbols are combined from
-  // both execution branches.
-  auto symbols = input_->ModifiedSymbols(table);
-  auto subquery_symbols = subquery_->ModifiedSymbols(table);
-  symbols.insert(symbols.end(), subquery_symbols.begin(), subquery_symbols.end());
-  return symbols;
-}
-
-bool Apply::ApplyCursor::Pull(Frame &frame, ExecutionContext &context) {
-  SCOPED_PROFILE_OP("Apply");
-
-  while (true) {
-    if (pull_input_ && !input_->Pull(frame, context)) {
-      return false;
-    };
-
-    if (subquery_->Pull(frame, context)) {
-      // if successful, next Pull from this should not pull_input_
-      pull_input_ = false;
-      return true;
-    }
-    // failed to pull from subquery cursor
-    // skip that row
-    pull_input_ = true;
-    subquery_->Reset();
-
-    // don't skip row if no rows are returned from subquery, return input_ rows
-    if (!subquery_has_return_) return true;
-  }
-}
-
-void Apply::ApplyCursor::Shutdown() {
-  input_->Shutdown();
-  subquery_->Shutdown();
-}
-
-void Apply::ApplyCursor::Reset() {
-  input_->Reset();
-  subquery_->Reset();
-  pull_input_ = true;
-}
-
 }  // namespace memgraph::query::plan

src/query/plan/operator.lcp

@@ -132,9 +132,6 @@ class Cartesian;
 class CallProcedure;
 class LoadCsv;
 class Foreach;
-class EmptyResult;
-class EvaluatePatternFilter;
-class Apply;
 
 using LogicalOperatorCompositeVisitor = utils::CompositeVisitor<
     Once, CreateNode, CreateExpand, ScanAll, ScanAllByLabel,
@@ -143,8 +140,7 @@ using LogicalOperatorCompositeVisitor = utils::CompositeVisitor<
     Expand, ExpandVariable, ConstructNamedPath, Filter, Produce, Delete,
     SetProperty, SetProperties, SetLabels, RemoveProperty, RemoveLabels,
     EdgeUniquenessFilter, Accumulate, Aggregate, Skip, Limit, OrderBy, Merge,
-    Optional, Unwind, Distinct, Union, Cartesian, CallProcedure, LoadCsv, Foreach, EmptyResult,
-    EvaluatePatternFilter, Apply>;
+    Optional, Unwind, Distinct, Union, Cartesian, CallProcedure, LoadCsv, Foreach>;
 
 using LogicalOperatorLeafVisitor = utils::LeafVisitor<Once>;
 
@@ -1125,9 +1121,6 @@ pulled.")
   ((input "std::shared_ptr<LogicalOperator>" :scope :public
           :slk-save #'slk-save-operator-pointer
           :slk-load #'slk-load-operator-pointer)
-   (pattern_filters "std::vector<std::shared_ptr<LogicalOperator>>" :scope :public
-          :slk-save #'slk-save-ast-vector
-          :slk-load (slk-load-ast-vector "std::shared_ptr<LogicalOperator>"))
    (expression "Expression *" :scope :public
                :slk-save #'slk-save-ast-pointer
                :slk-load (slk-load-ast-pointer "Expression")))
@@ -1142,7 +1135,6 @@ a boolean value.")
    Filter() {}
 
    Filter(const std::shared_ptr<LogicalOperator> &input_,
-          const std::vector<std::shared_ptr<LogicalOperator>> &pattern_filters_,
           Expression *expression_);
    bool Accept(HierarchicalLogicalOperatorVisitor &visitor) override;
    UniqueCursorPtr MakeCursor(utils::MemoryResource *) const override;
@@ -1166,7 +1158,6 @@ a boolean value.")
     private:
      const Filter &self_;
      const UniqueCursorPtr input_cursor_;
-     const std::vector<UniqueCursorPtr> pattern_filter_cursors_;
    };
    cpp<#)
   (:serialize (:slk))
@@ -1563,41 +1554,6 @@ edge lists).")
   (:serialize (:slk))
   (:clone))
 
-
-(lcp:define-class empty-result (logical-operator)
-  ((input "std::shared_ptr<LogicalOperator>" :scope :public
-          :slk-save #'slk-save-operator-pointer
-          :slk-load #'slk-load-operator-pointer))
-  (:documentation
-   "Pulls everything from the input and discards it.
-
-On the first Pull from this operator's Cursor the input Cursor will be Pulled
-until it is empty. The results won't be accumulated in the temporary cache.
-
-This technique is used for ensuring that the cursor has been exhausted after
-a WriteHandleClause. A typical use case is a `MATCH--SET` query with RETURN statement
-missing.
-@param input Input @c LogicalOperator. ")
-  (:public
-   #>cpp
-   EmptyResult() {}
-
-   EmptyResult(const std::shared_ptr<LogicalOperator> &input);
-   bool Accept(HierarchicalLogicalOperatorVisitor &visitor) override;
-   UniqueCursorPtr MakeCursor(utils::MemoryResource *) const override;
-   std::vector<Symbol> OutputSymbols(const SymbolTable &) const override;
-   std::vector<Symbol> ModifiedSymbols(const SymbolTable &) const override;
-
-   bool HasSingleInput() const override { return true; }
-   std::shared_ptr<LogicalOperator> input() const override { return input_; }
-   void set_input(std::shared_ptr<LogicalOperator> input) override {
-     input_ = input;
-   }
-   cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
-
 (lcp:define-class accumulate (logical-operator)
   ((input "std::shared_ptr<LogicalOperator>" :scope :public
           :slk-save #'slk-save-operator-pointer
@@ -1701,8 +1657,7 @@ elements are in an undefined state after aggregation.")
            :slk-save #'slk-save-ast-pointer
            :slk-load (slk-load-ast-pointer "Expression"))
       (op "::Aggregation::Op")
-      (output-sym "Symbol")
-      (distinct bool :initval "false" ))
+      (output-sym "Symbol"))
      (:documentation
       "An aggregation element, contains:
        (input data expression, key expression - only used in COLLECT_MAP, type of
@@ -1785,45 +1740,6 @@ operator's implementation does not expect this.")
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class evaluate-pattern-filter (logical-operator)
-  ((input "std::shared_ptr<LogicalOperator>" :scope :public
-          :slk-save #'slk-save-operator-pointer
-          :slk-load #'slk-load-operator-pointer)
-   (output-symbol "Symbol" :scope :public))
-  (:documentation "Applies the pattern filter by putting the value of the input cursor to the frame.")
-
-  (:public
-   #>cpp
-   EvaluatePatternFilter() {}
-
-   EvaluatePatternFilter(const std::shared_ptr<LogicalOperator> &input, Symbol output_symbol);
-   bool Accept(HierarchicalLogicalOperatorVisitor &visitor) override;
-   UniqueCursorPtr MakeCursor(utils::MemoryResource *) const override;
-   std::vector<Symbol> ModifiedSymbols(const SymbolTable &) const override;
-
-   bool HasSingleInput() const override { return true; }
-   std::shared_ptr<LogicalOperator> input() const override { return input_; }
-   void set_input(std::shared_ptr<LogicalOperator> input) override {
-     input_ = input;
-   }
-   cpp<#)
-  (:private
-   #>cpp
-   class EvaluatePatternFilterCursor : public Cursor {
-    public:
-     EvaluatePatternFilterCursor(const EvaluatePatternFilter &, utils::MemoryResource *);
-     bool Pull(Frame &, ExecutionContext &) override;
-     void Shutdown() override;
-     void Reset() override;
-
-    private:
-     const EvaluatePatternFilter &self_;
-     UniqueCursorPtr input_cursor_;
-   };
-   cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:define-class limit (logical-operator)
   ((input "std::shared_ptr<LogicalOperator>" :scope :public
           :slk-save #'slk-save-operator-pointer
@@ -2366,9 +2282,9 @@ clauses.
   (:public
    #>cpp
    Foreach() = default;
-   Foreach(std::shared_ptr<LogicalOperator> input,
+   Foreach(std::shared_ptr<LogicalOperator> input, 
            std::shared_ptr<LogicalOperator> updates,
-           Expression *named_expr,
+           Expression *named_expr, 
            Symbol loop_variable_symbol);
 
    bool Accept(HierarchicalLogicalOperatorVisitor &visitor) override;
@@ -2383,52 +2299,6 @@ clauses.
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class apply (logical-operator)
-  ((input "std::shared_ptr<LogicalOperator>" :scope :public
-          :slk-save #'slk-save-operator-pointer
-          :slk-load #'slk-load-operator-pointer)
-   (subquery "std::shared_ptr<LogicalOperator>" :scope :public
-          :slk-save #'slk-save-operator-pointer
-          :slk-load #'slk-load-operator-pointer)
-   (subquery-has-return "bool" :scope :public))
-
-  (:documentation "Applies symbols from both output branches.")
-
-  (:public
-   #>cpp
-   Apply() {}
-
-   Apply(const std::shared_ptr<LogicalOperator> input, const std::shared_ptr<LogicalOperator> subquery, bool subquery_has_return);
-   bool Accept(HierarchicalLogicalOperatorVisitor &visitor) override;
-   UniqueCursorPtr MakeCursor(utils::MemoryResource *) const override;
-   std::vector<Symbol> ModifiedSymbols(const SymbolTable &) const override;
-
-   bool HasSingleInput() const override { return true; }
-   std::shared_ptr<LogicalOperator> input() const override { return input_; }
-   void set_input(std::shared_ptr<LogicalOperator> input) override {
-     input_ = input;
-   }
-   cpp<#)
-  (:private
-   #>cpp
-   class ApplyCursor : public Cursor {
-    public:
-     ApplyCursor(const Apply &, utils::MemoryResource *);
-     bool Pull(Frame &, ExecutionContext &) override;
-     void Shutdown() override;
-     void Reset() override;
-
-    private:
-     const Apply &self_;
-     UniqueCursorPtr input_;
-     UniqueCursorPtr subquery_;
-     bool pull_input_{true};
-     bool subquery_has_return_{true};
-   };
-   cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:pop-namespace) ;; plan
 (lcp:pop-namespace) ;; query
 (lcp:pop-namespace) ;; memgraph

src/query/plan/operator_type_info.cpp

@@ -1,151 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#include <cstdint>
-
-#include "query/plan/operator.hpp"
-
-namespace memgraph {
-
-constexpr utils::TypeInfo query::plan::LogicalOperator::kType{utils::TypeId::LOGICAL_OPERATOR, "LogicalOperator",
-                                                              nullptr};
-
-constexpr utils::TypeInfo query::plan::Once::kType{utils::TypeId::ONCE, "Once", &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::NodeCreationInfo::kType{utils::TypeId::NODE_CREATION_INFO, "NodeCreationInfo",
-                                                               nullptr};
-
-constexpr utils::TypeInfo query::plan::CreateNode::kType{utils::TypeId::CREATE_NODE, "CreateNode",
-                                                         &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::EdgeCreationInfo::kType{utils::TypeId::EDGE_CREATION_INFO, "EdgeCreationInfo",
-                                                               nullptr};
-
-constexpr utils::TypeInfo query::plan::CreateExpand::kType{utils::TypeId::CREATE_EXPAND, "CreateExpand",
-                                                           &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAll::kType{utils::TypeId::SCAN_ALL, "ScanAll",
-                                                      &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAllByLabel::kType{utils::TypeId::SCAN_ALL_BY_LABEL, "ScanAllByLabel",
-                                                             &query::plan::ScanAll::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAllByLabelPropertyRange::kType{
-    utils::TypeId::SCAN_ALL_BY_LABEL_PROPERTY_RANGE, "ScanAllByLabelPropertyRange", &query::plan::ScanAll::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAllByLabelPropertyValue::kType{
-    utils::TypeId::SCAN_ALL_BY_LABEL_PROPERTY_VALUE, "ScanAllByLabelPropertyValue", &query::plan::ScanAll::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAllByLabelProperty::kType{
-    utils::TypeId::SCAN_ALL_BY_LABEL_PROPERTY, "ScanAllByLabelProperty", &query::plan::ScanAll::kType};
-
-constexpr utils::TypeInfo query::plan::ScanAllById::kType{utils::TypeId::SCAN_ALL_BY_ID, "ScanAllById",
-                                                          &query::plan::ScanAll::kType};
-
-constexpr utils::TypeInfo query::plan::ExpandCommon::kType{utils::TypeId::EXPAND_COMMON, "ExpandCommon", nullptr};
-
-constexpr utils::TypeInfo query::plan::Expand::kType{utils::TypeId::EXPAND, "Expand",
-                                                     &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::ExpansionLambda::kType{utils::TypeId::EXPANSION_LAMBDA, "ExpansionLambda",
-                                                              nullptr};
-
-constexpr utils::TypeInfo query::plan::ExpandVariable::kType{utils::TypeId::EXPAND_VARIABLE, "ExpandVariable",
-                                                             &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::ConstructNamedPath::kType{
-    utils::TypeId::CONSTRUCT_NAMED_PATH, "ConstructNamedPath", &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Filter::kType{utils::TypeId::FILTER, "Filter",
-                                                     &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Produce::kType{utils::TypeId::PRODUCE, "Produce",
-                                                      &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Delete::kType{utils::TypeId::DELETE, "Delete",
-                                                     &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::SetProperty::kType{utils::TypeId::SET_PROPERTY, "SetProperty",
-                                                          &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::SetProperties::kType{utils::TypeId::SET_PROPERTIES, "SetProperties",
-                                                            &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::SetLabels::kType{utils::TypeId::SET_LABELS, "SetLabels",
-                                                        &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::RemoveProperty::kType{utils::TypeId::REMOVE_PROPERTY, "RemoveProperty",
-                                                             &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::RemoveLabels::kType{utils::TypeId::REMOVE_LABELS, "RemoveLabels",
-                                                           &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::EdgeUniquenessFilter::kType{
-    utils::TypeId::EDGE_UNIQUENESS_FILTER, "EdgeUniquenessFilter", &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::EmptyResult::kType{utils::TypeId::EMPTY_RESULT, "EmptyResult",
-                                                          &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Accumulate::kType{utils::TypeId::ACCUMULATE, "Accumulate",
-                                                         &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Aggregate::Element::kType{utils::TypeId::AGGREGATE_ELEMENT, "Element", nullptr};
-
-constexpr utils::TypeInfo query::plan::Aggregate::kType{utils::TypeId::AGGREGATE, "Aggregate",
-                                                        &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Skip::kType{utils::TypeId::SKIP, "Skip", &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::EvaluatePatternFilter::kType{
-    utils::TypeId::EVALUATE_PATTERN_FILTER, "EvaluatePatternFilter", &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Limit::kType{utils::TypeId::LIMIT, "Limit",
-                                                    &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::OrderBy::kType{utils::TypeId::ORDERBY, "OrderBy",
-                                                      &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Merge::kType{utils::TypeId::MERGE, "Merge",
-                                                    &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Optional::kType{utils::TypeId::OPTIONAL, "Optional",
-                                                       &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Unwind::kType{utils::TypeId::UNWIND, "Unwind",
-                                                     &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Distinct::kType{utils::TypeId::DISTINCT, "Distinct",
-                                                       &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Union::kType{utils::TypeId::UNION, "Union",
-                                                    &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Cartesian::kType{utils::TypeId::CARTESIAN, "Cartesian",
-                                                        &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::OutputTable::kType{utils::TypeId::OUTPUT_TABLE, "OutputTable",
-                                                          &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::OutputTableStream::kType{utils::TypeId::OUTPUT_TABLE_STREAM, "OutputTableStream",
-                                                                &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::CallProcedure::kType{utils::TypeId::CALL_PROCEDURE, "CallProcedure",
-                                                            &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::LoadCsv::kType{utils::TypeId::LOAD_CSV, "LoadCsv",
-                                                      &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Foreach::kType{utils::TypeId::FOREACH, "Foreach",
-                                                      &query::plan::LogicalOperator::kType};
-
-constexpr utils::TypeInfo query::plan::Apply::kType{utils::TypeId::APPLY, "Apply",
-                                                    &query::plan::LogicalOperator::kType};
-}  // namespace memgraph

src/query/plan/planner.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -50,6 +50,23 @@ class PostProcessor final {
   double EstimatePlanCost(const std::unique_ptr<LogicalOperator> &plan, TVertexCounts *vertex_counts) {
     return query::plan::EstimatePlanCost(vertex_counts, parameters_, *plan);
   }
+
+  template <class TPlanningContext>
+  std::unique_ptr<LogicalOperator> MergeWithCombinator(std::unique_ptr<LogicalOperator> curr_op,
+                                                       std::unique_ptr<LogicalOperator> last_op, const Tree &combinator,
+                                                       TPlanningContext *context) {
+    if (const auto *union_ = utils::Downcast<const CypherUnion>(&combinator)) {
+      return std::unique_ptr<LogicalOperator>(
+          impl::GenUnion(*union_, std::move(last_op), std::move(curr_op), *context->symbol_table));
+    }
+    throw utils::NotYetImplemented("query combinator");
+  }
+
+  template <class TPlanningContext>
+  std::unique_ptr<LogicalOperator> MakeDistinct(std::unique_ptr<LogicalOperator> last_op, TPlanningContext *context) {
+    auto output_symbols = last_op->OutputSymbols(*context->symbol_table);
+    return std::make_unique<Distinct>(std::move(last_op), output_symbols);
+  }
 };
 
 /// @brief Generates the LogicalOperator tree for a single query and returns the
@@ -65,9 +82,10 @@ class PostProcessor final {
 /// @sa RuleBasedPlanner
 /// @sa VariableStartPlanner
 template <template <class> class TPlanner, class TDbAccessor>
-auto MakeLogicalPlanForSingleQuery(QueryParts query_parts, PlanningContext<TDbAccessor> *context) {
+auto MakeLogicalPlanForSingleQuery(std::vector<SingleQueryPart> single_query_parts,
+                                   PlanningContext<TDbAccessor> *context) {
   context->bound_symbols.clear();
-  return TPlanner<PlanningContext<TDbAccessor>>(context).Plan(query_parts);
+  return TPlanner<PlanningContext<TDbAccessor>>(context).Plan(single_query_parts);
 }
 
 /// Generates the LogicalOperator tree and returns the resulting plan.
@@ -85,34 +103,48 @@ template <class TPlanningContext, class TPlanPostProcess>
 auto MakeLogicalPlan(TPlanningContext *context, TPlanPostProcess *post_process, bool use_variable_planner) {
   auto query_parts = CollectQueryParts(*context->symbol_table, *context->ast_storage, context->query);
   auto &vertex_counts = *context->db;
-  double total_cost = std::numeric_limits<double>::max();
+  double total_cost = 0;
 
   using ProcessedPlan = typename TPlanPostProcess::ProcessedPlan;
-  ProcessedPlan plan_with_least_cost;
+  ProcessedPlan last_plan;
 
-  std::optional<ProcessedPlan> curr_plan;
-  if (use_variable_planner) {
-    auto plans = MakeLogicalPlanForSingleQuery<VariableStartPlanner>(query_parts, context);
-    for (auto plan : plans) {
-      // Plans are generated lazily and the current plan will disappear, so
-      // it's ok to move it.
-      auto rewritten_plan = post_process->Rewrite(std::move(plan), context);
-      double cost = post_process->EstimatePlanCost(rewritten_plan, &vertex_counts);
-      if (!curr_plan || cost < total_cost) {
-        curr_plan.emplace(std::move(rewritten_plan));
-        total_cost = cost;
+  for (const auto &query_part : query_parts.query_parts) {
+    std::optional<ProcessedPlan> curr_plan;
+    double min_cost = std::numeric_limits<double>::max();
+
+    if (use_variable_planner) {
+      auto plans = MakeLogicalPlanForSingleQuery<VariableStartPlanner>(query_part.single_query_parts, context);
+      for (auto plan : plans) {
+        // Plans are generated lazily and the current plan will disappear, so
+        // it's ok to move it.
+        auto rewritten_plan = post_process->Rewrite(std::move(plan), context);
+        double cost = post_process->EstimatePlanCost(rewritten_plan, &vertex_counts);
+        if (!curr_plan || cost < min_cost) {
+          curr_plan.emplace(std::move(rewritten_plan));
+          min_cost = cost;
+        }
       }
+    } else {
+      auto plan = MakeLogicalPlanForSingleQuery<RuleBasedPlanner>(query_part.single_query_parts, context);
+      auto rewritten_plan = post_process->Rewrite(std::move(plan), context);
+      min_cost = post_process->EstimatePlanCost(rewritten_plan, &vertex_counts);
+      curr_plan.emplace(std::move(rewritten_plan));
+    }
+
+    total_cost += min_cost;
+    if (query_part.query_combinator) {
+      last_plan = post_process->MergeWithCombinator(std::move(*curr_plan), std::move(last_plan),
+                                                    *query_part.query_combinator, context);
+    } else {
+      last_plan = std::move(*curr_plan);
     }
-  } else {
-    auto plan = MakeLogicalPlanForSingleQuery<RuleBasedPlanner>(query_parts, context);
-    auto rewritten_plan = post_process->Rewrite(std::move(plan), context);
-    total_cost = post_process->EstimatePlanCost(rewritten_plan, &vertex_counts);
-    curr_plan.emplace(std::move(rewritten_plan));
   }
 
-  plan_with_least_cost = std::move(*curr_plan);
+  if (query_parts.distinct) {
+    last_plan = post_process->MakeDistinct(std::move(last_plan), context);
+  }
 
-  return std::make_pair(std::move(plan_with_least_cost), total_cost);
+  return std::make_pair(std::move(last_plan), total_cost);
 }
 
 template <class TPlanningContext>

src/query/plan/preprocess.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -84,6 +84,56 @@ std::vector<Expansion> NormalizePatterns(const SymbolTable &symbol_table, const
   return expansions;
 }
 
+// Fills the given Matching, by converting the Match patterns to normalized
+// representation as Expansions. Filters used in the Match are also collected,
+// as well as edge symbols which determine Cyphermorphism. Collecting filters
+// will lift them out of a pattern and generate new expressions (just like they
+// were in a Where clause).
+void AddMatching(const std::vector<Pattern *> &patterns, Where *where, SymbolTable &symbol_table, AstStorage &storage,
+                 Matching &matching) {
+  auto expansions = NormalizePatterns(symbol_table, patterns);
+  std::unordered_set<Symbol> edge_symbols;
+  for (const auto &expansion : expansions) {
+    // Matching may already have some expansions, so offset our index.
+    const size_t expansion_ix = matching.expansions.size();
+    // Map node1 symbol to expansion
+    const auto &node1_sym = symbol_table.at(*expansion.node1->identifier_);
+    matching.node_symbol_to_expansions[node1_sym].insert(expansion_ix);
+    // Add node1 to all symbols.
+    matching.expansion_symbols.insert(node1_sym);
+    if (expansion.edge) {
+      const auto &edge_sym = symbol_table.at(*expansion.edge->identifier_);
+      // Fill edge symbols for Cyphermorphism.
+      edge_symbols.insert(edge_sym);
+      // Map node2 symbol to expansion
+      const auto &node2_sym = symbol_table.at(*expansion.node2->identifier_);
+      matching.node_symbol_to_expansions[node2_sym].insert(expansion_ix);
+      // Add edge and node2 to all symbols
+      matching.expansion_symbols.insert(edge_sym);
+      matching.expansion_symbols.insert(node2_sym);
+    }
+    matching.expansions.push_back(expansion);
+  }
+  if (!edge_symbols.empty()) {
+    matching.edge_symbols.emplace_back(edge_symbols);
+  }
+  for (auto *pattern : patterns) {
+    matching.filters.CollectPatternFilters(*pattern, symbol_table, storage);
+    if (pattern->identifier_->user_declared_) {
+      std::vector<Symbol> path_elements;
+      for (auto *pattern_atom : pattern->atoms_)
+        path_elements.emplace_back(symbol_table.at(*pattern_atom->identifier_));
+      matching.named_paths.emplace(symbol_table.at(*pattern->identifier_), std::move(path_elements));
+    }
+  }
+  if (where) {
+    matching.filters.CollectWhereFilter(*where, symbol_table);
+  }
+}
+void AddMatching(const Match &match, SymbolTable &symbol_table, AstStorage &storage, Matching &matching) {
+  return AddMatching(match.patterns_, match.where_, symbol_table, storage, matching);
+}
+
 auto SplitExpressionOnAnd(Expression *expression) {
   // TODO: Think about converting all filtering expression into CNF to improve
   // the granularity of filters which can be stand alone.
@@ -469,8 +519,6 @@ void Filters::AnalyzeAndStoreFilter(Expression *expr, const SymbolTable &symbol_
     if (!add_prop_is_not_null_check(is_not_null)) {
       all_filters_.emplace_back(make_filter(FilterInfo::Type::Generic));
     }
-  } else if (auto *exists = utils::Downcast<Exists>(expr)) {
-    all_filters_.emplace_back(make_filter(FilterInfo::Type::Pattern));
   } else {
     all_filters_.emplace_back(make_filter(FilterInfo::Type::Generic));
   }
@@ -480,78 +528,6 @@ void Filters::AnalyzeAndStoreFilter(Expression *expr, const SymbolTable &symbol_
   // as `expr1 < n.prop AND n.prop < expr2`.
 }
 
-// Fills the given Matching, by converting the Match patterns to normalized
-// representation as Expansions. Filters used in the Match are also collected,
-// as well as edge symbols which determine Cyphermorphism. Collecting filters
-// will lift them out of a pattern and generate new expressions (just like they
-// were in a Where clause).
-void AddMatching(const std::vector<Pattern *> &patterns, Where *where, SymbolTable &symbol_table, AstStorage &storage,
-                 Matching &matching) {
-  auto expansions = NormalizePatterns(symbol_table, patterns);
-  std::unordered_set<Symbol> edge_symbols;
-  for (const auto &expansion : expansions) {
-    // Matching may already have some expansions, so offset our index.
-    const size_t expansion_ix = matching.expansions.size();
-    // Map node1 symbol to expansion
-    const auto &node1_sym = symbol_table.at(*expansion.node1->identifier_);
-    matching.node_symbol_to_expansions[node1_sym].insert(expansion_ix);
-    // Add node1 to all symbols.
-    matching.expansion_symbols.insert(node1_sym);
-    if (expansion.edge) {
-      const auto &edge_sym = symbol_table.at(*expansion.edge->identifier_);
-      // Fill edge symbols for Cyphermorphism.
-      edge_symbols.insert(edge_sym);
-      // Map node2 symbol to expansion
-      const auto &node2_sym = symbol_table.at(*expansion.node2->identifier_);
-      matching.node_symbol_to_expansions[node2_sym].insert(expansion_ix);
-      // Add edge and node2 to all symbols
-      matching.expansion_symbols.insert(edge_sym);
-      matching.expansion_symbols.insert(node2_sym);
-    }
-    matching.expansions.push_back(expansion);
-  }
-  if (!edge_symbols.empty()) {
-    matching.edge_symbols.emplace_back(edge_symbols);
-  }
-  for (auto *const pattern : patterns) {
-    matching.filters.CollectPatternFilters(*pattern, symbol_table, storage);
-    if (pattern->identifier_->user_declared_) {
-      std::vector<Symbol> path_elements;
-      for (auto *const pattern_atom : pattern->atoms_)
-        path_elements.push_back(symbol_table.at(*pattern_atom->identifier_));
-      matching.named_paths.emplace(symbol_table.at(*pattern->identifier_), std::move(path_elements));
-    }
-  }
-  if (where) {
-    matching.filters.CollectWhereFilter(*where, symbol_table);
-  }
-}
-
-void AddMatching(const Match &match, SymbolTable &symbol_table, AstStorage &storage, Matching &matching) {
-  AddMatching(match.patterns_, match.where_, symbol_table, storage, matching);
-
-  // If there are any pattern filters, we add those as well
-  for (auto &filter : matching.filters) {
-    PatternFilterVisitor visitor(symbol_table, storage);
-
-    filter.expression->Accept(visitor);
-    filter.matchings = visitor.getMatchings();
-  }
-}
-
-void PatternFilterVisitor::Visit(Exists &op) {
-  std::vector<Pattern *> patterns;
-  patterns.push_back(op.pattern_);
-
-  FilterMatching filter_matching;
-  AddMatching(patterns, nullptr, symbol_table_, storage_, filter_matching);
-
-  filter_matching.type = PatternFilterType::EXISTS;
-  filter_matching.symbol = std::make_optional<Symbol>(symbol_table_.at(op));
-
-  matchings_.push_back(std::move(filter_matching));
-}
-
 static void ParseForeach(query::Foreach &foreach, SingleQueryPart &query_part, AstStorage &storage,
                          SymbolTable &symbol_table) {
   for (auto *clause : foreach.clauses_) {
@@ -584,9 +560,6 @@ std::vector<SingleQueryPart> CollectSingleQueryParts(SymbolTable &symbol_table,
       if (auto *merge = utils::Downcast<query::Merge>(clause)) {
         query_part->merge_matching.emplace_back(Matching{});
         AddMatching({merge->pattern_}, nullptr, symbol_table, storage, query_part->merge_matching.back());
-      } else if (auto *call_subquery = utils::Downcast<query::CallSubquery>(clause)) {
-        query_part->subqueries.emplace_back(
-            std::make_shared<QueryParts>(CollectQueryParts(symbol_table, storage, call_subquery->cypher_query_)));
       } else if (auto *foreach = utils::Downcast<query::Foreach>(clause)) {
         ParseForeach(*foreach, *query_part, storage, symbol_table);
       } else if (utils::IsSubtype(*clause, With::kType) || utils::IsSubtype(*clause, query::Unwind::kType) ||

src/query/plan/preprocess.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -70,26 +70,7 @@ class UsedSymbolsCollector : public HierarchicalTreeVisitor {
   }
 
   bool Visit(Identifier &ident) override {
-    if (!in_exists || ident.user_declared_) {
-      symbols_.insert(symbol_table_.at(ident));
-    }
-
-    return true;
-  }
-
-  bool PreVisit(Exists &exists) override {
-    in_exists = true;
-
-    // We do not visit pattern identifier since we're in exists filter pattern
-    for (auto &atom : exists.pattern_->atoms_) {
-      atom->Accept(*this);
-    }
-
-    return false;
-  }
-
-  bool PostVisit(Exists & /*exists*/) override {
-    in_exists = false;
+    symbols_.insert(symbol_table_.at(ident));
     return true;
   }
 
@@ -98,9 +79,6 @@ class UsedSymbolsCollector : public HierarchicalTreeVisitor {
 
   std::unordered_set<Symbol> symbols_;
   const SymbolTable &symbol_table_;
-
- private:
-  bool in_exists{false};
 };
 
 /// Normalized representation of a pattern that needs to be matched.
@@ -121,93 +99,6 @@ struct Expansion {
   NodeAtom *node2 = nullptr;
 };
 
-struct FilterMatching;
-
-enum class PatternFilterType { EXISTS };
-
-/// Collects matchings from filters that include patterns
-class PatternFilterVisitor : public ExpressionVisitor<void> {
- public:
-  explicit PatternFilterVisitor(SymbolTable &symbol_table, AstStorage &storage)
-      : symbol_table_(symbol_table), storage_(storage) {}
-
-  using ExpressionVisitor<void>::Visit;
-
-  // Unary operators
-  void Visit(NotOperator &op) override { op.expression_->Accept(*this); }
-  void Visit(IsNullOperator &op) override { op.expression_->Accept(*this); };
-  void Visit(UnaryPlusOperator &op) override{};
-  void Visit(UnaryMinusOperator &op) override{};
-
-  // Binary operators
-  void Visit(OrOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  }
-  void Visit(XorOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  }
-  void Visit(AndOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  }
-  void Visit(NotEqualOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  };
-  void Visit(EqualOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  };
-  void Visit(InListOperator &op) override {
-    op.expression1_->Accept(*this);
-    op.expression2_->Accept(*this);
-  };
-  void Visit(AdditionOperator &op) override{};
-  void Visit(SubtractionOperator &op) override{};
-  void Visit(MultiplicationOperator &op) override{};
-  void Visit(DivisionOperator &op) override{};
-  void Visit(ModOperator &op) override{};
-  void Visit(LessOperator &op) override{};
-  void Visit(GreaterOperator &op) override{};
-  void Visit(LessEqualOperator &op) override{};
-  void Visit(GreaterEqualOperator &op) override{};
-  void Visit(SubscriptOperator &op) override{};
-
-  // Other
-  void Visit(ListSlicingOperator &op) override{};
-  void Visit(IfOperator &op) override{};
-  void Visit(ListLiteral &op) override{};
-  void Visit(MapLiteral &op) override{};
-  void Visit(LabelsTest &op) override{};
-  void Visit(Aggregation &op) override{};
-  void Visit(Function &op) override{};
-  void Visit(Reduce &op) override{};
-  void Visit(Coalesce &op) override{};
-  void Visit(Extract &op) override{};
-  void Visit(Exists &op) override;
-  void Visit(All &op) override{};
-  void Visit(Single &op) override{};
-  void Visit(Any &op) override{};
-  void Visit(None &op) override{};
-  void Visit(Identifier &op) override{};
-  void Visit(PrimitiveLiteral &op) override{};
-  void Visit(PropertyLookup &op) override{};
-  void Visit(ParameterLookup &op) override{};
-  void Visit(NamedExpression &op) override{};
-  void Visit(RegexMatch &op) override{};
-
-  std::vector<FilterMatching> getMatchings() { return matchings_; }
-
-  SymbolTable &symbol_table_;
-  AstStorage &storage_;
-
- private:
-  /// Collection of matchings in the filter expression being analyzed.
-  std::vector<FilterMatching> matchings_;
-};
-
 /// Stores the symbols and expression used to filter a property.
 class PropertyFilter {
  public:
@@ -262,7 +153,7 @@ struct FilterInfo {
   /// applied for labels or a property. Non generic types contain extra
   /// information which can be used to produce indexed scans of graph
   /// elements.
-  enum class Type { Generic, Label, Property, Id, Pattern };
+  enum class Type { Generic, Label, Property, Id };
 
   Type type;
   /// The original filter expression which must be satisfied.
@@ -275,8 +166,6 @@ struct FilterInfo {
   std::optional<PropertyFilter> property_filter;
   /// Information for Type::Id filtering.
   std::optional<IdFilter> id_filter;
-  /// Matchings for filters that include patterns
-  std::vector<FilterMatching> matchings;
 };
 
 /// Stores information on filters used inside the @c Matching of a @c QueryPart.
@@ -398,16 +287,6 @@ struct Matching {
   std::unordered_set<Symbol> expansion_symbols{};
 };
 
-// TODO clumsy to need to declare it before, usually only the struct definition would be in header
-struct QueryParts;
-
-struct FilterMatching : Matching {
-  /// Type of pattern filter
-  PatternFilterType type;
-  /// Symbol for the filter expression
-  std::optional<Symbol> symbol;
-};
-
 /// @brief Represents a read (+ write) part of a query. Parts are split on
 /// `WITH` clauses.
 ///
@@ -452,9 +331,6 @@ struct SingleQueryPart {
   std::vector<Matching> merge_matching{};
   /// @brief All the remaining clauses (without @c Match).
   std::vector<Clause *> remaining_clauses{};
-  /// The subqueries vector are all the subqueries in this query part ordered in a list by
-  /// the order of calling.
-  std::vector<std::shared_ptr<QueryParts>> subqueries{};
 };
 
 /// Holds query parts of a single query together with the optional information

src/query/plan/pretty_print.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,7 +14,6 @@
 
 #include "query/db_accessor.hpp"
 #include "query/frontend/ast/pretty_print.hpp"
-#include "query/plan/operator.hpp"
 #include "utils/string.hpp"
 
 namespace memgraph::query::plan {
@@ -149,6 +148,7 @@ bool PlanPrinter::PreVisit(query::plan::Produce &op) {
 }
 
 PRE_VISIT(ConstructNamedPath);
+PRE_VISIT(Filter);
 PRE_VISIT(SetProperty);
 PRE_VISIT(SetProperties);
 PRE_VISIT(SetLabels);
@@ -156,8 +156,6 @@ PRE_VISIT(RemoveProperty);
 PRE_VISIT(RemoveLabels);
 PRE_VISIT(EdgeUniquenessFilter);
 PRE_VISIT(Accumulate);
-PRE_VISIT(EmptyResult);
-PRE_VISIT(EvaluatePatternFilter);
 
 bool PlanPrinter::PreVisit(query::plan::Aggregate &op) {
   WithPrintLn([&](auto &out) {
@@ -252,22 +250,6 @@ bool PlanPrinter::PreVisit(query::plan::Foreach &op) {
   op.input_->Accept(*this);
   return false;
 }
-
-bool PlanPrinter::PreVisit(query::plan::Filter &op) {
-  WithPrintLn([](auto &out) { out << "* Filter"; });
-  for (const auto &pattern_filter : op.pattern_filters_) {
-    Branch(*pattern_filter);
-  }
-  op.input_->Accept(*this);
-  return false;
-}
-
-bool PlanPrinter::PreVisit(query::plan::Apply &op) {
-  WithPrintLn([](auto &out) { out << "* Apply"; });
-  Branch(*op.subquery_);
-  op.input_->Accept(*this);
-  return false;
-}
 #undef PRE_VISIT
 
 bool PlanPrinter::DefaultPreVisit() {
@@ -419,8 +401,6 @@ json ToJson(const Aggregate::Element &elem) {
   }
   json["op"] = utils::ToLowerCase(Aggregation::OpToString(elem.op));
   json["output_symbol"] = ToJson(elem.output_sym);
-  json["distinct"] = elem.distinct;
-
   return json;
 }
 ////////////////////////// END HELPER FUNCTIONS ////////////////////////////////
@@ -606,13 +586,6 @@ bool PlanToJsonVisitor::PreVisit(Filter &op) {
   op.input_->Accept(*this);
   self["input"] = PopOutput();
 
-  for (auto pattern_idx = 0; pattern_idx < op.pattern_filters_.size(); pattern_idx++) {
-    auto pattern_filter_key = "pattern_filter" + std::to_string(pattern_idx + 1);
-
-    op.pattern_filters_[pattern_idx]->Accept(*this);
-    self[pattern_filter_key] = PopOutput();
-  }
-
   output_ = std::move(self);
   return false;
 }
@@ -730,17 +703,6 @@ bool PlanToJsonVisitor::PreVisit(EdgeUniquenessFilter &op) {
   return false;
 }
 
-bool PlanToJsonVisitor::PreVisit(EmptyResult &op) {
-  json self;
-  self["name"] = "EmptyResult";
-
-  op.input_->Accept(*this);
-  self["input"] = PopOutput();
-
-  output_ = std::move(self);
-  return false;
-}
-
 bool PlanToJsonVisitor::PreVisit(Accumulate &op) {
   json self;
   self["name"] = "Accumulate";
@@ -932,7 +894,6 @@ bool PlanToJsonVisitor::PreVisit(Cartesian &op) {
   output_ = std::move(self);
   return false;
 }
-
 bool PlanToJsonVisitor::PreVisit(Foreach &op) {
   json self;
   self["name"] = "Foreach";
@@ -949,32 +910,6 @@ bool PlanToJsonVisitor::PreVisit(Foreach &op) {
   return false;
 }
 
-bool PlanToJsonVisitor::PreVisit(EvaluatePatternFilter &op) {
-  json self;
-  self["name"] = "EvaluatePatternFilter";
-  self["output_symbol"] = ToJson(op.output_symbol_);
-
-  op.input_->Accept(*this);
-  self["input"] = PopOutput();
-
-  output_ = std::move(self);
-  return false;
-}
-
-bool PlanToJsonVisitor::PreVisit(Apply &op) {
-  json self;
-  self["name"] = "Apply";
-
-  op.input_->Accept(*this);
-  self["input"] = PopOutput();
-
-  op.subquery_->Accept(*this);
-  self["subquery"] = PopOutput();
-
-  output_ = std::move(self);
-  return false;
-}
-
 }  // namespace impl
 
 }  // namespace memgraph::query::plan

src/query/plan/pretty_print.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -74,14 +74,12 @@ class PlanPrinter : public virtual HierarchicalLogicalOperatorVisitor {
   bool PreVisit(ConstructNamedPath &) override;
 
   bool PreVisit(Filter &) override;
-  bool PreVisit(EvaluatePatternFilter & /*unused*/) override;
   bool PreVisit(EdgeUniquenessFilter &) override;
 
   bool PreVisit(Merge &) override;
   bool PreVisit(Optional &) override;
   bool PreVisit(Cartesian &) override;
 
-  bool PreVisit(EmptyResult &) override;
   bool PreVisit(Produce &) override;
   bool PreVisit(Accumulate &) override;
   bool PreVisit(Aggregate &) override;
@@ -95,7 +93,6 @@ class PlanPrinter : public virtual HierarchicalLogicalOperatorVisitor {
   bool PreVisit(CallProcedure &) override;
   bool PreVisit(LoadCsv &) override;
   bool PreVisit(Foreach &) override;
-  bool PreVisit(Apply & /*unused*/) override;
 
   bool Visit(Once &) override;
 
@@ -188,10 +185,8 @@ class PlanToJsonVisitor : public virtual HierarchicalLogicalOperatorVisitor {
   bool PreVisit(Optional &) override;
 
   bool PreVisit(Filter &) override;
-  bool PreVisit(EvaluatePatternFilter & /*op*/) override;
   bool PreVisit(EdgeUniquenessFilter &) override;
   bool PreVisit(Cartesian &) override;
-  bool PreVisit(Apply & /*unused*/) override;
 
   bool PreVisit(ScanAll &) override;
   bool PreVisit(ScanAllByLabel &) override;
@@ -200,7 +195,6 @@ class PlanToJsonVisitor : public virtual HierarchicalLogicalOperatorVisitor {
   bool PreVisit(ScanAllByLabelProperty &) override;
   bool PreVisit(ScanAllById &) override;
 
-  bool PreVisit(EmptyResult &) override;
   bool PreVisit(Produce &) override;
   bool PreVisit(Accumulate &) override;
   bool PreVisit(Aggregate &) override;

src/query/plan/read_write_type_checker.cpp

@@ -11,11 +11,10 @@
 
 #include "query/plan/read_write_type_checker.hpp"
 
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define PRE_VISIT(TOp, RWType, continue_visiting)                                     \
-  bool ReadWriteTypeChecker::PreVisit(TOp &) { /*NOLINT(bugprone-macro-parentheses)*/ \
-    UpdateType(RWType);                                                               \
-    return continue_visiting;                                                         \
+#define PRE_VISIT(TOp, RWType, continue_visiting) \
+  bool ReadWriteTypeChecker::PreVisit(TOp &op) {  \
+    UpdateType(RWType);                           \
+    return continue_visiting;                     \
   }
 
 namespace memgraph::query::plan {
@@ -55,7 +54,6 @@ bool ReadWriteTypeChecker::PreVisit(Cartesian &op) {
   return false;
 }
 
-PRE_VISIT(EmptyResult, RWType::NONE, true)
 PRE_VISIT(Produce, RWType::NONE, true)
 PRE_VISIT(Accumulate, RWType::NONE, true)
 PRE_VISIT(Aggregate, RWType::NONE, true)
@@ -88,28 +86,21 @@ bool ReadWriteTypeChecker::PreVisit([[maybe_unused]] Foreach &op) {
 
 #undef PRE_VISIT
 
-bool ReadWriteTypeChecker::Visit(Once &) { return false; }  // NOLINT(hicpp-named-parameter)
+bool ReadWriteTypeChecker::Visit(Once &op) { return false; }
 
 void ReadWriteTypeChecker::UpdateType(RWType op_type) {
+  // Update type only if it's not the NONE type and the current operator's type
+  // is different than the one that's currently inferred.
+  if (type != RWType::NONE && type != op_type) {
+    type = RWType::RW;
+  }
   // Stop inference because RW is the most "dominant" type, i.e. it isn't
   // affected by the type of nodes in the plan appearing after the node for
   // which the type is set to RW.
   if (type == RWType::RW) {
     return;
   }
-
-  // if op_type is NONE, type doesn't change.
-  if (op_type == RWType::NONE) {
-    return;
-  }
-
-  // Update type only if it's not the NONE type and the current operator's type
-  // is different than the one that's currently inferred.
-  if (type != RWType::NONE && type != op_type) {
-    type = RWType::RW;
-  }
-
-  if (type == RWType::NONE) {
+  if (type == RWType::NONE && op_type != RWType::NONE) {
     type = op_type;
   }
 }