Support Ubuntu 22.04 (#411)

* Fix toolchain url

* Add 22.04 os script

* Update centos-9 stream

* Update zlib

* Upgrade dotnet version

* Add libipt

* Update toolchain extension

* Add release container

* Remove CentOS 8

* Enable arm packaging

* Add centos 9 container

* Ignore missing python virtualenv

* Add virtualenvwrapper

* Rearrange order

* Install virtualenv without user

* Run virtualenv via python

* Add logrotate dependency

* Bump up checkout action version

.clang-format

@@ -1,7 +1,6 @@
 ---
-BasedOnStyle: Google
----
 Language:     Cpp
+BasedOnStyle: Google
 Standard:     "c++20"
 UseTab:       Never
 DerivePointerAlignment: false

.clang-tidy

@@ -61,9 +61,7 @@ Checks: '*,
          -readability-magic-numbers,
          -readability-named-parameter,
          -misc-no-recursion,
-         -concurrency-mt-unsafe,
-         -bugprone-easily-swappable-parameters'
-
+         -concurrency-mt-unsafe'
 WarningsAsErrors: ''
 HeaderFilterRegex: 'src/.*'
 AnalyzeTemporaryDtors: false

.github/pull_request_template.md

@@ -1,14 +1,9 @@
 [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
-- [ ] 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, including added/changed clauses
-- [ ] Tag someone from docs team in the comments
+- [ ] Update [changelog](https://docs.memgraph.com/memgraph/changelog)

.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

@@ -1,7 +1,4 @@
 name: Diff
-concurrency:
-  group: ${{ github.head_ref || github.sha }}
-  cancel-in-progress: true
 
 on:
   push:
@@ -14,7 +11,6 @@ on:
       - "**/*.md"
       - ".clang-format"
       - "CODEOWNERS"
-      - "licenses/*"
 
 jobs:
   community_build:
@@ -27,7 +23,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,18 +61,13 @@ 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)
           fetch-depth: 0
 
-        # This is also needed if we want do to comparison against other branches
-        # See https://github.community/t/checkout-code-fails-when-it-runs-lerna-run-test-since-master/17920
-      - 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 +75,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,7 +102,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
@@ -147,7 +112,7 @@ jobs:
           source /opt/toolchain-v4/activate
 
           # Restrict clang-tidy results only to the modified parts
-          git diff -U0 ${{ env.BASE_BRANCH }}... -- src | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -path build  -regex ".+\.cpp" | tee ./build/clang_tidy_output.txt
+          git diff -U0 master... -- src | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -path build | tee ./build/clang_tidy_output.txt
 
           # Fail if any warning is reported
           ! cat ./build/clang_tidy_output.txt | ./tools/github/clang-tidy/grep_error_lines.sh > /dev/null
@@ -162,7 +127,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 +188,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 +203,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 +228,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 +285,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 +310,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 +335,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 +351,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 +402,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
-          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 }}/"
+          name: debian-11
+          path: build/output/debian-11/memgraph*.deb

.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

@@ -4,12 +4,8 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Memgraph binary version to publish on DockerHub."
+        description: "Memgraph binary version to publish on Dockerhub."
         required: true
-      force_release:
-        type: boolean
-        required: false
-        default: false
 
 jobs:
   docker_publish:
@@ -19,20 +15,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: |
@@ -40,22 +36,6 @@ jobs:
           curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.version }}/debian-11/memgraph_${{ github.event.inputs.version }}-1_amd64.deb > memgraph-amd64.deb
           curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.version }}/debian-11-aarch64/memgraph_${{ github.event.inputs.version }}-1_arm64.deb > memgraph-arm64.deb
 
-      - 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 release/docker

.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,20 +1,23 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v2.3.0
     hooks:
       - id: check-yaml
-        args: [--allow-multiple-documents]
       - 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.3.1")
 
 # 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,17 +231,7 @@ endif()
 message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
 # -----------------------------------------------------------------------------
 
-add_definitions( -DCMAKE_BUILD_TYPE_NAME="${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 -------------------------------------------------
 

CODEOWNERS

@@ -0,0 +1 @@
+* @antaljanosbenjamin @kostasrim

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)

docs/csv-import-tool/README.md

@@ -1,204 +0,0 @@
-# CSV Import Tool Documentation
-
-CSV is a universal and very versatile data format used to store large quantities
-of data.  Each Memgraph database instance has a CSV import tool installed called
-`mg_import_csv`.  The CSV import tool should be used for initial bulk ingestion
-of data into the database.  Upon ingestion, the CSV importer creates a snapshot
-that will be used by the database to recover its state on its next startup.
-
-If you are already familiar with the Neo4j bulk import tool, then using the
-`mg_import_csv` tool should be easy.  The CSV import tool is fully compatible
-with the [Neo4j CSV
-format](https://neo4j.com/docs/operations-manual/current/tools/import/). If you
-already have a pipeline set-up for Neo4j, you should only replace `neo4j-admin
-import` with `mg_import_csv`.
-
-## CSV File Format
-
-Each row of a CSV file represents a single entry that should be imported into
-the database.  Both nodes and relationships can be imported into the database
-using CSV files.
-
-Each set of CSV files must have a header that describes the data that is stored
-in the CSV files. Each field in the CSV header is in the format
-`<name>[:<type>]` which identifies the name that should be used for that column
-and the type that should be used for that column. The type is optional and
-defaults to `string` (see the following chapter).
-
-Each CSV field must be divided using the delimiter and each CSV field can either
-be quoted or unquoted. When the field is quoted, the first and last character in
-the field *must* be the quote character. If the field isn't quoted, and a quote
-character appears in it, it is treated as a regular character. If a quote
-character appears inside a quoted string then the quote character must be
-doubled in order to escape it. Line feeds and carriage returns are ignored in
-the CSV file, also, the file can't contain a NULL character.
-
-## Properties
-
-Both nodes and relationships can have properties added to them.  When importing
-properties, the CSV importer uses the name specified in the header of the
-corresponding CSV column for the name of the property.  A property is designated
-by specifying one of the following types in the header:
- - `integer`, `int`, `long`, `byte`, `short`: creates an integer property
- - `float`, `double`: creates a float property
- - `boolean`, `bool`: creates a boolean property
- - `string`, `char`: creates a string property
-
-When importing a boolean value, the CSV field should contain exactly the text
-`true` to import a `True` boolean value.  All other text values are treated as a
-boolean value `False`.
-
-If you want to import an array of values, you can do so by appending `[]` to any
-of the above types.  The values of the array are then determined by splitting
-the raw CSV value using the array delimiter character.
-
-Assuming that the array delimiter is `;`, the following example:
-```plaintext
-first_name,last_name:string,number:integer,aliases:string[]
-John,Doe,1,Johnny;Jo;J-man
-Melissa,Doe,2,Mel
-```
-
-Will yield these results:
-```plaintext
-CREATE ({first_name: "John", last_name: "Doe", number: 1, aliases: ["Johnny", "Jo", "J-man"]});
-CREATE ({first_name: "Melissa", last_name: "Doe", number: 2, aliases: ["Mel"]});
-```
-### Nodes
-
-When importing nodes, several more types can be specified in the header of the
-CSV file (along with all property types):
- - `ID`: id of the node that should be used as the node ID when importing
-   relationships
- - `LABEL`: designates that the field contains additional labels for the node
- - `IGNORE`: designates that the field should be ignored
-
-The `ID` field type sets the internal ID that will be used for the node when
-creating relationships.  It is optional and nodes that don't have an ID value
-specified will be imported, but can't be connected to any relationships.  If you
-want to save the ID value as a property in the database, just specify a name for
-the ID (`user_id:ID`).  If you just want to use the ID during the import, leave
-out the name of the field (`:ID`).  The `ID` field also supports creating
-separate ID spaces.  The ID space is specified with the ID space name appended
-to the `ID` type in parentheses (`ID(user)`).  That allows you to have the same
-IDs (by value) for multiple different node files (for example, numbers from 1 to
-N).  The IDs in each ID space will be treated as an independent set of IDs that
-don't interfere with IDs in another ID space.
-
-The `LABEL` field type adds additional labels to the node.  The value is treated
-as an array type so that multiple additional labels can be specified for each
-node.  The value is split using the array delimiter (`--array-delimiter` flag).
-
-### Relationships
-
-In order to be able to import relationships, you must import the nodes in the
-same invocation of `mg_import_csv` that is used to import the relationships.
-
-When importing relationships, several more types can be specified in the header
-of the CSV file (along with all property types):
- - `START_ID`: id of the start node that should be connected with the
-   relationship
- - `END_ID`: id of the end node that should be connected with the relationship
- - `TYPE`: designates the type of the relationship
- - `IGNORE`: designates that the field should be ignored
-
-The `START_ID` field type sets the start node that should be connected with the
-relationship to the end node.  The field *must* be specified and the node ID
-must be one of the node IDs that were specified in the node CSV files.  The name
-of this field is ignored.  If the node ID is in an ID space, you can specify the
-ID space for the in the same way as for the node ID (`START_ID(user)`).
-
-The `END_ID` field type sets the end node that should be connected with the
-relationship to the start node.  The field *must* be specified and the node ID
-must be one of the node IDs that were specified in the node CSV files.  The name
-of this field is ignored.  If the node ID is in an ID space, you can specify the
-ID space for the in the same way as for the node ID (`END_ID(user)`).
-
-The `TYPE` field type sets the type of the relationship.  Each relationship
-*must* have a relationship type, but it doesn't necessarily need to be specified
-in the CSV file, it can also be set externally for the whole CSV file.  The name
-of this field is ignored.
-
-## CSV Importer Flags
-
-The importer has many command line options that allow you to customize the way
-the importer loads your data.
-
-The two main flags that are used to specify the input CSV files are `--nodes`
-and `--relationships`. Basic description of these flags is provided in the table
-and more detailed explainion can be found further down bellow.
-
-
-| Flag                  | Description  |
-|-----------------------| -------------- |
-|`--nodes`                | Used to specify CSV files that contain the nodes to the importer. |
-|`--relationships`        |  Used to specify CSV files that contain the relationships to the importer.|
-|`--delimiter`            | Sets the delimiter that should be used when splitting the CSV fields (default `,`)|
-|`--quote`                | Sets the quote character that should be used to quote a CSV field (default `"`)|
-|`--array-delimiter`      | Sets the delimiter that should be used when splitting array values (default `;`)|
-|`--id-type`              | Specifies which data type should be used to store the supplied <br /> node IDs when storing them as properties (if the field name is supplied). <br /> The supported values are either `STRING` or `INTEGER`. (default `STRING`)|
-|`--ignore-empty-strings` | Instructs the importer to treat all empty strings as `Null` values  <br /> instead of an empty string value (default `false`)|
-|`--ignore-extra-columns` | Instructs the importer to ignore all columns (instead of raising an error) <br /> that aren't specified after the last specified column in the CSV header. (default `false`) |
-| `--skip-bad-relationships`| Instructs the importer to ignore all relationships (instead of raising an error) <br /> that refer to nodes that don't exist in the node files. (default `false`) |
-|`--skip-duplicate-nodes`  | Instructs the importer to ignore all duplicate nodes (instead of raising an error).  <br /> Duplicate nodes are nodes that have an ID that is the same as another node that was already imported. (default `false`) |
-| `--trim-strings`| Instructs the importer to trim all of the loaded CSV field values before processing them further. <br /> Trimming the fields removes all leading and trailing whitespace from them. (default `false`) |
-
-The `--nodes` and  `--relationships` flags are used to specify CSV files that
-contain the nodes and relationships to the importer.  Multiple files can be
-specified in each supplied `--nodes` or `--relationships` flag. Files that are
-supplied in one `--nodes` or `--relationships` flag are treated by the CSV
-parser as one big CSV file.  Only the first line of the first file is parsed for
-the CSV header, all other files (and rows) are treated as data.  This is useful
-when you have a very large CSV file and don't want to edit its first line just
-to add a CSV header.  Instead, you can specify the header in a separate file
-(e.g. `users_header.csv` or `friendships_header.csv`) and have the data intact
-in the large file (e.g. `users.csv` or `friendships.csv`).  Also, you can supply
-additional labels for each set of node files.
-
-The format of `--nodes` flag is:
-`[<label>[:<label>]...=]<file>[,<file>][,<file>]...`.  Take note that only the
-first `<file>` part is mandatory, all other parts of the flag value are
-optional. Multiple `--nodes` flags can be supplied to describe multiple sets of
-different node files.  For the importer to work, at least one `--nodes` flag
-*must* be supplied.
-
-The format of `--relationships` flag is: `[<type>=]<file>[,<file>][,<file>]...`.
-Take note that only the first `<file>` part is mandatory, all other parts of the
-flag value are optional.  Multiple `--relationships` flags can be supplied to
-describe multiple sets of different relationship files.  The `--relationships`
-flag isn't mandatory.
-
-## CSV Parser Logic
-
-The CSV parser uses the same logic as the standard Python CSV parser.  The data
-is parsed in the same way as the following snippet:
-
-```python
-import csv
-for row in csv.reader(stream, strict=True):
-    # process 'row'
-```
-
-Python uses 'excel' as the default dialect when parsing CSV files and the
-default settings for the CSV parser are:
- - delimiter: `','`
- - doublequote: `True`
- - escapechar: `None`
- - lineterminator: `'\r\n'`
- - quotechar: `'"'`
- - skipinitialspace: `False`
-
-The above snippet can be expanded to:
-
-```python
-import csv
-for row in csv.reader(stream, delimiter=',', doublequote=True,
-                      escapechar=None, lineterminator='\r\n',
-                      quotechar='"', skipinitialspace=False,
-                      strict=True):
-    # process 'row'
-```
-
-For more information about the meaning of the above values, see:
-https://docs.python.org/3/library/csv.html#csv.Dialect
-

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/centos-7.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "centos-7"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc gcc-c++ make # generic build tools
     wget # used for archive download

environment/os/centos-9.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "centos-9"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils-common gcc gcc-c++ make # generic build tools
     wget # used for archive download

environment/os/debian-10.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "debian-10"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/debian-11-arm.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "debian-11"
-check_architecture "arm64" "aarch64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/debian-11.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "debian-11"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/fedora-36.sh

@@ -1,103 +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 "fedora-36"
-check_architecture "x86_64"
-
-TOOLCHAIN_BUILD_DEPS=(
-    coreutils-common 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 libbabeltrace-devel # for gdb
-    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
-    libipt libipt-devel # intel
-    patch
-    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 pkgconf-pkg-config # 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 python3-virtualenv python3-virtualenvwrapper python3-pyyaml nmap-ncat # for tests
-    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
-    sbcl # for custom Lisp C++ preprocessing
-    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 ! dnf 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
-    dnf update -y
-    for pkg in $1; do
-        dnf install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/os/template.sh

@@ -5,8 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "todo-os-name"
-
 TOOLCHAIN_BUILD_DEPS=(
     pkg
 )

environment/os/ubuntu-18.04.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "ubuntu-18.04"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # archive download

environment/os/ubuntu-20.04.sh

@@ -5,9 +5,6 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
-check_operating_system "ubuntu-20.04"
-check_architecture "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

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/os/ubuntu-22.04.sh

@@ -5,9 +5,6 @@ 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 "x86_64"
-
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/toolchain/.gitignore

@@ -1 +0,0 @@
-*.tar.gz

environment/toolchain/v4.sh

@@ -10,14 +10,6 @@ cd "$DIR"
 source "$DIR/../util.sh"
 DISTRO="$(operating_system)"
 
-function log_tool_name () {
-    echo ""
-    echo ""
-    echo "#### $1 ####"
-    echo ""
-    echo ""
-}
-
 for_arm=false
 if [[ "$#" -eq 1 ]]; then
     if [[ "$1" == "--for-arm" ]]; then
@@ -28,11 +20,9 @@ if [[ "$#" -eq 1 ]]; then
    fi
 fi
 
-TOOLCHAIN_STDCXX="${TOOLCHAIN_STDCXX:-libstdc++}"
-if [[ "$TOOLCHAIN_STDCXX" != "libstdc++" && "$TOOLCHAIN_STDCXX" != "libc++" ]]; then
-    echo "Only GCC (libstdc++) or LLVM (libc++) C++ standard library implementations are supported."
-    exit 1
-fi
+os="$1"
+
+# toolchain version
 TOOLCHAIN_VERSION=4
 
 # package versions used
@@ -51,19 +41,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
@@ -117,8 +99,6 @@ if [ ! -f llvm-$LLVM_VERSION.src.tar.xz ]; then
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/clang-tools-extra-$LLVM_VERSION.src.tar.xz
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/compiler-rt-$LLVM_VERSION.src.tar.xz
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libunwind-$LLVM_VERSION.src.tar.xz
-    wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libcxx-$LLVM_VERSION.src.tar.xz
-    wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libcxxabi-$LLVM_VERSION.src.tar.xz
 fi
 if [ ! -f pahole-gdb-master.zip ]; then
     wget https://github.com/PhilArmstrong/pahole-gdb/archive/master.zip -O pahole-gdb-master.zip
@@ -176,8 +156,6 @@ if [ ! -f llvm-$LLVM_VERSION.src.tar.xz.sig ]; then
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/clang-tools-extra-$LLVM_VERSION.src.tar.xz.sig
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/compiler-rt-$LLVM_VERSION.src.tar.xz.sig
     wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libunwind-$LLVM_VERSION.src.tar.xz.sig
-    wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libcxx-$LLVM_VERSION.src.tar.xz.sig
-    wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/libcxxabi-$LLVM_VERSION.src.tar.xz.sig
 fi
 # list of valid llvm gnupg keys: https://releases.llvm.org/download.html
 $GPG --keyserver $KEYSERVER --recv-keys 0x474E22316ABF4785A88C6E8EA2C794A986419D8A
@@ -187,8 +165,6 @@ $GPG --verify lld-$LLVM_VERSION.src.tar.xz.sig lld-$LLVM_VERSION.src.tar.xz
 $GPG --verify clang-tools-extra-$LLVM_VERSION.src.tar.xz.sig clang-tools-extra-$LLVM_VERSION.src.tar.xz
 $GPG --verify compiler-rt-$LLVM_VERSION.src.tar.xz.sig compiler-rt-$LLVM_VERSION.src.tar.xz
 $GPG --verify libunwind-$LLVM_VERSION.src.tar.xz.sig libunwind-$LLVM_VERSION.src.tar.xz
-$GPG --verify libcxx-$LLVM_VERSION.src.tar.xz.sig libcxx-$LLVM_VERSION.src.tar.xz
-$GPG --verify libcxxabi-$LLVM_VERSION.src.tar.xz.sig libcxxabi-$LLVM_VERSION.src.tar.xz
 
 popd
 
@@ -196,7 +172,7 @@ popd
 mkdir -p build
 pushd build
 
-log_tool_name "GCC $GCC_VERSION"
+# compile gcc
 if [ ! -f $PREFIX/bin/gcc ]; then
     if [ -d gcc-$GCC_VERSION ]; then
         rm -rf gcc-$GCC_VERSION
@@ -287,7 +263,7 @@ fi
 export PATH=$PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$PREFIX/lib64
 
-log_tool_name "binutils $BINUTILS_VERSION"
+# compile binutils
 if [ ! -f $PREFIX/bin/ld.gold ]; then
     if [ -d binutils-$BINUTILS_VERSION ]; then
         rm -rf binutils-$BINUTILS_VERSION
@@ -351,7 +327,7 @@ if [ ! -f $PREFIX/bin/ld.gold ]; then
     popd && popd
 fi
 
-log_tool_name "GDB $GDB_VERSION"
+# compile gdb
 if [ ! -f $PREFIX/bin/gdb ]; then
     if [ -d gdb-$GDB_VERSION ]; then
         rm -rf gdb-$GDB_VERSION
@@ -387,62 +363,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 \
@@ -478,13 +398,13 @@ if [ ! -f $PREFIX/bin/gdb ]; then
     popd && popd
 fi
 
-log_tool_name "install pahole"
+# install pahole
 if [ ! -d $PREFIX/share/pahole-gdb ]; then
     unzip ../archives/pahole-gdb-master.zip
     mv pahole-gdb-master $PREFIX/share/pahole-gdb
 fi
 
-log_tool_name "setup system gdbinit"
+# setup system gdbinit
 if [ ! -f $PREFIX/etc/gdb/gdbinit ]; then
     mkdir -p $PREFIX/etc/gdb
     cat >$PREFIX/etc/gdb/gdbinit <<EOF
@@ -510,7 +430,7 @@ end
 EOF
 fi
 
-log_tool_name "cmake $CMAKE_VERSION"
+# compile cmake
 if [ ! -f $PREFIX/bin/cmake ]; then
     if [ -d cmake-$CMAKE_VERSION ]; then
         rm -rf cmake-$CMAKE_VERSION
@@ -536,7 +456,7 @@ if [ ! -f $PREFIX/bin/cmake ]; then
     popd && popd
 fi
 
-log_tool_name "cppcheck $CPPCHECK_VERSION"
+# compile cppcheck
 if [ ! -f $PREFIX/bin/cppcheck ]; then
     if [ -d cppcheck-$CPPCHECK_VERSION ]; then
         rm -rf cppcheck-$CPPCHECK_VERSION
@@ -560,7 +480,7 @@ if [ ! -f $PREFIX/bin/cppcheck ]; then
     popd
 fi
 
-log_tool_name "swig $SWIG_VERSION"
+# compile swig
 if [ ! -d swig-$SWIG_VERSION/install ]; then
     if [ -d swig-$SWIG_VERSION ]; then
         rm -rf swig-$SWIG_VERSION
@@ -576,7 +496,7 @@ if [ ! -d swig-$SWIG_VERSION/install ]; then
     popd && popd
 fi
 
-log_tool_name "LLVM $LLVM_VERSION"
+# compile llvm
 if [ ! -f $PREFIX/bin/clang ]; then
     if [ -d llvm-$LLVM_VERSION ]; then
         rm -rf llvm-$LLVM_VERSION
@@ -593,19 +513,8 @@ if [ ! -f $PREFIX/bin/clang ]; then
     mv compiler-rt-$LLVM_VERSION.src/ llvm-$LLVM_VERSION/projects/compiler-rt
     tar -xvf ../archives/libunwind-$LLVM_VERSION.src.tar.xz
     mv libunwind-$LLVM_VERSION.src/include/mach-o llvm-$LLVM_VERSION/tools/lld/include
-
-    # The following is required because of libc++
-    tar -xvf ../archives/libcxx-$LLVM_VERSION.src.tar.xz
-    mv libcxx-$LLVM_VERSION.src llvm-$LLVM_VERSION/projects/libcxx
-    tar -xvf ../archives/libcxxabi-$LLVM_VERSION.src.tar.xz
-    mv libcxxabi-$LLVM_VERSION.src llvm-$LLVM_VERSION/projects/libcxxabi
-    # NOTE: We moved part of the libunwind in one of the previous step.
-    rm -r libunwind-$LLVM_VERSION.src
-    tar -xvf ../archives/libunwind-$LLVM_VERSION.src.tar.xz
-    mv libunwind-$LLVM_VERSION.src llvm-$LLVM_VERSION/projects/libunwind
-
     pushd llvm-$LLVM_VERSION
-    mkdir -p build && pushd build
+    mkdir build && pushd build
     # activate swig
     export PATH=$DIR/build/swig-$SWIG_VERSION/install/bin:$PATH
     # influenced by: https://buildd.debian.org/status/fetch.php?pkg=llvm-toolchain-7&arch=amd64&ver=1%3A7.0.1%7E%2Brc2-1%7Eexp1&stamp=1541506173&raw=0
@@ -658,7 +567,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 +624,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 +675,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
 
@@ -912,11 +820,7 @@ source $PREFIX/activate
 export CC=$PREFIX/bin/clang
 export CXX=$PREFIX/bin/clang++
 export CFLAGS="$CFLAGS -fPIC"
-if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
-    export CXXFLAGS="$CXXFLAGS -fPIC"
-else
-    export CXXFLAGS="$CXXFLAGS -fPIC -stdlib=libc++"
-fi
+export CXXFLAGS="$CXXFLAGS -fPIC"
 COMMON_CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$PREFIX
                     -DCMAKE_PREFIX_PATH=$PREFIX
                     -DCMAKE_BUILD_TYPE=Release
@@ -930,7 +834,7 @@ COMMON_CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=$PREFIX
 COMMON_CONFIGURE_FLAGS="--enable-shared=no --prefix=$PREFIX"
 COMMON_MAKE_INSTALL_FLAGS="-j$CPUS BUILD_SHARED=no PREFIX=$PREFIX install"
 
-log_tool_name "bzip2 $BZIP2_VERSION"
+# install bzip2
 if [ ! -f $PREFIX/include/bzlib.h ]; then
     if [ -d bzip2-$BZIP2_VERSION ]; then
         rm -rf bzip2-$BZIP2_VERSION
@@ -941,7 +845,7 @@ if [ ! -f $PREFIX/include/bzlib.h ]; then
     popd
 fi
 
-log_tool_name "fmt $FMT_VERSION"
+# install fmt
 if [ ! -d $PREFIX/include/fmt ]; then
     if [ -d fmt-$FMT_VERSION ]; then
         rm -rf fmt-$FMT_VERSION
@@ -954,7 +858,7 @@ if [ ! -d $PREFIX/include/fmt ]; then
     popd && popd
 fi
 
-log_tool_name "lz4 $LZ4_VERSION"
+# install lz4
 if [ ! -f $PREFIX/include/lz4.h ]; then
     if [ -d lz4-$LZ4_VERSION ]; then
         rm -rf lz4-$LZ4_VERSION
@@ -965,7 +869,7 @@ if [ ! -f $PREFIX/include/lz4.h ]; then
     popd
 fi
 
-log_tool_name "xz $XZ_VERSION"
+# install xz
 if [ ! -f $PREFIX/include/lzma.h ]; then
     if [ -d xz-$XZ_VERSION ]; then
         rm -rf xz-$XZ_VERSION
@@ -977,7 +881,7 @@ if [ ! -f $PREFIX/include/lzma.h ]; then
     popd
 fi
 
-log_tool_name "zlib $ZLIB_VERSION"
+# install zlib
 if [ ! -f $PREFIX/include/zlib.h ]; then
     if [ -d zlib-$ZLIB_VERSION ]; then
         rm -rf zlib-$ZLIB_VERSION
@@ -991,7 +895,7 @@ if [ ! -f $PREFIX/include/zlib.h ]; then
     popd && popd
 fi
 
-log_tool_name "zstd $ZSTD_VERSION"
+# install zstd
 if [ ! -f $PREFIX/include/zstd.h ]; then
     if [ -d zstd-$ZSTD_VERSION ]; then
         rm -rf zstd-$ZSTD_VERSION
@@ -1006,8 +910,7 @@ if [ ! -f $PREFIX/include/zstd.h ]; then
     popd && popd
 fi
 
-# TODO(gitbuda): Freeze jmalloc version.
-log_tool_name "jmalloc"
+#install jemalloc
 if [ ! -d $PREFIX/include/jemalloc ]; then
     if [ -d jemalloc ]; then
         rm -rf jemalloc
@@ -1024,7 +927,7 @@ if [ ! -d $PREFIX/include/jemalloc ]; then
     popd
 fi
 
-log_tool_name "BOOST $BOOST_VERSION"
+# install boost
 if [ ! -d $PREFIX/include/boost ]; then
     if [ -d boost_$BOOST_VERSION_UNDERSCORES ]; then
         rm -rf boost_$BOOST_VERSION_UNDERSCORES
@@ -1032,24 +935,15 @@ if [ ! -d $PREFIX/include/boost ]; then
     tar -xzf ../archives/boost_$BOOST_VERSION_UNDERSCORES.tar.gz
     pushd boost_$BOOST_VERSION_UNDERSCORES
     ./bootstrap.sh --prefix=$PREFIX --with-toolset=clang --with-python=python3  --without-icu
-    if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
-        ./b2 toolset=clang -j$CPUS install variant=release link=static cxxstd=20 --disable-icu \
-            -sZLIB_SOURCE="$PREFIX" -sZLIB_INCLUDE="$PREFIX/include" -sZLIB_LIBPATH="$PREFIX/lib" \
-            -sBZIP2_SOURCE="$PREFIX" -sBZIP2_INCLUDE="$PREFIX/include" -sBZIP2_LIBPATH="$PREFIX/lib" \
-            -sLZMA_SOURCE="$PREFIX" -sLZMA_INCLUDE="$PREFIX/include" -sLZMA_LIBPATH="$PREFIX/lib" \
-            -sZSTD_SOURCE="$PREFIX" -sZSTD_INCLUDE="$PREFIX/include" -sZSTD_LIBPATH="$PREFIX/lib"
-    else
-        ./b2 toolset=clang -j$CPUS install variant=release link=static cxxstd=20 --disable-icu \
-            cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" \
-            -sZLIB_SOURCE="$PREFIX" -sZLIB_INCLUDE="$PREFIX/include" -sZLIB_LIBPATH="$PREFIX/lib" \
-            -sBZIP2_SOURCE="$PREFIX" -sBZIP2_INCLUDE="$PREFIX/include" -sBZIP2_LIBPATH="$PREFIX/lib" \
-            -sLZMA_SOURCE="$PREFIX" -sLZMA_INCLUDE="$PREFIX/include" -sLZMA_LIBPATH="$PREFIX/lib" \
-            -sZSTD_SOURCE="$PREFIX" -sZSTD_INCLUDE="$PREFIX/include" -sZSTD_LIBPATH="$PREFIX/lib"
-    fi
+    ./b2 toolset=clang -j$CPUS install variant=release link=static cxxstd=20 --disable-icu \
+        -sZLIB_SOURCE="$PREFIX" -sZLIB_INCLUDE="$PREFIX/include" -sZLIB_LIBPATH="$PREFIX/lib" \
+        -sBZIP2_SOURCE="$PREFIX" -sBZIP2_INCLUDE="$PREFIX/include" -sBZIP2_LIBPATH="$PREFIX/lib" \
+        -sLZMA_SOURCE="$PREFIX" -sLZMA_INCLUDE="$PREFIX/include" -sLZMA_LIBPATH="$PREFIX/lib" \
+        -sZSTD_SOURCE="$PREFIX" -sZSTD_INCLUDE="$PREFIX/include" -sZSTD_LIBPATH="$PREFIX/lib"
     popd
 fi
 
-log_tool_name "double-conversion $DOUBLE_CONVERSION_VERSION"
+# install double-conversion
 if [ ! -d $PREFIX/include/double-conversion ]; then
     if [ -d double-conversion-$DOUBLE_CONVERSION_VERSION ]; then
         rm -rf double-conversion-$DOUBLE_CONVERSION_VERSION
@@ -1064,8 +958,7 @@ if [ ! -d $PREFIX/include/double-conversion ]; then
     popd && popd
 fi
 
-# TODO(gitbuda): Freeze gflags version.
-log_tool_name "gflags"
+# install gflags
 if [ ! -d $PREFIX/include/gflags ]; then
     if [ -d gflags ]; then
         rm -rf gflags
@@ -1084,7 +977,7 @@ if [ ! -d $PREFIX/include/gflags ]; then
     popd && popd
 fi
 
-log_tool_name "libunwind $LIBUNWIND_VERSION"
+# install libunwind
 if [ ! -f $PREFIX/include/libunwind.h ]; then
     if [ -d libunwind-$LIBUNWIND_VERSION ]; then
         rm -rf libunwind-$LIBUNWIND_VERSION
@@ -1097,7 +990,7 @@ if [ ! -f $PREFIX/include/libunwind.h ]; then
     popd
 fi
 
-log_tool_name "glog $GLOG_VERSION"
+# install glog
 if [ ! -d $PREFIX/include/glog ]; then
     if [ -d glog-$GLOG_VERSION ]; then
         rm -rf glog-$GLOG_VERSION
@@ -1111,7 +1004,7 @@ if [ ! -d $PREFIX/include/glog ]; then
     popd && popd
 fi
 
-log_tool_name "libevent $LIBEVENT_VERSION"
+# install libevent
 if [ ! -d $PREFIX/include/event2 ]; then
     if [ -d libevent-$LIBEVENT_VERSION ]; then
         rm -rf libevent-$LIBEVENT_VERSION
@@ -1130,7 +1023,7 @@ if [ ! -d $PREFIX/include/event2 ]; then
     popd && popd
 fi
 
-log_tool_name "snappy $SNAPPY_VERSION"
+# install snappy
 if [ ! -f $PREFIX/include/snappy.h ]; then
     if [ -d snappy-$SNAPPY_VERSION ]; then
         rm -rf snappy-$SNAPPY_VERSION
@@ -1148,7 +1041,7 @@ if [ ! -f $PREFIX/include/snappy.h ]; then
     popd && popd
 fi
 
-log_tool_name "libsodium $LIBSODIUM_VERSION"
+# install libsodium
 if [ ! -f $PREFIX/include/sodium.h ]; then
     if [ -d libsodium-$LIBSODIUM_VERSION ]; then
         rm -rf libsodium-$LIBSODIUM_VERSION
@@ -1160,7 +1053,7 @@ if [ ! -f $PREFIX/include/sodium.h ]; then
     popd
 fi
 
-log_tool_name "libaio $LIBAIO_VERSION"
+# install libaio
 if [ ! -f $PREFIX/include/libaio.h ]; then
     if [ -d libaio-$LIBAIO_VERSION ]; then
         rm -rf libaio-$LIBAIO_VERSION
@@ -1171,121 +1064,114 @@ 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
+# install folly
+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
+# install fizz
+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
+# install wangle
+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
+# install proxygen
+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
+# install flex
+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
+# install fbthrift
+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
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -Denable_tests=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DCMAKE_CXX_FLAGS=-fsized-deallocation
+    make -j$CPUS install
+    popd
 fi
 
 popd
@@ -1293,7 +1179,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
@@ -1306,12 +1192,7 @@ if [ ! -f $NAME-binaries-$DISTRO.tar.gz ]; then
             DISTRO_FULL_NAME="$DISTRO_FULL_NAME-amd64"
         fi
     fi
-    if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
-        # Pass because infra scripts assume there is not C++ standard lib in the name.
-        echo "NOTE: Not adding anything to the archive name that GCC C++ standard lib is used."
-    else
-        DISTRO_FULL_NAME="$DISTRO_FULL_NAME-libc++"
-    fi
+
     tar --owner=root --group=root -cpvzf $NAME-binaries-$DISTRO_FULL_NAME.tar.gz -C /opt $NAME
 fi
 

environment/util.sh

@@ -1,38 +1,15 @@
 #!/bin/bash
 
-function operating_system() {
+operating_system() {
     grep -E '^(VERSION_)?ID=' /etc/os-release | \
     sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-'
 }
 
-function check_operating_system() {
-    if [ "$(operating_system)" != "$1" ]; then
-        echo "Not the right operating system!"
-        exit 1
-    else
-        echo "The right operating system."
-    fi
-}
-
-function architecture() {
+architecture() {
     uname -m
 }
 
-check_architecture() {
-    local ARCH=$(architecture)
-    for arch in "$@"; do
-        if [ "${ARCH}" = "$arch" ]; then
-            echo "The right architecture!"
-            return 0
-        fi
-    done
-    echo "Not the right architecture!"
-    echo "Expected: $@"
-    echo "Actual: ${ARCH}"
-    exit 1
-}
-
-function check_all_yum() {
+check_all_yum() {
     local missing=""
     for pkg in $1; do
         if ! yum list installed "$pkg" >/dev/null 2>/dev/null; then
@@ -45,7 +22,7 @@ function check_all_yum() {
     fi
 }
 
-function check_all_dpkg() {
+check_all_dpkg() {
     local missing=""
     for pkg in $1; do
         if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
@@ -58,7 +35,7 @@ function check_all_dpkg() {
     fi
 }
 
-function check_all_dnf() {
+check_all_dnf() {
     local missing=""
     for pkg in $1; do
         if ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
@@ -70,8 +47,7 @@ function check_all_dnf() {
         exit 1
     fi
 }
-
-function install_all_apt() {
+install_all_apt() {
     for pkg in $1; do
         apt install -y "$pkg"
     done

include/_mgp.hpp

@@ -1,734 +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.
-
-/// @file _mgp.hpp
-///
-/// The file contains methods that connect mg procedures and the outside code
-/// Methods like mapping a graph into memory or assigning new mg results or
-/// their properties are implemented.
-#pragma once
-
-#include "mg_exceptions.hpp"
-#include "mg_procedure.h"
-
-namespace mgp {
-
-namespace {
-inline void MgExceptionHandle(mgp_error result_code) {
-  switch (result_code) {
-    case mgp_error::MGP_ERROR_UNKNOWN_ERROR:
-      throw mg_exception::UnknownException();
-    case mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE:
-      throw mg_exception::AllocationException();
-    case mgp_error::MGP_ERROR_INSUFFICIENT_BUFFER:
-      throw mg_exception::InsufficientBufferException();
-    case mgp_error::MGP_ERROR_OUT_OF_RANGE:
-      throw mg_exception::OutOfRangeException();
-    case mgp_error::MGP_ERROR_LOGIC_ERROR:
-      throw mg_exception::LogicException();
-    case mgp_error::MGP_ERROR_DELETED_OBJECT:
-      throw mg_exception::DeletedObjectException();
-    case mgp_error::MGP_ERROR_INVALID_ARGUMENT:
-      throw mg_exception::InvalidArgumentException();
-    case mgp_error::MGP_ERROR_KEY_ALREADY_EXISTS:
-      throw mg_exception::KeyAlreadyExistsException();
-    case mgp_error::MGP_ERROR_IMMUTABLE_OBJECT:
-      throw mg_exception::ImmutableObjectException();
-    case mgp_error::MGP_ERROR_VALUE_CONVERSION:
-      throw mg_exception::ValueConversionException();
-    case mgp_error::MGP_ERROR_SERIALIZATION_ERROR:
-      throw mg_exception::SerializationException();
-    default:
-      return;
-  }
-}
-
-template <typename TResult, typename TFunc, typename... TArgs>
-TResult MgInvoke(TFunc func, TArgs... args) {
-  TResult result{};
-
-  auto result_code = func(args..., &result);
-  MgExceptionHandle(result_code);
-
-  return result;
-}
-
-template <typename TFunc, typename... TArgs>
-inline void MgInvokeVoid(TFunc func, TArgs... args) {
-  auto result_code = func(args...);
-  MgExceptionHandle(result_code);
-}
-}  // namespace
-
-// mgp_value
-
-// Make value
-
-inline 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) {
-  return MgInvoke<mgp_value *>(mgp_value_make_bool, val, memory);
-}
-
-inline 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) {
-  return MgInvoke<mgp_value *>(mgp_value_make_double, val, memory);
-}
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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);
-}
-
-inline 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); }
-
-// 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);
-}
-
-// Destroy value
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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) {
-  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);
-}
-
-// Check type of value
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-// Get type
-
-inline mgp_type *type_any() { return MgInvoke<mgp_type *>(mgp_type_any); }
-
-inline mgp_type *type_bool() { return MgInvoke<mgp_type *>(mgp_type_bool); }
-
-inline mgp_type *type_string() { return MgInvoke<mgp_type *>(mgp_type_string); }
-
-inline mgp_type *type_int() { return MgInvoke<mgp_type *>(mgp_type_int); }
-
-inline mgp_type *type_float() { return MgInvoke<mgp_type *>(mgp_type_float); }
-
-inline 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); }
-
-inline mgp_type *type_map() { return MgInvoke<mgp_type *>(mgp_type_map); }
-
-inline mgp_type *type_node() { return MgInvoke<mgp_type *>(mgp_type_node); }
-
-inline mgp_type *type_relationship() { return MgInvoke<mgp_type *>(mgp_type_relationship); }
-
-inline mgp_type *type_path() { return MgInvoke<mgp_type *>(mgp_type_path); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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);
-}
-
-inline 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) {
-  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); }
-
-inline 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) {
-  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); }
-
-inline 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) {
-  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); }
-
-inline 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_properties_iterator
-
-inline void properties_iterator_destroy(mgp_properties_iterator *it) { mgp_properties_iterator_destroy(it); }
-
-inline 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) {
-  return MgInvoke<mgp_property *>(mgp_properties_iterator_next, it);
-}
-
-// Container {mgp_list, mgp_map} methods
-
-// mgp_list
-
-inline 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);
-}
-
-inline 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); }
-
-inline 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); }
-
-inline 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_map
-
-inline 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); }
-
-inline 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);
-}
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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) {
-  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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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) {
-  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) {
-  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) {
-  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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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) {
-  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) {
-  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);
-}
-
-inline 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); }
-
-inline 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) {
-  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);
-}
-
-inline 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) {
-  return MgInvoke<mgp_date *>(mgp_date_from_string, string, memory);
-}
-
-inline 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);
-}
-
-inline 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); }
-
-inline 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); }
-
-inline 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); }
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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); }
-
-inline 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);
-}
-
-inline 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);
-}
-
-inline 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) {
-  return MgInvoke<int>(mgp_local_time_get_microsecond, local_time);
-}
-
-inline 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);
-}
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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);
-}
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  return MgInvoke<int64_t>(mgp_local_date_time_timestamp, local_date_time);
-}
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  return MgInvoke<mgp_duration *>(mgp_duration_from_string, string, memory);
-}
-
-inline 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) {
-  return MgInvoke<mgp_duration *>(mgp_duration_from_microseconds, microseconds, memory);
-}
-
-inline 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); }
-
-inline 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) {
-  return MgInvoke<int>(mgp_duration_equal, first, second);
-}
-
-inline 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) {
-  return MgInvoke<mgp_duration *>(mgp_duration_add, first, second, memory);
-}
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  MgInvokeVoid(mgp_proc_add_result, proc, name, type);
-}
-
-inline 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); }
-
-// mgp_result
-
-inline 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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  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) {
-  MgInvokeVoid(mgp_func_result_set_value, res, value, memory);
-}
-
-}  // namespace mgp

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/mg_exceptions.hpp

@@ -1,57 +0,0 @@
-// 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
-// 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 <exception>
-#include <iostream>
-
-namespace mg_exception {
-struct NotEnoughMemoryException : public std::exception {
-  const char *what() const throw() { return "Not enough memory!"; }
-};
-struct UnknownException : public std::exception {
-  const char *what() const throw() { return "Unknown exception!"; }
-};
-struct AllocationException : public std::exception {
-  const char *what() const throw() { return "Could not allocate memory!"; }
-};
-struct InsufficientBufferException : public std::exception {
-  const char *what() const throw() { return "Buffer is not sufficient to process procedure!"; }
-};
-struct OutOfRangeException : public std::exception {
-  const char *what() const throw() { return "Index out of range!"; }
-};
-struct LogicException : public std::exception {
-  const char *what() const throw() { return "Logic exception, check the procedure signature!"; }
-};
-struct DeletedObjectException : public std::exception {
-  const char *what() const throw() { return "Object is deleted!"; }
-};
-struct InvalidArgumentException : public std::exception {
-  const char *what() const throw() { return "Invalid argument!"; }
-};
-struct InvalidIDException : public std::exception {
-  const char *what() const throw() { return "Invalid ID!"; }
-};
-struct KeyAlreadyExistsException : public std::exception {
-  const char *what() const throw() { return "Key you are trying to set already exists!"; }
-};
-struct ImmutableObjectException : public std::exception {
-  const char *what() const throw() { return "Object you are trying to change is immutable!"; }
-};
-struct ValueConversionException : public std::exception {
-  const char *what() const throw() { return "Error in value conversion!"; }
-};
-struct SerializationException : public std::exception {
-  const char *what() const throw() { return "Error in serialization!"; }
-};
-}  // namespace mg_exception

include/mg_procedure.h

@@ -37,19 +37,12 @@ extern "C" {
 /// All functions return an error code that can be used to figure out whether the API call was successful or not. In
 /// case of failure, the specific error code can be used to identify the reason of the failure.
 MGP_ENUM_CLASS MGP_NODISCARD mgp_error{
-    MGP_ERROR_NO_ERROR,
-    MGP_ERROR_UNKNOWN_ERROR,
-    MGP_ERROR_UNABLE_TO_ALLOCATE,
-    MGP_ERROR_INSUFFICIENT_BUFFER,
-    MGP_ERROR_OUT_OF_RANGE,
-    MGP_ERROR_LOGIC_ERROR,
-    MGP_ERROR_DELETED_OBJECT,
-    MGP_ERROR_INVALID_ARGUMENT,
-    MGP_ERROR_KEY_ALREADY_EXISTS,
-    MGP_ERROR_IMMUTABLE_OBJECT,
-    MGP_ERROR_VALUE_CONVERSION,
-    MGP_ERROR_SERIALIZATION_ERROR,
-    MGP_ERROR_AUTHORIZATION_ERROR,
+    MGP_ERROR_NO_ERROR,           MGP_ERROR_UNKNOWN_ERROR,
+    MGP_ERROR_UNABLE_TO_ALLOCATE, MGP_ERROR_INSUFFICIENT_BUFFER,
+    MGP_ERROR_OUT_OF_RANGE,       MGP_ERROR_LOGIC_ERROR,
+    MGP_ERROR_DELETED_OBJECT,     MGP_ERROR_INVALID_ARGUMENT,
+    MGP_ERROR_KEY_ALREADY_EXISTS, MGP_ERROR_IMMUTABLE_OBJECT,
+    MGP_ERROR_VALUE_CONVERSION,   MGP_ERROR_SERIALIZATION_ERROR,
 };
 ///@}
 
@@ -171,8 +164,6 @@ enum mgp_value_type {
   MGP_VALUE_TYPE_DURATION,
 };
 
-enum mgp_error mgp_value_copy(struct mgp_value *val, struct mgp_memory *memory, struct mgp_value **result);
-
 /// Free the memory used by the given mgp_value instance.
 void mgp_value_destroy(struct mgp_value *val);
 
@@ -408,8 +399,6 @@ enum mgp_error mgp_value_get_duration(struct mgp_value *val, struct mgp_duration
 /// mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE is returned if unable to allocate a mgp_list.
 enum mgp_error mgp_list_make_empty(size_t capacity, struct mgp_memory *memory, struct mgp_list **result);
 
-enum mgp_error mgp_list_copy(struct mgp_list *list, struct mgp_memory *memory, struct mgp_list **result);
-
 /// Free the memory used by the given mgp_list and contained elements.
 void mgp_list_destroy(struct mgp_list *list);
 
@@ -448,8 +437,6 @@ enum mgp_error mgp_list_at(struct mgp_list *list, size_t index, struct mgp_value
 /// mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE is returned if unable to allocate a mgp_map.
 enum mgp_error mgp_map_make_empty(struct mgp_memory *memory, struct mgp_map **result);
 
-enum mgp_error mgp_map_copy(struct mgp_map *map, struct mgp_memory *memory, struct mgp_map **result);
-
 /// Free the memory used by the given mgp_map and contained items.
 void mgp_map_destroy(struct mgp_map *map);
 
@@ -1305,12 +1292,6 @@ struct mgp_proc;
 /// Describes a Memgraph magic function.
 struct mgp_func;
 
-/// All available log levels that can be used in mgp_log function
-MGP_ENUM_CLASS mgp_log_level{
-    MGP_LOG_LEVEL_TRACE, MGP_LOG_LEVEL_DEBUG, MGP_LOG_LEVEL_INFO,
-    MGP_LOG_LEVEL_WARN,  MGP_LOG_LEVEL_ERROR, MGP_LOG_LEVEL_CRITICAL,
-};
-
 /// Entry-point for a query module read procedure, invoked through openCypher.
 ///
 /// Passed in arguments will not live longer than the callback's execution.
@@ -1405,9 +1386,6 @@ enum mgp_error mgp_proc_add_result(struct mgp_proc *proc, const char *name, stru
 /// Return mgp_error::MGP_ERROR_INVALID_ARGUMENT if `name` is not a valid result name.
 /// RETURN mgp_error::MGP_ERROR_LOGIC_ERROR if a result field with the same name was already added.
 enum mgp_error mgp_proc_add_deprecated_result(struct mgp_proc *proc, const char *name, struct mgp_type *type);
-
-/// Log a message on a certain level.
-enum mgp_error mgp_log(enum mgp_log_level log_level, const char *output);
 ///@}
 
 /// @name Execution
@@ -1534,10 +1512,6 @@ enum mgp_error mgp_module_add_transformation(struct mgp_module *module, const ch
 ///
 ///@{
 
-/// State of the database that is exposed to magic functions. Currently it is unused, but it enables extending the
-/// functionalities of magic functions in future without breaking the API.
-struct mgp_func_context;
-
 /// Add a required argument to a function.
 ///
 /// The order of the added arguments corresponds to the signature of the openCypher function.

init

@@ -5,15 +5,13 @@ cd "$DIR"
 
 source "$DIR/environment/util.sh"
 
-DISTRO=$(operating_system)
-ARCHITECTURE=$(architecture)
-
 function print_help () {
     echo "Usage: $0 [OPTION]"
     echo -e "Check for missing packages and setup the project.\n"
     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 +32,7 @@ function setup_virtualenv () {
     popd > /dev/null
 }
 
+wsl_quicklisp_proxy=""
 setup_libs=true
 if [[ $# -eq 1 && "$1" == "-h" ]]; then
     print_help
@@ -41,6 +40,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
@@ -55,6 +64,8 @@ else
     done
 fi
 
+DISTRO=$(operating_system)
+ARCHITECTURE=$(architecture)
 if [ "${ARCHITECTURE}" = "arm64" ] || [ "${ARCHITECTURE}" = "aarch64" ]; then
   OS_SCRIPT=$DIR/environment/os/$DISTRO-arm.sh
 else
@@ -67,18 +78,37 @@ echo "All packages are in-place..."
 # create a default build directory
 mkdir -p ./build
 
-if [[ "$setup_libs" == "true" ]]; then
-  # Setup libs (download).
-  cd libs
-  ./cleanup.sh
-  ./setup.sh
-  cd ..
+# quicklisp package manager for Common Lisp
+quicklisp_install_dir="$HOME/quicklisp"
+if [[ -v QUICKLISP_HOME ]]; then
+  quicklisp_install_dir="${QUICKLISP_HOME}"
 fi
 
-# Fix for centos 7 during release
-if [ "${DISTRO}" = "centos-7" ] || [ "${DISTRO}" = "debian-11" ] || [ "${DISTRO}" = "amzn-2" ]; then
-  python3 -m pip uninstall -y virtualenv
-  python3 -m pip install virtualenv
+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 ..
 fi
 
 # setup gql_behave dependencies
@@ -106,18 +136,6 @@ 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
-
-# Link `include/mgp.py` with `release/mgp/mgp.py`
-ln -v -f include/mgp.py release/mgp/mgp.py
+# Install precommit hook
+python3 -m pip install pre-commit
+python3 -m pre_commit install

libs/.gitignore

@@ -5,5 +5,3 @@
 !CMakeLists.txt
 !__main.cpp
 !pulsar.patch
-!antlr4.10.1.patch
-!rocksdb8.1.1.patch

libs/CMakeLists.txt

@@ -106,7 +106,6 @@ import_external_library(antlr4 STATIC
              -DWITH_LIBCXX=OFF # because of debian bug
              -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
              -DCMAKE_CXX_STANDARD=20
-             -DANTLR_BUILD_CPP_TESTS=OFF
   BUILD_COMMAND $(MAKE) antlr4_static
   INSTALL_COMMAND $(MAKE) install)
 

libs/antlr4.10.1.patch

@@ -1,13 +0,0 @@
-diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
-index baf46cac9..2e7756de8 100644
---- a/runtime/Cpp/runtime/CMakeLists.txt
-+++ b/runtime/Cpp/runtime/CMakeLists.txt
-@@ -134,7 +134,7 @@ set_target_properties(antlr4_static
-                                  ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}
-                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
-
--install(TARGETS antlr4_shared
-+install(TARGETS antlr4_shared OPTIONAL
-         EXPORT antlr4-targets
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

libs/antlr4.patch

@@ -0,0 +1,43 @@
+diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
+index a8503bb..11362cf 100644
+--- a/runtime/Cpp/runtime/CMakeLists.txt
++++ b/runtime/Cpp/runtime/CMakeLists.txt
+@@ -5,8 +5,8 @@ set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
+ set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
+ ExternalProject_Add(
+   utfcpp
+-  GIT_REPOSITORY        "git://github.com/nemtrif/utfcpp"
+-  GIT_TAG               "v3.1.1"
++  GIT_REPOSITORY        "https://github.com/nemtrif/utfcpp"
++  GIT_TAG               "v3.2.1"
+   SOURCE_DIR            ${UTFCPP_DIR}
+   UPDATE_DISCONNECTED   1
+   CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
+@@ -118,7 +118,7 @@ set_target_properties(antlr4_static
+                                  ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}
+                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
+ 
+-install(TARGETS antlr4_shared
++install(TARGETS antlr4_shared OPTIONAL
+         DESTINATION lib
+         EXPORT antlr4-targets)
+ install(TARGETS antlr4_static
+diff --git a/runtime/Cpp/runtime/src/support/Any.h b/runtime/Cpp/runtime/src/support/Any.h
+index 468db98..65a473b 100644
+--- a/runtime/Cpp/runtime/src/support/Any.h
++++ b/runtime/Cpp/runtime/src/support/Any.h
+@@ -122,12 +122,12 @@ private:
+     }
+ 
+   private:
+-    template<int N = 0, typename std::enable_if<N == N && std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
++    template<int N = 0, typename std::enable_if<N == N && std::is_copy_constructible<T>::value, int>::type = 0>
+     Base* clone() const {
+       return new Derived<T>(value);
+     }
+ 
+-    template<int N = 0, typename std::enable_if<N == N && !std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
++    template<int N = 0, typename std::enable_if<N == N && !std::is_copy_constructible<T>::value, int>::type = 0>
+     Base* clone() const {
+       return nullptr;
+     }

libs/rocksdb8.1.1.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 598c728..816c705 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1242,7 +1242,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
-
-   if(ROCKSDB_BUILD_SHARED)
-     install(
--      TARGETS ${ROCKSDB_SHARED_LIB}
-+      TARGETS ${ROCKSDB_SHARED_LIB} OPTIONAL
-       EXPORT RocksDBTargets
-       COMPONENT runtime
-       ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

libs/setup.sh

@@ -105,7 +105,7 @@ repo_clone_try_double () {
 # Download from primary_urls might fail because the cache is not installed.
 declare -A primary_urls=(
   ["antlr4-code"]="http://$local_cache_host/git/antlr4.git"
-  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.10.1-complete.jar"
+  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.9.2-complete.jar"
   ["cppitertools"]="http://$local_cache_host/git/cppitertools.git"
   ["rapidcheck"]="http://$local_cache_host/git/rapidcheck.git"
   ["gbenchmark"]="http://$local_cache_host/git/benchmark.git"
@@ -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"
@@ -130,7 +130,7 @@ declare -A primary_urls=(
 # should fail.
 declare -A secondary_urls=(
   ["antlr4-code"]="https://github.com/antlr/antlr4.git"
-  ["antlr4-generator"]="https://www.antlr.org/download/antlr-4.10.1-complete.jar"
+  ["antlr4-generator"]="http://www.antlr.org/download/antlr-4.9.2-complete.jar"
   ["cppitertools"]="https://github.com/ryanhaining/cppitertools.git"
   ["rapidcheck"]="https://github.com/emil-e/rapidcheck.git"
   ["gbenchmark"]="https://github.com/google/benchmark.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"
@@ -152,10 +152,10 @@ declare -A secondary_urls=(
 # antlr
 file_get_try_double "${primary_urls[antlr4-generator]}" "${secondary_urls[antlr4-generator]}"
 
-antlr4_tag="4.10.1" # v4.10.1
+antlr4_tag="4.9.2" # v4.9.2
 repo_clone_try_double "${primary_urls[antlr4-code]}" "${secondary_urls[antlr4-code]}" "antlr4" "$antlr4_tag" true
 pushd antlr4
-git apply ../antlr4.10.1.patch
+git apply ../antlr4.patch
 popd
 
 # cppitertools v2.0 2019-12-23
@@ -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).
@@ -192,14 +192,14 @@ cd json
 file_get_try_double "${primary_urls[nlohmann]}" "${secondary_urls[nlohmann]}"
 cd ..
 
-rocksdb_tag="v8.1.1" # (2023-04-21)
+rocksdb_tag="v6.14.6" # (2020-10-14)
 repo_clone_try_double "${primary_urls[rocksdb]}" "${secondary_urls[rocksdb]}" "rocksdb" "$rocksdb_tag" true
 pushd rocksdb
-git apply ../rocksdb8.1.1.patch
+git apply ../rocksdb.patch
 popd
 
 # mgclient
-mgclient_tag="v1.4.0" # (2022-06-14)
+mgclient_tag="96e95c6845463cbe88948392be58d26da0d5ffd3" # (2022-02-08)
 repo_clone_try_double "${primary_urls[mgclient]}" "${secondary_urls[mgclient]}" "mgclient" "$mgclient_tag"
 sed -i 's/\${CMAKE_INSTALL_LIBDIR}/lib/' mgclient/src/CMakeLists.txt
 
@@ -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-18-05
+CHANGE DATE:            2026-16-06
 CHANGE LICENSE:         Apache License, Version 2.0
 
 For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.

licenses/MEL.txt

@@ -2,8 +2,8 @@ MEMGRAPH
 ENTERPRISE LICENCE AGREEMENT
 
 
-Memgraph Limited is registered in England under registration 10195084 and has its registered office at 90a High Street,
-Hertfordshire, Berkhamsted, HP4 2BL United Kingdom ("Memgraph").
+Memgraph Limited is registered in England under registration 10195084 and has its registered office at Suite 4,
+Ironstone House, Ironstone Way, Brixworth, Northampton, NN6 9UD (“Memgraph”).
 
 
 Memgraph agrees to license and/or grant you (the “Customer”) access to the Software ( as defined below) and provide

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/CMakeLists.txt

@@ -8,40 +8,29 @@ disallow_in_source_build()
 
 # Everything that is installed here, should be under the "query_modules" component.
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "query_modules")
-string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
-add_library(example_c SHARED example.c)
-target_include_directories(example_c PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_compile_options(example_c PRIVATE -Wall)
-# Strip C example in release build.
+add_library(example SHARED example.c)
+target_include_directories(example PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_compile_options(example PRIVATE -Wall)
+
+# Strip the library in release build.
+string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 if (lower_build_type STREQUAL "release")
-  add_custom_command(TARGET example_c POST_BUILD
-                     COMMAND strip -s $<TARGET_FILE:example_c>
-                     COMMENT "Stripping symbols and sections from the C example module")
+  add_custom_command(TARGET example POST_BUILD
+                     COMMAND strip -s $<TARGET_FILE:example>
+                     COMMENT "Stripping symbols and sections from example module")
 endif()
-install(PROGRAMS $<TARGET_FILE:example_c>
+
+install(PROGRAMS $<TARGET_FILE:example>
         DESTINATION lib/memgraph/query_modules
-        RENAME example_c.so)
+        RENAME example.so)
 # Also install the source of the example, so user can read it.
 install(FILES example.c DESTINATION lib/memgraph/query_modules/src)
 
-add_library(example_cpp SHARED example.cpp)
-target_include_directories(example_cpp PRIVATE ${CMAKE_SOURCE_DIR}/include)
-target_compile_options(example_cpp PRIVATE -Wall)
-# Strip C++ example in release build.
-if (lower_build_type STREQUAL "release")
-  add_custom_command(TARGET example_cpp POST_BUILD
-                     COMMAND strip -s $<TARGET_FILE:example_cpp>
-                     COMMENT "Stripping symbols and sections from the C++ example module")
-endif()
-install(PROGRAMS $<TARGET_FILE:example_cpp>
-        DESTINATION lib/memgraph/query_modules
-        RENAME example_cpp.so)
-# Also install the source of the example, so user can read it.
-install(FILES example.cpp DESTINATION lib/memgraph/query_modules/src)
-
-# Install the Python example and modules
+# Install the Python example
 install(FILES example.py DESTINATION lib/memgraph/query_modules RENAME py_example.py)
+
+# Install the Python modules
 install(FILES graph_analyzer.py DESTINATION lib/memgraph/query_modules)
 install(FILES mgp_networkx.py DESTINATION lib/memgraph/query_modules)
 install(FILES nxalg.py DESTINATION lib/memgraph/query_modules)

query_modules/example.cpp

@@ -1,103 +0,0 @@
-// 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
-// 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 <mgp.hpp>
-
-void ProcImpl(std::vector<mgp::Value> arguments, mgp::Graph graph, mgp::RecordFactory record_factory) {
-  auto record = record_factory.NewRecord();
-  record.Insert("out", true);
-}
-
-void SampleReadProc(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
-  try {
-    mgp::memory = memory;
-
-    std::vector<mgp::Value> arguments;
-    for (size_t i = 0; i < mgp::list_size(args); i++) {
-      auto arg = mgp::Value(mgp::list_at(args, i));
-      arguments.push_back(arg);
-    }
-
-    ProcImpl(arguments, mgp::Graph(memgraph_graph), mgp::RecordFactory(result));
-  } catch (const std::exception &e) {
-    mgp::result_set_error_msg(result, e.what());
-    return;
-  }
-}
-
-void AddXNodes(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
-  mgp::memory = memory;
-  auto graph = mgp::Graph(memgraph_graph);
-
-  std::vector<mgp::Value> arguments;
-  for (size_t i = 0; i < mgp::list_size(args); i++) {
-    auto arg = mgp::Value(mgp::list_at(args, i));
-    arguments.push_back(arg);
-  }
-
-  for (int i = 0; i < arguments[0].ValueInt(); i++) {
-    graph.CreateNode();
-  }
-}
-
-void Multiply(mgp_list *args, mgp_func_context *ctx, mgp_func_result *res, mgp_memory *memory) {
-  mgp::memory = memory;
-
-  std::vector<mgp::Value> arguments;
-  for (size_t i = 0; i < mgp::list_size(args); i++) {
-    auto arg = mgp::Value(mgp::list_at(args, i));
-    arguments.push_back(arg);
-  }
-
-  auto result = mgp::Result(res);
-
-  auto first = arguments[0].ValueInt();
-  auto second = arguments[1].ValueInt();
-
-  result.SetValue(first * second);
-}
-
-extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *memory) {
-  try {
-    mgp::memory = memory;
-
-    AddProcedure(SampleReadProc, "return_true", mgp::ProcedureType::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) {
-    return 1;
-  }
-
-  try {
-    mgp::memory = memory;
-
-    mgp::AddProcedure(AddXNodes, "add_x_nodes", mgp::ProcedureType::Write, {mgp::Parameter("param_1", mgp::Type::Int)},
-                      {}, module, memory);
-
-  } catch (const std::exception &e) {
-    return 1;
-  }
-
-  try {
-    mgp::memory = memory;
-
-    mgp::AddFunction(Multiply, "multiply",
-                     {mgp::Parameter("int", mgp::Type::Int), mgp::Parameter("int", mgp::Type::Int, (int64_t)3)}, module,
-                     memory);
-
-  } catch (const std::exception &e) {
-    return 1;
-  }
-
-  return 0;
-}
-
-extern "C" int mgp_shutdown_module() { return 0; }

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 +0,0 @@
-.venv
-dist
-mgp.py
-poetry.lock

release/mgp/LICENSE

@@ -1,201 +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.

release/mgp/README.md

@@ -1,11 +0,0 @@
-# mgp
-
-PyPi package used for type hinting when creating query modules. Repository of already available query modules is called [MAGE](https://github.com/memgraph/mage).
-
-## 🎬 Get started
- 
- To learn more, head over to the [docs for the query modules Python API](https://memgraph.com/docs/memgraph/reference-guide/query-modules/api/python-api). To get started with query modules, check out the [how-to guide](https://memgraph.com/docs/memgraph/how-to-guides/query-modules) on Memgraph docs. 
-
- ## 🔢 Versioning
-
- - mgp v1.1 is compatible with Memgraph >= 2.4.0

release/mgp/_mgp.py

@@ -1,267 +0,0 @@
-from typing import Any
-
-
-class MgpIterable:
-    def get() -> Any:
-        pass
-
-    def next() -> Any:
-        pass
-
-
-class Vertex:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-    def underlying_graph_is_mutable() -> bool:  # type: ignore
-        pass
-
-    def iter_properties() -> MgpIterable:  # type: ignore
-        pass
-
-    def get_property(self, property_name: str) -> "Property":  # type: ignore
-        pass
-
-    def set_property(self, property_name: str, value: Any) -> "Property":  # type: ignore
-        pass
-
-    def get_id() -> "VertexId":  # type: ignore
-        pass
-
-    def label_at(self, index: int) -> "Label":  # type: ignore
-        pass
-
-    def labels_count() -> int:  # type: ignore
-        pass
-
-    def add_label(self, label: Any):
-        pass
-
-    def remove_label(self, label: Any):
-        pass
-
-    def iter_in_edges() -> MgpIterable:  # type: ignore
-        pass
-
-    def iter_out_edges() -> MgpIterable:  # type: ignore
-        pass
-
-
-class Edge:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-    def underlying_graph_is_mutable() -> bool:  # type: ignore
-        pass
-
-    def iter_properties() -> MgpIterable:  # type: ignore
-        pass
-
-    def get_property(self, property_name: str) -> "Property":  # type: ignore
-        pass
-
-    def set_property(self, property_name: str, valuse: Any) -> "Property":  # type: ignore
-        pass
-
-    def get_type_name() -> str:  # type: ignore
-        pass
-
-    def get_id() -> "EdgeId":  # type: ignore
-        pass
-
-    def from_vertex() -> Vertex:  # type: ignore
-        pass
-
-    def to_vertex() -> Vertex:  # type: ignore
-        pass
-
-
-class Path:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-    @staticmethod
-    def make_with_start(vertex: Vertex) -> "Path":  # type: ignore
-        pass
-
-
-class Graph:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-
-class CypherType:
-    pass
-
-
-class Message:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-    def source_type() -> str:  # type: ignore
-        pass
-
-    def topic_name() -> str:  # type: ignore
-        pass
-
-    def key() -> bytes:  # type: ignore
-        pass
-
-    def timestamp() -> int:  # type: ignore
-        pass
-
-    def offset() -> int:  # type: ignore
-        pass
-
-    def payload() -> bytes:  # type: ignore
-        pass
-
-
-class Messages:
-    def is_valid() -> bool:  # type: ignore
-        pass
-
-    def message_at(self, id: int) -> Message:  # type: ignore
-        pass
-
-    def total_messages() -> int:  # type: ignore
-        pass
-
-
-class UnknownError(Exception):
-    pass
-
-
-class UnableToAllocateError(Exception):
-    pass
-
-
-class InsufficientBufferError(Exception):
-    pass
-
-
-class OutOfRangeError(Exception):
-    pass
-
-
-class LogicErrorError(Exception):
-
-    pass
-
-
-class DeletedObjectError(Exception):
-    pass
-
-
-class InvalidArgumentError(Exception):
-    pass
-
-
-class KeyAlreadyExistsError(Exception):
-    pass
-
-
-class ImmutableObjectError(Exception):
-    pass
-
-
-class ValueConversionError(Exception):
-    pass
-
-
-class SerializationError(Exception):
-    pass
-
-
-class AuthorizationError(Exception):
-    pass
-
-
-def type_nullable(elem: Any):
-    pass
-
-
-def type_list(elem: Any):
-    pass
-
-
-def type_bool():
-    pass
-
-
-def type_string():
-    pass
-
-
-def type_int():
-    pass
-
-
-def type_float():
-    pass
-
-
-def type_number():
-    pass
-
-
-def type_map():
-    pass
-
-
-def type_node():
-    pass
-
-
-def type_relationship():
-    pass
-
-
-def type_path():
-    pass
-
-
-def type_date():
-    pass
-
-
-def type_local_time():
-    pass
-
-
-def type_local_date_time():
-    pass
-
-
-def type_duration():
-    pass
-
-
-def type_any():
-    pass
-
-
-class _MODULE:
-    @staticmethod
-    def add_read_procedure(wrapper):
-        pass
-
-    @staticmethod
-    def add_write_procedure(wrapper):
-        pass
-
-    @staticmethod
-    def add_transformation(wrapper):
-        pass
-
-    @staticmethod
-    def add_function(wrapper):
-        pass
-
-
-class SOURCE_TYPE_KAFKA:
-    pass
-
-
-class SOURCE_TYPE_PULSAR:
-    pass

release/mgp/instructions.md

@@ -1,22 +0,0 @@
-# How to publish new versions
-## Prerequisites
-1. Installed poetry
-```
-pip install poetry
-```
-2. Set up [API tokens](https://pypi.org/help/#apitoken)
-3. Be a collaborator on [pypi](https://pypi.org/project/mgp/)
-
-## Making changes
-1. Make changes to the package
-2. Bump version in `pyproject.tml`
-3. `poetry build`
-4. `poetry publish`
-
-## Why is this not automatized?
-
-Because someone always has to manually bump up the version in `pyproject.toml`
-
-## Why does `_mgp.py` exists?
-Because we are mocking here all the types that are created by Memgraph
-in order to fix typing errors in `mgp.py`.

release/mgp/pyproject.toml

@@ -1,23 +0,0 @@
-[tool.poetry]
-name = "mgp"
-version = "1.1.1"
-description = "Memgraph's module for developing MAGE modules. Used only for type hinting!"
-authors = [
-    "katarinasupe <katarina.supe@memgraph.io>",
-    "jbajic <jure.bajic@memgraph.io>",
-    "antejavor <ante.javor@memgraph.io>",
-    "antaljanosbenjamin <benjamin.antal@memgraph.io>",
-    "MasterMedo <mislav.vuletic@gmail.com>",
-]
-license = "Apache-2.0"
-readme = "README.md"
-include = ["mgp.py", "_mgp.py"]
-
-[tool.poetry.dependencies]
-python = "^3.7"
-
-[tool.poetry.dev-dependencies]
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"

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"
@@ -79,11 +72,9 @@ make_package () {
     docker exec "$build_container" bash -c "/memgraph/environment/os/$os.sh install MEMGRAPH_BUILD_DEPS"
 
     echo "Building targeted package..."
-    # Fix issue with git marking directory as not safe
-    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)
@@ -11,14 +12,12 @@ add_subdirectory(memory)
 add_subdirectory(storage/v2)
 add_subdirectory(integrations)
 add_subdirectory(query)
-add_subdirectory(glue)
 add_subdirectory(slk)
 add_subdirectory(rpc)
-add_subdirectory(license)
 add_subdirectory(auth)
 
-if(MG_ENTERPRISE)
-        add_subdirectory(audit)
+if (MG_ENTERPRISE)
+  add_subdirectory(audit)
 endif()
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
@@ -32,98 +31,80 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # Memgraph Single Node v2 Executable
 # ----------------------------------------------------------------------------
 set(mg_single_node_v2_sources
-        memgraph.cpp
+    glue/communication.cpp
+    memgraph.cpp
+    glue/auth.cpp
 )
 
 set(mg_single_node_v2_libs stdc++fs Threads::Threads
-        mg-telemetry mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-glue)
-
-if(MG_ENTERPRISE)
-        # These are enterprise subsystems
-        set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)
+    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings)
+if (MG_ENTERPRISE)
+  # These are enterprise subsystems
+  set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)
 endif()
 
 # memgraph main executable
 add_executable(memgraph ${mg_single_node_v2_sources})
 target_include_directories(memgraph PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(memgraph ${mg_single_node_v2_libs})
-
 # NOTE: `include/mg_procedure.syms` describes a pattern match for symbols which
 # should be dynamically exported, so that `dlopen` can correctly link the
 # symbols in custom procedure module libraries.
 target_link_libraries(memgraph "-Wl,--dynamic-list=${CMAKE_SOURCE_DIR}/include/mg_procedure.syms")
 set_target_properties(memgraph PROPERTIES
-
-        # Set the executable output name to include version information.
-        OUTPUT_NAME "memgraph-${MEMGRAPH_VERSION}_${CMAKE_BUILD_TYPE}"
-
-        # Output the executable in main binary dir.
-        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
+                      # Set the executable output name to include version information.
+                      OUTPUT_NAME "memgraph-${MEMGRAPH_VERSION}_${CMAKE_BUILD_TYPE}"
+                      # Output the executable in main binary dir.
+                      RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 # Create symlink to the built executable.
 add_custom_command(TARGET memgraph POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:memgraph> ${CMAKE_BINARY_DIR}/memgraph
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/memgraph
-        COMMENT "Creating symlink to memgraph executable")
-
+                   COMMAND ${CMAKE_COMMAND} -E create_symlink $<TARGET_FILE:memgraph> ${CMAKE_BINARY_DIR}/memgraph
+                   BYPRODUCTS ${CMAKE_BINARY_DIR}/memgraph
+                   COMMENT "Creating symlink to memgraph executable")
 # Emulate the installed python_support, by creating a symlink
 add_custom_command(TARGET memgraph POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/python_support
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/python_support
-        COMMENT "Creating symlink for python_support")
+                   COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/python_support
+                   BYPRODUCTS ${CMAKE_BINARY_DIR}/python_support
+                   COMMENT "Creating symlink for python_support")
 
 # Strip the executable in release build.
-if(lower_build_type STREQUAL "release")
-        add_custom_command(TARGET memgraph POST_BUILD
-                COMMAND strip -s $<TARGET_FILE:memgraph>
-                COMMENT "Stripping symbols and sections from memgraph")
+if (lower_build_type STREQUAL "release")
+  add_custom_command(TARGET memgraph POST_BUILD
+                     COMMAND strip -s $<TARGET_FILE:memgraph>
+                     COMMENT "Stripping symbols and sections from memgraph")
 endif()
 
 # Generate the configuration file.
 add_custom_command(TARGET memgraph POST_BUILD
-        COMMAND ${CMAKE_SOURCE_DIR}/config/generate.py
-        ${CMAKE_BINARY_DIR}/memgraph
-        ${CMAKE_BINARY_DIR}/config/memgraph.conf
-        DEPENDS ${CMAKE_SOURCE_DIR}/config/generate.py
-        ${CMAKE_SOURCE_DIR}/config/flags.yaml
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/config/memgraph.conf
-        COMMENT "Generating memgraph configuration file")
+                   COMMAND ${CMAKE_SOURCE_DIR}/config/generate.py
+                               ${CMAKE_BINARY_DIR}/memgraph
+                               ${CMAKE_BINARY_DIR}/config/memgraph.conf
+                   DEPENDS ${CMAKE_SOURCE_DIR}/config/generate.py
+                           ${CMAKE_SOURCE_DIR}/config/flags.yaml
+                   BYPRODUCTS ${CMAKE_BINARY_DIR}/config/memgraph.conf
+                   COMMENT "Generating memgraph configuration file")
 
 # Everything here is under "memgraph" install component.
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "memgraph")
 
 # TODO: Default directory permissions to 755
 # NOTE: This is added in CMake 3.11, so enable it then
-# set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
-# OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ WORLD_READ)
+#set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
+#    OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ WORLD_READ)
 
 # Install and rename executable to just 'memgraph' Since we have to rename,
 # we cannot use the recommended `install(TARGETS ...)`.
 install(PROGRAMS $<TARGET_FILE:memgraph>
         DESTINATION lib/memgraph RENAME 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 the include file for writing custom procedures.
 install(FILES ${CMAKE_SOURCE_DIR}/include/mg_procedure.h
         DESTINATION include/memgraph)
-install(FILES ${CMAKE_SOURCE_DIR}/include/_mgp.hpp
-        DESTINATION include/memgraph)
-install(FILES ${CMAKE_SOURCE_DIR}/include/mg_exceptions.hpp
-        DESTINATION include/memgraph)
-install(FILES ${CMAKE_SOURCE_DIR}/include/mgp.hpp
-        DESTINATION include/memgraph)
-
 # Install the config file (must use absolute path).
 install(FILES ${CMAKE_BINARY_DIR}/config/memgraph.conf
         DESTINATION /etc/memgraph RENAME memgraph.conf)
-
 # Install logrotate configuration (must use absolute path).
 install(FILES ${CMAKE_SOURCE_DIR}/release/logrotate.conf
         DESTINATION /etc/logrotate.d RENAME memgraph)
@@ -139,14 +120,15 @@ install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}/var/log/memgraph
 # ----------------------------------------------------------------------------
 # Memgraph CSV Import Tool Executable
 # ----------------------------------------------------------------------------
+
 add_executable(mg_import_csv mg_import_csv.cpp)
 target_link_libraries(mg_import_csv mg-storage-v2)
 
 # Strip the executable in release build.
-if(lower_build_type STREQUAL "release")
-        add_custom_command(TARGET mg_import_csv POST_BUILD
-                COMMAND strip -s mg_import_csv
-                COMMENT "Stripping symbols and sections from mg_import_csv")
+if (lower_build_type STREQUAL "release")
+  add_custom_command(TARGET mg_import_csv POST_BUILD
+                     COMMAND strip -s mg_import_csv
+                     COMMENT "Stripping symbols and sections from mg_import_csv")
 endif()
 
 install(TARGETS mg_import_csv RUNTIME DESTINATION bin)

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/auth.cpp

@@ -16,8 +16,8 @@
 #include <fmt/format.h>
 
 #include "auth/exceptions.hpp"
-#include "license/license.hpp"
 #include "utils/flag_validation.hpp"
+#include "utils/license.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 #include "utils/settings.hpp"
@@ -68,9 +68,10 @@ Auth::Auth(const std::string &storage_directory) : storage_(storage_directory),
 
 std::optional<User> Auth::Authenticate(const std::string &username, const std::string &password) {
   if (module_.IsUsed()) {
-    const auto license_check_result = license::global_license_checker.IsEnterpriseValid(utils::global_settings);
+    const auto license_check_result = utils::license::global_license_checker.IsValidLicense(utils::global_settings);
     if (license_check_result.HasError()) {
-      spdlog::warn(license::LicenseCheckErrorToString(license_check_result.GetError(), "authentication modules"));
+      spdlog::warn(
+          utils::license::LicenseCheckErrorToString(license_check_result.GetError(), "authentication modules"));
       return std::nullopt;
     }
 
@@ -225,7 +226,7 @@ std::vector<auth::User> Auth::AllUsers() const {
     if (username != utils::ToLowerCase(username)) continue;
     auto user = GetUser(username);
     if (user) {
-      ret.push_back(std::move(*user));
+      ret.push_back(*user);
     }
   }
   return ret;
@@ -305,7 +306,7 @@ std::vector<auth::User> Auth::AllUsersForRole(const std::string &rolename_orig)
     if (it->second == rolename) {
       auto user = GetUser(username);
       if (user) {
-        ret.push_back(std::move(*user));
+        ret.push_back(*user);
       } else {
         throw AuthException("Couldn't load user '{}'!", username);
       }

src/auth/auth.hpp

@@ -21,7 +21,7 @@
 namespace memgraph::auth {
 /**
  * This class serves as the main Authentication/Authorization storage.
- * It provides functions for managing Users, Roles, Permissions and FineGrainedAccessPermissions.
+ * It provides functions for managing Users, Roles and Permissions.
  * NOTE: The non-const functions in this class aren't thread safe.
  * TODO (mferencevic): Disable user/role modification functions when they are
  * being managed by the 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
@@ -8,17 +8,14 @@
 
 #include "auth/models.hpp"
 
-#include <cstdint>
 #include <regex>
 
 #include <gflags/gflags.h>
 
 #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/license.hpp"
 #include "utils/settings.hpp"
 #include "utils/string.hpp"
 
@@ -33,21 +30,14 @@ DEFINE_string(auth_password_strength_regex, default_password_regex.data(),
 
 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 +84,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";
   }
 }
 
@@ -112,55 +98,6 @@ std::string PermissionLevelToString(PermissionLevel level) {
   }
 }
 
-#ifdef MG_ENTERPRISE
-FineGrainedPermission PermissionToFineGrainedPermission(const uint64_t permission) {
-  if (permission & FineGrainedPermission::CREATE_DELETE) {
-    return FineGrainedPermission::CREATE_DELETE;
-  }
-
-  if (permission & FineGrainedPermission::UPDATE) {
-    return FineGrainedPermission::UPDATE;
-  }
-
-  if (permission & FineGrainedPermission::READ) {
-    return FineGrainedPermission::READ;
-  }
-
-  return FineGrainedPermission::NOTHING;
-}
-
-std::string FineGrainedPermissionToString(const FineGrainedPermission level) {
-  switch (level) {
-    case FineGrainedPermission::CREATE_DELETE:
-      return "CREATE_DELETE";
-    case FineGrainedPermission::UPDATE:
-      return "UPDATE";
-    case FineGrainedPermission::READ:
-      return "READ";
-    case FineGrainedPermission::NOTHING:
-      return "NOTHING";
-  }
-}
-
-FineGrainedAccessPermissions Merge(const FineGrainedAccessPermissions &first,
-                                   const FineGrainedAccessPermissions &second) {
-  std::unordered_map<std::string, uint64_t> permissions{first.GetPermissions()};
-  std::optional<uint64_t> global_permission;
-
-  if (second.GetGlobalPermission().has_value()) {
-    global_permission = *second.GetGlobalPermission();
-  } else if (first.GetGlobalPermission().has_value()) {
-    global_permission = *first.GetGlobalPermission();
-  }
-
-  for (const auto &[label_name, permission] : second.GetPermissions()) {
-    permissions[label_name] = permission;
-  }
-
-  return FineGrainedAccessPermissions(permissions, global_permission);
-}
-#endif
-
 Permissions::Permissions(uint64_t grants, uint64_t denies) {
   // The deny bitmask has higher priority than the grant bitmask.
   denies_ = denies;
@@ -234,7 +171,7 @@ Permissions Permissions::Deserialize(const nlohmann::json &data) {
   if (!data["grants"].is_number_unsigned() || !data["denies"].is_number_unsigned()) {
     throw AuthException("Couldn't load permissions data!");
   }
-  return Permissions{data["grants"], data["denies"]};
+  return {data["grants"], data["denies"]};
 }
 
 uint64_t Permissions::grants() const { return grants_; }
@@ -246,191 +183,19 @@ bool operator==(const Permissions &first, const Permissions &second) {
 
 bool operator!=(const Permissions &first, const Permissions &second) { return !(first == second); }
 
-#ifdef MG_ENTERPRISE
-FineGrainedAccessPermissions::FineGrainedAccessPermissions(const std::unordered_map<std::string, uint64_t> &permissions,
-                                                           const std::optional<uint64_t> &global_permission)
-    : permissions_(permissions), global_permission_(global_permission) {}
-
-PermissionLevel FineGrainedAccessPermissions::Has(const std::string &permission,
-                                                  const FineGrainedPermission fine_grained_permission) const {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return PermissionLevel::GRANT;
-  }
-  const auto concrete_permission = std::invoke([&]() -> uint64_t {
-    if (permissions_.contains(permission)) {
-      return permissions_.at(permission);
-    }
-
-    if (global_permission_.has_value()) {
-      return global_permission_.value();
-    }
-
-    return 0;
-  });
-
-  const auto temp_permission = concrete_permission & fine_grained_permission;
-
-  return temp_permission > 0 ? PermissionLevel::GRANT : PermissionLevel::DENY;
-}
-
-void FineGrainedAccessPermissions::Grant(const std::string &permission,
-                                         const FineGrainedPermission fine_grained_permission) {
-  if (permission == query::kAsterisk) {
-    global_permission_ = CalculateGrant(fine_grained_permission);
-  } else {
-    permissions_[permission] = CalculateGrant(fine_grained_permission);
-  }
-}
-
-void FineGrainedAccessPermissions::Revoke(const std::string &permission) {
-  if (permission == query::kAsterisk) {
-    permissions_.clear();
-    global_permission_ = std::nullopt;
-  } else {
-    permissions_.erase(permission);
-  }
-}
-
-nlohmann::json FineGrainedAccessPermissions::Serialize() const {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return {};
-  }
-  nlohmann::json data = nlohmann::json::object();
-  data["permissions"] = permissions_;
-  data["global_permission"] = global_permission_.has_value() ? global_permission_.value() : -1;
-  return data;
-}
-
-FineGrainedAccessPermissions FineGrainedAccessPermissions::Deserialize(const nlohmann::json &data) {
-  if (!data.is_object()) {
-    throw AuthException("Couldn't load permissions data!");
-  }
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return FineGrainedAccessPermissions{};
-  }
-  std::optional<uint64_t> global_permission;
-
-  if (data["global_permission"].empty() || data["global_permission"] == -1) {
-    global_permission = std::nullopt;
-  } else {
-    global_permission = data["global_permission"];
-  }
-
-  return FineGrainedAccessPermissions(data["permissions"], global_permission);
-}
-
-const std::unordered_map<std::string, uint64_t> &FineGrainedAccessPermissions::GetPermissions() const {
-  return permissions_;
-}
-const std::optional<uint64_t> &FineGrainedAccessPermissions::GetGlobalPermission() const { return global_permission_; };
-
-uint64_t FineGrainedAccessPermissions::CalculateGrant(FineGrainedPermission fine_grained_permission) {
-  uint64_t shift{1};
-  uint64_t result{0};
-  auto uint_fine_grained_permission = static_cast<uint64_t>(fine_grained_permission);
-  while (uint_fine_grained_permission > 0) {
-    result |= uint_fine_grained_permission;
-    uint_fine_grained_permission >>= shift;
-  }
-
-  return result;
-}
-
-bool operator==(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second) {
-  return first.GetPermissions() == second.GetPermissions() &&
-         first.GetGlobalPermission() == second.GetGlobalPermission();
-}
-
-bool operator!=(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second) {
-  return !(first == second);
-}
-
-FineGrainedAccessHandler::FineGrainedAccessHandler(FineGrainedAccessPermissions labelPermissions,
-                                                   FineGrainedAccessPermissions edgeTypePermissions)
-    : label_permissions_(std::move(labelPermissions)), edge_type_permissions_(std::move(edgeTypePermissions)) {}
-
-const FineGrainedAccessPermissions &FineGrainedAccessHandler::label_permissions() const { return label_permissions_; }
-FineGrainedAccessPermissions &FineGrainedAccessHandler::label_permissions() { return label_permissions_; }
-
-const FineGrainedAccessPermissions &FineGrainedAccessHandler::edge_type_permissions() const {
-  return edge_type_permissions_;
-}
-FineGrainedAccessPermissions &FineGrainedAccessHandler::edge_type_permissions() { return edge_type_permissions_; }
-
-nlohmann::json FineGrainedAccessHandler::Serialize() const {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return {};
-  }
-  nlohmann::json data = nlohmann::json::object();
-  data["label_permissions"] = label_permissions_.Serialize();
-  data["edge_type_permissions"] = edge_type_permissions_.Serialize();
-  return data;
-}
-
-FineGrainedAccessHandler FineGrainedAccessHandler::Deserialize(const nlohmann::json &data) {
-  if (!data.is_object()) {
-    throw AuthException("Couldn't load role data!");
-  }
-  if (!data["label_permissions"].is_object() || !data["edge_type_permissions"].is_object()) {
-    throw AuthException("Couldn't load label_permissions or edge_type_permissions data!");
-  }
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return FineGrainedAccessHandler{};
-  }
-  auto label_permissions = FineGrainedAccessPermissions::Deserialize(data["label_permissions"]);
-  auto edge_type_permissions = FineGrainedAccessPermissions::Deserialize(data["edge_type_permissions"]);
-
-  return FineGrainedAccessHandler(std::move(label_permissions), std::move(edge_type_permissions));
-}
-
-bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second) {
-  return first.label_permissions_ == second.label_permissions_ &&
-         first.edge_type_permissions_ == second.edge_type_permissions_;
-}
-
-bool operator!=(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second) {
-  return !(first == second);
-}
-#endif
-
 Role::Role(const std::string &rolename) : rolename_(utils::ToLowerCase(rolename)) {}
+
 Role::Role(const std::string &rolename, const Permissions &permissions)
     : rolename_(utils::ToLowerCase(rolename)), permissions_(permissions) {}
-#ifdef MG_ENTERPRISE
-Role::Role(const std::string &rolename, const Permissions &permissions,
-           FineGrainedAccessHandler fine_grained_access_handler)
-    : rolename_(utils::ToLowerCase(rolename)),
-      permissions_(permissions),
-      fine_grained_access_handler_(std::move(fine_grained_access_handler)) {}
-#endif
 
 const std::string &Role::rolename() const { return rolename_; }
 const Permissions &Role::permissions() const { return permissions_; }
 Permissions &Role::permissions() { return permissions_; }
-#ifdef MG_ENTERPRISE
-const FineGrainedAccessHandler &Role::fine_grained_access_handler() const { return fine_grained_access_handler_; }
-FineGrainedAccessHandler &Role::fine_grained_access_handler() { return fine_grained_access_handler_; }
-
-const FineGrainedAccessPermissions &Role::GetFineGrainedAccessLabelPermissions() const {
-  return fine_grained_access_handler_.label_permissions();
-}
-
-const FineGrainedAccessPermissions &Role::GetFineGrainedAccessEdgeTypePermissions() const {
-  return fine_grained_access_handler_.edge_type_permissions();
-}
-#endif
 
 nlohmann::json Role::Serialize() const {
   nlohmann::json data = nlohmann::json::object();
   data["rolename"] = rolename_;
   data["permissions"] = permissions_.Serialize();
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    data["fine_grained_access_handler"] = fine_grained_access_handler_.Serialize();
-  } else {
-    data["fine_grained_access_handler"] = {};
-  }
-#endif
   return data;
 }
 
@@ -442,43 +207,18 @@ Role Role::Deserialize(const nlohmann::json &data) {
     throw AuthException("Couldn't load role data!");
   }
   auto permissions = Permissions::Deserialize(data["permissions"]);
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    if (!data["fine_grained_access_handler"].is_object()) {
-      throw AuthException("Couldn't load user data!");
-    }
-    auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
-    return {data["rolename"], permissions, std::move(fine_grained_access_handler)};
-  }
-#endif
   return {data["rolename"], permissions};
 }
 
 bool operator==(const Role &first, const Role &second) {
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return first.rolename_ == second.rolename_ && first.permissions_ == second.permissions_ &&
-           first.fine_grained_access_handler_ == second.fine_grained_access_handler_;
-  }
-#endif
   return first.rolename_ == second.rolename_ && first.permissions_ == second.permissions_;
 }
 
-User::User() {}
-
 User::User(const std::string &username) : username_(utils::ToLowerCase(username)) {}
+
 User::User(const std::string &username, const std::string &password_hash, const Permissions &permissions)
     : username_(utils::ToLowerCase(username)), password_hash_(password_hash), permissions_(permissions) {}
 
-#ifdef MG_ENTERPRISE
-User::User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-           FineGrainedAccessHandler fine_grained_access_handler)
-    : username_(utils::ToLowerCase(username)),
-      password_hash_(password_hash),
-      permissions_(permissions),
-      fine_grained_access_handler_(std::move(fine_grained_access_handler)) {}
-#endif
-
 bool User::CheckPassword(const std::string &password) {
   if (password_hash_.empty()) return true;
   return VerifyPassword(password, password_hash_);
@@ -494,13 +234,13 @@ void User::UpdatePassword(const std::optional<std::string> &password) {
   }
 
   if (FLAGS_auth_password_strength_regex != default_password_regex) {
-    if (const auto license_check_result = license::global_license_checker.IsEnterpriseValid(utils::global_settings);
+    if (const auto license_check_result = utils::license::global_license_checker.IsValidLicense(utils::global_settings);
         license_check_result.HasError()) {
       throw AuthException(
           "Custom password regex is a Memgraph Enterprise feature. Please set the config "
           "(\"--auth-password-strength-regex\") to its default value (\"{}\") or remove the flag.\n{}",
           default_password_regex,
-          license::LicenseCheckErrorToString(license_check_result.GetError(), "password regex"));
+          utils::license::LicenseCheckErrorToString(license_check_result.GetError(), "password regex"));
     }
   }
   std::regex re(FLAGS_auth_password_strength_regex);
@@ -520,47 +260,17 @@ void User::ClearRole() { role_ = std::nullopt; }
 
 Permissions User::GetPermissions() const {
   if (role_) {
-    return Permissions{permissions_.grants() | role_->permissions().grants(),
-                       permissions_.denies() | role_->permissions().denies()};
+    return Permissions(permissions_.grants() | role_->permissions().grants(),
+                       permissions_.denies() | role_->permissions().denies());
   }
   return permissions_;
 }
 
-#ifdef MG_ENTERPRISE
-FineGrainedAccessPermissions User::GetFineGrainedAccessLabelPermissions() const {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return FineGrainedAccessPermissions{};
-  }
-
-  if (role_) {
-    return Merge(role()->fine_grained_access_handler().label_permissions(),
-                 fine_grained_access_handler_.label_permissions());
-  }
-
-  return fine_grained_access_handler_.label_permissions();
-}
-
-FineGrainedAccessPermissions User::GetFineGrainedAccessEdgeTypePermissions() const {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return FineGrainedAccessPermissions{};
-  }
-  if (role_) {
-    return Merge(role()->fine_grained_access_handler().edge_type_permissions(),
-                 fine_grained_access_handler_.edge_type_permissions());
-  }
-  return fine_grained_access_handler_.edge_type_permissions();
-}
-#endif
-
 const std::string &User::username() const { return username_; }
 
 const Permissions &User::permissions() const { return permissions_; }
 Permissions &User::permissions() { return permissions_; }
-#ifdef MG_ENTERPRISE
-const FineGrainedAccessHandler &User::fine_grained_access_handler() const { return fine_grained_access_handler_; }
 
-FineGrainedAccessHandler &User::fine_grained_access_handler() { return fine_grained_access_handler_; }
-#endif
 const Role *User::role() const {
   if (role_.has_value()) {
     return &role_.value();
@@ -573,13 +283,6 @@ nlohmann::json User::Serialize() const {
   data["username"] = username_;
   data["password_hash"] = password_hash_;
   data["permissions"] = permissions_.Serialize();
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    data["fine_grained_access_handler"] = fine_grained_access_handler_.Serialize();
-  } else {
-    data["fine_grained_access_handler"] = {};
-  }
-#endif
   // The role shouldn't be serialized here, it is stored as a foreign key.
   return data;
 }
@@ -592,28 +295,11 @@ User User::Deserialize(const nlohmann::json &data) {
     throw AuthException("Couldn't load user data!");
   }
   auto permissions = Permissions::Deserialize(data["permissions"]);
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    if (!data["fine_grained_access_handler"].is_object()) {
-      throw AuthException("Couldn't load user data!");
-    }
-    auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
-    return {data["username"], data["password_hash"], permissions, fine_grained_access_handler};
-  }
-#endif
   return {data["username"], data["password_hash"], permissions};
 }
 
 bool operator==(const User &first, const User &second) {
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    return first.username_ == second.username_ && first.password_hash_ == second.password_hash_ &&
-           first.permissions_ == second.permissions_ && first.role_ == second.role_ &&
-           first.fine_grained_access_handler_ == second.fine_grained_access_handler_;
-  }
-#endif
   return first.username_ == second.username_ && first.password_hash_ == second.password_hash_ &&
          first.permissions_ == second.permissions_ && first.role_ == second.role_;
 }
-
 }  // namespace memgraph::auth

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
@@ -10,7 +10,6 @@
 
 #include <optional>
 #include <string>
-#include <unordered_map>
 
 #include <json/json.hpp>
 
@@ -39,67 +38,26 @@ 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
 
-#ifdef MG_ENTERPRISE
-// clang-format off
-enum class FineGrainedPermission : uint64_t {
-  NOTHING       = 0,
-  READ          = 1,
-  UPDATE        = 1U << 1U,
-  CREATE_DELETE = 1U << 2U
-};
-// clang-format on
-
-constexpr inline uint64_t operator|(FineGrainedPermission lhs, FineGrainedPermission rhs) {
-  return static_cast<uint64_t>(lhs) | static_cast<uint64_t>(rhs);
-}
-
-constexpr inline uint64_t operator|(uint64_t lhs, FineGrainedPermission rhs) {
-  return lhs | static_cast<uint64_t>(rhs);
-}
-
-constexpr inline uint64_t operator&(uint64_t lhs, FineGrainedPermission rhs) {
-  return (lhs & static_cast<uint64_t>(rhs)) != 0;
-}
-
-constexpr uint64_t kLabelPermissionAll = memgraph::auth::FineGrainedPermission::CREATE_DELETE |
-                                         memgraph::auth::FineGrainedPermission::UPDATE |
-                                         memgraph::auth::FineGrainedPermission::READ;
-constexpr uint64_t kLabelPermissionMax = static_cast<uint64_t>(memgraph::auth::FineGrainedPermission::CREATE_DELETE);
-constexpr uint64_t kLabelPermissionMin = static_cast<uint64_t>(memgraph::auth::FineGrainedPermission::READ);
-#endif
-
 // Function that converts a permission to its string representation.
 std::string PermissionToString(Permission permission);
 
 // Class that indicates what permission level the user/role has.
-enum class PermissionLevel : uint8_t { GRANT, NEUTRAL, DENY };
+enum class PermissionLevel {
+  GRANT,
+  NEUTRAL,
+  DENY,
+};
 
 // Function that converts a permission level to its string representation.
 std::string PermissionLevelToString(PermissionLevel level);
 
-#ifdef MG_ENTERPRISE
-// Function that converts a label permission level to its string representation.
-std::string FineGrainedPermissionToString(FineGrainedPermission level);
-
-// Constructs a label permission from a permission
-FineGrainedPermission PermissionToFineGrainedPermission(uint64_t permission);
-#endif
-
 class Permissions final {
  public:
-  explicit Permissions(uint64_t grants = 0, uint64_t denies = 0);
-
-  Permissions(const Permissions &) = default;
-  Permissions &operator=(const Permissions &) = default;
-  Permissions(Permissions &&) noexcept = default;
-  Permissions &operator=(Permissions &&) noexcept = default;
-  ~Permissions() = default;
+  Permissions(uint64_t grants = 0, uint64_t denies = 0);
 
   PermissionLevel Has(Permission permission) const;
 
@@ -130,96 +88,16 @@ bool operator==(const Permissions &first, const Permissions &second);
 
 bool operator!=(const Permissions &first, const Permissions &second);
 
-#ifdef MG_ENTERPRISE
-class FineGrainedAccessPermissions final {
- public:
-  explicit FineGrainedAccessPermissions(const std::unordered_map<std::string, uint64_t> &permissions = {},
-                                        const std::optional<uint64_t> &global_permission = std::nullopt);
-  FineGrainedAccessPermissions(const FineGrainedAccessPermissions &) = default;
-  FineGrainedAccessPermissions &operator=(const FineGrainedAccessPermissions &) = default;
-  FineGrainedAccessPermissions(FineGrainedAccessPermissions &&) = default;
-  FineGrainedAccessPermissions &operator=(FineGrainedAccessPermissions &&) = default;
-  ~FineGrainedAccessPermissions() = default;
-  PermissionLevel Has(const std::string &permission, FineGrainedPermission fine_grained_permission) const;
-
-  void Grant(const std::string &permission, FineGrainedPermission fine_grained_permission);
-
-  void Revoke(const std::string &permission);
-
-  nlohmann::json Serialize() const;
-
-  /// @throw AuthException if unable to deserialize.
-  static FineGrainedAccessPermissions Deserialize(const nlohmann::json &data);
-
-  const std::unordered_map<std::string, uint64_t> &GetPermissions() const;
-  const std::optional<uint64_t> &GetGlobalPermission() const;
-
- private:
-  std::unordered_map<std::string, uint64_t> permissions_{};
-  std::optional<uint64_t> global_permission_;
-
-  static uint64_t CalculateGrant(FineGrainedPermission fine_grained_permission);
-};
-
-bool operator==(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second);
-
-bool operator!=(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second);
-
-class FineGrainedAccessHandler final {
- public:
-  explicit FineGrainedAccessHandler(FineGrainedAccessPermissions labelPermissions = FineGrainedAccessPermissions(),
-                                    FineGrainedAccessPermissions edgeTypePermissions = FineGrainedAccessPermissions());
-
-  FineGrainedAccessHandler(const FineGrainedAccessHandler &) = default;
-  FineGrainedAccessHandler &operator=(const FineGrainedAccessHandler &) = default;
-  FineGrainedAccessHandler(FineGrainedAccessHandler &&) noexcept = default;
-  FineGrainedAccessHandler &operator=(FineGrainedAccessHandler &&) noexcept = default;
-  ~FineGrainedAccessHandler() = default;
-
-  const FineGrainedAccessPermissions &label_permissions() const;
-  FineGrainedAccessPermissions &label_permissions();
-
-  const FineGrainedAccessPermissions &edge_type_permissions() const;
-  FineGrainedAccessPermissions &edge_type_permissions();
-
-  nlohmann::json Serialize() const;
-
-  /// @throw AuthException if unable to deserialize.
-  static FineGrainedAccessHandler Deserialize(const nlohmann::json &data);
-
-  friend bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second);
-
- private:
-  FineGrainedAccessPermissions label_permissions_;
-  FineGrainedAccessPermissions edge_type_permissions_;
-};
-
-bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second);
-#endif
-
 class Role final {
  public:
-  explicit Role(const std::string &rolename);
+  Role(const std::string &rolename);
+
   Role(const std::string &rolename, const Permissions &permissions);
-#ifdef MG_ENTERPRISE
-  Role(const std::string &rolename, const Permissions &permissions,
-       FineGrainedAccessHandler fine_grained_access_handler);
-#endif
-  Role(const Role &) = default;
-  Role &operator=(const Role &) = default;
-  Role(Role &&) noexcept = default;
-  Role &operator=(Role &&) noexcept = default;
-  ~Role() = default;
 
   const std::string &rolename() const;
   const Permissions &permissions() const;
   Permissions &permissions();
-#ifdef MG_ENTERPRISE
-  const FineGrainedAccessHandler &fine_grained_access_handler() const;
-  FineGrainedAccessHandler &fine_grained_access_handler();
-  const FineGrainedAccessPermissions &GetFineGrainedAccessLabelPermissions() const;
-  const FineGrainedAccessPermissions &GetFineGrainedAccessEdgeTypePermissions() const;
-#endif
+
   nlohmann::json Serialize() const;
 
   /// @throw AuthException if unable to deserialize.
@@ -230,9 +108,6 @@ class Role final {
  private:
   std::string rolename_;
   Permissions permissions_;
-#ifdef MG_ENTERPRISE
-  FineGrainedAccessHandler fine_grained_access_handler_;
-#endif
 };
 
 bool operator==(const Role &first, const Role &second);
@@ -240,19 +115,9 @@ bool operator==(const Role &first, const Role &second);
 // TODO (mferencevic): Implement password expiry.
 class User final {
  public:
-  User();
+  User(const std::string &username);
 
-  explicit User(const std::string &username);
   User(const std::string &username, const std::string &password_hash, const Permissions &permissions);
-#ifdef MG_ENTERPRISE
-  User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-       FineGrainedAccessHandler fine_grained_access_handler);
-#endif
-  User(const User &) = default;
-  User &operator=(const User &) = default;
-  User(User &&) noexcept = default;
-  User &operator=(User &&) noexcept = default;
-  ~User() = default;
 
   /// @throw AuthException if unable to verify the password.
   bool CheckPassword(const std::string &password);
@@ -266,12 +131,6 @@ class User final {
 
   Permissions GetPermissions() const;
 
-#ifdef MG_ENTERPRISE
-  FineGrainedAccessPermissions GetFineGrainedAccessLabelPermissions() const;
-  FineGrainedAccessPermissions GetFineGrainedAccessEdgeTypePermissions() const;
-  const FineGrainedAccessHandler &fine_grained_access_handler() const;
-  FineGrainedAccessHandler &fine_grained_access_handler();
-#endif
   const std::string &username() const;
 
   const Permissions &permissions() const;
@@ -290,16 +149,8 @@ class User final {
   std::string username_;
   std::string password_hash_;
   Permissions permissions_;
-#ifdef MG_ENTERPRISE
-  FineGrainedAccessHandler fine_grained_access_handler_;
-#endif
   std::optional<Role> role_;
 };
 
 bool operator==(const User &first, const User &second);
-
-#ifdef MG_ENTERPRISE
-FineGrainedAccessPermissions Merge(const FineGrainedAccessPermissions &first,
-                                   const FineGrainedAccessPermissions &second);
-#endif
 }  // namespace memgraph::auth

src/communication/CMakeLists.txt

@@ -7,7 +7,6 @@ set(communication_src_files
     websocket/listener.cpp
     websocket/session.cpp
     bolt/v1/value.cpp
-    bolt/client.cpp
     buffer.cpp
     client.cpp
     context.cpp

src/communication/bolt/client.cpp

@@ -1,267 +0,0 @@
-// 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
-// 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 "communication/bolt/client.hpp"
-
-#include "communication/bolt/v1/codes.hpp"
-#include "communication/bolt/v1/value.hpp"
-#include "utils/logging.hpp"
-
-namespace {
-constexpr uint8_t kBoltV43Version[4] = {0x00, 0x00, 0x03, 0x04};
-constexpr uint8_t kEmptyBoltVersion[4] = {0x00, 0x00, 0x00, 0x00};
-}  // namespace
-namespace memgraph::communication::bolt {
-
-Client::Client(communication::ClientContext &context) : client_{&context} {}
-
-void Client::Connect(const io::network::Endpoint &endpoint, const std::string &username, const std::string &password,
-                     const std::string &client_name) {
-  if (!client_.Connect(endpoint)) {
-    throw ClientFatalException("Couldn't connect to {}!", endpoint);
-  }
-
-  if (!client_.Write(kPreamble, sizeof(kPreamble), true)) {
-    spdlog::error("Couldn't send preamble!");
-    throw ServerCommunicationException();
-  }
-
-  if (!client_.Write(kBoltV43Version, sizeof(kBoltV43Version), true)) {
-    spdlog::error("Couldn't send protocol version!");
-    throw ServerCommunicationException();
-  }
-
-  for (int i = 0; i < 3; ++i) {
-    if (!client_.Write(kEmptyBoltVersion, sizeof(kEmptyBoltVersion), i != 2)) {
-      spdlog::error("Couldn't send protocol version!");
-      throw ServerCommunicationException();
-    }
-  }
-
-  if (!client_.Read(sizeof(kBoltV43Version))) {
-    spdlog::error("Couldn't get negotiated protocol version!");
-    throw ServerCommunicationException();
-  }
-
-  if (memcmp(kBoltV43Version, client_.GetData(), sizeof(kBoltV43Version)) != 0) {
-    spdlog::error("Server negotiated unsupported protocol version!");
-    throw ClientFatalException("The server negotiated an usupported protocol version!");
-  }
-  client_.ShiftData(sizeof(kBoltV43Version));
-
-  if (!encoder_.MessageInit({{"user_agent", client_name},
-                             {"scheme", "basic"},
-                             {"principal", username},
-                             {"credentials", password},
-                             {"routing", {}}})) {
-    spdlog::error("Couldn't send init message!");
-    throw ServerCommunicationException();
-  }
-
-  Signature signature{};
-  Value metadata;
-  if (!ReadMessage(signature, metadata)) {
-    spdlog::error("Couldn't read init message response!");
-    throw ServerCommunicationException();
-  }
-  if (signature != Signature::Success) {
-    spdlog::error("Handshake failed!");
-    throw ClientFatalException("Handshake with the server failed!");
-  }
-
-  spdlog::debug("Metadata of init message response: {}", metadata);
-}
-
-QueryData Client::Execute(const std::string &query, const std::map<std::string, Value> &parameters) {
-  if (!client_.IsConnected()) {
-    throw ClientFatalException("You must first connect to the server before using the client!");
-  }
-
-  spdlog::debug("Sending run message with statement: '{}'; parameters: {}", query, parameters);
-
-  // 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)}});
-
-  spdlog::debug("Reading run message response");
-  Signature signature{};
-  Value fields;
-  if (!ReadMessage(signature, fields)) {
-    throw ServerCommunicationException();
-  }
-  if (fields.type() != Value::Type::Map) {
-    throw ServerMalformedDataException();
-  }
-
-  if (signature == Signature::Failure) {
-    HandleFailure<ClientQueryException>(fields.ValueMap());
-  }
-  if (signature != Signature::Success) {
-    throw ServerMalformedDataException();
-  }
-
-  spdlog::debug("Reading pull_all message response");
-  Marker marker{};
-  Value metadata;
-  std::vector<std::vector<Value>> records;
-  while (true) {
-    if (!GetMessage()) {
-      throw ServerCommunicationException();
-    }
-    if (!decoder_.ReadMessageHeader(&signature, &marker)) {
-      throw ServerCommunicationException();
-    }
-    if (signature == Signature::Record) {
-      Value record;
-      if (!decoder_.ReadValue(&record, Value::Type::List)) {
-        throw ServerCommunicationException();
-      }
-      records.emplace_back(std::move(record.ValueList()));
-    } else if (signature == Signature::Success) {
-      if (!decoder_.ReadValue(&metadata)) {
-        throw ServerCommunicationException();
-      }
-      break;
-    } else if (signature == Signature::Failure) {
-      Value data;
-      if (!decoder_.ReadValue(&data)) {
-        throw ServerCommunicationException();
-      }
-      HandleFailure<ClientQueryException>(data.ValueMap());
-    } else {
-      throw ServerMalformedDataException();
-    }
-  }
-
-  if (metadata.type() != Value::Type::Map) {
-    throw ServerMalformedDataException();
-  }
-
-  auto &header = fields.ValueMap();
-
-  QueryData ret{{}, std::move(records), std::move(metadata.ValueMap())};
-
-  if (header.find("fields") == header.end()) {
-    throw ServerMalformedDataException();
-  }
-  if (header["fields"].type() != Value::Type::List) {
-    throw ServerMalformedDataException();
-  }
-  auto &field_vector = header["fields"].ValueList();
-
-  for (auto &field_item : field_vector) {
-    if (field_item.type() != Value::Type::String) {
-      throw ServerMalformedDataException();
-    }
-    ret.fields.emplace_back(std::move(field_item.ValueString()));
-  }
-
-  if (header.contains("qid")) {
-    ret.metadata["qid"] = header["qid"];
-  }
-
-  return ret;
-}
-
-void Client::Reset() {
-  if (!client_.IsConnected()) {
-    throw ClientFatalException("You must first connect to the server before using the client!");
-  }
-
-  spdlog::debug("Sending reset message");
-
-  encoder_.MessageReset();
-
-  Signature signature{};
-  Value fields;
-  // In Execute the pull message is sent right after the run message without reading the answer for the run message.
-  // That means some of the messages sent might get ignored.
-  while (true) {
-    if (!ReadMessage(signature, fields)) {
-      throw ServerCommunicationException();
-    }
-    if (signature == Signature::Success) {
-      break;
-    }
-    if (signature != Signature::Ignored) {
-      throw ServerMalformedDataException();
-    }
-  }
-}
-
-std::optional<std::map<std::string, Value>> Client::Route(const std::map<std::string, Value> &routing,
-                                                          const std::vector<Value> &bookmarks,
-                                                          const std::optional<std::string> &db) {
-  if (!client_.IsConnected()) {
-    throw ClientFatalException("You must first connect to the server before using the client!");
-  }
-
-  spdlog::debug("Sending route message with routing: {}; bookmarks: {}; db: {}", routing, bookmarks,
-                db.has_value() ? *db : Value());
-
-  encoder_.MessageRoute(routing, bookmarks, db);
-
-  spdlog::debug("Reading route message response");
-  Signature signature{};
-  Value fields;
-  if (!ReadMessage(signature, fields)) {
-    throw ServerCommunicationException();
-  }
-  if (signature == Signature::Ignored) {
-    return std::nullopt;
-  }
-  if (signature == Signature::Failure) {
-    HandleFailure(fields.ValueMap());
-  }
-  if (signature != Signature::Success) {
-    throw ServerMalformedDataException{};
-  }
-  return fields.ValueMap();
-}
-
-void Client::Close() { client_.Close(); };
-
-bool Client::GetMessage() {
-  client_.ClearData();
-  while (true) {
-    if (!client_.Read(kChunkHeaderSize)) return false;
-
-    size_t chunk_size = client_.GetData()[0];
-    chunk_size <<= 8U;
-    chunk_size += client_.GetData()[1];
-    if (chunk_size == 0) return true;
-
-    if (!client_.Read(chunk_size)) return false;
-    if (decoder_buffer_.GetChunk() != ChunkState::Whole) return false;
-    client_.ClearData();
-  }
-  return true;
-}
-
-bool Client::ReadMessage(Signature &signature, Value &ret) {
-  Marker marker{};
-  if (!GetMessage()) return false;
-  if (!decoder_.ReadMessageHeader(&signature, &marker)) return false;
-  return ReadMessageData(marker, ret);
-}
-
-bool Client::ReadMessageData(Marker marker, Value &ret) {
-  if (marker == Marker::TinyStruct) {
-    ret = Value();
-    return true;
-  }
-  if (marker == Marker::TinyStruct1) {
-    return decoder_.ReadValue(&ret);
-  }
-  return false;
-}
-}  // namespace memgraph::communication::bolt

src/communication/bolt/client.hpp

@@ -11,12 +11,6 @@
 
 #pragma once
 
-#include <map>
-#include <optional>
-#include <string>
-#include <vector>
-
-#include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/decoder/chunked_decoder_buffer.hpp"
 #include "communication/bolt/v1/decoder/decoder.hpp"
 #include "communication/bolt/v1/encoder/chunked_encoder_buffer.hpp"
@@ -25,17 +19,22 @@
 #include "communication/context.hpp"
 #include "io/network/endpoint.hpp"
 #include "utils/exceptions.hpp"
+#include "utils/logging.hpp"
 
 namespace memgraph::communication::bolt {
 
-class FailureResponseException : public utils::BasicException {
+/// This exception is thrown whenever an error occurs during query execution
+/// that isn't fatal (eg. mistyped query or some transient error occurred).
+/// It should be handled by everyone who uses the client.
+class ClientQueryException : public utils::BasicException {
  public:
-  FailureResponseException() : utils::BasicException{"Couldn't execute query!"} {}
+  using utils::BasicException::BasicException;
 
-  explicit FailureResponseException(const std::string &message) : utils::BasicException{message} {}
+  ClientQueryException() : utils::BasicException("Couldn't execute query!") {}
 
-  FailureResponseException(const std::string &code, const std::string &message)
-      : utils::BasicException{message}, code_{code} {}
+  template <class... Args>
+  ClientQueryException(const std::string &code, Args &&...args)
+      : utils::BasicException(std::forward<Args>(args)...), code_(code) {}
 
   const std::string &code() const { return code_; }
 
@@ -43,14 +42,6 @@ class FailureResponseException : public utils::BasicException {
   std::string code_;
 };
 
-/// This exception is thrown whenever an error occurs during query execution
-/// that isn't fatal (eg. mistyped query or some transient error occurred).
-/// It should be handled by everyone who uses the client.
-class ClientQueryException : public FailureResponseException {
- public:
-  using FailureResponseException::FailureResponseException;
-};
-
 /// This exception is thrown whenever a fatal error occurs during query
 /// execution and/or connecting to the server.
 /// It should be handled by everyone who uses the client.
@@ -85,13 +76,12 @@ struct QueryData {
 /// server. It supports both SSL and plaintext connections.
 class Client final {
  public:
-  explicit Client(communication::ClientContext &context);
+  explicit Client(communication::ClientContext *context) : client_(context) {}
 
   Client(const Client &) = delete;
   Client(Client &&) = delete;
   Client &operator=(const Client &) = delete;
   Client &operator=(Client &&) = delete;
-  ~Client() = default;
 
   /// Method used to connect to the server. Before executing queries this method
   /// should be called to set-up the connection to the server. After the
@@ -99,7 +89,50 @@ class Client final {
   /// established connection.
   /// @throws ClientFatalException when we couldn't connect to the server
   void Connect(const io::network::Endpoint &endpoint, const std::string &username, const std::string &password,
-               const std::string &client_name = "memgraph-bolt");
+               const std::string &client_name = "memgraph-bolt") {
+    if (!client_.Connect(endpoint)) {
+      throw ClientFatalException("Couldn't connect to {}!", endpoint);
+    }
+
+    if (!client_.Write(kPreamble, sizeof(kPreamble), true)) {
+      SPDLOG_ERROR("Couldn't send preamble!");
+      throw ServerCommunicationException();
+    }
+    for (int i = 0; i < 4; ++i) {
+      if (!client_.Write(kProtocol, sizeof(kProtocol), i != 3)) {
+        SPDLOG_ERROR("Couldn't send protocol version!");
+        throw ServerCommunicationException();
+      }
+    }
+
+    if (!client_.Read(sizeof(kProtocol))) {
+      SPDLOG_ERROR("Couldn't get negotiated protocol version!");
+      throw ServerCommunicationException();
+    }
+    if (memcmp(kProtocol, client_.GetData(), sizeof(kProtocol)) != 0) {
+      SPDLOG_ERROR("Server negotiated unsupported protocol version!");
+      throw ClientFatalException("The server negotiated an usupported protocol version!");
+    }
+    client_.ShiftData(sizeof(kProtocol));
+
+    if (!encoder_.MessageInit(client_name, {{"scheme", "basic"}, {"principal", username}, {"credentials", password}})) {
+      SPDLOG_ERROR("Couldn't send init message!");
+      throw ServerCommunicationException();
+    }
+
+    Signature signature;
+    Value metadata;
+    if (!ReadMessage(&signature, &metadata)) {
+      SPDLOG_ERROR("Couldn't read init message response!");
+      throw ServerCommunicationException();
+    }
+    if (signature != Signature::Success) {
+      SPDLOG_ERROR("Handshake failed!");
+      throw ClientFatalException("Handshake with the server failed!");
+    }
+
+    SPDLOG_INFO("Metadata of init message response: {}", metadata);
+  }
 
   /// Function used to execute queries against the server. Before you can
   /// execute queries you must connect the client to the server.
@@ -107,40 +140,167 @@ class Client final {
   ///                              executing the query (eg. mistyped query,
   ///                              etc.)
   /// @throws ClientFatalException when we couldn't communicate with the server
-  QueryData Execute(const std::string &query, const std::map<std::string, Value> &parameters);
-
-  /// Close the active client connection.
-  void Close();
-
-  /// Can be used to reset the active client connection. Reset is automatically sent after receiving a failure message
-  /// from the server, which result in throwing an FailureResponseException or any exception derived from it.
-  void Reset();
-
-  /// Can be used to send a route message.
-  std::optional<std::map<std::string, Value>> Route(const std::map<std::string, Value> &routing,
-                                                    const std::vector<Value> &bookmarks,
-                                                    const std::optional<std::string> &db);
-
- private:
-  using ClientEncoder = ClientEncoder<ChunkedEncoderBuffer<communication::ClientOutputStream>>;
-
-  template <typename TException = FailureResponseException>
-  [[noreturn]] void HandleFailure(const std::map<std::string, Value> &response_map) {
-    Reset();
-    auto it = response_map.find("message");
-    if (it != response_map.end()) {
-      auto it_code = response_map.find("code");
-      if (it_code != response_map.end()) {
-        throw TException(it_code->second.ValueString(), it->second.ValueString());
-      }
-      throw TException("", it->second.ValueString());
+  QueryData Execute(const std::string &query, const std::map<std::string, Value> &parameters) {
+    if (!client_.IsConnected()) {
+      throw ClientFatalException("You must first connect to the server before using the client!");
     }
-    throw TException();
+
+    SPDLOG_INFO("Sending run message with statement: '{}'; parameters: {}", query, parameters);
+
+    encoder_.MessageRun(query, parameters);
+    encoder_.MessagePullAll();
+
+    SPDLOG_INFO("Reading run message response");
+    Signature signature;
+    Value fields;
+    if (!ReadMessage(&signature, &fields)) {
+      throw ServerCommunicationException();
+    }
+    if (fields.type() != Value::Type::Map) {
+      throw ServerMalformedDataException();
+    }
+
+    if (signature == Signature::Failure) {
+      HandleFailure();
+      auto &tmp = fields.ValueMap();
+      auto it = tmp.find("message");
+      if (it != tmp.end()) {
+        auto it_code = tmp.find("code");
+        if (it_code != tmp.end()) {
+          throw ClientQueryException(it_code->second.ValueString(), it->second.ValueString());
+        } else {
+          throw ClientQueryException("", it->second.ValueString());
+        }
+      }
+      throw ClientQueryException();
+    } else if (signature != Signature::Success) {
+      throw ServerMalformedDataException();
+    }
+
+    SPDLOG_INFO("Reading pull_all message response");
+    Marker marker;
+    Value metadata;
+    std::vector<std::vector<Value>> records;
+    while (true) {
+      if (!GetMessage()) {
+        throw ServerCommunicationException();
+      }
+      if (!decoder_.ReadMessageHeader(&signature, &marker)) {
+        throw ServerCommunicationException();
+      }
+      if (signature == Signature::Record) {
+        Value record;
+        if (!decoder_.ReadValue(&record, Value::Type::List)) {
+          throw ServerCommunicationException();
+        }
+        records.emplace_back(std::move(record.ValueList()));
+      } else if (signature == Signature::Success) {
+        if (!decoder_.ReadValue(&metadata)) {
+          throw ServerCommunicationException();
+        }
+        break;
+      } else if (signature == Signature::Failure) {
+        Value data;
+        if (!decoder_.ReadValue(&data)) {
+          throw ServerCommunicationException();
+        }
+        HandleFailure();
+        auto &tmp = data.ValueMap();
+        auto it = tmp.find("message");
+        if (it != tmp.end()) {
+          auto it_code = tmp.find("code");
+          if (it_code != tmp.end()) {
+            throw ClientQueryException(it_code->second.ValueString(), it->second.ValueString());
+          } else {
+            throw ClientQueryException("", it->second.ValueString());
+          }
+        }
+        throw ClientQueryException();
+      } else {
+        throw ServerMalformedDataException();
+      }
+    }
+
+    if (metadata.type() != Value::Type::Map) {
+      throw ServerMalformedDataException();
+    }
+
+    QueryData ret{{}, std::move(records), std::move(metadata.ValueMap())};
+
+    auto &header = fields.ValueMap();
+    if (header.find("fields") == header.end()) {
+      throw ServerMalformedDataException();
+    }
+    if (header["fields"].type() != Value::Type::List) {
+      throw ServerMalformedDataException();
+    }
+    auto &field_vector = header["fields"].ValueList();
+
+    for (auto &field_item : field_vector) {
+      if (field_item.type() != Value::Type::String) {
+        throw ServerMalformedDataException();
+      }
+      ret.fields.emplace_back(std::move(field_item.ValueString()));
+    }
+
+    return ret;
   }
 
-  bool GetMessage();
-  bool ReadMessage(Signature &signature, Value &ret);
-  bool ReadMessageData(Marker marker, Value &ret);
+  /// Close the active client connection.
+  void Close() { client_.Close(); };
+
+ private:
+  bool GetMessage() {
+    client_.ClearData();
+    while (true) {
+      if (!client_.Read(kChunkHeaderSize)) return false;
+
+      size_t chunk_size = client_.GetData()[0];
+      chunk_size <<= 8;
+      chunk_size += client_.GetData()[1];
+      if (chunk_size == 0) return true;
+
+      if (!client_.Read(chunk_size)) return false;
+      if (decoder_buffer_.GetChunk() != ChunkState::Whole) return false;
+      client_.ClearData();
+    }
+    return true;
+  }
+
+  bool ReadMessage(Signature *signature, Value *ret) {
+    Marker marker;
+    if (!GetMessage()) return false;
+    if (!decoder_.ReadMessageHeader(signature, &marker)) return false;
+    return ReadMessageData(marker, ret);
+  }
+
+  bool ReadMessageData(Marker marker, Value *ret) {
+    if (marker == Marker::TinyStruct) {
+      *ret = Value();
+      return true;
+    } else if (marker == Marker::TinyStruct1) {
+      return decoder_.ReadValue(ret);
+    }
+    return false;
+  }
+
+  void HandleFailure() {
+    if (!encoder_.MessageAckFailure()) {
+      throw ServerCommunicationException();
+    }
+    while (true) {
+      Signature signature;
+      Value data;
+      if (!ReadMessage(&signature, &data)) {
+        throw ServerCommunicationException();
+      }
+      if (signature == Signature::Success) {
+        break;
+      } else if (signature != Signature::Ignored) {
+        throw ServerMalformedDataException();
+      }
+    }
+  }
 
   // client
   communication::Client client_;
@@ -153,6 +313,6 @@ class Client final {
 
   // encoder objects
   ChunkedEncoderBuffer<communication::ClientOutputStream> encoder_buffer_{output_stream_};
-  ClientEncoder encoder_{encoder_buffer_};
+  ClientEncoder<ChunkedEncoderBuffer<communication::ClientOutputStream>> encoder_{encoder_buffer_};
 };
 }  // namespace memgraph::communication::bolt

src/communication/bolt/v1/codes.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,12 +16,11 @@
 namespace memgraph::communication::bolt {
 
 inline constexpr uint8_t kPreamble[4] = {0x60, 0x60, 0xB0, 0x17};
+inline constexpr uint8_t kProtocol[4] = {0x00, 0x00, 0x00, 0x01};
 
 enum class Signature : uint8_t {
   Noop = 0x00,
   Init = 0x01,
-  LogOn = 0x6A,
-  LogOff = 0x6B,
   AckFailure = 0x0E,  // only v1
   Reset = 0x0F,
   Goodbye = 0x02,

src/communication/bolt/v1/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
@@ -28,7 +28,7 @@ inline constexpr size_t kChunkWholeSize = kChunkHeaderSize + kChunkMaxDataSize;
  */
 inline constexpr size_t kHandshakeSize = 20;
 
-inline constexpr uint16_t kSupportedVersions[] = {0x0100, 0x0400, 0x0401, 0x0403, 0x0502};
+inline constexpr uint16_t kSupportedVersions[] = {0x0100, 0x0400, 0x0401, 0x0403};
 
 inline constexpr int kPullAll = -1;
 inline constexpr int kPullLast = -1;

src/communication/bolt/v1/decoder/decoder.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
@@ -33,14 +33,7 @@ namespace memgraph::communication::bolt {
 template <typename Buffer>
 class Decoder {
  public:
-  explicit Decoder(Buffer &buffer) : buffer_(buffer), major_v_(0) {}
-
-  /**
-   * Lets the user update the version.
-   * This is all single thread for now. TODO: Update if ever multithreaded.
-   * @param major_v the major version of the Bolt protocol used.
-   */
-  void UpdateVersion(int major_v) { major_v_ = major_v; }
+  explicit Decoder(Buffer &buffer) : buffer_(buffer) {}
 
   /**
    * Reads a Value from the available data in the buffer.
@@ -215,10 +208,6 @@ class Decoder {
 
  protected:
   Buffer &buffer_;
-  int major_v_;  //!< Major version of the underlying Bolt protocol
-                 // TODO: when refactoring
-  // Ideally the major_v would be a compile time constant. If the higher level (Bolt driver) ends up being separate
-  // classes, this could be just a template and each version of the driver would use the appropriate decoder.
 
  private:
   bool ReadNull(const Marker &marker, Value *data) {
@@ -381,7 +370,11 @@ class Decoder {
       }
       ret.emplace(std::move(dv_key.ValueString()), std::move(dv_val));
     }
-    return ret.size() == size;
+    if (ret.size() != size) {
+      return false;
+    }
+
+    return true;
   }
 
   bool ReadVertex(Value *data) {
@@ -414,14 +407,6 @@ class Decoder {
     }
     vertex.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      vertex.element_id = std::move(dv.ValueString());
-    }
-
     return true;
   }
 
@@ -460,23 +445,6 @@ class Decoder {
     }
     edge.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.element_id = std::move(dv.ValueString());
-      // from_element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.from_element_id = std::move(dv.ValueString());
-      // to_element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.to_element_id = std::move(dv.ValueString());
-    }
     return true;
   }
 
@@ -503,14 +471,6 @@ class Decoder {
     }
     edge.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.element_id = std::move(dv.ValueString());
-    }
-
     return true;
   }
 

src/communication/bolt/v1/encoder/base_encoder.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,7 @@ namespace memgraph::communication::bolt {
 template <typename Buffer>
 class BaseEncoder {
  public:
-  explicit BaseEncoder(Buffer &buffer) : buffer_(buffer), major_v_(0) {}
-
-  /**
-   * Lets the user update the version.
-   * This is all single thread for now. TODO: Update if ever multithreaded.
-   * @param major_v the major version of the Bolt protocol used.
-   */
-  void UpdateVersion(int major_v) { major_v_ = major_v; }
+  explicit BaseEncoder(Buffer &buffer) : buffer_(buffer) {}
 
   void WriteRAW(const uint8_t *data, uint64_t len) { buffer_.Write(data, len); }
 
@@ -123,8 +116,7 @@ class BaseEncoder {
   }
 
   void WriteVertex(const Vertex &vertex) {
-    int struct_n = 3 + 1 * int(major_v_ > 4);  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + 3);
     WriteRAW(utils::UnderlyingCast(Signature::Node));
     WriteInt(vertex.id.AsInt());
 
@@ -140,16 +132,10 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(vertex.element_id);
-    }
   }
 
   void WriteEdge(const Edge &edge, bool unbound = false) {
-    int struct_n = (unbound ? 3 + 1 * int(major_v_ > 4) : 5 + 3 * int(major_v_ > 4));  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + (unbound ? 3 : 5));
     WriteRAW(utils::UnderlyingCast(unbound ? Signature::UnboundRelationship : Signature::Relationship));
 
     WriteInt(edge.id.AsInt());
@@ -166,22 +152,10 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(edge.element_id);
-      if (!unbound) {
-        // from_element_id introduced in v5.0
-        WriteString(edge.from_element_id);
-        // to_element_id introduced in v5.0
-        WriteString(edge.to_element_id);
-      }
-    }
   }
 
   void WriteEdge(const UnboundedEdge &edge) {
-    const int struct_n = 3 + 1 * int(major_v_ > 4);  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + 3);
     WriteRAW(utils::UnderlyingCast(Signature::UnboundRelationship));
 
     WriteInt(edge.id.AsInt());
@@ -194,11 +168,6 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(edge.element_id);
-    }
   }
 
   void WritePath(const Path &path) {
@@ -295,7 +264,6 @@ class BaseEncoder {
 
  protected:
   Buffer &buffer_;
-  int major_v_;  //!< Major version of the underlying Bolt protocol (TODO: Think about reimplementing the versioning)
 
  private:
   template <class T>

src/communication/bolt/v1/encoder/client_encoder.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,11 +11,6 @@
 
 #pragma once
 
-#include <map>
-#include <optional>
-#include <string>
-#include <vector>
-
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 
@@ -35,20 +30,18 @@ class ClientEncoder : private BaseEncoder<Buffer> {
   using BaseEncoder<Buffer>::WriteList;
   using BaseEncoder<Buffer>::WriteMap;
   using BaseEncoder<Buffer>::WriteString;
-  using BaseEncoder<Buffer>::WriteNull;
   using BaseEncoder<Buffer>::buffer_;
 
  public:
   ClientEncoder(Buffer &buffer) : BaseEncoder<Buffer>(buffer) {}
 
-  using BaseEncoder<Buffer>::UpdateVersion;
-
   /**
    * Writes a Init message.
    *
-   * From the Bolt v4.3 documentation:
-   *   HelloMess (signature=0x01) {
-   *     Map<String,Value> extra
+   * From the Bolt v1 documentation:
+   *   InitMessage (signature=0x01) {
+   *     String clientName
+   *     Map<String,Value> authToken
    *   }
    *
    * @param client_name the name of the connected client
@@ -56,10 +49,11 @@ class ClientEncoder : private BaseEncoder<Buffer> {
    * @returns true if the data was successfully sent to the client
    *          when flushing, false otherwise
    */
-  bool MessageInit(const std::map<std::string, Value> &extra) {
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct1));
+  bool MessageInit(const std::string client_name, const std::map<std::string, Value> &auth_token) {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct2));
     WriteRAW(utils::UnderlyingCast(Signature::Init));
-    WriteMap(extra);
+    WriteString(client_name);
+    WriteMap(auth_token);
     // Try to flush all remaining data in the buffer, but tell it that we will
     // send more data (the end of message chunk).
     if (!buffer_.Flush(true)) return false;
@@ -70,11 +64,10 @@ class ClientEncoder : private BaseEncoder<Buffer> {
   /**
    * Writes a Run message.
    *
-   * From the Bolt v4.3 documentation:
+   * From the Bolt v1 documentation:
    *   RunMessage (signature=0x10) {
-   *     String            statement
-   *     Map<String,Value> parameters
-   *     Map<String,Value> extra
+   *     String             statement
+   *     Map<String,Value>  parameters
    *   }
    *
    * @param statement the statement that should be executed
@@ -82,13 +75,11 @@ class ClientEncoder : private BaseEncoder<Buffer> {
    * @returns true if the data was successfully sent to the client
    *          when flushing, false otherwise
    */
-  bool MessageRun(const std::string &statement, const std::map<std::string, Value> &parameters,
-                  const std::map<std::string, Value> &extra, bool have_more = true) {
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct3));
+  bool MessageRun(const std::string &statement, const std::map<std::string, Value> &parameters, bool have_more = true) {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct2));
     WriteRAW(utils::UnderlyingCast(Signature::Run));
     WriteString(statement);
     WriteMap(parameters);
-    WriteMap(extra);
     // Try to flush all remaining data in the buffer, but tell it that we will
     // send more data (the end of message chunk).
     if (!buffer_.Flush(true)) return false;
@@ -99,20 +90,18 @@ class ClientEncoder : private BaseEncoder<Buffer> {
   }
 
   /**
-   * Writes a Discard message.
+   * Writes a DiscardAll message.
    *
-   * From the Bolt v4.3 documentation:
+   * From the Bolt v1 documentation:
    *   DiscardMessage (signature=0x2F) {
-   *     Map<String,Value> extra
    *   }
    *
    * @returns true if the data was successfully sent to the client
    *          when flushing, false otherwise
    */
-  bool MessageDiscard(const std::map<std::string, Value> &extra) {
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct1));
+  bool MessageDiscardAll() {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct));
     WriteRAW(utils::UnderlyingCast(Signature::Discard));
-    WriteMap(extra);
     // Try to flush all remaining data in the buffer, but tell it that we will
     // send more data (the end of message chunk).
     if (!buffer_.Flush(true)) return false;
@@ -123,18 +112,36 @@ class ClientEncoder : private BaseEncoder<Buffer> {
   /**
    * Writes a PullAll message.
    *
-   * From the Bolt v4.3 documentation:
-   *   PullMessage (signature=0x3F) {
-   *     Map<String,Value> extra
+   * From the Bolt v1 documentation:
+   *   PullAllMessage (signature=0x3F) {
    *   }
    *
    * @returns true if the data was successfully sent to the client
    *          when flushing, false otherwise
    */
-  bool MessagePull(const std::map<std::string, Value> &extra) {
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct1));
+  bool MessagePullAll() {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct));
     WriteRAW(utils::UnderlyingCast(Signature::Pull));
-    WriteMap(extra);
+    // Try to flush all remaining data in the buffer, but tell it that we will
+    // send more data (the end of message chunk).
+    if (!buffer_.Flush(true)) return false;
+    // Flush an empty chunk to indicate that the message is done.
+    return buffer_.Flush();
+  }
+
+  /**
+   * Writes a AckFailure message.
+   *
+   * From the Bolt v1 documentation:
+   *   AckFailureMessage (signature=0x0E) {
+   *   }
+   *
+   * @returns true if the data was successfully sent to the client
+   *          when flushing, false otherwise
+   */
+  bool MessageAckFailure() {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct));
+    WriteRAW(utils::UnderlyingCast(Signature::AckFailure));
     // Try to flush all remaining data in the buffer, but tell it that we will
     // send more data (the end of message chunk).
     if (!buffer_.Flush(true)) return false;
@@ -145,7 +152,7 @@ class ClientEncoder : private BaseEncoder<Buffer> {
   /**
    * Writes a Reset message.
    *
-   * From the Bolt v4.3 documentation:
+   * From the Bolt v1 documentation:
    *   ResetMessage (signature=0x0F) {
    *   }
    *
@@ -161,36 +168,5 @@ class ClientEncoder : private BaseEncoder<Buffer> {
     // Flush an empty chunk to indicate that the message is done.
     return buffer_.Flush();
   }
-
-  /**
-   * Writes a Route message.
-   *
-   * From the Bolt v4.3 documentation:
-   *   RouteMessage (signature=0x0F) {
-   *     Map<String,Value> routing
-   *     List<String>      bookmarks
-   *     String            db
-   *   }
-   *
-   * @returns true if the data was successfully sent to the client
-   *          when flushing, false otherwise
-   */
-  bool MessageRoute(const std::map<std::string, Value> &routing, const std::vector<Value> &bookmarks,
-                    const std::optional<std::string> &db) {
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct3));
-    WriteRAW(utils::UnderlyingCast(Signature::Route));
-    WriteMap(routing);
-    WriteList(bookmarks);
-    if (db.has_value()) {
-      WriteString(*db);
-    } else {
-      WriteNull();
-    }
-    // Try to flush all remaining data in the buffer, but tell it that we will
-    // send more data (the end of message chunk).
-    if (!buffer_.Flush(true)) return false;
-    // Flush an empty chunk to indicate that the message is done.
-    return buffer_.Flush();
-  }
 };
 }  // namespace memgraph::communication::bolt

src/communication/bolt/v1/encoder/encoder.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
@@ -34,8 +34,6 @@ class Encoder : private BaseEncoder<Buffer> {
  public:
   Encoder(Buffer &buffer) : BaseEncoder<Buffer>(buffer) {}
 
-  using BaseEncoder<Buffer>::UpdateVersion;
-
   /**
    * Sends a Record message.
    *
@@ -119,6 +117,29 @@ class Encoder : private BaseEncoder<Buffer> {
     return buffer_.Flush();
   }
 
+  /**
+   * Sends an Ignored message.
+   *
+   * From the bolt v1 documentation:
+   *   IgnoredMessage (signature=0x7E) {
+   *     Map<String,Value> metadata
+   *   }
+   *
+   * @param metadata the metadata map object that should be sent
+   * @returns true if the data was successfully sent to the client,
+   *          false otherwise
+   */
+  bool MessageIgnored(const std::map<std::string, Value> &metadata) {
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct1));
+    WriteRAW(utils::UnderlyingCast(Signature::Ignored));
+    WriteMap(metadata);
+    // Try to flush all remaining data in the buffer, but tell it that we will
+    // send more data (the end of message chunk).
+    if (!buffer_.Flush(true)) return false;
+    // Flush an empty chunk to indicate that the message is done.
+    return buffer_.Flush();
+  }
+
   /**
    * Sends an Ignored message.
    *

src/communication/bolt/v1/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
@@ -63,8 +63,7 @@ class Session {
    * if an explicit transaction was started.
    */
   virtual std::pair<std::vector<std::string>, std::optional<int>> Interpret(
-      const std::string &query, const std::map<std::string, Value> &params,
-      const std::map<std::string, memgraph::communication::bolt::Value> &metadata) = 0;
+      const std::string &query, const std::map<std::string, Value> &params) = 0;
 
   /**
    * Put results of the processed query in the `encoder`.
@@ -86,7 +85,7 @@ class Session {
    */
   virtual std::map<std::string, Value> Discard(std::optional<int> n, std::optional<int> qid) = 0;
 
-  virtual void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &) = 0;
+  virtual void BeginTransaction() = 0;
   virtual void CommitTransaction() = 0;
   virtual void RollbackTransaction() = 0;
 
@@ -121,9 +120,6 @@ class Session {
         return;
       }
       handshake_done_ = true;
-      // Update the decoder's Bolt version (v5 has changed the undelying structure)
-      decoder_.UpdateVersion(version_.major);
-      encoder_.UpdateVersion(version_.major);
     }
 
     ChunkState chunk_state;

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

@@ -15,7 +15,6 @@
 
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/state.hpp"
-#include "communication/bolt/v1/states/handlers.hpp"
 #include "communication/bolt/v1/value.hpp"
 #include "utils/cast.hpp"
 #include "utils/likely.hpp"
@@ -31,8 +30,8 @@ namespace memgraph::communication::bolt {
  */
 template <typename TSession>
 State StateErrorRun(TSession &session, State state) {
-  Marker marker{};
-  Signature signature{};
+  Marker marker;
+  Signature signature;
   if (!session.decoder_.ReadMessageHeader(&signature, &marker)) {
     spdlog::trace("Missing header data!");
     return State::Close;
@@ -46,49 +45,54 @@ State StateErrorRun(TSession &session, State state) {
   // Clear the data buffer if it has any leftover data.
   session.encoder_buffer_.Clear();
 
-  if (session.version_.major == 1 && signature == Signature::AckFailure) {
-    spdlog::trace("AckFailure received");
+  if ((session.version_.major == 1 && signature == Signature::AckFailure) || signature == Signature::Reset) {
+    if (signature == Signature::AckFailure) {
+      spdlog::trace("AckFailure received");
+    } else {
+      spdlog::trace("Reset received");
+    }
 
     if (!session.encoder_.MessageSuccess()) {
       spdlog::trace("Couldn't send success message!");
       return State::Close;
     }
 
+    if (signature == Signature::Reset) {
+      session.Abort();
+      return State::Idle;
+    }
+
     // We got AckFailure get back to right state.
     MG_ASSERT(state == State::Error, "Shouldn't happen");
     return State::Idle;
-  }
-  if (signature == Signature::Reset) {
-    spdlog::trace("Reset received");
-    return HandleReset(session, marker);
-  }
+  } else {
+    uint8_t value = utils::UnderlyingCast(marker);
 
-  uint8_t value = utils::UnderlyingCast(marker);
-
-  // All bolt client messages have less than 15 parameters so if we receive
-  // anything than a TinyStruct it's an error.
-  if ((value & 0xF0U) != utils::UnderlyingCast(Marker::TinyStruct)) {
-    spdlog::trace("Expected TinyStruct marker, but received 0x{:02X}!", value);
-    return State::Close;
-  }
-
-  // We need to clean up all parameters from this command.
-  value &= 0x0FU;  // The length is stored in the lower nibble.
-  Value dv;
-  for (int i = 0; i < value; ++i) {
-    if (!session.decoder_.ReadValue(&dv)) {
-      spdlog::trace("Couldn't clean up parameter {} / {}!", i, value);
+    // All bolt client messages have less than 15 parameters so if we receive
+    // anything than a TinyStruct it's an error.
+    if ((value & 0xF0) != utils::UnderlyingCast(Marker::TinyStruct)) {
+      spdlog::trace("Expected TinyStruct marker, but received 0x{:02X}!", value);
       return State::Close;
     }
-  }
 
-  // Ignore this message.
-  if (!session.encoder_.MessageIgnored()) {
-    spdlog::trace("Couldn't send ignored message!");
-    return State::Close;
-  }
+    // We need to clean up all parameters from this command.
+    value &= 0x0F;  // The length is stored in the lower nibble.
+    Value dv;
+    for (int i = 0; i < value; ++i) {
+      if (!session.decoder_.ReadValue(&dv)) {
+        spdlog::trace("Couldn't clean up parameter {} / {}!", i, value);
+        return State::Close;
+      }
+    }
 
-  // Cleanup done, command ignored, stay in error state.
-  return state;
+    // Ignore this message.
+    if (!session.encoder_.MessageIgnored()) {
+      spdlog::trace("Couldn't send ignored message!");
+      return State::Close;
+    }
+
+    // Cleanup done, command ignored, stay in error state.
+    return state;
+  }
 }
 }  // namespace memgraph::communication::bolt

src/communication/bolt/v1/states/executing.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,15 +22,10 @@
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/states/handlers.hpp"
 #include "communication/bolt/v1/value.hpp"
-#include "utils/event_counter.hpp"
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 
-namespace memgraph::metrics {
-extern const Event BoltMessages;
-}  // namespace memgraph::metrics
-
 namespace memgraph::communication::bolt {
 
 template <typename TSession>
@@ -79,7 +74,7 @@ State RunHandlerV4(Signature signature, TSession &session, State state, Marker m
     }
     case Signature::Route: {
       if constexpr (bolt_minor >= 3) {
-        if (signature == Signature::Route) return HandleRoute<TSession>(session, marker);
+        if (signature == Signature::Route) return HandleRoute<TSession>(session);
       } else {
         spdlog::trace("Supported only in bolt v4.3");
         return State::Close;
@@ -91,37 +86,6 @@ State RunHandlerV4(Signature signature, TSession &session, State state, Marker m
   }
 }
 
-template <typename TSession>
-State RunHandlerV5(Signature signature, TSession &session, State state, Marker marker) {
-  switch (signature) {
-    case Signature::Run:
-      return HandleRunV5<TSession>(session, state, marker);
-    case Signature::Pull:
-      return HandlePullV5<TSession>(session, state, marker);
-    case Signature::Discard:
-      return HandleDiscardV5<TSession>(session, state, marker);
-    case Signature::Reset:
-      return HandleReset<TSession>(session, marker);
-    case Signature::Begin:
-      return HandleBegin<TSession>(session, state, marker);
-    case Signature::Commit:
-      return HandleCommit<TSession>(session, state, marker);
-    case Signature::Goodbye:
-      return HandleGoodbye<TSession>();
-    case Signature::Rollback:
-      return HandleRollback<TSession>(session, state, marker);
-    case Signature::Noop:
-      return HandleNoop<TSession>(state);
-    case Signature::Route:
-      return HandleRoute<TSession>(session, marker);
-    case Signature::LogOff:
-      return HandleLogOff<TSession>();
-    default:
-      spdlog::trace("Unrecognized signature received (0x{:02X})!", utils::UnderlyingCast(signature));
-      return State::Close;
-  }
-}
-
 /**
  * Executor state run function
  * This function executes an initialized Bolt session.
@@ -139,10 +103,8 @@ State StateExecutingRun(TSession &session, State state) {
 
   switch (session.version_.major) {
     case 1:
-      memgraph::metrics::IncrementCounter(memgraph::metrics::BoltMessages);
       return RunHandlerV1(signature, session, state, marker);
     case 4: {
-      memgraph::metrics::IncrementCounter(memgraph::metrics::BoltMessages);
       if (session.version_.minor >= 3) {
         return RunHandlerV4<TSession, 3>(signature, session, state, marker);
       }
@@ -151,8 +113,6 @@ State StateExecutingRun(TSession &session, State state) {
       }
       return RunHandlerV4<TSession>(signature, session, state, marker);
     }
-    case 5:
-      return RunHandlerV5<TSession>(signature, session, state, marker);
     default:
       spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
       return State::Close;

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
@@ -12,18 +12,15 @@
 #pragma once
 
 #include <map>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/constants.hpp"
-#include "communication/bolt/v1/exceptions.hpp"
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/value.hpp"
 #include "communication/exceptions.hpp"
-#include "storage/v2/property_value.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 
@@ -73,25 +70,42 @@ inline std::pair<std::string, std::string> ExceptionToErrorMessage(const std::ex
           "should be in database logs."};
 }
 
-namespace helpers {
-
-/** Extracts metadata from the extras field.
- * NOTE: In order to avoid a copy, the metadata in moved.
- * TODO: Update if extra field is used for anything else.
- */
-inline std::map<std::string, Value> ConsumeMetadata(Value &extra) {
-  std::map<std::string, Value> md;
-  auto &md_tv = extra.ValueMap()["tx_metadata"];
-  if (md_tv.IsMap()) {
-    md = std::move(md_tv.ValueMap());
-  }
-  return md;
-}
-
-}  // namespace helpers
-
 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 {
@@ -122,7 +136,7 @@ template <bool is_pull, typename TSession>
 State HandlePullDiscardV1(TSession &session, const State state, const Marker marker) {
   const auto expected_marker = Marker::TinyStruct;
   if (marker != expected_marker) {
-    spdlog::trace("Expected TinyStruct marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
+    spdlog::trace("Expected {} marker, but received 0x{:02X}!", "TinyStruct", utils::UnderlyingCast(marker));
     return State::Close;
   }
 
@@ -143,7 +157,7 @@ template <bool is_pull, typename TSession>
 State HandlePullDiscardV4(TSession &session, const State state, const Marker marker) {
   const auto expected_marker = Marker::TinyStruct1;
   if (marker != expected_marker) {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
+    spdlog::trace("Expected {} marker, but received 0x{:02X}!", "TinyStruct1", utils::UnderlyingCast(marker));
     return State::Close;
   }
 
@@ -202,8 +216,7 @@ State HandleRunV1(TSession &session, const State state, const Marker marker) {
                   session.version_.major == 1 ? "TinyStruct2" : "TinyStruct3", utils::UnderlyingCast(marker));
     return State::Close;
   }
-  Value query;
-  Value params;
+  Value query, params;
   if (!session.decoder_.ReadValue(&query, Value::Type::String)) {
     spdlog::trace("Couldn't read query string!");
     return State::Close;
@@ -214,48 +227,17 @@ 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>
 State HandleRunV4(TSession &session, const State state, const Marker marker) {
   const auto expected_marker = Marker::TinyStruct3;
   if (marker != expected_marker) {
-    spdlog::trace("Expected TinyStruct3 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
+    spdlog::trace("Expected {} marker, but received 0x{:02X}!", "TinyStruct3", utils::UnderlyingCast(marker));
     return State::Close;
   }
-  Value query;
-  Value params;
-  Value extra;
+  Value query, params, extra;
   if (!session.decoder_.ReadValue(&query, Value::Type::String)) {
     spdlog::trace("Couldn't read query string!");
     return State::Close;
@@ -269,50 +251,9 @@ State HandleRunV4(TSession &session, const State state, const Marker marker) {
   // Even though this part seems unnecessary it is needed to move the buffer
   if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
     spdlog::trace("Couldn't read extra field!");
-    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(), helpers::ConsumeMetadata(extra));
-    // 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);
-  }
-}
-
-template <typename TSession>
-State HandleRunV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandleRunV4<TSession>(session, state, marker);
+  return details::HandleRun(session, state, query, params);
 }
 
 template <typename TSession>
@@ -325,12 +266,6 @@ State HandlePullV4(TSession &session, const State state, const Marker marker) {
   return details::HandlePullDiscardV4<true>(session, state, marker);
 }
 
-template <typename TSession>
-State HandlePullV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandlePullV4<TSession>(session, state, marker);
-}
-
 template <typename TSession>
 State HandleDiscardV1(TSession &session, const State state, const Marker marker) {
   return details::HandlePullDiscardV1<false>(session, state, marker);
@@ -341,12 +276,6 @@ State HandleDiscardV4(TSession &session, const State state, const Marker marker)
   return details::HandlePullDiscardV4<false>(session, state, marker);
 }
 
-template <typename TSession>
-State HandleDiscardV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandleDiscardV4<TSession>(session, state, marker);
-}
-
 template <typename TSession>
 State HandleReset(TSession &session, const Marker marker) {
   // IMPORTANT: This implementation of the Bolt RESET command isn't fully
@@ -363,6 +292,9 @@ State HandleReset(TSession &session, const Marker marker) {
     return State::Close;
   }
 
+  // Clear all pending data and send a success message.
+  session.encoder_buffer_.Clear();
+
   if (!session.encoder_.MessageSuccess()) {
     spdlog::trace("Couldn't send success message!");
     return State::Close;
@@ -399,7 +331,7 @@ State HandleBegin(TSession &session, const State state, const Marker marker) {
   }
 
   try {
-    session.BeginTransaction(helpers::ConsumeMetadata(extra));
+    session.BeginTransaction();
   } catch (const std::exception &e) {
     return HandleFailure(session, e);
   }
@@ -471,43 +403,16 @@ State HandleGoodbye() {
 }
 
 template <typename TSession>
-State HandleRoute(TSession &session, const Marker marker) {
-  // Route message is not implemented since it is Neo4j specific, therefore we will receive it and inform user that
-  // there is no implementation. Before that, we have to read out the fields from the buffer to leave it in a clean
-  // state.
-  if (marker != Marker::TinyStruct3) {
-    spdlog::trace("Expected TinyStruct3 marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-  Value routing;
-  if (!session.decoder_.ReadValue(&routing, Value::Type::Map)) {
-    spdlog::trace("Couldn't read routing field!");
-    return State::Close;
-  }
-
-  Value bookmarks;
-  if (!session.decoder_.ReadValue(&bookmarks, Value::Type::List)) {
-    spdlog::trace("Couldn't read bookmarks field!");
-    return State::Close;
-  }
-  Value db;
-  if (!session.decoder_.ReadValue(&db)) {
-    spdlog::trace("Couldn't read db field!");
-    return State::Close;
-  }
+State HandleRoute(TSession &session) {
+  // Route message is not implemented since it is neo4j specific, therefore we
+  // will receive it an inform user that there is no implementation.
   session.encoder_buffer_.Clear();
   bool fail_sent =
-      session.encoder_.MessageFailure({{"code", "66"}, {"message", "Route message is not supported in Memgraph!"}});
+      session.encoder_.MessageFailure({{"code", 66}, {"message", "Route message not supported in Memgraph!"}});
   if (!fail_sent) {
     spdlog::trace("Couldn't send failure message!");
     return State::Close;
   }
   return State::Error;
 }
-
-template <typename TSession>
-State HandleLogOff() {
-  // Not arguments sent, the user just needs to reauthenticate
-  return State::Init;
-}
 }  // namespace memgraph::communication::bolt

src/communication/bolt/v1/states/init.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
@@ -27,25 +27,17 @@ namespace details {
 template <typename TSession>
 std::optional<State> AuthenticateUser(TSession &session, Value &metadata) {
   // Get authentication data.
-  // From neo4j driver v4.4, fields that have a default value are not sent.
-  // In order to have back-compatibility, the missing fields will be added.
-
   auto &data = metadata.ValueMap();
-  if (data.empty()) {  // Special case auth=None
-    spdlog::warn("The client didn't supply the authentication scheme! Trying with \"none\"...");
-    data["scheme"] = "none";
+  if (!data.count("scheme")) {
+    spdlog::warn("The client didn't supply authentication information!");
+    return State::Close;
   }
-
   std::string username;
   std::string password;
   if (data["scheme"].ValueString() == "basic") {
-    if (!data.count("principal")) {  // Special case principal = ""
-      spdlog::warn("The client didn't supply the principal field! Trying with \"\"...");
-      data["principal"] = "";
-    }
-    if (!data.count("credentials")) {  // Special case credentials = ""
-      spdlog::warn("The client didn't supply the credentials field! Trying with \"\"...");
-      data["credentials"] = "";
+    if (!data.count("principal") || !data.count("credentials")) {
+      spdlog::warn("The client didn't supply authentication information!");
+      return State::Close;
     }
     username = data["principal"].ValueString();
     password = data["credentials"].ValueString();
@@ -114,30 +106,6 @@ std::optional<Value> GetMetadataV4(TSession &session, const Marker marker) {
     return std::nullopt;
   }
 
-  auto &data = metadata.ValueMap();
-  if (!data.count("user_agent")) {
-    spdlog::warn("The client didn't supply the user agent!");
-    return std::nullopt;
-  }
-
-  spdlog::info("Client connected '{}'", data.at("user_agent").ValueString());
-
-  return metadata;
-}
-
-template <typename TSession>
-std::optional<Value> GetInitDataV5(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct1) [[unlikely]] {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-    return std::nullopt;
-  }
-
-  Value metadata;
-  if (!session.decoder_.ReadValue(&metadata, Value::Type::Map)) {
-    spdlog::trace("Couldn't read metadata!");
-    return std::nullopt;
-  }
-
   const auto &data = metadata.ValueMap();
   if (!data.count("user_agent")) {
     spdlog::warn("The client didn't supply the user agent!");
@@ -149,22 +117,6 @@ std::optional<Value> GetInitDataV5(TSession &session, const Marker marker) {
   return metadata;
 }
 
-template <typename TSession>
-std::optional<Value> GetAuthDataV5(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct1) [[unlikely]] {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-    return std::nullopt;
-  }
-
-  Value metadata;
-  if (!session.decoder_.ReadValue(&metadata, Value::Type::Map)) {
-    spdlog::trace("Couldn't read metadata!");
-    return std::nullopt;
-  }
-
-  return metadata;
-}
-
 template <typename TSession>
 State SendSuccessMessage(TSession &session) {
   // Neo4j's Java driver 4.1.1+ requires connection_id.
@@ -228,57 +180,6 @@ State StateInitRunV4(TSession &session, Marker marker, Signature signature) {
 
   return SendSuccessMessage(session);
 }
-
-template <typename TSession>
-State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
-  if (signature == Signature::Noop) [[unlikely]] {
-    SPDLOG_DEBUG("Received NOOP message");
-    return State::Init;
-  }
-
-  if (signature == Signature::Init) {
-    auto maybeMetadata = GetInitDataV5(session, marker);
-
-    if (!maybeMetadata) {
-      return State::Close;
-    }
-
-    if (SendSuccessMessage(session) == State::Close) {
-      return State::Close;
-    }
-    // Stay in Init
-    return State::Init;
-
-  } else if (signature == Signature::LogOn) {
-    if (marker != Marker::TinyStruct1) [[unlikely]] {
-      spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-      spdlog::trace(
-          "The client sent malformed data, but we are continuing "
-          "because the official Neo4j Java driver sends malformed "
-          "data. D'oh!");
-      return State::Close;
-    }
-
-    auto maybeMetadata = GetAuthDataV5(session, marker);
-    if (!maybeMetadata) {
-      return State::Close;
-    }
-    auto result = AuthenticateUser(session, *maybeMetadata);
-    if (result) {
-      spdlog::trace("Failed to authenticate, closing connection...");
-      return State::Close;
-    }
-
-    if (SendSuccessMessage(session) == State::Close) {
-      return State::Close;
-    }
-    return State::Idle;
-
-  } else [[unlikely]] {
-    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
-    return State::Close;
-  }
-}
 }  // namespace details
 
 /**
@@ -307,9 +208,6 @@ State StateInitRun(TSession &session) {
       }
       return details::StateInitRunV4<TSession>(session, marker, signature);
     }
-    case 5: {
-      return details::StateInitRunV5<TSession>(session, marker, signature);
-    }
   }
   spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
   return State::Close;

src/communication/bolt/v1/value.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
@@ -342,9 +342,6 @@ std::ostream &operator<<(std::ostream &os, const Vertex &vertex) {
                          [&](auto &stream, const auto &pair) { stream << pair.first << ": " << pair.second; });
     os << "}";
   }
-  if (!vertex.element_id.empty()) {
-    os << " element_id: " << vertex.element_id;
-  }
   return os << ")";
 }
 

src/communication/bolt/v1/value.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
@@ -57,7 +57,6 @@ struct Vertex {
   Id id;
   std::vector<std::string> labels;
   std::map<std::string, Value> properties;
-  std::string element_id;
 };
 
 /**
@@ -70,9 +69,6 @@ struct Edge {
   Id to;
   std::string type;
   std::map<std::string, Value> properties;
-  std::string element_id;
-  std::string from_element_id;
-  std::string to_element_id;
 };
 
 /**
@@ -83,7 +79,6 @@ struct UnboundedEdge {
   Id id;
   std::string type;
   std::map<std::string, Value> properties;
-  std::string element_id;
 };
 
 /**

src/communication/http/listener.hpp

@@ -1,108 +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 <list>
-#include <memory>
-
-#include <spdlog/spdlog.h>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/beast/core.hpp>
-
-#include "communication/context.hpp"
-#include "communication/http/session.hpp"
-#include "utils/spin_lock.hpp"
-#include "utils/synchronized.hpp"
-
-namespace memgraph::communication::http {
-
-template <class TRequestHandler, typename TSessionData>
-class Listener final : public std::enable_shared_from_this<Listener<TRequestHandler, TSessionData>> {
-  using tcp = boost::asio::ip::tcp;
-  using SessionHandler = Session<TRequestHandler, TSessionData>;
-  using std::enable_shared_from_this<Listener<TRequestHandler, TSessionData>>::shared_from_this;
-
- public:
-  Listener(const Listener &) = delete;
-  Listener(Listener &&) = delete;
-  Listener &operator=(const Listener &) = delete;
-  Listener &operator=(Listener &&) = delete;
-  ~Listener() {}
-
-  template <typename... Args>
-  static std::shared_ptr<Listener> Create(Args &&...args) {
-    return std::shared_ptr<Listener>{new Listener(std::forward<Args>(args)...)};
-  }
-
-  // Start accepting incoming connections
-  void Run() { DoAccept(); }
-  tcp::endpoint GetEndpoint() const { return acceptor_.local_endpoint(); }
-
- private:
-  Listener(boost::asio::io_context &ioc, TSessionData *data, ServerContext *context, tcp::endpoint endpoint)
-      : ioc_(ioc), data_(data), context_(context), acceptor_(ioc) {
-    boost::beast::error_code ec;
-
-    // Open the acceptor
-    acceptor_.open(endpoint.protocol(), ec);
-    if (ec) {
-      LogError(ec, "open");
-      return;
-    }
-
-    // Allow address reuse
-    acceptor_.set_option(boost::asio::socket_base::reuse_address(true), ec);
-    if (ec) {
-      LogError(ec, "set_option");
-      return;
-    }
-
-    // Bind to the server address
-    acceptor_.bind(endpoint, ec);
-    if (ec) {
-      LogError(ec, "bind");
-      return;
-    }
-
-    acceptor_.listen(boost::asio::socket_base::max_listen_connections, ec);
-    if (ec) {
-      LogError(ec, "listen");
-      return;
-    }
-
-    spdlog::info("HTTP server is listening on {}:{}", endpoint.address(), endpoint.port());
-  }
-
-  void DoAccept() {
-    acceptor_.async_accept(ioc_, [shared_this = shared_from_this()](auto ec, auto socket) {
-      shared_this->OnAccept(ec, std::move(socket));
-    });
-  }
-
-  void OnAccept(boost::beast::error_code ec, tcp::socket socket) {
-    if (ec) {
-      return LogError(ec, "accept");
-    }
-
-    SessionHandler::Create(std::move(socket), data_, *context_)->Run();
-
-    DoAccept();
-  }
-
-  boost::asio::io_context &ioc_;
-  TSessionData *data_;
-  ServerContext *context_;
-  tcp::acceptor acceptor_;
-};
-}  // namespace memgraph::communication::http

src/communication/http/server.hpp

@@ -1,65 +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 <thread>
-
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/tcp.hpp>
-
-#include "communication/http/listener.hpp"
-#include "io/network/endpoint.hpp"
-
-namespace memgraph::communication::http {
-
-template <class TRequestHandler, typename TSessionData>
-class Server final {
-  using tcp = boost::asio::ip::tcp;
-
- public:
-  explicit Server(io::network::Endpoint endpoint, TSessionData *data, ServerContext *context)
-      : listener_{Listener<TRequestHandler, TSessionData>::Create(
-            ioc_, data, context, tcp::endpoint{boost::asio::ip::make_address(endpoint.address), endpoint.port})} {}
-
-  Server(const Server &) = delete;
-  Server(Server &&) = delete;
-  Server &operator=(const Server &) = delete;
-  Server &operator=(Server &&) = delete;
-
-  ~Server() {
-    MG_ASSERT(!background_thread_ || (ioc_.stopped() && !background_thread_->joinable()),
-              "Server wasn't shutdown properly");
-  }
-
-  void Start() {
-    MG_ASSERT(!background_thread_, "The server was already started!");
-    listener_->Run();
-    background_thread_.emplace([this] { ioc_.run(); });
-  }
-
-  void Shutdown() { ioc_.stop(); }
-
-  void AwaitShutdown() {
-    if (background_thread_ && background_thread_->joinable()) {
-      background_thread_->join();
-    }
-  }
-  bool IsRunning() const { return background_thread_ && !ioc_.stopped(); }
-  tcp::endpoint GetEndpoint() const { return listener_->GetEndpoint(); }
-
- private:
-  boost::asio::io_context ioc_;
-
-  std::shared_ptr<Listener<TRequestHandler, TSessionData>> listener_;
-  std::optional<std::thread> background_thread_;
-};
-}  // namespace memgraph::communication::http

src/communication/http/session.hpp

@@ -1,193 +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 <deque>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
-#include <variant>
-
-#include <spdlog/spdlog.h>
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/beast/core/buffers_to_string.hpp>
-#include <boost/beast/core/stream_traits.hpp>
-#include <boost/beast/core/tcp_stream.hpp>
-#include <boost/beast/http.hpp>
-#include <boost/beast/ssl.hpp>
-#include <boost/beast/version.hpp>
-#include <json/json.hpp>
-
-#include "communication/context.hpp"
-#include "utils/logging.hpp"
-#include "utils/variant_helpers.hpp"
-
-namespace memgraph::communication::http {
-
-inline constexpr uint16_t kSSLExpirySeconds = 30;
-inline void LogError(boost::beast::error_code ec, const std::string_view what) {
-  spdlog::warn("HTTP session failed on {}: {}", what, ec.message());
-}
-
-template <class TRequestHandler, typename TSessionData>
-class Session : public std::enable_shared_from_this<Session<TRequestHandler, TSessionData>> {
-  using tcp = boost::asio::ip::tcp;
-  using std::enable_shared_from_this<Session<TRequestHandler, TSessionData>>::shared_from_this;
-
- public:
-  template <typename... Args>
-  static std::shared_ptr<Session> Create(Args &&...args) {
-    return std::shared_ptr<Session>{new Session{std::forward<Args>(args)...}};
-  }
-
-  void Run() {
-    if (auto *ssl = std::get_if<SSLSocket>(&stream_); ssl != nullptr) {
-      try {
-        boost::beast::get_lowest_layer(*ssl).expires_after(std::chrono::seconds(kSSLExpirySeconds));
-        ssl->handshake(boost::asio::ssl::stream_base::server);
-      } catch (const boost::system::system_error &e) {
-        spdlog::warn("Failed on SSL handshake: {}", e.what());
-        return;
-      }
-    }
-
-    // run on the strand
-    boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoRead(); });
-  }
-
- private:
-  using PlainSocket = boost::beast::tcp_stream;
-  using SSLSocket = boost::beast::ssl_stream<boost::beast::tcp_stream>;
-
-  explicit Session(tcp::socket &&socket, TSessionData *data, ServerContext &context)
-      : stream_(CreateSocket(std::move(socket), context)),
-        handler_(data),
-        strand_{boost::asio::make_strand(GetExecutor())} {}
-
-  std::variant<PlainSocket, SSLSocket> CreateSocket(tcp::socket &&socket, ServerContext &context) {
-    if (context.use_ssl()) {
-      ssl_context_.emplace(context.context_clone());
-      return Session::SSLSocket{std::move(socket), *ssl_context_};
-    }
-
-    return Session::PlainSocket{std::move(socket)};
-  }
-
-  void OnWrite(boost::beast::error_code ec, size_t bytes_transferred) {
-    boost::ignore_unused(bytes_transferred);
-
-    if (ec) {
-      close_ = true;
-      return LogError(ec, "write");
-    }
-
-    if (close_) {
-      DoClose();
-      return;
-    }
-
-    res_ = nullptr;
-
-    DoRead();
-  }
-
-  void DoRead() {
-    req_ = {};
-
-    ExecuteForStream([this](auto &&stream) {
-      boost::beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(kSSLExpirySeconds));
-
-      boost::beast::http::async_read(
-          stream, buffer_, req_,
-          boost::asio::bind_executor(strand_, std::bind_front(&Session::OnRead, shared_from_this())));
-    });
-  }
-
-  void OnRead(boost::beast::error_code ec, size_t bytes_transferred) {
-    boost::ignore_unused(bytes_transferred);
-
-    if (ec == boost::beast::http::error::end_of_stream) {
-      DoClose();
-      return;
-    }
-
-    if (ec) {
-      return LogError(ec, "read");
-    }
-
-    auto async_write = [this](boost::beast::http::response<boost::beast::http::string_body> msg) {
-      ExecuteForStream([this, &msg](auto &&stream) {
-        // The lifetime of the message has to extend
-        // for the duration of the async operation so
-        // we use a shared_ptr to manage it.
-        auto sp = std::make_shared<boost::beast::http::response<boost::beast::http::string_body>>(std::move(msg));
-
-        // Store a type-erased version of the shared
-        // pointer in the class to keep it alive.
-        res_ = sp;
-        // Write the response
-        boost::beast::http::async_write(
-            stream, *sp, boost::asio::bind_executor(strand_, std::bind_front(&Session::OnWrite, shared_from_this())));
-      });
-    };
-
-    // handle request
-    handler_.HandleRequest(std::move(req_), async_write);
-  }
-
-  void DoClose() {
-    std::visit(utils::Overloaded{[this](SSLSocket &stream) {
-                                   boost::beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(30));
-
-                                   // Perform the SSL shutdown
-                                   stream.async_shutdown(
-                                       boost::beast::bind_front_handler(&Session::OnClose, shared_from_this()));
-                                 },
-                                 [](PlainSocket &stream) {
-                                   boost::beast::error_code ec;
-                                   stream.socket().shutdown(tcp::socket::shutdown_send, ec);
-                                 }},
-               stream_);
-  }
-  void OnClose(boost::beast::error_code ec) {
-    if (ec) {
-      LogError(ec, "close");
-    }
-
-    // At this point the connection is closed gracefully
-  }
-
-  auto GetExecutor() {
-    return std::visit(utils::Overloaded{[](auto &&stream) { return stream.get_executor(); }}, stream_);
-  }
-
-  template <typename F>
-  decltype(auto) ExecuteForStream(F &&fn) {
-    return std::visit(utils::Overloaded{std::forward<F>(fn)}, stream_);
-  }
-
-  std::optional<std::reference_wrapper<boost::asio::ssl::context>> ssl_context_;
-  std::variant<PlainSocket, SSLSocket> stream_;
-  boost::beast::flat_buffer buffer_;
-
-  TRequestHandler handler_;
-  boost::beast::http::request<boost::beast::http::string_body> req_;
-  std::shared_ptr<void> res_;
-
-  boost::asio::strand<boost::beast::tcp_stream::executor_type> strand_;
-  bool close_{false};
-};
-}  // namespace memgraph::communication::http

src/communication/v2/listener.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
@@ -30,7 +30,6 @@
 #include "communication/context.hpp"
 #include "communication/v2/pool.hpp"
 #include "communication/v2/session.hpp"
-#include "utils/message.hpp"
 #include "utils/spin_lock.hpp"
 #include "utils/synchronized.hpp"
 

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,21 +41,11 @@
 #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/event_counter.hpp"
 #include "utils/logging.hpp"
-#include "utils/on_scope_exit.hpp"
 #include "utils/variant_helpers.hpp"
 
-namespace memgraph::metrics {
-extern const Event ActiveSessions;
-extern const Event ActiveTCPSessions;
-extern const Event ActiveSSLSessions;
-extern const Event ActiveWebSocketSessions;
-}  // namespace memgraph::metrics
-
 namespace memgraph::communication::v2 {
 
 /**
@@ -109,8 +99,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
   // Start the asynchronous accept operation
   template <class Body, class Allocator>
   void DoAccept(boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>> req) {
-    memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveWebSocketSessions);
-
     execution_active_ = true;
     // Set suggested timeout settings for the websocket
     ws_.set_option(boost::beast::websocket::stream_base::timeout::suggested(boost::beast::role_type::server));
@@ -225,10 +213,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
     if (!IsConnected()) {
       return;
     }
-
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSessions);
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveWebSocketSessions);
-
     if (ec) {
       return OnError(ec, "close");
     }
@@ -275,19 +259,12 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     if (execution_active_) {
       return false;
     }
-
-    memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveSessions);
-
     execution_active_ = true;
     timeout_timer_.async_wait(boost::asio::bind_executor(strand_, std::bind(&Session::OnTimeout, shared_from_this())));
 
     if (std::holds_alternative<SSLSocket>(socket_)) {
-      utils::OnScopeExit increment_counter(
-          [] { memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveSSLSessions); });
       boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoHandshake(); });
     } else {
-      utils::OnScopeExit increment_counter(
-          [] { memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveTCPSessions); });
       boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoRead(); });
     }
     return true;
@@ -473,14 +450,6 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   }
 
   void OnClose(const boost::system::error_code &ec) {
-    if (ssl_context_.has_value()) {
-      memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSSLSessions);
-    } else {
-      memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveTCPSessions);
-    }
-
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSessions);
-
     if (ec) {
       return OnError(ec);
     }
@@ -496,7 +465,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     if (timeout_timer_.expiry() <= boost::asio::steady_timer::clock_type::now()) {
       // The deadline has passed. Stop the session. The other actors will
       // terminate as soon as possible.
-      spdlog::info("Shutting down session after {} seconds of inactivity", timeout_seconds_.count());
+      spdlog::info("Shutting down session after {} of inactivity", timeout_seconds_);
       DoShutdown();
     } else {
       // Put the actor back to sleep.

src/glue/CMakeLists.txt

@@ -1,4 +0,0 @@
-set(mg_glue_sources auth.cpp auth_checker.cpp auth_handler.cpp communication.cpp)
-
-add_library(mg-glue STATIC ${mg_glue_sources})
-target_link_libraries(mg-glue mg-query mg-auth)