Added support for additional python decorator timed_read_proc

.clang-tidy

@@ -1,9 +1,7 @@
 ---
 Checks: '*,
          -abseil-string-find-str-contains,
-         -altera-id-dependent-backward-branch,
          -altera-struct-pack-align,
-         -altera-unroll-loops,
          -android-*,
          -cert-err58-cpp,
          -cppcoreguidelines-avoid-c-arrays,
@@ -60,8 +58,7 @@ Checks: '*,
          -readability-implicit-bool-conversion,
          -readability-magic-numbers,
          -readability-named-parameter,
-         -misc-no-recursion,
-         -concurrency-mt-unsafe'
+         -misc-no-recursion'
 WarningsAsErrors: ''
 HeaderFilterRegex: 'src/.*'
 AnalyzeTemporaryDtors: false
@@ -88,3 +85,4 @@ CheckOptions:
   - key:             modernize-use-nullptr.NullMacros
     value:           'NULL'
 ...
+

.githooks/pre-commit

@@ -16,7 +16,6 @@ tmpdir=$(mktemp -d repo-XXXXXXXX)
 trap "rm -rf $tmpdir" EXIT INT
 
 modified_files=$(git diff --cached --name-only --diff-filter=AM $against | sed -nE "/.*\.(cpp|cc|cxx|c|h|hpp)$/p")
-FAIL=0
 for file in $modified_files; do
   echo "Checking $file..."
 
@@ -24,13 +23,21 @@ for file in $modified_files; do
 
   git checkout-index --prefix="$tmpdir/" -- $file
 
-  # Do not break header checker
+  echo "Running clang-format..."
+  $project_folder/tools/git-clang-format $tmpdir/$file
+  code=$?
+
+  if [ $code -ne 0 ]; then
+    break
+  fi
+
   echo "Running header checker..."
-  $project_folder/tools/header-checker.py $tmpdir/$file $file --amend-year
-  CODE=$?
-  if [ $CODE -ne 0 ]; then
-    FAIL=1
+  $project_folder/tools/header-checker.py $tmpdir/$file
+  code=$?
+
+  if [ $code -ne 0 ]; then
+    break
   fi
 done;
 
-return ${FAIL}
+return $code

.github/workflows/daily_banchmark.yaml

@@ -25,7 +25,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -42,16 +42,6 @@ jobs:
             --groups aggregation 1000_create unwind_create dense_expand match \
             --no-strict
 
-      - name: Get branch name (merge)
-        if: github.event_name != 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
-
-      - name: Get branch name (pull request)
-        if: github.event_name == 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
-
       - name: Upload macro benchmark results
         run: |
           cd tools/bench-graph-client
@@ -61,8 +51,7 @@ jobs:
           ./main.py --benchmark-name "macro_benchmark" \
                     --benchmark-results-path "../../tests/macro_benchmark/.harness_summary" \
                     --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
+                    --github-run-number "${{ github.run_number }}"
 
       - name: Run mgbench
         run: |
@@ -78,5 +67,4 @@ jobs:
           ./main.py --benchmark-name "mgbench" \
                     --benchmark-results-path "../../tests/mgbench/benchmark_result.json" \
                     --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
+                    --github-run-number "${{ github.run_number }}"

.github/workflows/diff.yaml

@@ -1,16 +1,13 @@
 name: Diff
 
 on:
-  push:
-    branches:
-      - master
   workflow_dispatch:
   pull_request:
     paths-ignore:
-      - "docs/**"
-      - "**/*.md"
-      - ".clang-format"
-      - "CODEOWNERS"
+      - 'docs/**'
+      - '**/*.md'
+      - '.clang-format'
+      - 'CODEOWNERS'
 
 jobs:
   community_build:
@@ -32,7 +29,7 @@ jobs:
       - name: Build community binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -45,7 +42,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -70,7 +67,7 @@ jobs:
       - name: Build combined ASAN, UBSAN and coverage binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -82,7 +79,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests. It is restricted to 2 threads intentionally, because higher concurrency makes the timing related tests unstable.
           cd build
@@ -91,7 +88,7 @@ jobs:
       - name: Compute code coverage
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Compute code coverage.
           cd tools/github
@@ -109,7 +106,7 @@ jobs:
 
       - name: Run clang-tidy
         run: |
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Restrict clang-tidy results only to the modified parts
           git diff -U0 master... -- src ':!*.hpp' | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -path build | tee ./build/clang_tidy_output.txt
@@ -136,7 +133,7 @@ jobs:
       - name: Build debug binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -149,7 +146,7 @@ jobs:
       - name: Run leftover CTest tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run leftover CTest tests (all except unit and benchmark tests).
           cd build
@@ -181,7 +178,7 @@ jobs:
       - name: Run cppcheck and clang-format
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run cppcheck and clang-format.
           cd tools/github
@@ -212,7 +209,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -238,7 +235,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -272,7 +269,7 @@ jobs:
       - name: Create enterprise DEB package
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           cd build
 
@@ -319,7 +316,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -360,7 +357,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -377,16 +374,6 @@ jobs:
             --groups aggregation 1000_create unwind_create dense_expand match \
             --no-strict
 
-      - name: Get branch name (merge)
-        if: github.event_name != 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
-
-      - name: Get branch name (pull request)
-        if: github.event_name == 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
-
       - name: Upload macro benchmark results
         run: |
           cd tools/bench-graph-client
@@ -396,8 +383,7 @@ jobs:
           ./main.py --benchmark-name "macro_benchmark" \
                     --benchmark-results-path "../../tests/macro_benchmark/.harness_summary" \
                     --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
+                    --github-run-number "${{ github.run_number }}"
 
       - name: Run mgbench
         run: |
@@ -413,5 +399,4 @@ jobs:
           ./main.py --benchmark-name "mgbench" \
                     --benchmark-results-path "../../tests/mgbench/benchmark_result.json" \
                     --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
+                    --github-run-number "${{ github.run_number }}"

.github/workflows/full_clang_tidy.yaml

@@ -23,7 +23,7 @@ jobs:
       - name: Build debug binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -36,10 +36,10 @@ jobs:
 
       - name: Run clang-tidy
         run: |
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # The results are also written to standard output in order to retain them in the logs
-          ./tools/github/clang-tidy/run-clang-tidy.py -p build -j $THREADS -clang-tidy-binary=/opt/toolchain-v4/bin/clang-tidy "$PWD/src/*" |
+          ./tools/github/clang-tidy/run-clang-tidy.py -p build -j $THREADS -clang-tidy-binary=/opt/toolchain-v3/bin/clang-tidy "$PWD/src/*" |
             tee ./build/full_clang_tidy_output.txt
 
       - name: Summarize clang-tidy results

.github/workflows/package_all.yaml

@@ -39,6 +39,23 @@ jobs:
           name: centos-8
           path: build/output/centos-8/memgraph*.rpm
 
+  debian-9:
+    runs-on: [self-hosted, DockerMgBuild]
+    timeout-minutes: 60
+    steps:
+      - name: "Set up repository"
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Required because of release/get_version.py
+      - name: "Build package"
+        run: |
+          ./release/package/run.sh package debian-9
+      - name: "Upload package"
+        uses: actions/upload-artifact@v2
+        with:
+          name: debian-9
+          path: build/output/debian-9/memgraph*.deb
+
   debian-10:
     runs-on: [self-hosted, DockerMgBuild]
     timeout-minutes: 60
@@ -84,7 +101,7 @@ jobs:
       - name: "Build package"
         run: |
           cd release/package
-          ./run.sh package debian-11 --for-docker
+          ./run.sh package debian-10 --for-docker
           ./run.sh docker
       - name: "Upload package"
         uses: actions/upload-artifact@v2
@@ -126,7 +143,7 @@ jobs:
           name: ubuntu-2004
           path: build/output/ubuntu-20.04/memgraph*.deb
 
-  debian-11-platform:
+  debian-10-platform:
     runs-on: [self-hosted, DockerMgBuild]
     timeout-minutes: 60
     steps:
@@ -136,9 +153,9 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package debian-11 --for-platform
+          ./release/package/run.sh package debian-10 --for-platform
       - name: "Upload package"
         uses: actions/upload-artifact@v2
         with:
-          name: debian-11-platform
-          path: build/output/debian-11/memgraph*.deb
+          name: debian-10-platform
+          path: build/output/debian-10/memgraph*.deb

.github/workflows/release_centos8.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Build community binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -39,7 +39,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -64,7 +64,7 @@ jobs:
       - name: Build coverage binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -77,7 +77,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -86,7 +86,7 @@ jobs:
       - name: Compute code coverage
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Compute code coverage.
           cd tools/github
@@ -121,7 +121,7 @@ jobs:
       - name: Build debug binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -134,7 +134,7 @@ jobs:
       - name: Run leftover CTest tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run leftover CTest tests (all except unit and benchmark tests).
           cd build
@@ -166,7 +166,7 @@ jobs:
       - name: Run cppcheck and clang-format
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run cppcheck and clang-format.
           cd tools/github
@@ -198,7 +198,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -211,7 +211,7 @@ jobs:
       - name: Create enterprise RPM package
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           cd build
 
@@ -233,7 +233,7 @@ jobs:
       - name: Run micro benchmark tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run micro benchmark tests.
           cd build
@@ -272,7 +272,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build

.github/workflows/release_debian10.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Build community binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -39,7 +39,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -64,7 +64,7 @@ jobs:
       - name: Build coverage binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -77,7 +77,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -86,7 +86,7 @@ jobs:
       - name: Compute code coverage
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Compute code coverage.
           cd tools/github
@@ -121,7 +121,7 @@ jobs:
       - name: Build debug binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -134,7 +134,7 @@ jobs:
       - name: Run leftover CTest tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run leftover CTest tests (all except unit and benchmark tests).
           cd build
@@ -166,7 +166,7 @@ jobs:
       - name: Run cppcheck and clang-format
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run cppcheck and clang-format.
           cd tools/github
@@ -198,7 +198,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -211,7 +211,7 @@ jobs:
       - name: Create enterprise DEB package
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           cd build
 
@@ -232,7 +232,7 @@ jobs:
       - name: Run micro benchmark tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run micro benchmark tests.
           cd build
@@ -271,7 +271,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -333,7 +333,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init

.github/workflows/release_docker.yaml

@@ -1,49 +0,0 @@
-name: Publish Docker images
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Memgraph binary version to publish on Dockerhub."
-        required: true
-
-jobs:
-  docker_publish:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_ORGANIZATION_NAME: memgraph
-      DOCKER_REPOSITORY_NAME: memgraph
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Download memgraph binary
-        run: |
-          cd release/docker
-          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: Build & push docker images
-        run: |
-          cd release/docker
-          docker buildx build \
-          --build-arg BINARY_NAME="memgraph-" \
-          --build-arg EXTENSION="deb" \
-          --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 memgraph_deb.dockerfile \
-          --push .

.github/workflows/release_ubuntu2004.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Build community binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -39,7 +39,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -64,7 +64,7 @@ jobs:
       - name: Build coverage binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -77,7 +77,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build
@@ -86,7 +86,7 @@ jobs:
       - name: Compute code coverage
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Compute code coverage.
           cd tools/github
@@ -121,7 +121,7 @@ jobs:
       - name: Build debug binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -134,7 +134,7 @@ jobs:
       - name: Run leftover CTest tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run leftover CTest tests (all except unit and benchmark tests).
           cd build
@@ -166,7 +166,7 @@ jobs:
       - name: Run cppcheck and clang-format
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run cppcheck and clang-format.
           cd tools/github
@@ -198,7 +198,7 @@ jobs:
       - name: Build release binaries
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Initialize dependencies.
           ./init
@@ -211,7 +211,7 @@ jobs:
       - name: Create enterprise DEB package
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           cd build
 
@@ -232,7 +232,7 @@ jobs:
       - name: Run micro benchmark tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run micro benchmark tests.
           cd build
@@ -271,7 +271,7 @@ jobs:
       - name: Run unit tests
         run: |
           # Activate toolchain.
-          source /opt/toolchain-v4/activate
+          source /opt/toolchain-v3/activate
 
           # Run unit tests.
           cd build

.pre-commit-config.yaml

@@ -1,24 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
-    hooks:
-      - id: check-yaml
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        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:
-      - id: clang-format

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.0.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.
@@ -66,7 +66,7 @@ if (MG_ENTERPRISE)
 else()
   set(get_version_offering "--open-source")
 endif()
-set(get_version_script "${CMAKE_CURRENT_SOURCE_DIR}/release/get_version.py")
+set(get_version_script "${CMAKE_SOURCE_DIR}/release/get_version.py")
 
 # Get version that should be used in the binary.
 execute_process(
@@ -76,7 +76,7 @@ execute_process(
                 "${MEMGRAPH_OVERRIDE_VERSION}"
                 "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
                 "--memgraph-root-dir"
-                "${CMAKE_CURRENT_SOURCE_DIR}"
+                "${CMAKE_SOURCE_DIR}"
 )
 if(MEMGRAPH_VERSION_RESULT AND NOT MEMGRAPH_VERSION_RESULT EQUAL 0)
     message(FATAL_ERROR "Unable to get Memgraph version.")
@@ -93,7 +93,7 @@ execute_process(
                 "${MEMGRAPH_OVERRIDE_VERSION}"
                 "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
                 "--memgraph-root-dir"
-                "${CMAKE_CURRENT_SOURCE_DIR}"
+                "${CMAKE_SOURCE_DIR}"
 )
 if(MEMGRAPH_VERSION_DEB_RESULT AND NOT MEMGRAPH_VERSION_DEB_RESULT EQUAL 0)
     message(FATAL_ERROR "Unable to get Memgraph DEB version.")
@@ -110,7 +110,7 @@ execute_process(
                 "${MEMGRAPH_OVERRIDE_VERSION}"
                 "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
                 "--memgraph-root-dir"
-                "${CMAKE_CURRENT_SOURCE_DIR}"
+                "${CMAKE_SOURCE_DIR}"
 )
 if(MEMGRAPH_VERSION_RPM_RESULT AND NOT MEMGRAPH_VERSION_RPM_RESULT EQUAL 0)
     message(FATAL_ERROR "Unable to get Memgraph RPM version.")
@@ -184,8 +184,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall \
     -Werror=switch -Werror=switch-bool -Werror=return-type \
     -Werror=return-stack-address \
-    -Wno-c99-designator \
-    -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT")
+    -Wno-c99-designator")
 
 # Don't omit frame pointer in RelWithDebInfo, for additional callchain debug.
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
@@ -205,8 +204,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
 # release flags
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
 
-SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -pthread")
-
 #debug flags
 set(PREFERRED_DEBUGGER "gdb" CACHE STRING
     "Tunes the debug output for your preferred debugger (gdb or lldb).")
@@ -231,8 +228,6 @@ endif()
 message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
 # -----------------------------------------------------------------------------
 
-set(MG_ARCH "x86_64" CACHE STRING "Host architecture to build Memgraph on. Supported values are x86_64 (default), ARM64.")
-
 # setup external dependencies -------------------------------------------------
 
 # threading
@@ -327,8 +322,7 @@ if (UBSAN)
   # To make the program abort on undefined behavior, use UBSAN_OPTIONS=halt_on_error=1.
 endif()
 
-set(MG_PYTHON_VERSION "" CACHE STRING "Specify the exact Python version used by the query modules")
-set(MG_PYTHON_PATH "" CACHE STRING "Specify the exact Python path used by the query modules")
+set(MG_PYTHON_VERSION "" CACHE STRING "Specify the exact python version used by the query modules")
 
 # Add subprojects
 include_directories(src)
@@ -337,13 +331,8 @@ add_subdirectory(src)
 # Release configuration
 add_subdirectory(release)
 
-option(MG_ENABLE_TESTING "Set this to OFF to disable building test binaries" ON)
-message(STATUS "MG_ENABLE_TESTING: ${MG_ENABLE_TESTING}")
-
-if (MG_ENABLE_TESTING)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
+enable_testing()
+add_subdirectory(tests)
 
 if(TOOLS)
   add_subdirectory(tools)

CODEOWNERS

@@ -1 +1 @@
-* @antaljanosbenjamin @kostasrim
+* @gitbuda @antonio2368 @antaljanosbenjamin @kostasrim @jbajic

README.md

@@ -54,18 +54,6 @@ Memgraph is implemented in C/C++ and leverages an in-memory first architecture
 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
-
-You don't need to install anything to try out Memgraph. Check out 
-our **[Memgraph Playground](https://playground.memgraph.com/)** sandboxes in 
-your browser.
-
-<p align="left">
-  <a href="https://playground.memgraph.com/">
-    <img width="450px" alt="Memgraph Playground" src="https://download.memgraph.com/asset/github/memgraph/memgraph-playground.png">
-  </a>
-</p>
-
 ## :floppy_disk: Download & Install
 
 ### Windows
@@ -127,14 +115,6 @@ understand what actions will and will not be tolerated.
 Read our [contributing guide](CONTRIBUTING.md) to learn about our development
 process and how to propose bug fixes and improvements.
 
-### Internals
-
-Read our
-[internal](https://memgraph.notion.site/Memgraph-Internals-12b69132d67a417898972927d6870bd2)
-docs to learn more about Memgraph's architecture, how to build the project from
-source and how to start contributing. All information related to the database,
-can be found in the aforementioned docs.
-
 ### :scroll: License
 
 Memgraph Community is available under the [BSL

cmake/FindJemalloc.cmake

@@ -1,55 +0,0 @@
-# Try to find jemalloc library
-#
-# Use this module as:
-#   find_package(Jemalloc)
-#
-# or:
-#   find_package(Jemalloc REQUIRED)
-#
-# This will define the following variables:
-#
-#   Jemalloc_FOUND           True if the system has the jemalloc library.
-#   Jemalloc_INCLUDE_DIRS    Include directories needed to use jemalloc.
-#   Jemalloc_LIBRARIES       Libraries needed to link to jemalloc.
-#
-# The following cache variables may also be set:
-#
-# Jemalloc_INCLUDE_DIR     The directory containing jemalloc/jemalloc.h.
-# Jemalloc_LIBRARY         The path to the jemalloc static library.
-
-find_path(Jemalloc_INCLUDE_DIR NAMES jemalloc/jemalloc.h PATH_SUFFIXES include)
-
-find_library(Jemalloc_LIBRARY NAMES libjemalloc.a PATH_SUFFIXES lib)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Jemalloc
-  FOUND_VAR Jemalloc_FOUND
-  REQUIRED_VARS
-    Jemalloc_LIBRARY
-    Jemalloc_INCLUDE_DIR
-)
-
-if(Jemalloc_FOUND)
-  set(Jemalloc_LIBRARIES ${Jemalloc_LIBRARY})
-  set(Jemalloc_INCLUDE_DIRS ${Jemalloc_INCLUDE_DIR})
-else()
-  if(Jemalloc_FIND_REQUIRED)
-    message(FATAL_ERROR "Cannot find jemalloc!")
-  else()
-    message(WARNING "jemalloc is not found!")
-  endif()
-endif()
-
-if(Jemalloc_FOUND AND NOT TARGET Jemalloc::Jemalloc)
-  add_library(Jemalloc::Jemalloc UNKNOWN IMPORTED)
-  set_target_properties(Jemalloc::Jemalloc
-    PROPERTIES
-      IMPORTED_LOCATION "${Jemalloc_LIBRARY}"
-      INTERFACE_INCLUDE_DIRECTORIES "${Jemalloc_INCLUDE_DIR}"
-  )
-endif()
-
-mark_as_advanced(
-  Jemalloc_INCLUDE_DIR
-  Jemalloc_LIBRARY
-)

config/flags.yaml

@@ -47,14 +47,6 @@ modifications:
     value: ""
     override: false
 
-  - name: "bolt_cert_file"
-    value: "/etc/memgraph/ssl/cert.pem"
-    override: false
-
-  - name: "bolt_key_file"
-    value: "/etc/memgraph/ssl/key.pem"
-    override: false
-
   - name: "storage_properties_on_edges"
     value: "true"
     override: true

environment/README.md

@@ -0,0 +1,4 @@
+# Memgraph Build and Run Environments
+
+Please continue in
+[Notion](https://www.notion.so/memgraph/Tools-05e0baafb78a49b386e0063b4833d23d).

environment/os/centos-7.sh

@@ -11,18 +11,12 @@ TOOLCHAIN_BUILD_DEPS=(
     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 libipt libipt-devel libbabeltrace-devel xz-devel python3-devel # gdb
+    expat-devel libipt-devel libbabeltrace-devel xz-devel python3-devel # gdb
     texinfo # gdb
     libcurl-devel # cmake
-    curl # snappy
     readline-devel # cmake and llvm
     libffi-devel libxml2-devel perl-Digest-MD5 # llvm
     libedit-devel pcre-devel automake bison # swig
-    file
-    openssl-devel
-    gmp-devel
-    gperf
-    patch
 )
 
 TOOLCHAIN_RUN_DEPS=(
@@ -32,10 +26,10 @@ TOOLCHAIN_RUN_DEPS=(
     expat libipt libbabeltrace xz-libs python3 # for gdb
     readline # for cmake and llvm
     libffi libxml2 # for llvm
-    openssl-devel
 )
 
 MEMGRAPH_BUILD_DEPS=(
+    git # source code control
     make pkgconfig # build system
     curl wget # for downloading libs
     libuuid-devel java-11-openjdk # required by antlr
@@ -55,7 +49,6 @@ MEMGRAPH_BUILD_DEPS=(
     doxygen graphviz # source documentation generators
     which mono-complete dotnet-sdk-3.1 golang nodejs zip unzip java-11-openjdk-devel # for driver tests
     autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
 )
 
 list() {
@@ -101,12 +94,8 @@ install() {
         echo "NOTE: export LANG=en_US.utf8"
     fi
     yum install -y epel-release
-    yum remove -y ius-release
-    yum install -y \
-      https://repo.ius.io/ius-release-el7.rpm
     yum update -y
-    yum install -y wget python3 python3-pip
-    yum install -y git
+    yum install -y wget git python3 python3-pip
     for pkg in $1; do
         if [ "$pkg" == libipt ]; then
             if ! yum list installed libipt >/dev/null 2>/dev/null; then

environment/os/centos-8.sh

@@ -6,22 +6,16 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
 TOOLCHAIN_BUILD_DEPS=(
-    coreutils-common gcc gcc-c++ make # generic build tools
+    coreutils 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 libipt libipt-devel libbabeltrace-devel xz-devel python36-devel texinfo # for gdb
+    expat-devel libipt-devel libbabeltrace-devel xz-devel python36-devel texinfo # for gdb
     libcurl-devel # for cmake
-    curl # snappy
     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
-    patch
 )
 
 TOOLCHAIN_RUN_DEPS=(
@@ -31,7 +25,6 @@ TOOLCHAIN_RUN_DEPS=(
     expat libipt libbabeltrace xz-libs python36 # for gdb
     readline # for cmake and llvm
     libffi libxml2 # for llvm
-    openssl-devel
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -55,7 +48,6 @@ MEMGRAPH_BUILD_DEPS=(
     which mono-complete dotnet-sdk-3.1 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() {
@@ -117,10 +109,9 @@ install() {
         # https://centos.pkgs.org
 	    # Since 2020, there is Babeltrace2 (https://babeltrace.org). Not used
         # within GDB yet (an assumption).
-        # http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/libbabeltrace-devel-1.5.4-3.el8.x86_64.rpm not working
         if [ "$pkg" == libbabeltrace-devel ]; then
             if ! dnf list installed libbabeltrace-devel >/dev/null 2>/dev/null; then
-                dnf install -y https://rpmfind.net/linux/centos/8-stream/PowerTools/x86_64/os/Packages/libbabeltrace-devel-1.5.4-3.el8.x86_64.rpm
+                dnf install -y http://mirror.centos.org/centos/8/PowerTools/x86_64/os/Packages/libbabeltrace-devel-1.5.4-3.el8.x86_64.rpm
             fi
             continue
         fi

environment/os/centos-9.sh

@@ -1,139 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-TOOLCHAIN_BUILD_DEPS=(
-    coreutils 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 # for gdb
-    libcurl-devel # for cmake
-    curl # snappy
-    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
-)
-
-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
-    curl 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-virtualenv python3-pip nmap-ncat # for qa, macro_benchmark and stress tests
-    #
-    # IMPORTANT: python3-yaml does NOT exist on CentOS
-    # Install it manually 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
-    sbcl # for custom Lisp C++ preprocessing
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    local missing=""
-    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 [ "$pkg" == "python3-virtualenv" ]; then
-            continue
-        fi
-        if [ "$pkg" == sbcl ]; then
-            if ! sbcl --version &> /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
-}
-
-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 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
-    yum update -y
-    yum install -y wget git python3 python3-pip
-    for pkg in $1; do
-        if [ "$pkg" == sbcl ]; then
-            if ! sbcl --version &> /dev/null; then
-	        curl -s https://altushost-swe.dl.sourceforge.net/project/sbcl/sbcl/1.4.2/sbcl-1.4.2-arm64-linux-binary.tar.bz2 -o /tmp/sbcl-arm64.tar.bz2
-		tar xvjf /tmp/sbcl-arm64.tar.bz2 -C /tmp
-		pushd /tmp/sbcl-1.4.2-arm64-linux
-		INSTALL_ROOT=/usr/local sh install.sh
-		popd
-            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" == python3-virtualenv ]; then
-            if [ -z ${SUDO_USER+x} ]; then # Running as root (e.g. Docker).
-                pip3 install --user virtualenv
-            else # Running using sudo.
-                sudo -H -u "$SUDO_USER" bash -c "pip3 install --user virtualenv"
-            fi
-            continue
-        fi
-        yum install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/os/debian-10.sh

@@ -15,12 +15,6 @@ TOOLCHAIN_BUILD_DEPS=(
     libcurl4-openssl-dev # for cmake
     libreadline-dev # for cmake and llvm
     libffi-dev libxml2-dev # for llvm
-    curl # snappy
-    file # for libunwind
-    libssl-dev # for libevent
-    libgmp-dev # for gdb
-    gperf # for proxygen
-    git # for fbthrift
     libedit-dev libpcre3-dev automake bison # for swig
 )
 
@@ -32,7 +26,6 @@ TOOLCHAIN_RUN_DEPS=(
     libcurl4 # for cmake
     libreadline7 # for cmake and llvm
     libffi6 libxml2 # for llvm
-    libssl-dev # for libevent
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -53,7 +46,6 @@ MEMGRAPH_BUILD_DEPS=(
     mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
     dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
 )
 
 list() {

environment/os/debian-11-arm.sh

@@ -1,104 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-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 liblzma-dev python3-dev texinfo # for gdb
-    libcurl4-openssl-dev # for cmake
-    libreadline-dev # for cmake and llvm
-    libffi-dev libxml2-dev # for llvm
-    libedit-dev libpcre3-dev automake bison # for swig
-    curl # snappy
-    file # for libunwind
-    libssl-dev # for libevent
-    libgmp-dev
-    gperf # for proxygen
-    git # for fbthrift
-)
-
-TOOLCHAIN_RUN_DEPS=(
-    make # generic build tools
-    tar gzip bzip2 xz-utils # used for archive unpacking
-    zlib1g # zlib library used for all builds
-    libexpat1 liblzma5 python3 # for gdb
-    libcurl4 # for cmake
-    file # for CPack
-    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 virtualenv 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
-    golang nodejs npm
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    check_all_dpkg "$1"
-}
-
-install() {
-    cat >/etc/apt/sources.list <<EOF
-deb http://deb.debian.org/debian bullseye main
-deb-src http://deb.debian.org/debian bullseye main
-
-deb http://deb.debian.org/debian-security/ bullseye-security main
-deb-src http://deb.debian.org/debian-security/ bullseye-security main
-
-deb http://deb.debian.org/debian bullseye-updates main
-deb-src http://deb.debian.org/debian bullseye-updates main
-EOF
-    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-3.1 ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                wget -nv https://packages.microsoft.com/config/debian/10/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-3.1
-            fi
-            continue
-        fi
-        apt install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/os/debian-11.sh

@@ -16,12 +16,6 @@ TOOLCHAIN_BUILD_DEPS=(
     libreadline-dev # for cmake and llvm
     libffi-dev libxml2-dev # for llvm
     libedit-dev libpcre3-dev automake bison # for swig
-    curl # snappy
-    file # for libunwind
-    libssl-dev # for libevent
-    libgmp-dev
-    gperf # for proxygen
-    git # for fbthrift
 )
 
 TOOLCHAIN_RUN_DEPS=(
@@ -30,10 +24,8 @@ TOOLCHAIN_RUN_DEPS=(
     zlib1g # zlib library used for all builds
     libexpat1 libipt2 libbabeltrace1 liblzma5 python3 # for gdb
     libcurl4 # for cmake
-    file # for CPack
     libreadline8 # for cmake and llvm
     libffi7 libxml2 # for llvm
-    libssl-dev # for libevent
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -54,7 +46,6 @@ MEMGRAPH_BUILD_DEPS=(
     mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
     dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
 )
 
 list() {

environment/os/debian-9.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source "$DIR/../util.sh"
+
+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 libipt-dev libbabeltrace-dev libbabeltrace-ctf-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
+    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 libipt1 libbabeltrace1 libbabeltrace-ctf1 liblzma5 python3 # for gdb
+    libcurl3 # for cmake
+    libreadline7 # for cmake and llvm
+    libffi6 libxml2 # for llvm
+)
+
+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
+    python3 python-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 nodejs zip unzip default-jdk-headless # for driver tests
+    autoconf # for jemalloc code generation
+)
+
+list() {
+    echo "$1"
+}
+
+check() {
+    check_all_dpkg "$1"
+}
+
+install() {
+    install_all_apt "$1"
+}
+
+deps=$2"[*]"
+"$1" "${!deps}"

environment/os/ubuntu-18.04.sh

@@ -16,12 +16,6 @@ TOOLCHAIN_BUILD_DEPS=(
     libcurl4-openssl-dev # cmake
     libreadline-dev # cmake and llvm
     libffi-dev libxml2-dev # llvm
-    curl # snappy
-    file
-    git # for thrift
-    libgmp-dev # for gdb
-    gperf # for proxygen
-    libssl-dev
     libedit-dev libpcre3-dev automake bison # swig
 )
 
@@ -33,7 +27,6 @@ TOOLCHAIN_RUN_DEPS=(
     libcurl4 # for cmake
     libreadline7 # for cmake and llvm
     libffi6 libxml2 # for llvm
-    libssl-dev # for libevent
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -52,7 +45,6 @@ MEMGRAPH_BUILD_DEPS=(
     doxygen graphviz # source documentation generators
     mono-runtime mono-mcs nodejs zip unzip default-jdk-headless # driver tests
     autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
 )
 
 list() {

environment/os/ubuntu-20.04.sh

@@ -15,12 +15,6 @@ TOOLCHAIN_BUILD_DEPS=(
     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
 )
 
@@ -32,7 +26,6 @@ TOOLCHAIN_RUN_DEPS=(
     libcurl4 # for cmake
     libreadline8 # for cmake and llvm
     libffi7 libxml2 # for llvm
-    libssl-dev # for libevent
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -53,7 +46,6 @@ MEMGRAPH_BUILD_DEPS=(
     mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
     dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
 )
 
 list() {

environment/toolchain/folly.patch

@@ -1,41 +0,0 @@
-diff -ur a/folly/CMakeLists.txt b/folly/CMakeLists.txt
---- a/folly/CMakeLists.txt	2021-12-12 23:10:42.000000000 +0100
-+++ b/folly/CMakeLists.txt	2022-02-03 15:19:41.349693134 +0100
-@@ -28,7 +28,6 @@
- )
-
- add_subdirectory(experimental/exception_tracer)
--add_subdirectory(logging/example)
-
- if (PYTHON_EXTENSIONS)
-   # Create tree of symbolic links in structure required for successful
-diff -ur a/folly/experimental/exception_tracer/ExceptionTracerLib.cpp b/folly/experimental/exception_tracer/ExceptionTracerLib.cpp
---- a/folly/experimental/exception_tracer/ExceptionTracerLib.cpp	2021-12-12 23:10:42.000000000 +0100
-+++ b/folly/experimental/exception_tracer/ExceptionTracerLib.cpp	2022-02-03 15:19:11.003368891 +0100
-@@ -96,6 +96,7 @@
- #define __builtin_unreachable()
- #endif
-
-+#if 0
- namespace __cxxabiv1 {
-
- void __cxa_throw(
-@@ -154,5 +155,5 @@
- }
-
- } // namespace std
--
-+#endif
- #endif // defined(__GLIBCXX__)
-diff -ur a/folly/Portability.h b/folly/Portability.h
---- a/folly/Portability.h	2021-12-12 23:10:42.000000000 +0100
-+++ b/folly/Portability.h	2022-02-03 15:19:11.003368891 +0100
-@@ -566,7 +566,7 @@
- #define FOLLY_HAS_COROUTINES 0
- #elif (__cpp_coroutines >= 201703L || __cpp_impl_coroutine >= 201902L) && \
-     (__has_include(<coroutine>) || __has_include(<experimental/coroutine>))
--#define FOLLY_HAS_COROUTINES 1
-+#define FOLLY_HAS_COROUTINES 0
- // This is mainly to workaround bugs triggered by LTO, when stack allocated
- // variables in await_suspend end up on a coroutine frame.
- #define FOLLY_CORO_AWAIT_SUSPEND_NONTRIVIAL_ATTRIBUTES FOLLY_NOINLINE

environment/toolchain/proxygen.patch

@@ -1,11 +0,0 @@
-diff -ur a/cmake/proxygen-config.cmake.in b/cmake/proxygen-config.cmake.in
---- a/cmake/proxygen-config.cmake.in	2021-12-13 02:37:05.000000000 +0100
-+++ b/cmake/proxygen-config.cmake.in	2022-01-27 17:14:28.284810621 +0100
-@@ -21,7 +21,6 @@
- find_dependency(folly)
- find_dependency(wangle)
- find_dependency(Fizz)
--find_dependency(mvfst)
- # For now, anything that depends on Proxygen has to copy its FindZstd.cmake
- # and issue a `find_package(Zstd)`.  Uncommenting this won't work because
- # this Zstd module exposes a library called `zstd`.  The right fix is

environment/toolchain/snappy.patch

@@ -1,29 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2021-05-05 00:53:34.000000000 +0200
-+++ b/CMakeLists.txt	2022-01-27 17:18:34.758302398 +0100
-@@ -52,9 +52,9 @@
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
-   add_definitions(-D_HAS_EXCEPTIONS=0)
- 
--  # Disable RTTI.
--  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
-+  # # Disable RTTI.
-+  # string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+  # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
- else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-   # Use -Wall for clang and gcc.
-   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-@@ -77,9 +77,9 @@
-   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
- 
--  # Disable RTTI.
--  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-+  # # Disable RTTI.
-+  # string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+  # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
- endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- 
- # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make

environment/toolchain/xz_pgp.txt

@@ -1,75 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBEzEOZIBEACxg/IuXERlDB48JBWmF4NxNUuuup1IhJAJyFGFSKh3OGAO2Ard
-sNuRLjANsFXA7m7P5eTFcG+BoHHuAVYmKnI3PPZtHVLnUt4pGItPczQZ2BE1WpcI
-ayjGTBJeKItX3Npqg9D/odO9WWS1i3FQPVdrLn0YH37/BA66jeMQCRo7g7GLpaNf
-IrvYGsqTbxCwsmA37rpE7oyU4Yrf74HT091WBsRIoq/MelhbxTDMR8eu/dUGZQVc
-Kj3lN55RepwWwUUKyqarY0zMt4HkFJ7v7yRL+Cvzy92Ouv4Wf2FlhNtEs5LE4Tax
-W0PO5AEmUoKjX87SezQK0f652018b4u6Ex52cY7p+n5TII/UyoowH6+tY8UHo9yb
-fStrqgNE/mY2bhA6+AwCaOUGsFzVVPTbjtxL3HacUP/jlA1h78V8VTvTs5d55iG7
-jSqR9o05wje8rwNiXXK0xtiJahyNzL97Kn/DgPSqPIi45G+8nxWSPFM5eunBKRl9
-vAnsvwrdPRsR6YR3uMHTuVhQX9/CY891MHkaZJ6wydWtKt3yQwJLYqwo5d4DwnUX
-CduUwSKv+6RmtWI5ZmTQYOcBRcZyGKml9X9Q8iSbm6cnpFXmLrNQwCJN+D3SiYGc
-MtbltZo0ysPMa6Xj5xFaYqWk/BI4iLb2Gs+ByGo/+a0Eq4XYBMOpitNniQARAQAB
-tCdMYXNzZSBDb2xsaW4gPGxhc3NlLmNvbGxpbkB0dWthYW5pLm9yZz6JAlEEEwEK
-ADsCGwMCHgECF4AECwkIBwMVCggFFgIDAQAWIQQ2kMJAzlG0Zw0wrRw47nV9aRhG
-IAUCYEt9dQUJFxeR4wAKCRA47nV9aRhGIBNDEACxD6vJ+enZwe3IgkJh5JtLsC9b
-MWCQRlPW1EVMsg96Cb5Rtron1eN1pp1TlzENJu1/C7C/VEsr9WwOPg26Men7fNf/
-O21QM9IBWd/uB0Pu333WqKh92ESS5x9ST9DrG39nVGSPkQQBMuia72VrA+crPnwT
-/h/u1IN6/sff5VDIU24rUiqW2Npy733dANruj7Ny0scRXVPltnVdhqwPHt6qNjC1
-t+/cCnwHgW1BR1RYXBPpB42z/m29dL9rPrG0YPGWs2Bc+EATUICfEE6eIvwfciue
-IJTjKT9Y9DrogJC2AYFhjC7N04OKdCB2hFs4BjexJwr4X0GJO7LhFl03c951AsIE
-GHwrucRPB5bo2vmvQ8IvZn7CmtdUJzXv9JlyU6p+MIK1pz7TK6GgSOSffQIXZn6e
-nUPtm9mEwuncOfmW8/ODYPs1gCWYgyiFJx8h7eEu+M4MxHSFBs7MwXf/Ae2fSp+M
-P/p198qB8fC5oVBnF95qb0Qi0uc1D+Gb+gpBF+ymMb+s/VBOR3QWiym7AzBrJ62g
-UnbC9jMLGnSRI+7p7raUfMTgXr5/oQoBw7ExJVltSSRrim2YH/t4CV47mO6dR9J3
-1RtsTFIRNhz+07XPsETcuCV/dgqeC8fOFLt9MY17Sufhb1DcGy4urZBOIhXcpTV7
-vHVj5IYH5nYOT49NRYkCOAQTAQIAIgUCTMQ5kgIbAwYLCQgHAwIGFQgCCQoLBBYC
-AwECHgECF4AACgkQOO51fWkYRiAg4A/7BXKwoRaXrMbMPOW7vuVF7c2IKB2Yqzn1
-vLBCwuEHkqY237lDcXY4/5LR+1gcZ3Duw1n/BRSm0FBdvyX/JTWiWNSDUkKAO/0l
-T2Tg44YLrDT3bzwu8dbU9xQt6kH+SCOHvv5Oe4k79l5mro6fF3H1M0bN63x/YoFY
-ojy09D7/JptY82oR4f/VdKnfZLJcCViCb0wp8SD2NkDAudKg+K+7PD8HlTWklQQg
-TZdRXxVZKIJeU42aJDqnRbAhJd64YHyClhqut9F5LUmiP5qfLfNhkKDhNOwk2Blr
-BGBJkSd7wPyzcX4Mun/L6YspHjbeVMt9TD7HQlo+OOd2OjAHCx6pqwkXnzeLPEaE
-cPdQ1SHgrBViAxX3DNPubLP0Knw8XwFu96EuhHZgexE1W7bB4LFsJyXAc5k1PqPD
-CLsAauxmvI2OfI7opG/8wyxDvNgoPjG8fZNAgY0REqPC0JnTXChH31IxUmhNotH8
-tD3DDTZOHw05n5MwwUrEE9xiETVDfFQcMLfxZ9KLz+BC2g1t5LYublRgnCMNJzFg
-sNUMM02CphABzl/LCLnumr0eyQQ/weV4twEhLwSDmqLYHL0EdYW0Y3CnnU9vmYxQ
-cXKbstS71sEJJYBBmSBbf9GxkOY8BRNtwVwY0kPgxv1WqdVBiAFvfB+pyAsrax9B
-3UeB7ZSwRD6JAhwEEAEKAAYFAlS25GwACgkQlbYYGy0z6ew92Q//ZA9/6piQtoW4
-PwP/1DtWGyKU8hwR+9FG669iPk/dAG+yoEJtFMOUpg/FUFmCX8Bc4oEHsCVyLxKt
-DcCVUIRcYNSFi5hTZaBEbwsOlDT37gtlfIIu34hhHRccKaLnN/N9gNMNw8wGh9xg
-Q/KtxZwcbk/bZIlDkKTJkFBRAekdEGAFDWb/AZOy+LQxS8ZAh1eWkfV0i8opmK9k
-gPXtLE0WSsqtYyGs58z+BFE9NH3tEUwK6jSvtuLwQl4UrICNbKthcpb8WwH6UXzb
-q3QNSYVOpf/cqRdBJA6bvb/ku/xyKVL08lGmxD9v1b137R7mafDAFPTsvH2Mt/0V
-YuhtWav3r1Bl9QksDxt2DTS8wiWDUBetGqOVdcw7vBrXPEWDNBmxeJXsiJ7zJlR+
-9wrJOm6RV2+l1IPxu96EaPS+kTNBijKrhxb67bww8BTEWTd0wcdJmgWRkM8SIstp
-IKqd0L2TFYph2/NtrBhRg+DIEPJPpSTGsUMcCEXCZPQ+cIdlQKsWpk0tZ62DlvEl
-r7E+wgUSQolRfx5KrpZifiS2zQlhzdXv28CJhsVbLyw5fUAWUKIH/dCo5NKsNLk2
-Lc5DH9VWnFgxAAtW290FqeK/4ulMq7Vs1dQSwyHM2Ni3QqqeaiOrh8gbSY5CMLFN
-Y3HYRwuTYPa3AobsozCzBj0Zdf/6AFe5Ag0ETMQ5kgEQAL/FwKdjxgPxtSpgq1SM
-zgZtTTyLqhgGD3NZfadHWHYRIL38NDV3JeTA79Y2zj2dj7KQPDT+0aqeizTV2E3j
-P3iCQ53VOT4consBaQAgKexpptnS+T1DobtICFJ0GGzf0HRj6KO2zSOuOitWPWlU
-wbvX7M0LLI2+hqlx0jTPqbJFZ/Za6KTtbS6xdCPVUpUqYZQpokEZcwQmUp8Q+lGo
-JD2sNYCZyap63X/aAOgCGr2RXYddOH5e8vGzGW+mwtCv+WQ9Ay35mGqI5MqkbZd1
-Qbuv2b1647E/QEEucfRHVbJVKGGPpFMUJtcItyyIt5jo+r9CCL4Cs47dF/9/RNwu
-NvpvHXUyqMBQdWNZRMx4k/NGD/WviPi9m6mIMui6rOQsSOaqYdcUX4Nq2Orr3Oaz
-2JPQdUfeI23iot1vK8hxvUCQTV3HfJghizN6spVl0yQOKBiE8miJRgrjHilH3hTb
-xoo42xDkNAq+CQo3QAm1ibDxKCDq0RcWPjcCRAN/Q5MmpcodpdKkzV0yGIS4g7s5
-frVrgV/kox2r4/Yxsr8K909+4H82AjTKGX/BmsQFCTAqBk6p7I0zxjIqJ/w33TZB
-Q0Pn4r3WIlUPafzY6a9/LAvN1fHRxf9SpCByJsszD03Qu5f5TB8gthsdnVmTo7jj
-iordEKMtw2aEMLzdWWTQ/TNVABEBAAGJAjwEGAEKACYCGwwWIQQ2kMJAzlG0Zw0w
-rRw47nV9aRhGIAUCYEt9YAUJFxeRzgAKCRA47nV9aRhGIMLtD/9HuKM4pngImcuz
-YwzQmdv4j26YYyh4jVsKEmVWTiRcehEgUIlrWkCu3qzd5NK+RetS7kJ8MPnzEUfj
-YbpdC6yrF6n1mSrZZ4VJMkV2ev37bIgXM+Wp1mCAGbjNxQnjn9RabT/gjIqmGuRn
-AP7RsSeOSuO/gO9h2Pteciz23ussTilB+8cTooQEQQZe6Kv/zukvL+ccSehLHsZ7
-qVfRUAmtt8nFkXXE+s8jfLfhqstaI2/RJu5witaPcXM8Mnz2E95aASAbZy0eQot9
-0Pvf07n9yuC3tueTvzvlXx3h5U3yT44tIOmzANIQjay1TGdm+RBJ2ZYyhyLawlZ2
-NVUXXSp4QZZXPA0UWbF+pb7Q9cdKDNFVuvGBljuea0Yd0T2o+ibDq43HziX9ll+l
-SXk9mqvW1UcDOaxWrSsm1Gc1O9g3wqH5xHAhtY8GPh/7VgAawskPkmnlkMW6pYPy
-zibbeISJL1gd1jIT63y6aoVrtNoo+wYJm280ROflh4+5QOo6QJ+jm70fkXSG/qJ5
-a8/qCPTHkJc/rpkL6/TDQAJURi9RhDAC0gb40HtusbN1LZEA+i0cWTmYXap+DB4Y
-R4pApilpaG87M+VUokR4xpnx7vTb2MPa7Mdenvi9FEGnKXadmT8038vlfzz5GGUT
-MlVin9BQPTpdA+PpRiJvKJgVDeAFOg==
-=asTC
------END PGP PUBLIC KEY BLOCK-----

environment/util.sh

@@ -5,10 +5,6 @@ operating_system() {
     sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-'
 }
 
-architecture() {
-    uname -m
-}
-
 check_all_yum() {
     local missing=""
     for pkg in $1; do

include/mgp.py

@@ -40,7 +40,6 @@ class InvalidContextError(Exception):
     """
     Signals using a graph element instance outside of the registered procedure.
     """
-
     pass
 
 
@@ -48,7 +47,6 @@ class UnknownError(_mgp.UnknownError):
     """
     Signals unspecified failure.
     """
-
     pass
 
 
@@ -56,7 +54,6 @@ class UnableToAllocateError(_mgp.UnableToAllocateError):
     """
     Signals failed memory allocation.
     """
-
     pass
 
 
@@ -64,7 +61,6 @@ class InsufficientBufferError(_mgp.InsufficientBufferError):
     """
     Signals that some buffer is not big enough.
     """
-
     pass
 
 
@@ -73,7 +69,6 @@ class OutOfRangeError(_mgp.OutOfRangeError):
     Signals that an index-like parameter has a value that is outside its
     possible values.
     """
-
     pass
 
 
@@ -82,7 +77,6 @@ class LogicErrorError(_mgp.LogicErrorError):
     Signals faulty logic within the program such as violating logical
     preconditions or class invariants and may be preventable.
     """
-
     pass
 
 
@@ -90,7 +84,6 @@ class DeletedObjectError(_mgp.DeletedObjectError):
     """
     Signals accessing an already deleted object.
     """
-
     pass
 
 
@@ -98,7 +91,6 @@ class InvalidArgumentError(_mgp.InvalidArgumentError):
     """
     Signals that some of the arguments have invalid values.
     """
-
     pass
 
 
@@ -106,7 +98,6 @@ class KeyAlreadyExistsError(_mgp.KeyAlreadyExistsError):
     """
     Signals that a key already exists in a container-like object.
     """
-
     pass
 
 
@@ -114,7 +105,6 @@ class ImmutableObjectError(_mgp.ImmutableObjectError):
     """
     Signals modification of an immutable object.
     """
-
     pass
 
 
@@ -122,7 +112,6 @@ class ValueConversionError(_mgp.ValueConversionError):
     """
     Signals that the conversion failed between python and cypher values.
     """
-
     pass
 
 
@@ -131,14 +120,12 @@ class SerializationError(_mgp.SerializationError):
     Signals serialization error caused by concurrent modifications from
     different transactions.
     """
-
     pass
 
 
 class Label:
     """Label of a Vertex."""
-
-    __slots__ = ("_name",)
+    __slots__ = ('_name',)
 
     def __init__(self, name: str):
         self._name = name
@@ -158,22 +145,19 @@ class Label:
 # Named property value of a Vertex or an Edge.
 # It would be better to use typing.NamedTuple with typed fields, but that is
 # not available in Python 3.5.
-Property = namedtuple("Property", ("name", "value"))
+Property = namedtuple('Property', ('name', 'value'))
 
 
 class Properties:
     """
     A collection of properties either on a Vertex or an Edge.
     """
-
-    __slots__ = (
-        "_vertex_or_edge",
-        "_len",
-    )
+    __slots__ = ('_vertex_or_edge', '_len',)
 
     def __init__(self, vertex_or_edge):
         if not isinstance(vertex_or_edge, (_mgp.Vertex, _mgp.Edge)):
-            raise TypeError("Expected '_mgp.Vertex' or '_mgp.Edge', got {}".format(type(vertex_or_edge)))
+            raise TypeError("Expected '_mgp.Vertex' or '_mgp.Edge', \
+                            got {}".format(type(vertex_or_edge)))
         self._len = None
         self._vertex_or_edge = vertex_or_edge
 
@@ -346,8 +330,7 @@ class Properties:
 
 class EdgeType:
     """Type of an Edge."""
-
-    __slots__ = ("_name",)
+    __slots__ = ('_name',)
 
     def __init__(self, name):
         self._name = name
@@ -365,7 +348,7 @@ class EdgeType:
 
 
 if sys.version_info >= (3, 5, 2):
-    EdgeId = typing.NewType("EdgeId", int)
+    EdgeId = typing.NewType('EdgeId', int)
 else:
     EdgeId = int
 
@@ -377,12 +360,12 @@ class Edge:
     a query. You should not globally store an instance of an Edge. Using an
     invalid Edge instance will raise InvalidContextError.
     """
-
-    __slots__ = ("_edge",)
+    __slots__ = ('_edge',)
 
     def __init__(self, edge):
         if not isinstance(edge, _mgp.Edge):
-            raise TypeError("Expected '_mgp.Edge', got '{}'".format(type(edge)))
+            raise TypeError(
+                "Expected '_mgp.Edge', got '{}'".format(type(edge)))
         self._edge = edge
 
     def __deepcopy__(self, memo):
@@ -425,7 +408,7 @@ class Edge:
         return EdgeType(self._edge.get_type_name())
 
     @property
-    def from_vertex(self) -> "Vertex":
+    def from_vertex(self) -> 'Vertex':
         """
         Get the source vertex.
 
@@ -436,7 +419,7 @@ class Edge:
         return Vertex(self._edge.from_vertex())
 
     @property
-    def to_vertex(self) -> "Vertex":
+    def to_vertex(self) -> 'Vertex':
         """
         Get the destination vertex.
 
@@ -470,7 +453,7 @@ class Edge:
 
 
 if sys.version_info >= (3, 5, 2):
-    VertexId = typing.NewType("VertexId", int)
+    VertexId = typing.NewType('VertexId', int)
 else:
     VertexId = int
 
@@ -482,12 +465,12 @@ class Vertex:
     in a query. You should not globally store an instance of a Vertex. Using an
     invalid Vertex instance will raise InvalidContextError.
     """
-
-    __slots__ = ("_vertex",)
+    __slots__ = ('_vertex',)
 
     def __init__(self, vertex):
         if not isinstance(vertex, _mgp.Vertex):
-            raise TypeError("Expected '_mgp.Vertex', got '{}'".format(type(vertex)))
+            raise TypeError(
+                "Expected '_mgp.Vertex', got '{}'".format(type(vertex)))
         self._vertex = vertex
 
     def __deepcopy__(self, memo):
@@ -530,7 +513,8 @@ class Vertex:
         """
         if not self.is_valid():
             raise InvalidContextError()
-        return tuple(Label(self._vertex.label_at(i)) for i in range(self._vertex.labels_count()))
+        return tuple(Label(self._vertex.label_at(i))
+                     for i in range(self._vertex.labels_count()))
 
     def add_label(self, label: str) -> None:
         """
@@ -631,8 +615,7 @@ class Vertex:
 
 class Path:
     """Path containing Vertex and Edge instances."""
-
-    __slots__ = ("_path", "_vertices", "_edges")
+    __slots__ = ('_path', '_vertices', '_edges')
 
     def __init__(self, starting_vertex_or_path: typing.Union[_mgp.Path, Vertex]):
         """Initialize with a starting Vertex.
@@ -653,7 +636,8 @@ class Path:
                 raise InvalidContextError()
             self._path = _mgp.Path.make_with_start(vertex)
         else:
-            raise TypeError("Expected '_mgp.Vertex' or '_mgp.Path', got '{}'".format(type(starting_vertex_or_path)))
+            raise TypeError("Expected '_mgp.Vertex' or '_mgp.Path', got '{}'"
+                            .format(type(starting_vertex_or_path)))
 
     def __copy__(self):
         if not self.is_valid():
@@ -694,7 +678,8 @@ class Path:
         extension.
         """
         if not isinstance(edge, Edge):
-            raise TypeError("Expected '_mgp.Edge', got '{}'".format(type(edge)))
+            raise TypeError(
+                "Expected '_mgp.Edge', got '{}'".format(type(edge)))
         if not self.is_valid() or not edge.is_valid():
             raise InvalidContextError()
         self._path.expand(edge._edge)
@@ -713,7 +698,8 @@ class Path:
             raise InvalidContextError()
         if self._vertices is None:
             num_vertices = self._path.size() + 1
-            self._vertices = tuple(Vertex(self._path.vertex_at(i)) for i in range(num_vertices))
+            self._vertices = tuple(Vertex(self._path.vertex_at(i))
+                                   for i in range(num_vertices))
         return self._vertices
 
     @property
@@ -727,14 +713,14 @@ class Path:
             raise InvalidContextError()
         if self._edges is None:
             num_edges = self._path.size()
-            self._edges = tuple(Edge(self._path.edge_at(i)) for i in range(num_edges))
+            self._edges = tuple(Edge(self._path.edge_at(i))
+                                for i in range(num_edges))
         return self._edges
 
 
 class Record:
     """Represents a record of resulting field values."""
-
-    __slots__ = ("fields",)
+    __slots__ = ('fields',)
 
     def __init__(self, **kwargs):
         """Initialize with name=value fields in kwargs."""
@@ -743,12 +729,12 @@ class Record:
 
 class Vertices:
     """Iterable over vertices in a graph."""
-
-    __slots__ = ("_graph", "_len")
+    __slots__ = ('_graph', '_len')
 
     def __init__(self, graph):
         if not isinstance(graph, _mgp.Graph):
-            raise TypeError("Expected '_mgp.Graph', got '{}'".format(type(graph)))
+            raise TypeError(
+                "Expected '_mgp.Graph', got '{}'".format(type(graph)))
         self._graph = graph
         self._len = None
 
@@ -805,12 +791,12 @@ class Vertices:
 
 class Graph:
     """State of the graph database in current ProcCtx."""
-
-    __slots__ = ("_graph",)
+    __slots__ = ('_graph',)
 
     def __init__(self, graph):
         if not isinstance(graph, _mgp.Graph):
-            raise TypeError("Expected '_mgp.Graph', got '{}'".format(type(graph)))
+            raise TypeError(
+                "Expected '_mgp.Graph', got '{}'".format(type(graph)))
         self._graph = graph
 
     def __deepcopy__(self, memo):
@@ -899,7 +885,8 @@ class Graph:
             raise InvalidContextError()
         self._graph.detach_delete_vertex(vertex._vertex)
 
-    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex, edge_type: EdgeType) -> None:
+    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex,
+                    edge_type: EdgeType) -> None:
         """
         Create an edge.
 
@@ -912,7 +899,8 @@ class Graph:
         """
         if not self.is_valid():
             raise InvalidContextError()
-        return Edge(self._graph.create_edge(from_vertex._vertex, to_vertex._vertex, edge_type.name))
+        return Edge(self._graph.create_edge(from_vertex._vertex,
+                                            to_vertex._vertex, edge_type.name))
 
     def delete_edge(self, edge: Edge) -> None:
         """
@@ -930,7 +918,6 @@ class Graph:
 
 class AbortError(Exception):
     """Signals that the procedure was asked to abort its execution."""
-
     pass
 
 
@@ -940,12 +927,12 @@ class ProcCtx:
     Access to a ProcCtx is only valid during a single execution of a procedure
     in a query. You should not globally store a ProcCtx instance.
     """
-
-    __slots__ = ("_graph",)
+    __slots__ = ('_graph',)
 
     def __init__(self, graph):
         if not isinstance(graph, _mgp.Graph):
-            raise TypeError("Expected '_mgp.Graph', got '{}'".format(type(graph)))
+            raise TypeError(
+                "Expected '_mgp.Graph', got '{}'".format(type(graph)))
         self._graph = Graph(graph)
 
     def is_valid(self) -> bool:
@@ -982,7 +969,8 @@ LocalDateTime = datetime.datetime
 
 Duration = datetime.timedelta
 
-Any = typing.Union[bool, str, Number, Map, Path, list, Date, LocalTime, LocalDateTime, Duration]
+Any = typing.Union[bool, str, Number, Map, Path,
+                   list, Date, LocalTime, LocalDateTime, Duration]
 
 List = typing.List
 
@@ -1015,7 +1003,7 @@ def _typing_to_cypher_type(type_):
         Date: _mgp.type_date(),
         LocalTime: _mgp.type_local_time(),
         LocalDateTime: _mgp.type_local_date_time(),
-        Duration: _mgp.type_duration(),
+        Duration: _mgp.type_duration()
     }
     try:
         return simple_types[type_]
@@ -1033,14 +1021,14 @@ def _typing_to_cypher_type(type_):
             if type(None) in type_args:
                 types = tuple(t for t in type_args if t is not type(None))  # noqa E721
                 if len(types) == 1:
-                    (type_arg,) = types
+                    type_arg, = types
                 else:
                     # We cannot do typing.Union[*types], so do the equivalent
                     # with __getitem__ which does not even need arg unpacking.
                     type_arg = typing.Union.__getitem__(types)
                 return _mgp.type_nullable(_typing_to_cypher_type(type_arg))
         elif complex_type == list:
-            (type_arg,) = type_args
+            type_arg, = type_args
             return _mgp.type_list(_typing_to_cypher_type(type_arg))
         raise UnsupportedTypingError(type_)
     else:
@@ -1050,17 +1038,13 @@ def _typing_to_cypher_type(type_):
         # printed the same way. `typing.List[type]` is printed as such, while
         # `typing.Optional[type]` is printed as 'typing.Union[type, NoneType]'
         def parse_type_args(type_as_str):
-            return tuple(
-                map(
-                    str.strip,
-                    type_as_str[type_as_str.index("[") + 1 : -1].split(","),
-                )
-            )
+            return tuple(map(str.strip,
+                             type_as_str[type_as_str.index('[') + 1: -1].split(',')))
 
         def fully_qualified_name(cls):
-            if cls.__module__ is None or cls.__module__ == "builtins":
+            if cls.__module__ is None or cls.__module__ == 'builtins':
                 return cls.__name__
-            return cls.__module__ + "." + cls.__name__
+            return cls.__module__ + '.' + cls.__name__
 
         def get_simple_type(type_as_str):
             for simple_type, cypher_type in simple_types.items():
@@ -1076,26 +1060,28 @@ def _typing_to_cypher_type(type_):
                     pass
 
         def parse_typing(type_as_str):
-            if type_as_str.startswith("typing.Union"):
+            if type_as_str.startswith('typing.Union'):
                 type_args_as_str = parse_type_args(type_as_str)
                 none_type_as_str = type(None).__name__
                 if none_type_as_str in type_args_as_str:
-                    types = tuple(t for t in type_args_as_str if t != none_type_as_str)
+                    types = tuple(
+                        t for t in type_args_as_str if t != none_type_as_str)
                     if len(types) == 1:
-                        (type_arg_as_str,) = types
+                        type_arg_as_str, = types
                     else:
-                        type_arg_as_str = "typing.Union[" + ", ".join(types) + "]"
+                        type_arg_as_str = 'typing.Union[' + \
+                            ', '.join(types) + ']'
                     simple_type = get_simple_type(type_arg_as_str)
                     if simple_type is not None:
                         return _mgp.type_nullable(simple_type)
                     return _mgp.type_nullable(parse_typing(type_arg_as_str))
-            elif type_as_str.startswith("typing.List"):
+            elif type_as_str.startswith('typing.List'):
                 type_arg_as_str = parse_type_args(type_as_str)
 
                 if len(type_arg_as_str) > 1:
                     # Nested object could be a type consisting of a list of types (e.g. mgp.Map)
                     # so we need to join the parts.
-                    type_arg_as_str = ", ".join(type_arg_as_str)
+                    type_arg_as_str = ', '.join(type_arg_as_str)
                 else:
                     type_arg_as_str = type_arg_as_str[0]
 
@@ -1110,11 +1096,9 @@ def _typing_to_cypher_type(type_):
 
 # Procedure registration
 
-
 class Deprecated:
     """Annotate a resulting Record's field as deprecated."""
-
-    __slots__ = ("field_type",)
+    __slots__ = ('field_type',)
 
     def __init__(self, type_):
         self.field_type = type_
@@ -1122,7 +1106,8 @@ class Deprecated:
 
 def raise_if_does_not_meet_requirements(func: typing.Callable[..., Record]):
     if not callable(func):
-        raise TypeError("Expected a callable object, got an instance of '{}'".format(type(func)))
+        raise TypeError("Expected a callable object, got an instance of '{}'"
+                        .format(type(func)))
     if inspect.iscoroutinefunction(func):
         raise TypeError("Callable must not be 'async def' function")
     if sys.version_info >= (3, 6):
@@ -1132,25 +1117,34 @@ def raise_if_does_not_meet_requirements(func: typing.Callable[..., Record]):
         raise NotImplementedError("Generator functions are not supported")
 
 
-def _register_proc(func: typing.Callable[..., Record], is_write: bool):
+def _register_proc(func: typing.Callable[..., Record],
+                   is_write: bool, is_timed: bool):
     raise_if_does_not_meet_requirements(func)
-    register_func = _mgp.Module.add_write_procedure if is_write else _mgp.Module.add_read_procedure
+    register_func = (
+        _mgp.Module.add_write_procedure if is_write
+        else _mgp.Module.add_read_procedure)
     sig = inspect.signature(func)
     params = tuple(sig.parameters.values())
     if params and params[0].annotation is ProcCtx:
-
         @wraps(func)
         def wrapper(graph, args):
-            return func(ProcCtx(graph), *args)
-
+            start = datetime.datetime.now()
+            result = func(ProcCtx(graph), *args)
+            if is_timed:
+                delta = datetime.datetime.now() - start
+                result.fields["duration"] = delta.total_seconds() * 10**6 + delta.microseconds % 10**6
+            return result
         params = params[1:]
         mgp_proc = register_func(_mgp._MODULE, wrapper)
     else:
-
         @wraps(func)
         def wrapper(graph, args):
-            return func(*args)
-
+            start = datetime.datetime.now()
+            result = func(*args)
+            if is_timed:
+                delta = datetime.datetime.now() - start
+                result.fields["duration"] = delta.total_seconds() * 10**6 + delta.microseconds % 10**6
+            return result
         mgp_proc = register_func(_mgp._MODULE, wrapper)
     for param in params:
         name = param.name
@@ -1165,29 +1159,38 @@ def _register_proc(func: typing.Callable[..., Record], is_write: bool):
     if sig.return_annotation is not sig.empty:
         record = sig.return_annotation
         if not isinstance(record, Record):
-            raise TypeError("Expected '{}' to return 'mgp.Record', got '{}'".format(func.__name__, type(record)))
+            raise TypeError("Expected '{}' to return 'mgp.Record', got '{}'"
+                            .format(func.__name__, type(record)))
         for name, type_ in record.fields.items():
             if isinstance(type_, Deprecated):
                 cypher_type = _typing_to_cypher_type(type_.field_type)
                 mgp_proc.add_deprecated_result(name, cypher_type)
             else:
                 mgp_proc.add_result(name, _typing_to_cypher_type(type_))
+    if is_timed:
+        mgp_proc.add_result("duration", _typing_to_cypher_type(int))    
     return func
 
-
 def read_proc(func: typing.Callable[..., Record]):
+    _read_proc(func, False)
+
+def timed_read_proc(func: typing.Callable[..., Record]):
+    _read_proc(func, True)
+
+def _read_proc(func: typing.Callable[..., Record], is_timed: bool):
     """
     Register `func` as a read-only procedure of the current module.
 
-    The decorator `read_proc` is meant to be used to register module procedures.
-    The registered `func` needs to be a callable which optionally takes
-    `ProcCtx` as its first argument. Other arguments of `func` will be bound to
-    values passed in the cypherQuery. The full signature of `func` needs to be
-    annotated with types. The return type must be `Record(field_name=type, ...)`
-    and the procedure must produce either a complete Record or None. To mark a
-    field as deprecated, use `Record(field_name=Deprecated(type), ...)`.
-    Multiple records can be produced by returning an iterable of them.
-    Registering generator functions is currently not supported.
+    `read_proc` is meant to be used as a decorator function to register module
+    procedures. The registered `func` needs to be a callable which optionally
+    takes `ProcCtx` as the first argument. Other arguments of `func` will be
+    bound to values passed in the cypherQuery. The full signature of `func`
+    needs to be annotated with types. The return type must be
+    `Record(field_name=type, ...)` and the procedure must produce either a
+    complete Record or None. To mark a field as deprecated, use
+    `Record(field_name=Deprecated(type), ...)`. Multiple records can be
+    produced by returning an iterable of them. Registering generator functions
+    is currently not supported.
 
     Example usage.
 
@@ -1214,23 +1217,23 @@ def read_proc(func: typing.Callable[..., Record]):
       CALL example.procedure(1) YIELD args, result;
     Naturally, you may pass in different arguments or yield less fields.
     """
-    return _register_proc(func, False)
+    return _register_proc(func, False, is_timed)
 
 
 def write_proc(func: typing.Callable[..., Record]):
     """
     Register `func` as a writeable procedure of the current module.
 
-    The decorator `write_proc` is meant to be used to register module
+    `write_proc` is meant to be used as a decorator function to register module
     procedures. The registered `func` needs to be a callable which optionally
     takes `ProcCtx` as the first argument. Other arguments of `func` will be
     bound to values passed in the cypherQuery. The full signature of `func`
     needs to be annotated with types. The return type must be
     `Record(field_name=type, ...)` and the procedure must produce either a
     complete Record or None. To mark a field as deprecated, use
-    `Record(field_name=Deprecated(type), ...)`. Multiple records can be produced
-    by returning an iterable of them. Registering generator functions is
-    currently not supported.
+    `Record(field_name=Deprecated(type), ...)`. Multiple records can be
+    produced by returning an iterable of them. Registering generator functions
+    is currently not supported.
 
     Example usage.
 
@@ -1264,29 +1267,24 @@ def write_proc(func: typing.Callable[..., Record]):
       CALL example.procedure("single argument") YIELD result;
     Naturally, you may pass in different arguments.
     """
-    return _register_proc(func, True)
+    return _register_proc(func, True, False)
 
 
 class InvalidMessageError(Exception):
     """
     Signals using a message instance outside of the registered transformation.
     """
-
     pass
 
 
-SOURCE_TYPE_KAFKA = _mgp.SOURCE_TYPE_KAFKA
-SOURCE_TYPE_PULSAR = _mgp.SOURCE_TYPE_PULSAR
-
-
 class Message:
     """Represents a message from a stream."""
-
-    __slots__ = ("_message",)
+    __slots__ = ('_message',)
 
     def __init__(self, message):
         if not isinstance(message, _mgp.Message):
-            raise TypeError("Expected '_mgp.Message', got '{}'".format(type(message)))
+            raise TypeError(
+                "Expected '_mgp.Message', got '{}'".format(type(message)))
         self._message = message
 
     def __deepcopy__(self, memo):
@@ -1299,88 +1297,40 @@ class Message:
         """Return True if `self` is in valid context and may be used."""
         return self._message.is_valid()
 
-    def source_type(self) -> str:
-        """
-        Supported in all stream sources
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
-        if not self.is_valid():
-            raise InvalidMessageError()
-        return self._message.source_type()
-
     def payload(self) -> bytes:
-        """
-        Supported stream sources:
-          - Kafka
-          - Pulsar
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
         if not self.is_valid():
             raise InvalidMessageError()
         return self._message.payload()
 
     def topic_name(self) -> str:
-        """
-        Supported stream sources:
-          - Kafka
-          - Pulsar
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
         if not self.is_valid():
             raise InvalidMessageError()
         return self._message.topic_name()
 
     def key(self) -> bytes:
-        """
-        Supported stream sources:
-          - Kafka
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
         if not self.is_valid():
             raise InvalidMessageError()
         return self._message.key()
 
     def timestamp(self) -> int:
-        """
-        Supported stream sources:
-          - Kafka
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
         if not self.is_valid():
             raise InvalidMessageError()
         return self._message.timestamp()
 
-    def offset(self) -> int:
-        """
-        Supported stream sources:
-          - Kafka
-
-        Raise InvalidArgumentError if the message is from an unsupported stream source.
-        """
-        if not self.is_valid():
-            raise InvalidMessageError()
-        return self._message.offset()
-
 
 class InvalidMessagesError(Exception):
     """Signals using a messages instance outside of the registered transformation."""
-
     pass
 
 
 class Messages:
     """Represents a list of messages from a stream."""
-
-    __slots__ = ("_messages",)
+    __slots__ = ('_messages',)
 
     def __init__(self, messages):
         if not isinstance(messages, _mgp.Messages):
-            raise TypeError("Expected '_mgp.Messages', got '{}'".format(type(messages)))
+            raise TypeError(
+                "Expected '_mgp.Messages', got '{}'".format(type(messages)))
         self._messages = messages
 
     def __deepcopy__(self, memo):
@@ -1412,12 +1362,12 @@ class TransCtx:
     Access to a TransCtx is only valid during a single execution of a transformation.
     You should not globally store a TransCtx instance.
     """
-
-    __slots__ = "_graph"
+    __slots__ = ('_graph')
 
     def __init__(self, graph):
         if not isinstance(graph, _mgp.Graph):
-            raise TypeError("Expected '_mgp.Graph', got '{}'".format(type(graph)))
+            raise TypeError(
+                "Expected '_mgp.Graph', got '{}'".format(type(graph)))
         self._graph = Graph(graph)
 
     def is_valid(self) -> bool:
@@ -1437,116 +1387,21 @@ def transformation(func: typing.Callable[..., Record]):
     params = tuple(sig.parameters.values())
     if not params or not params[0].annotation is Messages:
         if not len(params) == 2 or not params[1].annotation is Messages:
-            raise NotImplementedError("Valid signatures for transformations are (TransCtx, Messages) or (Messages)")
+            raise NotImplementedError(
+                "Valid signatures for transformations are (TransCtx, Messages) or (Messages)")
     if params[0].annotation is TransCtx:
-
         @wraps(func)
         def wrapper(graph, messages):
             return func(TransCtx(graph), messages)
-
         _mgp._MODULE.add_transformation(wrapper)
     else:
-
         @wraps(func)
         def wrapper(graph, messages):
             return func(messages)
-
         _mgp._MODULE.add_transformation(wrapper)
     return func
 
 
-class FuncCtx:
-    """Context of a function being executed.
-
-    Access to a FuncCtx is only valid during a single execution of a function in
-    a query. You should not globally store a FuncCtx instance. The graph object
-    within the FuncCtx is not mutable.
-    """
-
-    __slots__ = "_graph"
-
-    def __init__(self, graph):
-        if not isinstance(graph, _mgp.Graph):
-            raise TypeError("Expected '_mgp.Graph', got '{}'".format(type(graph)))
-        self._graph = Graph(graph)
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-
-def function(func: typing.Callable):
-    """
-    Register `func` as a user-defined function in the current module.
-
-    The decorator `function` is meant to be used to register module functions.
-    The registered `func` needs to be a callable which optionally takes
-    `FuncCtx` as its first argument. Other arguments of `func` will be bound to
-    values passed in the Cypher query. Only the funcion arguments need to be
-    annotated with types. The return type doesn't need to be specified, but it
-    has to be supported by `mgp.Any`. Registering generator functions is
-    currently not supported.
-
-    Example usage.
-
-    ```
-    import mgp
-    @mgp.function
-    def func_example(context: mgp.FuncCtx,
-        required_arg: str,
-        optional_arg: mgp.Nullable[str] = None
-        ):
-        return_args = [required_arg]
-        if optional_arg is not None:
-            return_args.append(optional_arg)
-        # Return any kind of result supported by mgp.Any
-        return return_args
-    ```
-
-    The example function above returns a list of provided arguments:
-      * `required_arg` is always present and its value is the first argument of
-        the function.
-      * `optional_arg` is present if the second argument of the function is not
-        `null`.
-    Any errors can be reported by raising an Exception.
-
-    The function can be invoked in Cypher using the following calls:
-      RETURN example.func_example("first argument", "second_argument");
-      RETURN example.func_example("first argument");
-    Naturally, you may pass in different arguments.
-    """
-    raise_if_does_not_meet_requirements(func)
-    register_func = _mgp.Module.add_function
-    sig = inspect.signature(func)
-    params = tuple(sig.parameters.values())
-    if params and params[0].annotation is FuncCtx:
-
-        @wraps(func)
-        def wrapper(graph, args):
-            return func(FuncCtx(graph), *args)
-
-        params = params[1:]
-        mgp_func = register_func(_mgp._MODULE, wrapper)
-    else:
-
-        @wraps(func)
-        def wrapper(graph, args):
-            return func(*args)
-
-        mgp_func = register_func(_mgp._MODULE, wrapper)
-
-    for param in params:
-        name = param.name
-        type_ = param.annotation
-        if type_ is param.empty:
-            type_ = object
-        cypher_type = _typing_to_cypher_type(type_)
-        if param.default is param.empty:
-            mgp_func.add_arg(name, cypher_type)
-        else:
-            mgp_func.add_opt_arg(name, cypher_type, param.default)
-    return func
-
-
 def _wrap_exceptions():
     def wrap_function(func):
         @wraps(func)
@@ -1575,7 +1430,6 @@ def _wrap_exceptions():
                 raise ValueConversionError(e)
             except _mgp.SerializationError as e:
                 raise SerializationError(e)
-
         return wrapped_func
 
     def wrap_prop_func(func):
@@ -1586,16 +1440,11 @@ def _wrap_exceptions():
             if inspect.isfunction(obj):
                 setattr(cls, name, wrap_function(obj))
             elif isinstance(obj, property):
-                setattr(
-                    cls,
-                    name,
-                    property(
-                        wrap_prop_func(obj.fget),
-                        wrap_prop_func(obj.fset),
-                        wrap_prop_func(obj.fdel),
-                        obj.__doc__,
-                    ),
-                )
+                setattr(cls, name, property(
+                    wrap_prop_func(obj.fget),
+                    wrap_prop_func(obj.fset),
+                    wrap_prop_func(obj.fdel),
+                    obj.__doc__))
 
     def defined_in_this_module(obj: object):
         return getattr(obj, "__module__", "") == __name__

init

@@ -10,8 +10,6 @@ function print_help () {
     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 () {
@@ -32,47 +30,26 @@ function setup_virtualenv () {
     popd > /dev/null
 }
 
-wsl_quicklisp_proxy=""
-setup_libs=true
-if [[ $# -eq 1 && "$1" == "-h" ]]; then
+if [[ $# -gt 1 ]]; then
     print_help
-    exit 0
-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
-          ;;
-          *)
-              # unknown option
-              echo "Invalid argument provided: $1"
-              print_help
-              exit 1
-          ;;
-        esac
-    done
+    exit 1
+elif  [[ $# -eq 1 ]]; then
+    case "$1" in
+      -h)
+          print_help
+          exit 0
+      ;;
+      *)
+          # unknown option
+          print_help
+          exit 1
+      ;;
+  esac
 fi
 
 DISTRO=$(operating_system)
-ARCHITECTURE=$(architecture)
-if [ "${ARCHITECTURE}" = "arm64" ]; then
-  OS_SCRIPT=$DIR/environment/os/$DISTRO-arm.sh
-else
-  OS_SCRIPT=$DIR/environment/os/$DISTRO.sh
-fi
-echo "ALL BUILD PACKAGES: $($OS_SCRIPT list MEMGRAPH_BUILD_DEPS)"
-$OS_SCRIPT check MEMGRAPH_BUILD_DEPS
+echo "ALL BUILD PACKAGES: $($DIR/environment/os/$DISTRO.sh list MEMGRAPH_BUILD_DEPS)"
+$DIR/environment/os/$DISTRO.sh check MEMGRAPH_BUILD_DEPS
 echo "All packages are in-place..."
 
 # create a default build directory
@@ -89,7 +66,7 @@ if [[ ! -f "${quicklisp_install_dir}/setup.lisp" ]]; then
   echo \
   "
   (load \"${DIR}/quicklisp.lisp\")
-  (quicklisp-quickstart:install $wsl_quicklisp_proxy :path \"${quicklisp_install_dir}\")
+  (quicklisp-quickstart:install :path \"${quicklisp_install_dir}\")
   " | sbcl --script || exit 1
   rm -rf quicklisp.lisp || exit 1
 fi
@@ -103,13 +80,11 @@ echo \
   (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 libs (download).
+cd libs
+./cleanup.sh
+./setup.sh
+cd ..
 
 # setup gql_behave dependencies
 setup_virtualenv tests/gql_behave
@@ -135,7 +110,3 @@ for hook in $(find $DIR/.githooks -type f -printf "%f\n"); do
   ln -s -f "$DIR/.githooks/$hook" "$DIR/.git/hooks/$hook"
   echo "Added $hook hook"
 done;
-
-# Install precommit hook
-python3 -m pip install pre-commit
-python3 -m pre_commit install

libs/.gitignore

@@ -5,4 +5,3 @@
 !CMakeLists.txt
 !__main.cpp
 !jemalloc.cmake
-!pulsar.patch

libs/CMakeLists.txt

@@ -8,15 +8,6 @@ if (NPROC EQUAL 0)
   set(NPROC 1)
 endif()
 
-find_package(Boost 1.78 REQUIRED)
-find_package(BZip2 1.0.6 REQUIRED)
-find_package(Threads REQUIRED)
-set(GFLAGS_NOTHREADS OFF)
-find_package(gflags REQUIRED)
-find_package(fmt 8.0.1)
-find_package(Jemalloc REQUIRED)
-find_package(ZLIB 1.2.11 REQUIRED)
-
 set(LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 # convenience functions
@@ -57,7 +48,7 @@ endfunction(import_library)
 # INSTALL_COMMAND arguments.
 function(add_external_project name)
   set(options NO_C_COMPILER)
-  set(one_value_kwargs SOURCE_DIR BUILD_IN_SOURCE)
+  set(one_value_kwargs SOURCE_DIR)
   set(multi_value_kwargs CMAKE_ARGS DEPENDS INSTALL_COMMAND BUILD_COMMAND
       CONFIGURE_COMMAND)
   cmake_parse_arguments(KW "${options}" "${one_value_kwargs}" "${multi_value_kwargs}" ${ARGN})
@@ -65,16 +56,11 @@ function(add_external_project name)
   if (KW_SOURCE_DIR)
     set(source_dir ${KW_SOURCE_DIR})
   endif()
-  set(build_in_source 0)
-  if (KW_BUILD_IN_SOURCE)
-    set(build_in_source ${KW_BUILD_IN_SOURCE})
-  endif()
   if (NOT KW_NO_C_COMPILER)
     set(KW_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} ${KW_CMAKE_ARGS})
   endif()
   ExternalProject_Add(${name}-proj DEPENDS ${KW_DEPENDS}
                       PREFIX ${source_dir} SOURCE_DIR ${source_dir}
-                      BUILD_IN_SOURCE ${build_in_source}
                       CONFIGURE_COMMAND ${KW_CONFIGURE_COMMAND}
                       CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release
                                  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -111,12 +97,17 @@ import_external_library(antlr4 STATIC
 
 # Setup google benchmark.
 import_external_library(benchmark STATIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/${CMAKE_INSTALL_LIBDIR}/libbenchmark.a
+  ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/lib/libbenchmark.a
   ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/include
   # Skip testing. The tests don't compile with Clang 8.
   CMAKE_ARGS -DBENCHMARK_ENABLE_TESTING=OFF)
 
-include(FetchContent)
+# setup fmt format
+import_external_library(fmt STATIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/fmt/${CMAKE_INSTALL_LIBDIR}/libfmt.a
+  ${CMAKE_CURRENT_SOURCE_DIR}/fmt/include
+  # Skip testing.
+  CMAKE_ARGS -DFMT_TEST=OFF)
 
 # setup rapidcheck (it cannot be external, since it doesn't have install
 # target)
@@ -143,19 +134,55 @@ import_library(gtest_main STATIC ${GTEST_MAIN_LIBRARY} ${GTEST_INCLUDE_DIR} gtes
 import_library(gmock STATIC ${GMOCK_LIBRARY} ${GTEST_INCLUDE_DIR} gtest-proj)
 import_library(gmock_main STATIC ${GMOCK_MAIN_LIBRARY} ${GTEST_INCLUDE_DIR} gtest-proj)
 
+# setup google flags
+set(GFLAGS_NO_FILENAMES "0")
+if ("${CMAKE_BUILD_TYPE}" MATCHES "^(R|r)(E|e)(L|l).+")
+  set(GFLAGS_NO_FILENAMES "1")
+endif()
+
+# setup google flags
+import_external_library(gflags STATIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/gflags/lib/libgflags.a
+  ${CMAKE_CURRENT_SOURCE_DIR}/gflags/include
+  # Not needed, since gflags is C++ only.
+  NO_C_COMPILER
+  # Don't register installation in ~/.cmake
+  CMAKE_ARGS -DREGISTER_INSTALL_PREFIX=OFF
+             -DBUILD_gflags_nothreads_LIB=OFF
+             -DGFLAGS_NO_FILENAMES=${GFLAGS_NO_FILENAMES})
+
 # Setup cppitertools
 import_header_library(cppitertools ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Setup json
 import_header_library(json ${CMAKE_CURRENT_SOURCE_DIR})
 
+# Setup bzip2
+import_external_library(bzip2 STATIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/bzip2/libbz2.a
+    ${CMAKE_CURRENT_SOURCE_DIR}/bzip2
+    # bzip2's Makefile has -g CFLAG which is redundant
+    CONFIGURE_COMMAND sed -i "s/-Wall -Winline -O2 -g/-Wall -Winline -O2/g" ${CMAKE_CURRENT_SOURCE_DIR}/bzip2/Makefile
+    BUILD_COMMAND make -C ${CMAKE_CURRENT_SOURCE_DIR}/bzip2
+                       CC=${CMAKE_C_COMPILER}
+                       CXX=${CMAKE_CXX_COMPILER}
+    INSTALL_COMMAND true)
+
+# Setup zlib
+import_external_library(zlib STATIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/zlib/lib/libz.a
+    ${CMAKE_CURRENT_SOURCE_DIR}/zlib
+    CMAKE_ARGS -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
+    BUILD_COMMAND $(MAKE) zlibstatic)
+
 # Setup RocksDB
 import_external_library(rocksdb STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/lib/librocksdb.a
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
-  CMAKE_ARGS -DUSE_RTTI=ON
+  DEPENDS gflags-proj
+  CMAKE_ARGS -Dgflags_DIR=${CMAKE_CURRENT_SOURCE_DIR}/gflags/lib/cmake/gflags
+             -DUSE_RTTI=ON
              -DWITH_TESTS=OFF
-             -DGFLAGS_NOTHREADS=OFF
              -DCMAKE_INSTALL_LIBDIR=lib
              -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
   BUILD_COMMAND $(MAKE) rocksdb)
@@ -190,11 +217,12 @@ add_external_project(mgconsole
 add_custom_target(mgconsole DEPENDS mgconsole-proj)
 
 # Setup spdlog
-set(SPDLOG_FMT_EXTERNAL ON)
-FetchContent_Declare(spdlog
-  SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/spdlog)
+import_external_library(spdlog STATIC
+  ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/${CMAKE_INSTALL_LIBDIR}/libspdlog.a
+  ${CMAKE_CURRENT_SOURCE_DIR}/spdlog/include
+  BUILD_COMMAND $(MAKE) spdlog)
 
-FetchContent_MakeAvailable(spdlog)
+include(jemalloc.cmake)
 
 # Setup librdkafka.
 import_external_library(librdkafka STATIC
@@ -203,55 +231,14 @@ import_external_library(librdkafka STATIC
   CMAKE_ARGS -DRDKAFKA_BUILD_STATIC=ON
              -DRDKAFKA_BUILD_EXAMPLES=OFF
              -DRDKAFKA_BUILD_TESTS=OFF
-             -DWITH_ZSTD=OFF
-             -DENABLE_LZ4_EXT=OFF
              -DCMAKE_INSTALL_LIBDIR=lib
              -DWITH_SSL=ON
              # If we want SASL, we need to install it on build machines
              -DWITH_SASL=OFF)
-target_link_libraries(librdkafka INTERFACE ${OPENSSL_LIBRARIES} ZLIB::ZLIB)
+target_link_libraries(librdkafka INTERFACE ${OPENSSL_LIBRARIES} zlib)
 
 import_library(librdkafka++ STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka/lib/librdkafka++.a
   ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka/include
 )
 target_link_libraries(librdkafka++ INTERFACE librdkafka)
-
-set(PROTOBUF_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/protobuf/lib)
-import_external_library(protobuf STATIC
-  ${PROTOBUF_ROOT}/lib/libprotobuf.a
-  ${PROTOBUF_ROOT}/include
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND true)
-
-import_external_library(pulsar STATIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/pulsar/pulsar-client-cpp/lib/libpulsarwithdeps.a
-  ${CMAKE_CURRENT_SOURCE_DIR}/pulsar/install/include
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND cmake pulsar-client-cpp
-                            -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/pulsar/install
-                            -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-                            -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-                            -DBUILD_DYNAMIC_LIB=OFF
-                            -DBUILD_STATIC_LIB=ON
-                            -DBUILD_TESTS=OFF
-                            -DLINK_STATIC=ON
-                            -DPROTOC_PATH=${PROTOBUF_ROOT}/bin/protoc
-                            -DBOOST_ROOT=${BOOST_ROOT}
-                            -DCMAKE_PREFIX_PATH=${PROTOBUF_ROOT}
-                            -DProtobuf_INCLUDE_DIRS=${PROTOBUF_ROOT}/include
-                            -DBUILD_PYTHON_WRAPPER=OFF
-                            -DBUILD_PERF_TOOLS=OFF
-                            -DUSE_LOG4CXX=OFF
- BUILD_COMMAND $(MAKE) pulsarStaticWithDeps)
-add_dependencies(pulsar-proj protobuf)
-
-if (${MG_ARCH} STREQUAL "ARM64")
-  set(MG_LIBRDTSC_CMAKE_ARGS -DLIBRDTSC_ARCH_x86=OFF -DLIBRDTSC_ARCH_ARM64=ON)
-endif()
-
-import_external_library(librdtsc STATIC
-  ${CMAKE_CURRENT_SOURCE_DIR}/librdtsc/lib/librdtsc.a
-  ${CMAKE_CURRENT_SOURCE_DIR}/librdtsc/include
-  CMAKE_ARGS ${MG_LIBRDTSC_CMAKE_ARGS}
-  BUILD_COMMAND $(MAKE) rdtsc)

libs/antlr4.patch

@@ -1,43 +0,0 @@
-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/librdtsc.patch

@@ -1,29 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ee9b58c..31359a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,7 @@ option(LIBRDTSC_USE_PMU     "Enables PMU usage on ARM platforms"        OFF)
- # |          Library Build and Install Properties          |
- # +--------------------------------------------------------+
- 
--add_library(rdtsc SHARED
-+add_library(rdtsc
-     src/cycles.c
-     src/common_timer.c
-     src/timer.c
-@@ -72,15 +72,6 @@ target_include_directories(rdtsc
-   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
- )
- 
--# Install directory changes depending on build mode
--if (CMAKE_BUILD_TYPE MATCHES "^[Dd]ebug")
--    # During debug, the library will be installed into a local directory
--    set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/_install CACHE PATH "" FORCE)
--else ()
--    # This will install in /usr/lib and /usr/include
--    set(CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE)
--endif ()
--
- # Specifying what to export when installing (GNUInstallDirs required)
- install(TARGETS rdtsc
-         EXPORT librstsc-config

libs/rocksdb.patch

@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6761929..6a369af 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -220,6 +220,7 @@ else()
-       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -momit-leaf-frame-pointer")
-     endif()
-   endif()
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy -Wno-unused-but-set-variable")
- endif()
- 
- include(CheckCCompilerFlag)
-@@ -997,7 +998,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

@@ -14,49 +14,39 @@ clone () {
   local git_repo=$1
   local dir_name=$2
   local checkout_id=$3
-  local shallow=$4
-  shift 4
+  shift 3
   # Clone if there's no repo.
   if [[ ! -d "$dir_name" ]]; then
     echo "Cloning from $git_repo"
     # If the clone fails, it doesn't make sense to continue with the function
     # execution but the whole script should continue executing because we might
     # clone the same repo from a different source.
-
-    if [ "$shallow" = true ]; then
-      git clone --depth 1 --branch "$checkout_id" "$git_repo" "$dir_name" || return 1
-    else
-      git clone "$git_repo" "$dir_name" || return 1
-    fi
+    git clone "$git_repo" "$dir_name" || return 1
   fi
   pushd "$dir_name"
+  # Just fetch new commits from remote repository. Don't merge/pull them in, so
+  # that we don't clobber local modifications.
+  git fetch
   # Check whether we have any local changes which need to be preserved.
   local local_changes=true
   if git diff --no-ext-diff --quiet && git diff --no-ext-diff --cached --quiet; then
     local_changes=false
   fi
-
-  if [ "$shallow" = false ]; then
-    # Stash regardless of local_changes, so that a user gets a message on stdout.
-    git stash
-    # Just fetch new commits from remote repository. Don't merge/pull them in, so
-    # that we don't clobber local modifications.
-    git fetch
-    # Checkout the primary commit (there's no need to pull/merge).
-    # The checkout fail should exit this script immediately because the target
-    # commit is not there and that will most likely create build-time errors.
-    git checkout "$checkout_id" || exit 1
-    # Apply any optional cherry pick fixes.
-    while [[ $# -ne 0 ]]; do
-      local cherry_pick_id=$1
-      shift
-      # The cherry-pick fail should exit this script immediately because the
-      # target commit is not there and that will most likely create build-time
-      # errors.
-      git cherry-pick -n "$cherry_pick_id" || exit 1
-    done
-  fi
-
+  # Stash regardless of local_changes, so that a user gets a message on stdout.
+  git stash
+  # Checkout the primary commit (there's no need to pull/merge).
+  # The checkout fail should exit this script immediately because the target
+  # commit is not there and that will most likely create build-time errors.
+  git checkout "$checkout_id" || exit 1
+  # Apply any optional cherry pick fixes.
+  while [[ $# -ne 0 ]]; do
+    local cherry_pick_id=$1
+    shift
+    # The cherry-pick fail should exit this script immediately because the
+    # target commit is not there and that will most likely create build-time
+    # errors.
+    git cherry-pick -n "$cherry_pick_id" || exit 1
+  done
   # Reapply any local changes.
   if [[ $local_changes == true ]]; then
     git stash pop
@@ -80,13 +70,12 @@ repo_clone_try_double () {
     secondary_url="$2"
     folder_name="$3"
     ref="$4"
-    shallow="${5:-false}"
     echo "Cloning primary from $primary_url secondary from $secondary_url"
     if [ -z "$primary_url" ]; then echo "Primary should not be empty." && exit 1; fi
     if [ -z "$secondary_url" ]; then echo "Secondary should not be empty." && exit 1; fi
     if [ -z "$folder_name" ]; then echo "Clone folder should not be empty." && exit 1; fi
     if [ -z "$ref" ]; then echo "Git clone ref should not be empty." && exit 1; fi
-    clone "$primary_url" "$folder_name" "$ref" "$shallow" || clone "$secondary_url" "$folder_name" "$ref" "$shallow" || exit 1
+    clone "$primary_url" "$folder_name" "$ref" || clone "$secondary_url" "$folder_name" "$ref" || exit 1
     echo ""
 }
 
@@ -107,21 +96,23 @@ declare -A primary_urls=(
   ["antlr4-code"]="http://$local_cache_host/git/antlr4.git"
   ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.9.2-complete.jar"
   ["cppitertools"]="http://$local_cache_host/git/cppitertools.git"
+  ["fmt"]="http://$local_cache_host/git/fmt.git"
   ["rapidcheck"]="http://$local_cache_host/git/rapidcheck.git"
   ["gbenchmark"]="http://$local_cache_host/git/benchmark.git"
   ["gtest"]="http://$local_cache_host/git/googletest.git"
+  ["gflags"]="http://$local_cache_host/git/gflags.git"
   ["libbcrypt"]="http://$local_cache_host/git/libbcrypt.git"
+  ["bzip2"]="http://$local_cache_host/git/bzip2.git"
+  ["zlib"]="http://$local_cache_host/git/zlib.git"
   ["rocksdb"]="http://$local_cache_host/git/rocksdb.git"
   ["mgclient"]="http://$local_cache_host/git/mgclient.git"
   ["pymgclient"]="http://$local_cache_host/git/pymgclient.git"
   ["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"
+  ["jemalloc"]="http://$local_cache_host/git/jemalloc.git"
+  ["nlohmann"]="http://$local_cache_host/file/nlohmann/json/b3e5cb7f20dcc5c806e418df34324eca60d17d4e/single_include/nlohmann/json.hpp"
   ["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"
-  ["librdtsc"]="http://$local_cache_host/git/librdtsc.git"
 )
 
 # The goal of secondary urls is to have links to the "source of truth" of
@@ -132,47 +123,62 @@ declare -A secondary_urls=(
   ["antlr4-code"]="https://github.com/antlr/antlr4.git"
   ["antlr4-generator"]="http://www.antlr.org/download/antlr-4.9.2-complete.jar"
   ["cppitertools"]="https://github.com/ryanhaining/cppitertools.git"
+  ["fmt"]="https://github.com/fmtlib/fmt.git"
   ["rapidcheck"]="https://github.com/emil-e/rapidcheck.git"
   ["gbenchmark"]="https://github.com/google/benchmark.git"
   ["gtest"]="https://github.com/google/googletest.git"
+  ["gflags"]="https://github.com/memgraph/gflags.git"
   ["libbcrypt"]="https://github.com/rg3/libbcrypt"
+  ["bzip2"]="https://github.com/VFR-maniac/bzip2"
+  ["zlib"]="https://github.com/madler/zlib.git"
   ["rocksdb"]="https://github.com/facebook/rocksdb.git"
   ["mgclient"]="https://github.com/memgraph/mgclient.git"
   ["pymgclient"]="https://github.com/memgraph/pymgclient.git"
   ["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"
+  ["jemalloc"]="https://github.com/jemalloc/jemalloc.git"
+  ["nlohmann"]="https://raw.githubusercontent.com/nlohmann/json/b3e5cb7f20dcc5c806e418df34324eca60d17d4e/single_include/nlohmann/json.hpp"
   ["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"
-  ["librdtsc"]="https://github.com/gabrieleara/librdtsc.git"
 )
 
 # antlr
 file_get_try_double "${primary_urls[antlr4-generator]}" "${secondary_urls[antlr4-generator]}"
 
-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.patch
-popd
+antlr4_tag="5e5b6d35b4183fd330102c40947b95c4b5c6abb5" # v4.9.2
+repo_clone_try_double "${primary_urls[antlr4-code]}" "${secondary_urls[antlr4-code]}" "antlr4" "$antlr4_tag"
+# remove shared library from install dependencies
+sed -i 's/install(TARGETS antlr4_shared/install(TARGETS antlr4_shared OPTIONAL/' antlr4/runtime/Cpp/runtime/CMakeLists.txt
+# fix issue https://github.com/antlr/antlr4/issues/3194 - should update Antlr commit once the PR related to the issue gets merged
+sed -i 's/std::is_nothrow_copy_constructible/std::is_copy_constructible/' antlr4/runtime/Cpp/runtime/src/support/Any.h
+# replace the utf8cpp version which is used because the older one uses gtest that doesn't 
+# compile with the newer compilers because of uninitialized variable
+# the newer utf8cpp switched to ftest
+sed -i 's/v3.1.1/v3.2.1/' antlr4/runtime/Cpp/runtime/CMakeLists.txt
 
 # cppitertools v2.0 2019-12-23
 cppitertools_ref="cb3635456bdb531121b82b4d2e3afc7ae1f56d47"
 repo_clone_try_double "${primary_urls[cppitertools]}" "${secondary_urls[cppitertools]}" "cppitertools" "$cppitertools_ref"
 
+# fmt
+fmt_tag="7bdf0628b1276379886c7f6dda2cef2b3b374f0b" # (2020-11-25)
+repo_clone_try_double "${primary_urls[fmt]}" "${secondary_urls[fmt]}" "fmt" "$fmt_tag"
+
 # rapidcheck
 rapidcheck_tag="7bc7d302191a4f3d0bf005692677126136e02f60" # (2020-05-04)
 repo_clone_try_double "${primary_urls[rapidcheck]}" "${secondary_urls[rapidcheck]}" "rapidcheck" "$rapidcheck_tag"
 
 # google benchmark
-benchmark_tag="v1.6.0"
-repo_clone_try_double "${primary_urls[gbenchmark]}" "${secondary_urls[gbenchmark]}" "benchmark" "$benchmark_tag" true
+benchmark_tag="4f8bfeae470950ef005327973f15b0044eceaceb" # v1.1.0
+repo_clone_try_double "${primary_urls[gbenchmark]}" "${secondary_urls[gbenchmark]}" "benchmark" "$benchmark_tag"
 
 # google test
-googletest_tag="release-1.8.0"
-repo_clone_try_double "${primary_urls[gtest]}" "${secondary_urls[gtest]}" "googletest" "$googletest_tag" true
+googletest_tag="ec44c6c1675c25b9827aacd08c02433cccde7780" # v1.8.0
+repo_clone_try_double "${primary_urls[gtest]}" "${secondary_urls[gtest]}" "googletest" "$googletest_tag"
+
+# google flags
+gflags_tag="b37ceb03a0e56c9f15ce80409438a555f8a67b7c" # custom version (May 6, 2017)
+repo_clone_try_double "${primary_urls[gflags]}" "${secondary_urls[gflags]}" "gflags" "$gflags_tag"
 
 # libbcrypt
 libbcrypt_tag="8aa32ad94ebe06b76853b0767c910c9fbf7ccef4" # custom version (Dec 16, 2016)
@@ -192,14 +198,21 @@ cd json
 file_get_try_double "${primary_urls[nlohmann]}" "${secondary_urls[nlohmann]}"
 cd ..
 
-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 ../rocksdb.patch
-popd
+bzip2_tag="0405487e2b1de738e7f1c8afb50d19cf44e8d580"  # v1.0.6 (May 26, 2011)
+repo_clone_try_double "${primary_urls[bzip2]}" "${secondary_urls[bzip2]}" "bzip2" "$bzip2_tag"
+
+zlib_tag="cacf7f1d4e3d44d871b605da3b647f07d718623f" # v1.2.11.
+repo_clone_try_double "${primary_urls[zlib]}" "${secondary_urls[zlib]}" "zlib" "$zlib_tag"
+# remove shared library from install dependencies
+sed -i 's/install(TARGETS zlib zlibstatic/install(TARGETS zlibstatic/g' zlib/CMakeLists.txt
+
+rocksdb_tag="f3e33549c151f30ac4eb7c22356c6d0331f37652" # (2020-10-14)
+repo_clone_try_double "${primary_urls[rocksdb]}" "${secondary_urls[rocksdb]}" "rocksdb" "$rocksdb_tag"
+# remove shared library from install dependencies
+sed -i 's/TARGETS ${ROCKSDB_SHARED_LIB}/TARGETS ${ROCKSDB_SHARED_LIB} OPTIONAL/' rocksdb/CMakeLists.txt
 
 # mgclient
-mgclient_tag="96e95c6845463cbe88948392be58d26da0d5ffd3" # (2022-02-08)
+mgclient_tag="v1.3.0" # (2021-09-23)
 repo_clone_try_double "${primary_urls[mgclient]}" "${secondary_urls[mgclient]}" "mgclient" "$mgclient_tag"
 sed -i 's/\${CMAKE_INSTALL_LIBDIR}/lib/' mgclient/src/CMakeLists.txt
 
@@ -209,32 +222,30 @@ repo_clone_try_double "${primary_urls[pymgclient]}" "${secondary_urls[pymgclient
 
 # mgconsole
 mgconsole_tag="v1.1.0" # (2021-10-07)
-repo_clone_try_double "${primary_urls[mgconsole]}" "${secondary_urls[mgconsole]}" "mgconsole" "$mgconsole_tag" true
+repo_clone_try_double "${primary_urls[mgconsole]}" "${secondary_urls[mgconsole]}" "mgconsole" "$mgconsole_tag"
 
-spdlog_tag="v1.9.2" # (2021-08-12)
-repo_clone_try_double "${primary_urls[spdlog]}" "${secondary_urls[spdlog]}" "spdlog" "$spdlog_tag" true
+spdlog_tag="46d418164dd4cd9822cf8ca62a116a3f71569241" # (2020-12-01)
+repo_clone_try_double "${primary_urls[spdlog]}" "${secondary_urls[spdlog]}" "spdlog" "$spdlog_tag"
+
+jemalloc_tag="ea6b3e973b477b8061e0076bb257dbd7f3faa756" # (2021-02-11)
+repo_clone_try_double "${primary_urls[jemalloc]}" "${secondary_urls[jemalloc]}" "jemalloc" "$jemalloc_tag"
+pushd jemalloc
+# ThreadPool select job randomly, and there can be some threads that had been
+# performed some memory heavy task before and will be inactive for some time,
+# but until it will became active again, the memory will not be freed since by
+# default each thread has it's own arena, but there should be not more then
+# 4*CPU arenas (see opt.nareans description).
+#
+# By enabling percpu_arena number of arenas limited to number of CPUs and hence
+# this problem should go away.
+#
+# muzzy_decay_ms -- use MADV_FREE when available on newer Linuxes, to
+# avoid spurious latencies and additional work associated with
+# MADV_DONTNEED. See
+# https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
+./autogen.sh --with-malloc-conf="percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000"
+popd
 
 # librdkafka
 librdkafka_tag="v1.7.0" # (2021-05-06)
-repo_clone_try_double "${primary_urls[librdkafka]}" "${secondary_urls[librdkafka]}" "librdkafka" "$librdkafka_tag" true
-
-# protobuf
-protobuf_tag="v3.12.4"
-repo_clone_try_double "${primary_urls[protobuf]}" "${secondary_urls[protobuf]}" "protobuf" "$protobuf_tag" true
-pushd protobuf
-./autogen.sh && ./configure CC=clang CXX=clang++ --prefix=$(pwd)/lib
-popd
-
-#pulsar
-pulsar_tag="v2.8.1"
-repo_clone_try_double "${primary_urls[pulsar]}" "${secondary_urls[pulsar]}" "pulsar" "$pulsar_tag" true
-pushd pulsar
-git apply ../pulsar.patch
-popd
-
-#librdtsc
-librdtsc_tag="v0.3"
-repo_clone_try_double "${primary_urls[librdtsc]}" "${secondary_urls[librdtsc]}" "librdtsc" "$librdtsc_tag" true
-pushd librdtsc
-git apply ../librdtsc.patch
-popd
+repo_clone_try_double "${primary_urls[librdkafka]}" "${secondary_urls[librdkafka]}" "librdkafka" "$librdkafka_tag"

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:            2026-27-04
+CHANGE DATE:            2025-10-12
 CHANGE LICENSE:         Apache License, Version 2.0
 
 For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.

release/CMakeLists.txt

@@ -10,14 +10,6 @@ set(CPACK_PACKAGE_VENDOR "Memgraph Ltd.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     "High performance, in-memory, transactional graph database")
 
-# Setting arhitecture extension for deb packages
-set(MG_ARCH_EXTENSION_DEB "all")
-if (${MG_ARCH} STREQUAL "x86_64")
-    set(MG_ARCH_EXTENSION_DEB "amd64")
-elseif (${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_DEB  "arm64")
-endif()
-
 # DEB specific
 # Instead of using "name <email>" format, we use "email (name)" to prevent
 # errors due to full stop, '.' at the end of "Ltd". (See: RFC 822)
@@ -25,7 +17,7 @@ set(CPACK_DEBIAN_PACKAGE_MAINTAINER "tech@memgraph.com (Memgraph Ltd.)")
 set(CPACK_DEBIAN_PACKAGE_SECTION non-free/database)
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE https://memgraph.com)
 set(CPACK_DEBIAN_PACKAGE_VERSION "${MEMGRAPH_VERSION_DEB}")
-set(CPACK_DEBIAN_FILE_NAME "memgraph_${MEMGRAPH_VERSION_DEB}_${MG_ARCH_EXTENSION_DEB}.deb")
+set(CPACK_DEBIAN_FILE_NAME "memgraph_${MEMGRAPH_VERSION_DEB}_amd64.deb")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/conffiles;"
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/copyright;"
@@ -41,20 +33,12 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
  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")
-    set(MG_ARCH_EXTENSION_RPM "x86_64")
-elseif (${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_RPM  "aarch64")
-endif()
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0)")
 
 # RPM specific
 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_FILE_NAME "memgraph-${MEMGRAPH_VERSION_RPM}-1.x86_64.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)
@@ -67,7 +51,7 @@ 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 >= 6")
+set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0")
 
 # All variables must be set before including.
 include(CPack)

release/README.md

@@ -0,0 +1,4 @@
+# Memgraph Release
+
+Please continue in
+[Notion](https://www.notion.so/memgraph/Release-621733518c82456ebc119d2a025b5dd3).

release/arm64/build_env.dockerfile

@@ -1,19 +0,0 @@
-FROM dokken/centos-stream-9
-
-ARG env_folder
-ARG toolchain_version
-
-COPY ${env_folder} /env_folder
-
-RUN yum update && yum install -y curl git
-
-RUN /${env_folder}/os/centos-9.sh install MEMGRAPH_BUILD_DEPS
-RUN /${env_folder}/os/centos-9.sh install TOOLCHAIN_RUN_DEPS
-
-RUN rm -rf /env_folder
-
-RUN yum clean all
-
-RUN curl https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/${toolchain_version}/${toolchain_version}-binaries-centos-9-arm64.tar.gz -o /tmp/toolchain.tar.gz \
-  && tar xvzf /tmp/toolchain.tar.gz -C /opt \
-  && rm /tmp/toolchain.tar.gz

release/arm64/build_env.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cp -r ../../environment env_folder
-docker build -f build_env.dockerfile --build-arg env_folder=env_folder --build-arg toolchain_version=toolchain-v4 -t mg_build_env .
-rm -rf env_folder

release/debian/copyright

@@ -1 +1 @@
-../../LICENSE
+../LICENSE.md

release/docker/memgraph.dockerfile

@@ -1,21 +1,19 @@
-FROM debian:bullseye
+FROM debian:buster
 # NOTE: If you change the base distro update release/package as well.
 
-ARG BINARY_NAME
-ARG EXTENSION
-ARG TARGETARCH
+ARG deb_release
 
 RUN apt-get update && apt-get install -y \
-  openssl libcurl4 libssl1.1 libseccomp2 python3 libpython3.9 python3-pip \
-  --no-install-recommends \
+    openssl libcurl4 libssl1.1 libseccomp2 python3 libpython3.7 python3-pip \
+    --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN pip3 install networkx==2.4 numpy==1.21.4 scipy==1.7.3
+RUN pip3 install networkx==2.4 numpy==1.19.2 scipy==1.5.2
 
-COPY "${BINARY_NAME}${TARGETARCH}.${EXTENSION}" /
+COPY ${deb_release} /
 
 # Install memgraph package
-RUN dpkg -i "${BINARY_NAME}${TARGETARCH}.deb"
+RUN dpkg -i ${deb_release}
 
 # Memgraph listens for Bolt Protocol on this port by default.
 EXPOSE 7687

release/docker/memgraph_rpm.dockerfile

@@ -1,31 +0,0 @@
-FROM dokken/centos-stream-9
-# NOTE: If you change the base distro update release/package as well.
-
-ARG release
-
-RUN yum update && yum install -y \
-    openssl libcurl libseccomp python3 python3-pip \
-    --nobest --allowerasing \
-  && rm -rf /tmp/* \
-  && yum clean all
-
-RUN pip3 install networkx==2.4 numpy==1.21.4 scipy==1.7.3
-
-COPY ${release} /
-
-# Install memgraph package
-RUN rpm -i ${release}
-
-# Memgraph listens for Bolt Protocol on this port by default.
-EXPOSE 7687
-# Snapshots and logging volumes
-VOLUME /var/log/memgraph
-VOLUME /var/lib/memgraph
-# Configuration volume
-VOLUME /etc/memgraph
-
-USER memgraph
-WORKDIR /usr/lib/memgraph
-
-ENTRYPOINT ["/usr/lib/memgraph/memgraph"]
-CMD [""]

release/docker/package_deb_docker

@@ -0,0 +1,46 @@
+#!/bin/bash -e
+
+# Build and package Docker image of Memgraph.
+
+function print_help () {
+    echo "Usage: $0 [--latest] MEMGRAPH_PACKAGE.deb"
+    echo "Optional arguments:"
+    echo -e "\t-h|--help\t\tPrint help."
+    echo -e "\t--latest\t\tTag image as latest version."
+}
+
+working_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+latest_image=""
+tag_latest=""
+if [[ $# -eq 2 && "$1" == "--latest" ]]; then
+  latest_image="memgraph:latest"
+  tag_latest="-t memgraph:latest"
+  shift
+elif [[ $# -ne 1 || "$1" == "-h" || "$1" == "--help" ]]; then
+  print_help
+  exit 1
+fi
+
+deb_path="$1"
+if [[ ! -f "$deb_path" ]]; then
+  echo "File '$deb_path' does not exist!"
+  exit 1
+fi
+
+# Copy the .deb to working directory.
+cp "$deb_path" "${working_dir}/"
+cd ${working_dir}
+
+# Extract version and offering from deb name.
+deb_name=`echo $(basename "$deb_path") | sed 's/.deb$//'`
+version=`echo ${deb_name} | cut -d '_' -f 2 | rev | cut -d '-' -f 2- | rev | tr '+~' '__'`
+dockerfile_path="${working_dir}/memgraph.dockerfile"
+image_name="memgraph:${version}"
+package_name="memgraph-${version}-docker.tar.gz"
+
+# Build docker image.
+docker build -t ${image_name} ${tag_latest} -f ${dockerfile_path} --build-arg deb_release=${deb_name}.deb .
+docker save ${image_name} ${latest_image} > ${package_name}
+rm "${deb_name}.deb"
+echo "Built Docker image at '${working_dir}/${package_name}'"

release/docker/package_docker

@@ -1,64 +0,0 @@
-#!/bin/bash -e
-
-# Build and package Docker image of Memgraph.
-
-function print_help () {
-    echo "Usage: $0 [--latest] MEMGRAPH_PACKAGE.(deb|rpm)"
-    echo "Optional arguments:"
-    echo -e "\t-h|--help\t\tPrint help."
-    echo -e "\t--latest\t\tTag image as latest version."
-}
-
-working_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-latest_image=""
-tag_latest=""
-if [[ $# -eq 2 && "$1" == "--latest" ]]; then
-  latest_image="memgraph:latest"
-  tag_latest="-t memgraph:latest"
-  shift
-elif [[ $# -ne 1 || "$1" == "-h" || "$1" == "--help" ]]; then
-  print_help
-  exit 1
-fi
-
-package_path="$1"
-if [[ ! -f "$package_path" ]]; then
-  echo "File '$package_path' does not exist!"
-  exit 1
-fi
-
-# Copy the .deb to working directory.
-cp "$package_path" "${working_dir}/"
-cd ${working_dir}
-
-extension="${package_path##*.}"
-
-if [[ "$extension" == "deb" ]]; then
-  # Extract version and offering from deb name.
-  package_name=`echo $(basename "$package_path") | sed 's/.deb$//'`
-  version=`echo ${package_name} | cut -d '_' -f 2 | rev | cut -d '-' -f 2- | rev | tr '+~' '__'`
-  dockerfile_path="${working_dir}/memgraph_deb.dockerfile"
-elif [[ "$extension" == "rpm" ]]; then
-  # Extract version and offering from deb name.
-  package_name=`echo $(basename "$package_path") | sed 's/.rpm$//'`
-  version=`echo ${package_name} | cut -d '-' -f 2 | rev | cut -d '-' -f 2- | rev`
-  version=${version%_1}
-  dockerfile_path="${working_dir}/memgraph_rpm.dockerfile"
-else
-  echo "Invalid file sent as the package"
-  print_help
-  exit 1
-fi
-
-image_name="memgraph:${version}"
-image_package_name="memgraph-${version}-docker.tar.gz"
-
-# Build docker image.
-docker build -t ${image_name} ${tag_latest} -f ${dockerfile_path} \
---build-arg BINARY_NAME=${package_name} \
---build-arg EXTENSION=${extension} \
---build-arg TARGETARCH="" .
-docker save ${image_name} ${latest_image} | gzip > ${image_package_name}
-rm "${package_name}.${extension}"
-echo "Built Docker image at '${working_dir}/${image_package_name}'"

release/get_version.py

@@ -1,11 +1,10 @@
 #!/usr/bin/env python3
 import argparse
-import os
 import re
 import subprocess
 import sys
-import time
-from functools import wraps
+import os
+
 
 # This script is used to determine the current version of Memgraph. The script
 # determines the current version using `git` automatically. The user can also
@@ -94,29 +93,16 @@ from functools import wraps
 #   https://fedoraproject.org/wiki/Package_Versioning_Examples
 
 
-def retry(retry_limit, timeout=100):
-    def inner_func(func):
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            for _ in range(retry_limit):
-                try:
-                    return func(*args, **kwargs)
-                except Exception:
-                    time.sleep(timeout)
-            return func(*args, **kwargs)
-        return wrapper
-    return inner_func
-
-
-@retry(3)
 def get_output(*cmd, multiple=False):
     ret = subprocess.run(cmd, stdout=subprocess.PIPE, check=True)
     if multiple:
-        return list(map(lambda x: x.strip(), ret.stdout.decode("utf-8").strip().split("\n")))
+        return list(map(lambda x: x.strip(),
+                        ret.stdout.decode("utf-8").strip().split("\n")))
     return ret.stdout.decode("utf-8").strip()
 
 
-def format_version(variant, version, offering, distance=None, shorthash=None, suffix=None):
+def format_version(variant, version, offering, distance=None, shorthash=None,
+                   suffix=None):
     if not distance:
         # This is a release version.
         if variant == "deb":
@@ -149,7 +135,8 @@ def format_version(variant, version, offering, distance=None, shorthash=None, su
             return ret
         elif variant == "rpm":
             # <VERSION>_0.<DISTANCE>.<SHORTHASH>.<OFFERING>[.<SUFFIX>]
-            ret = "{}_0.{}.{}{}".format(version, distance, shorthash, "." + offering if offering else "")
+            ret = "{}_0.{}.{}{}".format(
+                version, distance, shorthash, "." + offering if offering else "")
             if suffix:
                 ret += "." + suffix
             return ret
@@ -162,23 +149,27 @@ def format_version(variant, version, offering, distance=None, shorthash=None, su
 
 
 # Parse arguments.
-parser = argparse.ArgumentParser(description="Get the current version of Memgraph.")
-parser.add_argument("--open-source", action="store_true", help="set the current offering to 'open-source'")
-parser.add_argument("version", help="manual version override, if supplied the version isn't " "determined using git")
-parser.add_argument("suffix", help="custom suffix for the current version being built")
+parser = argparse.ArgumentParser(
+    description="Get the current version of Memgraph.")
 parser.add_argument(
-    "--variant",
-    choices=("binary", "deb", "rpm"),
-    default="binary",
-    help="which variant of the version string should be generated",
-)
+    "--open-source", action="store_true",
+    help="set the current offering to 'open-source'")
 parser.add_argument(
-    "--memgraph-root-dir", help="The root directory of the checked out " "Memgraph repository.", default="."
-)
+    "version", help="manual version override, if supplied the version isn't "
+    "determined using git")
+parser.add_argument(
+    "suffix", help="custom suffix for the current version being built")
+parser.add_argument(
+    "--variant", choices=("binary", "deb", "rpm"), default="binary",
+    help="which variant of the version string should be generated")
+parser.add_argument(
+    "--memgraph-root-dir", help="The root directory of the checked out "
+    "Memgraph repository.", default=".")
 args = parser.parse_args()
 
 if not os.path.isdir(args.memgraph_root_dir):
-    raise Exception("The root directory ({}) is not a valid directory".format(args.memgraph_root_dir))
+    raise Exception("The root directory ({}) is not a valid directory".format(
+        args.memgraph_root_dir))
 
 os.chdir(args.memgraph_root_dir)
 
@@ -188,7 +179,8 @@ offering = "open-source" if args.open_source else None
 if args.version:
     if not re.match(r"^[0-9]+\.[0-9]+\.[0-9]+$", args.version):
         raise Exception("Invalid version supplied '{}'!".format(args.version))
-    print(format_version(args.variant, args.version, offering, suffix=args.suffix), end="")
+    print(format_version(args.variant, args.version, offering,
+                         suffix=args.suffix), end="")
     sys.exit(0)
 
 # Within CI, after the regular checkout, master is sometimes (e.g. in the case
@@ -242,28 +234,33 @@ versions.sort(reverse=True)
 current_version = None
 for version in versions:
     version_tuple, branch, master_branch_merge = version
-    current_branch_merge = get_output("git", "merge-base", current_hash, branch)
-    master_current_merge = get_output("git", "merge-base", current_hash, "master")
+    current_branch_merge = get_output(
+        "git", "merge-base", current_hash, branch)
+    master_current_merge = get_output(
+        "git", "merge-base", current_hash, "master")
     # The first check checks whether this commit is a child of `master` and
     # the version branch was created before us.
     # The second check checks whether this commit is a child of the version
     # branch.
-    if master_branch_merge == current_branch_merge or master_branch_merge == master_current_merge:
+    if master_branch_merge == current_branch_merge or \
+            master_branch_merge == master_current_merge:
         current_version = version
         break
 
 # Determine current version.
 if current_version is None:
-    raise Exception("You are attempting to determine the version for a very " "old version of Memgraph!")
+    raise Exception("You are attempting to determine the version for a very "
+                    "old version of Memgraph!")
 version, branch, master_branch_merge = current_version
-distance = int(get_output("git", "rev-list", "--count", "--first-parent", master_branch_merge + ".." + current_hash))
+distance = int(get_output("git", "rev-list", "--count", "--first-parent",
+                          master_branch_merge + ".." + current_hash))
 version_str = ".".join(map(str, version)) + ".0"
 if distance == 0:
-    print(format_version(args.variant, version_str, offering, suffix=args.suffix), end="")
+    print(format_version(args.variant, version_str, offering,
+                         suffix=args.suffix),
+          end="")
 else:
-    print(
-        format_version(
-            args.variant, version_str, offering, distance=distance, shorthash=current_hash_short, suffix=args.suffix
-        ),
-        end="",
-    )
+    print(format_version(args.variant, version_str, offering,
+                         distance=distance, shorthash=current_hash_short,
+                         suffix=args.suffix),
+          end="")

release/package/debian-9/Dockerfile

@@ -0,0 +1,17 @@
+FROM debian:9
+
+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-debian-9.tar.gz \
+    -O ${TOOLCHAIN_VERSION}-binaries-debian-9.tar.gz \
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-9.tar.gz -C /opt
+
+ENTRYPOINT ["sleep", "infinity"]

release/package/docker-compose.yml

@@ -8,6 +8,10 @@ services:
     build:
       context: centos-8
     container_name: "mgbuild_centos-8"
+  mgbuild_debian-9:
+    build:
+      context: debian-9
+    container_name: "mgbuild_debian-9"
   mgbuild_debian-10:
     build:
       context: debian-10

release/package/run.sh

@@ -3,9 +3,9 @@
 set -Eeuo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SUPPORTED_OS=(centos-7 centos-8 debian-10 debian-11 ubuntu-18.04 ubuntu-20.04)
+SUPPORTED_OS=(centos-7 centos-8 debian-9 debian-10 debian-11 ubuntu-18.04 ubuntu-20.04)
 PROJECT_ROOT="$SCRIPT_DIR/../.."
-TOOLCHAIN_VERSION="toolchain-v4"
+TOOLCHAIN_VERSION="toolchain-v3"
 ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate"
 HOST_OUTPUT_DIR="$PROJECT_ROOT/build/output"
 
@@ -18,21 +18,14 @@ print_help () {
 
 make_package () {
     os="$1"
-
-    build_container="mgbuild_$os"
-    echo "Building Memgraph for $os on $build_container..."
-
     package_command=""
     if [[ "$os" =~ ^"centos".* ]]; then
-        docker exec "$build_container" bash -c "yum -y update"
         package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint memgraph*.rpm "
     fi
     if [[ "$os" =~ ^"debian".* ]]; then
-        docker exec "$build_container" bash -c "apt update"
         package_command=" cpack -G DEB --config ../CPackConfig.cmake "
     fi
     if [[ "$os" =~ ^"ubuntu".* ]]; then
-        docker exec "$build_container" bash -c "apt update"
         package_command=" cpack -G DEB --config ../CPackConfig.cmake "
     fi
     telemetry_id_override_flag=""
@@ -46,6 +39,8 @@ make_package () {
           exit
         fi
     fi
+    build_container="mgbuild_$os"
+    echo "Building Memgraph for $os on $build_container..."
 
     echo "Copying project files..."
     # If master is not the current branch, fetch it, because the get_version
@@ -72,7 +67,7 @@ make_package () {
     docker exec "$build_container" bash -c "/memgraph/environment/os/$os.sh install MEMGRAPH_BUILD_DEPS"
 
     echo "Building targeted package..."
-    docker exec "$build_container" bash -c "cd /memgraph && $ACTIVATE_TOOLCHAIN && ./init"
+    docker exec "$build_container" bash -c "cd /memgraph && ./init"
     docker exec "$build_container" bash -c "cd $container_build_dir && rm -rf ./*"
     docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release $telemetry_id_override_flag .."
     # ' is used instead of " because we need to run make within the allowed
@@ -100,13 +95,13 @@ case "$1" in
     ;;
 
     docker)
-        # NOTE: Docker is build on top of Debian 11 package.
-        based_on_os="debian-11"
+        # NOTE: Docker is build on top of Debian 10 package.
+        based_on_os="debian-10"
         # shellcheck disable=SC2012
         last_package_name=$(cd "$HOST_OUTPUT_DIR/$based_on_os" && ls -t memgraph* | head -1)
         docker_build_folder="$PROJECT_ROOT/release/docker"
         cd "$docker_build_folder"
-        ./package_docker --latest "$HOST_OUTPUT_DIR/$based_on_os/$last_package_name"
+        ./package_deb_docker --latest "$HOST_OUTPUT_DIR/$based_on_os/$last_package_name"
         # shellcheck disable=SC2012
         docker_image_name=$(cd "$docker_build_folder" && ls -t memgraph* | head -1)
         docker_host_folder="$HOST_OUTPUT_DIR/docker"

src/CMakeLists.txt

@@ -37,7 +37,7 @@ set(mg_single_node_v2_sources
 )
 
 set(mg_single_node_v2_libs stdc++fs Threads::Threads
-    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings)
+    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth)
 if (MG_ENTERPRISE)
   # These are enterprise subsystems
   set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)

src/audit/CMakeLists.txt

@@ -1,8 +1,5 @@
 set(audit_src_files log.cpp)
 
-find_package(fmt REQUIRED)
-find_package(gflags REQUIRED)
-
 add_library(mg-audit STATIC ${audit_src_files})
-target_link_libraries(mg-audit json gflags fmt::fmt)
+target_link_libraries(mg-audit json gflags fmt)
 target_link_libraries(mg-audit mg-utils mg-storage-v2)

src/audit/log.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -18,7 +18,7 @@
 #include "utils/logging.hpp"
 #include "utils/string.hpp"
 
-namespace memgraph::audit {
+namespace audit {
 
 // Helper function that converts a `storage::PropertyValue` to `nlohmann::json`.
 inline nlohmann::json PropertyValueToJson(const storage::PropertyValue &pv) {
@@ -143,4 +143,4 @@ void Log::Flush() {
   log_.Sync();
 }
 
-}  // namespace memgraph::audit
+}  // namespace audit

src/audit/log.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -17,7 +17,7 @@
 #include "utils/file.hpp"
 #include "utils/scheduler.hpp"
 
-namespace memgraph::audit {
+namespace audit {
 
 const uint64_t kBufferSizeDefault = 100000;
 const uint64_t kBufferFlushIntervalMillisDefault = 200;
@@ -71,4 +71,4 @@ class Log {
   std::mutex lock_;
 };
 
-}  // namespace memgraph::audit
+}  // namespace audit

src/auth/CMakeLists.txt

@@ -5,13 +5,10 @@ set(auth_src_files
     module.cpp)
 
 find_package(Seccomp REQUIRED)
-find_package(fmt REQUIRED)
-find_package(gflags REQUIRED)
-
 
 add_library(mg-auth STATIC ${auth_src_files})
-target_link_libraries(mg-auth json libbcrypt gflags fmt::fmt)
-target_link_libraries(mg-auth mg-utils mg-kvstore mg-license )
+target_link_libraries(mg-auth json libbcrypt gflags fmt)
+target_link_libraries(mg-auth mg-utils mg-kvstore)
 
 target_link_libraries(mg-auth ${Seccomp_LIBRARIES})
 target_include_directories(mg-auth SYSTEM PRIVATE ${Seccomp_INCLUDE_DIRS})

src/auth/auth.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -42,7 +42,8 @@ DEFINE_VALIDATED_int32(auth_module_timeout_ms, 10000,
                        "response from the auth module.",
                        FLAG_IN_RANGE(100, 1800000));
 
-namespace memgraph::auth {
+namespace auth {
+
 const std::string kUserPrefix = "user:";
 const std::string kRolePrefix = "role:";
 const std::string kLinkPrefix = "link:";
@@ -315,4 +316,4 @@ std::vector<auth::User> Auth::AllUsersForRole(const std::string &rolename_orig)
   return ret;
 }
 
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/auth.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -18,7 +18,8 @@
 #include "kvstore/kvstore.hpp"
 #include "utils/settings.hpp"
 
-namespace memgraph::auth {
+namespace auth {
+
 /**
  * This class serves as the main Authentication/Authorization storage.
  * It provides functions for managing Users, Roles and Permissions.
@@ -162,4 +163,4 @@ class Auth final {
   kvstore::KVStore storage_;
   auth::Module module_;
 };
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/crypto.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -12,7 +12,8 @@
 
 #include "auth/exceptions.hpp"
 
-namespace memgraph::auth {
+namespace auth {
+
 const std::string EncryptPassword(const std::string &password) {
   char salt[BCRYPT_HASHSIZE];
   char hash[BCRYPT_HASHSIZE];
@@ -39,4 +40,4 @@ bool VerifyPassword(const std::string &password, const std::string &hash) {
   return ret == 0;
 }
 
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/crypto.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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,11 +10,12 @@
 
 #include <string>
 
-namespace memgraph::auth {
+namespace auth {
+
 /// @throw AuthException if unable to encrypt the 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
+}  // namespace auth

src/auth/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,7 +13,8 @@
 
 #include "utils/exceptions.hpp"
 
-namespace memgraph::auth {
+namespace auth {
+
 /**
  * This exception class is thrown for all exceptions that can occur when dealing
  * with the Auth library.
@@ -22,4 +23,4 @@ class AuthException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
 };
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/models.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -22,23 +22,13 @@
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(auth_password_permit_null, true, "Set to false to disable null passwords.");
 
-inline constexpr std::string_view default_password_regex = ".+";
+constexpr std::string_view default_password_regex = ".+";
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_string(auth_password_strength_regex, default_password_regex.data(),
               "The regular expression that should be used to match the entire "
               "entered password to ensure its strength.");
 
-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};
-}  // namespace
+namespace auth {
 
 std::string PermissionToString(Permission permission) {
   switch (permission) {
@@ -78,12 +68,6 @@ std::string PermissionToString(Permission permission) {
       return "AUTH";
     case Permission::STREAM:
       return "STREAM";
-    case Permission::MODULE_READ:
-      return "MODULE_READ";
-    case Permission::MODULE_WRITE:
-      return "MODULE_WRITE";
-    case Permission::WEBSOCKET:
-      return "WEBSOCKET";
   }
 }
 
@@ -302,4 +286,4 @@ bool operator==(const User &first, const User &second) {
   return first.username_ == second.username_ && first.password_hash_ == second.password_hash_ &&
          first.permissions_ == second.permissions_ && first.role_ == second.role_;
 }
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/models.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -13,35 +13,41 @@
 
 #include <json/json.hpp>
 
-namespace memgraph::auth {
+namespace auth {
+
 // These permissions must have values that are applicable for usage in a
 // bitmask.
 // clang-format off
 enum class Permission : uint64_t {
-  MATCH        = 1,
-  CREATE       = 1U << 1U,
-  MERGE        = 1U << 2U,
-  DELETE       = 1U << 3U,
-  SET          = 1U << 4U,
-  REMOVE       = 1U << 5U,
-  INDEX        = 1U << 6U,
-  STATS        = 1U << 7U,
-  CONSTRAINT   = 1U << 8U,
-  DUMP         = 1U << 9U,
-  REPLICATION  = 1U << 10U,
-  DURABILITY   = 1U << 11U,
-  READ_FILE    = 1U << 12U,
-  FREE_MEMORY  = 1U << 13U,
-  TRIGGER      = 1U << 14U,
-  CONFIG       = 1U << 15U,
-  AUTH         = 1U << 16U,
-  STREAM       = 1U << 17U,
-  MODULE_READ  = 1U << 18U,
-  MODULE_WRITE = 1U << 19U,
-  WEBSOCKET    = 1U << 20U
+  MATCH       = 1,
+  CREATE      = 1U << 1U,
+  MERGE       = 1U << 2U,
+  DELETE      = 1U << 3U,
+  SET         = 1U << 4U,
+  REMOVE      = 1U << 5U,
+  INDEX       = 1U << 6U,
+  STATS       = 1U << 7U,
+  CONSTRAINT  = 1U << 8U,
+  DUMP        = 1U << 9U,
+  REPLICATION = 1U << 10U,
+  DURABILITY  = 1U << 11U,
+  READ_FILE   = 1U << 12U,
+  FREE_MEMORY = 1U << 13U,
+  TRIGGER     = 1U << 14U,
+  CONFIG      = 1U << 15U,
+  AUTH        = 1U << 16U,
+  STREAM      = 1U << 17U
 };
 // clang-format on
 
+// 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};
+
 // Function that converts a permission to its string representation.
 std::string PermissionToString(Permission permission);
 
@@ -153,4 +159,4 @@ class User final {
 };
 
 bool operator==(const User &first, const User &second);
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/module.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -153,7 +153,7 @@ int Target(void *arg) {
   // process and something really bad could happen.
 
   // Get a pointer to the passed arguments.
-  auto *ta = reinterpret_cast<memgraph::auth::TargetArguments *>(arg);
+  auto *ta = reinterpret_cast<auth::TargetArguments *>(arg);
 
   // Redirect `stdin` to `/dev/null`.
   int fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
@@ -312,7 +312,8 @@ nlohmann::json GetData(int fd, int timeout_millisec) {
 
 }  // namespace
 
-namespace memgraph::auth {
+namespace auth {
+
 Module::Module(const std::filesystem::path &module_executable_path) {
   if (!module_executable_path.empty()) {
     module_executable_path_ = std::filesystem::absolute(module_executable_path);
@@ -446,4 +447,4 @@ void Module::Shutdown() {
 
 Module::~Module() { Shutdown(); }
 
-}  // namespace memgraph::auth
+}  // namespace auth

src/auth/module.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -16,7 +16,8 @@
 
 #include <json/json.hpp>
 
-namespace memgraph::auth {
+namespace auth {
+
 struct TargetArguments {
   std::filesystem::path module_executable_path;
   int pipe_to_module{-1};
@@ -69,4 +70,4 @@ class Module final {
   int pipe_from_module_[2] = {-1, -1};
 };
 
-}  // namespace memgraph::auth
+}  // namespace auth

src/communication/CMakeLists.txt

@@ -1,11 +1,4 @@
-find_package(fmt REQUIRED)
-find_package(gflags REQUIRED)
-
 set(communication_src_files
-    websocket/auth.cpp
-    websocket/server.cpp
-    websocket/listener.cpp
-    websocket/session.cpp
     bolt/v1/value.cpp
     buffer.cpp
     client.cpp
@@ -13,10 +6,8 @@ set(communication_src_files
     helpers.cpp
     init.cpp)
 
-find_package(Boost REQUIRED)
-
 add_library(mg-communication STATIC ${communication_src_files})
-target_link_libraries(mg-communication Boost::headers Threads::Threads mg-utils mg-io mg-auth fmt::fmt gflags)
+target_link_libraries(mg-communication Threads::Threads mg-utils mg-io fmt gflags)
 
 find_package(OpenSSL REQUIRED)
 target_link_libraries(mg-communication ${OPENSSL_LIBRARIES})

src/communication/bolt/client.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -21,7 +21,7 @@
 #include "utils/exceptions.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /// This exception is thrown whenever an error occurs during query execution
 /// that isn't fatal (eg. mistyped query or some transient error occurred).
@@ -315,4 +315,4 @@ class Client final {
   ChunkedEncoderBuffer<communication::ClientOutputStream> encoder_buffer_{output_stream_};
   ClientEncoder<ChunkedEncoderBuffer<communication::ClientOutputStream>> encoder_{encoder_buffer_};
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/codes.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,10 +13,10 @@
 
 #include <cstdint>
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
-inline constexpr uint8_t kPreamble[4] = {0x60, 0x60, 0xB0, 0x17};
-inline constexpr uint8_t kProtocol[4] = {0x00, 0x00, 0x00, 0x01};
+static constexpr uint8_t kPreamble[4] = {0x60, 0x60, 0xB0, 0x17};
+static constexpr uint8_t kProtocol[4] = {0x00, 0x00, 0x00, 0x01};
 
 enum class Signature : uint8_t {
   Noop = 0x00,
@@ -31,7 +31,6 @@ enum class Signature : uint8_t {
   Begin = 0x11,
   Commit = 0x12,
   Rollback = 0x13,
-  Route = 0x66,
 
   Record = 0x71,
   Success = 0x70,
@@ -95,9 +94,9 @@ enum class Marker : uint8_t {
   Struct16 = 0xDD,
 };
 
-inline constexpr uint8_t MarkerString = 0, MarkerList = 1, MarkerMap = 2;
-inline constexpr Marker MarkerTiny[3] = {Marker::TinyString, Marker::TinyList, Marker::TinyMap};
-inline constexpr Marker Marker8[3] = {Marker::String8, Marker::List8, Marker::Map8};
-inline constexpr Marker Marker16[3] = {Marker::String16, Marker::List16, Marker::Map16};
-inline constexpr Marker Marker32[3] = {Marker::String32, Marker::List32, Marker::Map32};
-}  // namespace memgraph::communication::bolt
+static constexpr uint8_t MarkerString = 0, MarkerList = 1, MarkerMap = 2;
+static constexpr Marker MarkerTiny[3] = {Marker::TinyString, Marker::TinyList, Marker::TinyMap};
+static constexpr Marker Marker8[3] = {Marker::String8, Marker::List8, Marker::Map8};
+static constexpr Marker Marker16[3] = {Marker::String16, Marker::List16, Marker::Map16};
+static constexpr Marker Marker32[3] = {Marker::String32, Marker::List32, Marker::Map32};
+}  // namespace communication::bolt

src/communication/bolt/v1/constants.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,22 +14,22 @@
 #include <cstddef>
 #include <cstdint>
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Sizes related to the chunk defined in Bolt protocol.
  */
-inline constexpr size_t kChunkHeaderSize = 2;
-inline constexpr size_t kChunkMaxDataSize = 65535;
-inline constexpr size_t kChunkWholeSize = kChunkHeaderSize + kChunkMaxDataSize;
+static constexpr size_t kChunkHeaderSize = 2;
+static constexpr size_t kChunkMaxDataSize = 65535;
+static constexpr size_t kChunkWholeSize = kChunkHeaderSize + kChunkMaxDataSize;
 
 /**
  * Handshake size defined in the Bolt protocol.
  */
-inline constexpr size_t kHandshakeSize = 20;
+static constexpr size_t kHandshakeSize = 20;
 
-inline constexpr uint16_t kSupportedVersions[] = {0x0100, 0x0400, 0x0401, 0x0403};
+static constexpr uint16_t kSupportedVersions[3] = {0x0100, 0x0400, 0x0401};
 
-inline constexpr int kPullAll = -1;
-inline constexpr int kPullLast = -1;
-}  // namespace memgraph::communication::bolt
+static constexpr int kPullAll = -1;
+static constexpr int kPullLast = -1;
+}  // namespace communication::bolt

src/communication/bolt/v1/decoder/chunked_decoder_buffer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -20,7 +20,7 @@
 
 #include "communication/bolt/v1/constants.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * This class is used as the return value of the GetChunk function of the
@@ -136,4 +136,4 @@ class ChunkedDecoderBuffer {
   std::vector<uint8_t> data_;
   size_t pos_{0};
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/decoder/decoder.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -22,7 +22,7 @@
 #include "utils/logging.hpp"
 #include "utils/temporal.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Bolt Decoder.
@@ -591,4 +591,4 @@ class Decoder {
     return true;
   }
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/encoder/base_encoder.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -22,7 +22,7 @@ static_assert(std::is_same_v<std::uint8_t, char> || std::is_same_v<std::uint8_t,
               "communication::bolt::Encoder requires uint8_t to be "
               "implemented as char or unsigned char.");
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Bolt BaseEncoder. Has public interfaces for writing Bolt encoded data.
@@ -273,4 +273,4 @@ class BaseEncoder {
   }
 };
 
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/encoder/chunked_encoder_buffer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,7 +18,7 @@
 
 #include "communication/bolt/v1/constants.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * @brief ChunkedEncoderBuffer
@@ -123,4 +123,4 @@ class ChunkedEncoderBuffer {
   // Amount of data in chunk array.
   size_t have_{0};
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/encoder/client_encoder.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,7 +14,7 @@
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Bolt Client Encoder.
@@ -169,4 +169,4 @@ class ClientEncoder : private BaseEncoder<Buffer> {
     return buffer_.Flush();
   }
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/encoder/encoder.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,7 +14,7 @@
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/encoder/base_encoder.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Bolt Encoder.
@@ -158,4 +158,4 @@ class Encoder : private BaseEncoder<Buffer> {
     return buffer_.Flush();
   }
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -17,7 +17,7 @@
 
 #include "utils/exceptions.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Used to indicate something is wrong with the client but the transaction is
@@ -83,4 +83,4 @@ class VerboseError : public utils::BasicException {
   std::string code_;
 };
 
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/session.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -27,7 +27,7 @@
 #include "utils/exceptions.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Bolt Session Exception
@@ -195,4 +195,4 @@ class Session {
   }
 };
 
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/state.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,7 +13,7 @@
 
 #include <cstdint>
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * This class represents states in execution of the Bolt protocol.
@@ -55,4 +55,4 @@ enum class State : uint8_t {
    */
   Close
 };
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -20,7 +20,7 @@
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /**
  * Error state run function
@@ -95,4 +95,4 @@ State StateErrorRun(TSession &session, State state) {
     return state;
   }
 }
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <map>
-#include <memory>
 #include <new>
 #include <string>
 
@@ -20,69 +19,339 @@
 #include "communication/bolt/v1/constants.hpp"
 #include "communication/bolt/v1/exceptions.hpp"
 #include "communication/bolt/v1/state.hpp"
-#include "communication/bolt/v1/states/handlers.hpp"
 #include "communication/bolt/v1/value.hpp"
+#include "communication/exceptions.hpp"
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
+
+// TODO (mferencevic): revise these error messages
+inline std::pair<std::string, std::string> ExceptionToErrorMessage(const std::exception &e) {
+  if (auto *verbose = dynamic_cast<const VerboseError *>(&e)) {
+    return {verbose->code(), verbose->what()};
+  }
+  if (dynamic_cast<const ClientError *>(&e)) {
+    // Clients expect 4 strings separated by dots. First being database name
+    // (for example: Neo, Memgraph...), second being either ClientError,
+    // TransientError or DatabaseError (or ClientNotification for warnings).
+    // ClientError means wrong query, do not retry. DatabaseError means
+    // something wrong in database, do not retry. TransientError means query
+    // failed, but if retried it may succeed, retry it.
+    //
+    // Third and fourth strings being namespace and specific error name.
+    // It is not really important what we put there since we don't expect
+    // any special handling of specific exceptions on client side, but we
+    // need to make sure that we don't accidentally return some exception
+    // name which clients handle in a special way. For example, if client
+    // receives *.TransientError.Transaction.Terminate it will not rerun
+    // query even though TransientError was returned, because of Neo's
+    // semantics of that error.
+    return {"Memgraph.ClientError.MemgraphError.MemgraphError", e.what()};
+  }
+  if (dynamic_cast<const utils::BasicException *>(&e)) {
+    // Exception not derived from QueryException was thrown which means that
+    // database probably aborted transaction because of some timeout,
+    // deadlock, serialization error or something similar. We return
+    // TransientError since retry of same transaction could succeed.
+    return {"Memgraph.TransientError.MemgraphError.MemgraphError", e.what()};
+  }
+  if (dynamic_cast<const std::bad_alloc *>(&e)) {
+    // std::bad_alloc was thrown, God knows in which state is database ->
+    // terminate.
+    LOG_FATAL("Memgraph is out of memory");
+  }
+  // All exceptions used in memgraph are derived from BasicException. Since
+  // we caught some other exception we don't know what is going on. Return
+  // DatabaseError, log real message and return generic string.
+  spdlog::error(
+      utils::MessageWithLink("Unknown exception occurred during query execution {}.", e.what(), "https://memgr.ph/unknown"));
+  return {"Memgraph.DatabaseError.MemgraphError.MemgraphError",
+          "An unknown exception occurred, this is unexpected. Real message "
+          "should be in database logs."};
+}
 
 template <typename TSession>
-State RunHandlerV1(Signature signature, TSession &session, State state, Marker marker) {
-  switch (signature) {
-    case Signature::Run:
-      return HandleRunV1<TSession>(session, state, marker);
-    case Signature::Pull:
-      return HandlePullV1<TSession>(session, state, marker);
-    case Signature::Discard:
-      return HandleDiscardV1<TSession>(session, state, marker);
-    case Signature::Reset:
-      return HandleReset<TSession>(session, marker);
-    default:
-      spdlog::trace("Unrecognized signature received (0x{:02X})!", utils::UnderlyingCast(signature));
+inline State HandleFailure(TSession &session, const std::exception &e) {
+  spdlog::trace("Error message: {}", e.what());
+  if (const auto *p = dynamic_cast<const utils::StacktraceException *>(&e)) {
+    spdlog::trace("Error trace: {}", p->trace());
+  }
+  session.encoder_buffer_.Clear();
+  auto code_message = ExceptionToErrorMessage(e);
+  bool fail_sent = session.encoder_.MessageFailure({{"code", code_message.first}, {"message", code_message.second}});
+  if (!fail_sent) {
+    spdlog::trace("Couldn't send failure message!");
+    return State::Close;
+  }
+  return State::Error;
+}
+
+template <typename TSession>
+State HandleRun(TSession &session, State state, Marker marker) {
+  const std::map<std::string, Value> kEmptyFields = {{"fields", std::vector<Value>{}}};
+
+  const auto expected_marker = session.version_.major == 1 ? Marker::TinyStruct2 : Marker::TinyStruct3;
+  if (marker != expected_marker) {
+    spdlog::trace("Expected {} marker, but received 0x{:02X}!",
+                  session.version_.major == 1 ? "TinyStruct2" : "TinyStruct3", utils::UnderlyingCast(marker));
+    return State::Close;
+  }
+
+  Value query, params, extra;
+  if (!session.decoder_.ReadValue(&query, Value::Type::String)) {
+    spdlog::trace("Couldn't read query string!");
+    return State::Close;
+  }
+
+  if (!session.decoder_.ReadValue(&params, Value::Type::Map)) {
+    spdlog::trace("Couldn't read parameters!");
+    return State::Close;
+  }
+
+  if (session.version_.major == 4) {
+    if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
+      spdlog::trace("Couldn't read extra field!");
+    }
+  }
+
+  if (state != State::Idle) {
+    // Client could potentially recover if we move to error state, but there is
+    // no legitimate situation in which well working client would end up in this
+    // situation.
+    spdlog::trace("Unexpected RUN command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  spdlog::debug("[Run] '{}'", query.ValueString());
+
+  try {
+    // Interpret can throw.
+    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 <typename TSession, int bolt_minor = 0>
-State RunHandlerV4(Signature signature, TSession &session, State state, Marker marker) {
-  switch (signature) {
-    case Signature::Run:
-      return HandleRunV4<TSession>(session, state, marker);
-    case Signature::Pull:
-      return HandlePullV4<TSession>(session, state, marker);
-    case Signature::Discard:
-      return HandleDiscardV4<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: {
-      if constexpr (bolt_minor >= 1) {
-        return HandleNoop<TSession>(state);
-      } else {
-        spdlog::trace("Supported only in bolt v4.1");
-        return State::Close;
+namespace detail {
+template <bool is_pull, typename TSession>
+State HandlePullDiscard(TSession &session, State state, Marker marker) {
+  const auto expected_marker = session.version_.major == 1 ? Marker::TinyStruct : Marker::TinyStruct1;
+  if (marker != expected_marker) {
+    spdlog::trace("Expected {} marker, but received 0x{:02X}!",
+                  session.version_.major == 1 ? "TinyStruct" : "TinyStruct1", utils::UnderlyingCast(marker));
+    return State::Close;
+  }
+
+  if (state != State::Result) {
+    if constexpr (is_pull) {
+      spdlog::trace("Unexpected PULL!");
+    } else {
+      spdlog::trace("Unexpected DISCARD!");
+    }
+    // Same as `unexpected RUN` case.
+    return State::Close;
+  }
+
+  try {
+    std::optional<int> n;
+    std::optional<int> qid;
+
+    if (session.version_.major == 4) {
+      Value extra;
+      if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
+        spdlog::trace("Couldn't read extra field!");
+      }
+      const auto &extra_map = extra.ValueMap();
+      if (extra_map.count("n")) {
+        if (const auto n_value = extra_map.at("n").ValueInt(); n_value != kPullAll) {
+          n = n_value;
+        }
+      }
+
+      if (extra_map.count("qid")) {
+        if (const auto qid_value = extra_map.at("qid").ValueInt(); qid_value != kPullLast) {
+          qid = qid_value;
+        }
       }
     }
-    case Signature::Route: {
-      if constexpr (bolt_minor >= 3) {
-        if (signature == Signature::Route) return HandleRoute<TSession>(session);
-      } else {
-        spdlog::trace("Supported only in bolt v4.3");
-        return State::Close;
-      }
+
+    std::map<std::string, Value> summary;
+    if constexpr (is_pull) {
+      // Pull can throw.
+      summary = session.Pull(&session.encoder_, n, qid);
+    } else {
+      summary = session.Discard(n, qid);
     }
-    default:
-      spdlog::trace("Unrecognized signature received (0x{:02X})!", utils::UnderlyingCast(signature));
+
+    if (!session.encoder_.MessageSuccess(summary)) {
+      spdlog::trace("Couldn't send query summary!");
       return State::Close;
+    }
+
+    if (summary.count("has_more") && summary.at("has_more").ValueBool()) {
+      return State::Result;
+    }
+
+    return State::Idle;
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
+  }
+}
+}  // namespace detail
+
+template <typename Session>
+State HandlePull(Session &session, State state, Marker marker) {
+  return detail::HandlePullDiscard<true>(session, state, marker);
+}
+
+template <typename Session>
+State HandleDiscard(Session &session, State state, Marker marker) {
+  return detail::HandlePullDiscard<false>(session, state, marker);
+}
+
+template <typename Session>
+State HandleReset(Session &session, State, Marker marker) {
+  // IMPORTANT: This implementation of the Bolt RESET command isn't fully
+  // compliant to the protocol definition. In the protocol it is defined
+  // that this command should immediately stop any running commands and
+  // reset the session to a clean state. That means that we should always
+  // make a look-ahead for the RESET command before processing anything.
+  // Our implementation, for now, does everything in a blocking fashion
+  // so we cannot simply "kill" a transaction while it is running. So
+  // now this command only resets the session to a clean state. It
+  // does not IGNORE running and pending commands as it should.
+  if (marker != Marker::TinyStruct) {
+    spdlog::trace("Expected TinyStruct marker, but received 0x{:02X}!", utils::UnderlyingCast(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;
+  }
+
+  session.Abort();
+
+  return State::Idle;
+}
+
+template <typename Session>
+State HandleBegin(Session &session, State state, Marker marker) {
+  if (session.version_.major == 1) {
+    spdlog::trace("BEGIN messsage not supported in Bolt v1!");
+    return State::Close;
+  }
+
+  if (marker != Marker::TinyStruct1) {
+    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
+    return State::Close;
+  }
+
+  Value extra;
+  if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
+    spdlog::trace("Couldn't read extra fields!");
+    return State::Close;
+  }
+
+  if (state != State::Idle) {
+    spdlog::trace("Unexpected BEGIN command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  if (!session.encoder_.MessageSuccess({})) {
+    spdlog::trace("Couldn't send success message!");
+    return State::Close;
+  }
+
+  try {
+    session.BeginTransaction();
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
+  }
+
+  return State::Idle;
+}
+
+template <typename Session>
+State HandleCommit(Session &session, State state, Marker marker) {
+  if (session.version_.major == 1) {
+    spdlog::trace("COMMIT messsage not supported in Bolt v1!");
+    return State::Close;
+  }
+
+  if (marker != Marker::TinyStruct) {
+    spdlog::trace("Expected TinyStruct marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
+    return State::Close;
+  }
+
+  if (state != State::Idle) {
+    spdlog::trace("Unexpected COMMIT command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  try {
+    if (!session.encoder_.MessageSuccess({})) {
+      spdlog::trace("Couldn't send success message!");
+      return State::Close;
+    }
+    session.CommitTransaction();
+    return State::Idle;
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
+  }
+}
+
+template <typename Session>
+State HandleRollback(Session &session, State state, Marker marker) {
+  if (session.version_.major == 1) {
+    spdlog::trace("ROLLBACK messsage not supported in Bolt v1!");
+    return State::Close;
+  }
+
+  if (marker != Marker::TinyStruct) {
+    spdlog::trace("Expected TinyStruct marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
+    return State::Close;
+  }
+
+  if (state != State::Idle) {
+    spdlog::trace("Unexpected ROLLBACK command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  try {
+    if (!session.encoder_.MessageSuccess({})) {
+      spdlog::trace("Couldn't send success message!");
+      return State::Close;
+    }
+    session.RollbackTransaction();
+    return State::Idle;
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
   }
 }
 
@@ -92,8 +361,8 @@ State RunHandlerV4(Signature signature, TSession &session, State state, Marker m
  * It executes: RUN, PULL_ALL, DISCARD_ALL & RESET.
  * @param session the session that should be used for the run
  */
-template <typename TSession>
-State StateExecutingRun(TSession &session, State state) {
+template <typename Session>
+State StateExecutingRun(Session &session, State state) {
   Marker marker;
   Signature signature;
   if (!session.decoder_.ReadMessageHeader(&signature, &marker)) {
@@ -101,21 +370,30 @@ State StateExecutingRun(TSession &session, State state) {
     return State::Close;
   }
 
-  switch (session.version_.major) {
-    case 1:
-      return RunHandlerV1(signature, session, state, marker);
-    case 4: {
-      if (session.version_.minor >= 3) {
-        return RunHandlerV4<TSession, 3>(signature, session, state, marker);
-      }
-      if (session.version_.minor >= 1) {
-        return RunHandlerV4<TSession, 1>(signature, session, state, marker);
-      }
-      return RunHandlerV4<TSession>(signature, session, state, marker);
-    }
-    default:
-      spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
-      return State::Close;
+  if (UNLIKELY(signature == Signature::Noop && session.version_.major == 4 && session.version_.minor == 1)) {
+    spdlog::trace("Received NOOP message");
+    return state;
+  }
+
+  if (signature == Signature::Run) {
+    return HandleRun(session, state, marker);
+  } else if (signature == Signature::Pull) {
+    return HandlePull(session, state, marker);
+  } else if (signature == Signature::Discard) {
+    return HandleDiscard(session, state, marker);
+  } else if (signature == Signature::Begin) {
+    return HandleBegin(session, state, marker);
+  } else if (signature == Signature::Commit) {
+    return HandleCommit(session, state, marker);
+  } else if (signature == Signature::Rollback) {
+    return HandleRollback(session, state, marker);
+  } else if (signature == Signature::Reset) {
+    return HandleReset(session, state, marker);
+  } else if (signature == Signature::Goodbye && session.version_.major != 1) {
+    throw SessionClosedException("Closing connection.");
+  } else {
+    spdlog::trace("Unrecognized signature received (0x{:02X})!", utils::UnderlyingCast(signature));
+    return State::Close;
   }
 }
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

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

@@ -1,418 +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 <map>
-#include <string>
-#include <string_view>
-#include <vector>
-
-#include "communication/bolt/v1/codes.hpp"
-#include "communication/bolt/v1/constants.hpp"
-#include "communication/bolt/v1/state.hpp"
-#include "communication/bolt/v1/value.hpp"
-#include "communication/exceptions.hpp"
-#include "utils/logging.hpp"
-#include "utils/message.hpp"
-
-namespace memgraph::communication::bolt {
-// TODO: Revise these error messages
-inline std::pair<std::string, std::string> ExceptionToErrorMessage(const std::exception &e) {
-  if (const auto *verbose = dynamic_cast<const VerboseError *>(&e)) {
-    return {verbose->code(), verbose->what()};
-  }
-  if (dynamic_cast<const ClientError *>(&e)) {
-    // Clients expect 4 strings separated by dots. First being database name
-    // (for example: Neo, Memgraph...), second being either ClientError,
-    // TransientError or DatabaseError (or ClientNotification for warnings).
-    // ClientError means wrong query, do not retry. DatabaseError means
-    // something wrong in database, do not retry. TransientError means query
-    // failed, but if retried it may succeed, retry it.
-    //
-    // Third and fourth strings being namespace and specific error name.
-    // It is not really important what we put there since we don't expect
-    // any special handling of specific exceptions on client side, but we
-    // need to make sure that we don't accidentally return some exception
-    // name which clients handle in a special way. For example, if client
-    // receives *.TransientError.Transaction.Terminate it will not rerun
-    // query even though TransientError was returned, because of Neo's
-    // semantics of that error.
-    return {"Memgraph.ClientError.MemgraphError.MemgraphError", e.what()};
-  }
-  if (dynamic_cast<const utils::BasicException *>(&e)) {
-    // Exception not derived from QueryException was thrown which means that
-    // database probably aborted transaction because of some timeout,
-    // deadlock, serialization error or something similar. We return
-    // TransientError since retry of same transaction could succeed.
-    return {"Memgraph.TransientError.MemgraphError.MemgraphError", e.what()};
-  }
-  if (dynamic_cast<const std::bad_alloc *>(&e)) {
-    // std::bad_alloc was thrown, God knows in which state is database ->
-    // terminate.
-    LOG_FATAL("Memgraph is out of memory");
-  }
-  // All exceptions used in memgraph are derived from BasicException. Since
-  // we caught some other exception we don't know what is going on. Return
-  // DatabaseError, log real message and return generic string.
-  spdlog::error(utils::MessageWithLink("Unknown exception occurred during query execution {}.", e.what(),
-                                       "https://memgr.ph/unknown"));
-  return {"Memgraph.DatabaseError.MemgraphError.MemgraphError",
-          "An unknown exception occurred, this is unexpected. Real message "
-          "should be in database logs."};
-}
-
-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 {
-    std::map<std::string, Value> summary;
-    if constexpr (is_pull) {
-      // Pull can throw.
-      summary = session.Pull(&session.encoder_, n, qid);
-    } else {
-      summary = session.Discard(n, qid);
-    }
-
-    if (!session.encoder_.MessageSuccess(summary)) {
-      spdlog::trace("Couldn't send query summary!");
-      return State::Close;
-    }
-
-    if (summary.count("has_more") && summary.at("has_more").ValueBool()) {
-      return State::Result;
-    }
-
-    return State::Idle;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-}
-
-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 {} marker, but received 0x{:02X}!", "TinyStruct", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-
-  if (state != State::Result) {
-    if constexpr (is_pull) {
-      spdlog::trace("Unexpected PULL!");
-    } else {
-      spdlog::trace("Unexpected DISCARD!");
-    }
-    // Same as `unexpected RUN` case.
-    return State::Close;
-  }
-
-  return HandlePullDiscard<is_pull, TSession>(session, std::nullopt, std::nullopt);
-}
-
-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 {} marker, but received 0x{:02X}!", "TinyStruct1", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-
-  if (state != State::Result) {
-    if constexpr (is_pull) {
-      spdlog::trace("Unexpected PULL!");
-    } else {
-      spdlog::trace("Unexpected DISCARD!");
-    }
-    // Same as `unexpected RUN` case.
-    return State::Close;
-  }
-  std::optional<int> n;
-  std::optional<int> qid;
-  Value extra;
-  if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
-    spdlog::trace("Couldn't read extra field!");
-  }
-  const auto &extra_map = extra.ValueMap();
-  if (extra_map.count("n")) {
-    if (const auto n_value = extra_map.at("n").ValueInt(); n_value != kPullAll) {
-      n = n_value;
-    }
-  }
-
-  if (extra_map.count("qid")) {
-    if (const auto qid_value = extra_map.at("qid").ValueInt(); qid_value != kPullLast) {
-      qid = qid_value;
-    }
-  }
-  return HandlePullDiscard<is_pull, TSession>(session, n, qid);
-}
-}  // namespace details
-
-template <typename TSession>
-inline State HandleFailure(TSession &session, const std::exception &e) {
-  spdlog::trace("Error message: {}", e.what());
-  if (const auto *p = dynamic_cast<const utils::StacktraceException *>(&e)) {
-    spdlog::trace("Error trace: {}", p->trace());
-  }
-  session.encoder_buffer_.Clear();
-  auto code_message = ExceptionToErrorMessage(e);
-  bool fail_sent = session.encoder_.MessageFailure({{"code", code_message.first}, {"message", code_message.second}});
-  if (!fail_sent) {
-    spdlog::trace("Couldn't send failure message!");
-    return State::Close;
-  }
-  return State::Error;
-}
-
-template <typename TSession>
-State HandleRunV1(TSession &session, const State state, const Marker marker) {
-  const auto expected_marker = Marker::TinyStruct2;
-  if (marker != expected_marker) {
-    spdlog::trace("Expected {} marker, but received 0x{:02X}!",
-                  session.version_.major == 1 ? "TinyStruct2" : "TinyStruct3", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-  Value query, params;
-  if (!session.decoder_.ReadValue(&query, Value::Type::String)) {
-    spdlog::trace("Couldn't read query string!");
-    return State::Close;
-  }
-
-  if (!session.decoder_.ReadValue(&params, Value::Type::Map)) {
-    spdlog::trace("Couldn't read parameters!");
-    return State::Close;
-  }
-
-  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 {} marker, but received 0x{:02X}!", "TinyStruct3", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-  Value query, params, extra;
-  if (!session.decoder_.ReadValue(&query, Value::Type::String)) {
-    spdlog::trace("Couldn't read query string!");
-    return State::Close;
-  }
-
-  if (!session.decoder_.ReadValue(&params, Value::Type::Map)) {
-    spdlog::trace("Couldn't read parameters!");
-    return State::Close;
-  }
-
-  // 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 details::HandleRun(session, state, query, params);
-}
-
-template <typename TSession>
-State HandlePullV1(TSession &session, const State state, const Marker marker) {
-  return details::HandlePullDiscardV1<true>(session, state, marker);
-}
-
-template <typename TSession>
-State HandlePullV4(TSession &session, const State state, const Marker marker) {
-  return details::HandlePullDiscardV4<true>(session, state, marker);
-}
-
-template <typename TSession>
-State HandleDiscardV1(TSession &session, const State state, const Marker marker) {
-  return details::HandlePullDiscardV1<false>(session, state, marker);
-}
-
-template <typename TSession>
-State HandleDiscardV4(TSession &session, const State state, const Marker marker) {
-  return details::HandlePullDiscardV4<false>(session, state, marker);
-}
-
-template <typename TSession>
-State HandleReset(TSession &session, const Marker marker) {
-  // IMPORTANT: This implementation of the Bolt RESET command isn't fully
-  // compliant to the protocol definition. In the protocol it is defined
-  // that this command should immediately stop any running commands and
-  // reset the session to a clean state. That means that we should always
-  // make a look-ahead for the RESET command before processing anything.
-  // Our implementation, for now, does everything in a blocking fashion
-  // so we cannot simply "kill" a transaction while it is running. So
-  // now this command only resets the session to a clean state. It
-  // does not IGNORE running and pending commands as it should.
-  if (marker != Marker::TinyStruct) {
-    spdlog::trace("Expected TinyStruct marker, but received 0x{:02X}!", utils::UnderlyingCast(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;
-  }
-
-  session.Abort();
-
-  return State::Idle;
-}
-
-template <typename TSession>
-State HandleBegin(TSession &session, const State state, const Marker marker) {
-  if (marker != Marker::TinyStruct1) {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-
-  Value extra;
-  if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
-    spdlog::trace("Couldn't read extra fields!");
-    return State::Close;
-  }
-
-  if (state != State::Idle) {
-    spdlog::trace("Unexpected BEGIN command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  if (!session.encoder_.MessageSuccess({})) {
-    spdlog::trace("Couldn't send success message!");
-    return State::Close;
-  }
-
-  try {
-    session.BeginTransaction();
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-
-  return State::Idle;
-}
-
-template <typename TSession>
-State HandleCommit(TSession &session, const State state, const Marker marker) {
-  if (marker != Marker::TinyStruct) {
-    spdlog::trace("Expected TinyStruct marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-
-  if (state != State::Idle) {
-    spdlog::trace("Unexpected COMMIT command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  try {
-    if (!session.encoder_.MessageSuccess({})) {
-      spdlog::trace("Couldn't send success message!");
-      return State::Close;
-    }
-    session.CommitTransaction();
-    return State::Idle;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-}
-
-template <typename TSession>
-State HandleRollback(TSession &session, const State state, const Marker marker) {
-  if (marker != Marker::TinyStruct) {
-    spdlog::trace("Expected TinyStruct marker, but received 0x{:02x}!", utils::UnderlyingCast(marker));
-    return State::Close;
-  }
-
-  if (state != State::Idle) {
-    spdlog::trace("Unexpected ROLLBACK command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  try {
-    if (!session.encoder_.MessageSuccess({})) {
-      spdlog::trace("Couldn't send success message!");
-      return State::Close;
-    }
-    session.RollbackTransaction();
-    return State::Idle;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-}
-
-template <typename TSession>
-State HandleNoop(const State state) {
-  spdlog::trace("Received NOOP message");
-  return state;
-}
-
-template <typename TSession>
-State HandleGoodbye() {
-  throw SessionClosedException("Closing connection.");
-}
-
-template <typename TSession>
-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 not supported in Memgraph!"}});
-  if (!fail_sent) {
-    spdlog::trace("Couldn't send failure message!");
-    return State::Close;
-  }
-  return State::Error;
-}
-}  // namespace memgraph::communication::bolt

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -12,9 +12,6 @@
 #pragma once
 
 #include <fmt/format.h>
-#include <algorithm>
-#include <cstdint>
-#include <iterator>
 
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/constants.hpp"
@@ -22,36 +19,7 @@
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication::bolt {
-
-inline bool CopyProtocolInformationIfSupported(uint16_t version, uint8_t *protocol) {
-  const auto *supported_version = std::find(std::begin(kSupportedVersions), std::end(kSupportedVersions), version);
-  if (supported_version != std::end(kSupportedVersions)) {
-    std::memcpy(protocol, &version, sizeof(version));
-    return true;
-  }
-  return false;
-}
-
-inline bool CopyProtocolInformationIfSupportedWithOffset(auto data_position, uint8_t *protocol) {
-  struct bolt_range_version {
-    uint8_t offset;
-    uint8_t minor;
-    uint8_t major;
-  } bolt_range_version;
-  std::memcpy(&bolt_range_version, data_position, sizeof(bolt_range_version));
-  if (bolt_range_version.major == 0 || bolt_range_version.minor == 0) return false;
-  bolt_range_version.offset = std::min(bolt_range_version.offset, bolt_range_version.minor);
-
-  for (uint8_t i{0U}; i <= bolt_range_version.offset; i++) {
-    uint8_t current_minor = bolt_range_version.minor - i;
-    if (CopyProtocolInformationIfSupported(static_cast<uint16_t>((bolt_range_version.major << 8U) + current_minor),
-                                           protocol)) {
-      return true;
-    }
-  }
-  return false;
-}
+namespace communication::bolt {
 
 /**
  * Handshake state run function
@@ -61,7 +29,7 @@ inline bool CopyProtocolInformationIfSupportedWithOffset(auto data_position, uin
 template <typename TSession>
 State StateHandshakeRun(TSession &session) {
   auto precmp = std::memcmp(session.input_stream_.data(), kPreamble, sizeof(kPreamble));
-  if (precmp != 0) [[unlikely]] {
+  if (UNLIKELY(precmp != 0)) {
     spdlog::trace("Received a wrong preamble!");
     return State::Close;
   }
@@ -69,22 +37,22 @@ State StateHandshakeRun(TSession &session) {
   DMG_ASSERT(session.input_stream_.size() >= kHandshakeSize, "Wrong size of the handshake data!");
 
   auto dataPosition = session.input_stream_.data() + sizeof(kPreamble);
+
   uint8_t protocol[4] = {0x00};
-
   for (int i = 0; i < 4 && !protocol[3]; ++i) {
-    // If there is an offset defined (e.g. 0x00 0x03 0x03 0x04) the second byte
-    // That would enable the client to pick between 4.0 and 4.3 versions
-    // as per changes in handshake bolt protocol in v4.3
-    if (CopyProtocolInformationIfSupportedWithOffset(dataPosition + 1, protocol + 2)) break;
-
     dataPosition += 2;  // version is defined only by the last 2 bytes
-    uint16_t version{0};
+
+    uint16_t version = 0;
     std::memcpy(&version, dataPosition, sizeof(version));
     if (!version) {
       break;
     }
-    if (CopyProtocolInformationIfSupported(version, protocol + 2)) {
-      break;
+
+    for (const auto supportedVersion : kSupportedVersions) {
+      if (supportedVersion == version) {
+        std::memcpy(protocol + 2, &version, sizeof(version));
+        break;
+      }
     }
 
     dataPosition += 2;
@@ -110,4 +78,4 @@ State StateHandshakeRun(TSession &session) {
 
   return State::Init;
 }
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <fmt/format.h>
-#include <optional>
 
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/state.hpp"
@@ -21,47 +20,12 @@
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
-namespace details {
+namespace detail {
 template <typename TSession>
-std::optional<State> AuthenticateUser(TSession &session, Value &metadata) {
-  // Get authentication data.
-  auto &data = metadata.ValueMap();
-  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") || !data.count("credentials")) {
-      spdlog::warn("The client didn't supply authentication information!");
-      return State::Close;
-    }
-    username = data["principal"].ValueString();
-    password = data["credentials"].ValueString();
-  } else if (data["scheme"].ValueString() != "none") {
-    spdlog::warn("Unsupported authentication scheme: {}", data["scheme"].ValueString());
-    return State::Close;
-  }
-
-  // Authenticate the user.
-  if (!session.Authenticate(username, password)) {
-    if (!session.encoder_.MessageFailure(
-            {{"code", "Memgraph.ClientError.Security.Unauthenticated"}, {"message", "Authentication failure"}})) {
-      spdlog::trace("Couldn't send failure message to the client!");
-    }
-    // Throw an exception to indicate to the network stack that the session
-    // should be closed and cleaned up.
-    throw SessionClosedException("The client is not authenticated!");
-  }
-  return std::nullopt;
-}
-
-template <typename TSession>
-std::optional<Value> GetMetadataV1(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct2) [[unlikely]] {
+std::optional<Value> StateInitRunV1(TSession &session, const Marker marker) {
+  if (UNLIKELY(marker != Marker::TinyStruct2)) {
     spdlog::trace("Expected TinyStruct2 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
     spdlog::trace(
         "The client sent malformed data, but we are continuing "
@@ -89,8 +53,8 @@ std::optional<Value> GetMetadataV1(TSession &session, const Marker marker) {
 }
 
 template <typename TSession>
-std::optional<Value> GetMetadataV4(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct1) [[unlikely]] {
+std::optional<Value> StateInitRunV4(TSession &session, const Marker marker) {
+  if (UNLIKELY(marker != Marker::TinyStruct1)) {
     spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
     spdlog::trace(
         "The client sent malformed data, but we are continuing "
@@ -116,79 +80,15 @@ std::optional<Value> GetMetadataV4(TSession &session, const Marker marker) {
 
   return metadata;
 }
-
-template <typename TSession>
-State SendSuccessMessage(TSession &session) {
-  // Neo4j's Java driver 4.1.1+ requires connection_id.
-  // The only usage in the mentioned version is for logging purposes.
-  // Because it's not critical for the regular usage of the driver
-  // we send a hardcoded value for now.
-  std::map<std::string, Value> metadata{{"connection_id", "bolt-1"}};
-  if (auto server_name = session.GetServerNameForInit(); server_name) {
-    metadata.insert({"server", *server_name});
-  }
-  bool success_sent = session.encoder_.MessageSuccess(metadata);
-  if (!success_sent) {
-    spdlog::trace("Couldn't send success message to the client!");
-    return State::Close;
-  }
-
-  return State::Idle;
-}
-
-template <typename TSession>
-State StateInitRunV1(TSession &session, const Marker marker, const Signature signature) {
-  if (signature != Signature::Init) [[unlikely]] {
-    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
-    return State::Close;
-  }
-
-  auto maybeMetadata = GetMetadataV1(session, marker);
-
-  if (!maybeMetadata) {
-    return State::Close;
-  }
-  if (auto result = AuthenticateUser(session, *maybeMetadata)) {
-    return result.value();
-  }
-
-  return SendSuccessMessage(session);
-}
-
-template <typename TSession, int bolt_minor = 0>
-State StateInitRunV4(TSession &session, Marker marker, Signature signature) {
-  if constexpr (bolt_minor > 0) {
-    if (signature == Signature::Noop) [[unlikely]] {
-      SPDLOG_DEBUG("Received NOOP message");
-      return State::Init;
-    }
-  }
-
-  if (signature != Signature::Init) [[unlikely]] {
-    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
-    return State::Close;
-  }
-
-  auto maybeMetadata = GetMetadataV4(session, marker);
-
-  if (!maybeMetadata) {
-    return State::Close;
-  }
-  if (auto result = AuthenticateUser(session, *maybeMetadata)) {
-    return result.value();
-  }
-
-  return SendSuccessMessage(session);
-}
-}  // namespace details
+}  // namespace detail
 
 /**
  * Init state run function.
  * This function runs everything to initialize a Bolt session with the client.
  * @param session the session that should be used for the run.
  */
-template <typename TSession>
-State StateInitRun(TSession &session) {
+template <typename Session>
+State StateInitRun(Session &session) {
   DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
 
   Marker marker;
@@ -198,18 +98,72 @@ State StateInitRun(TSession &session) {
     return State::Close;
   }
 
-  switch (session.version_.major) {
-    case 1: {
-      return details::StateInitRunV1<TSession>(session, marker, signature);
+  if (UNLIKELY(signature == Signature::Noop && session.version_.major == 4 && session.version_.minor == 1)) {
+    SPDLOG_DEBUG("Received NOOP message");
+    return State::Init;
+  }
+
+  if (UNLIKELY(signature != Signature::Init)) {
+    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
+    return State::Close;
+  }
+
+  auto maybeMetadata =
+      session.version_.major == 1 ? detail::StateInitRunV1(session, marker) : detail::StateInitRunV4(session, marker);
+
+  if (!maybeMetadata) {
+    return State::Close;
+  }
+
+  // Get authentication data.
+  std::string username;
+  std::string password;
+  auto &data = maybeMetadata->ValueMap();
+  if (!data.count("scheme")) {
+    spdlog::warn("The client didn't supply authentication information!");
+    return State::Close;
+  }
+  if (data["scheme"].ValueString() == "basic") {
+    if (!data.count("principal") || !data.count("credentials")) {
+      spdlog::warn("The client didn't supply authentication information!");
+      return State::Close;
     }
-    case 4: {
-      if (session.version_.minor > 0) {
-        return details::StateInitRunV4<TSession, 1>(session, marker, signature);
-      }
-      return details::StateInitRunV4<TSession>(session, marker, signature);
+    username = data["principal"].ValueString();
+    password = data["credentials"].ValueString();
+  } else if (data["scheme"].ValueString() != "none") {
+    spdlog::warn("Unsupported authentication scheme: {}", data["scheme"].ValueString());
+    return State::Close;
+  }
+
+  // Authenticate the user.
+  if (!session.Authenticate(username, password)) {
+    if (!session.encoder_.MessageFailure(
+            {{"code", "Memgraph.ClientError.Security.Unauthenticated"}, {"message", "Authentication failure"}})) {
+      spdlog::trace("Couldn't send failure message to the client!");
+    }
+    // Throw an exception to indicate to the network stack that the session
+    // should be closed and cleaned up.
+    throw SessionClosedException("The client is not authenticated!");
+  }
+
+  // Return success.
+  {
+    bool success_sent = false;
+    // Neo4j's Java driver 4.1.1+ requires connection_id.
+    // The only usage in the mentioned version is for logging purposes.
+    // Because it's not critical for the regular usage of the driver
+    // we send a hardcoded value for now.
+    std::map<std::string, Value> metadata{{"connection_id", "bolt-1"}};
+    if (auto server_name = session.GetServerNameForInit(); server_name) {
+      metadata.insert({"server", *server_name});
+    }
+    success_sent = session.encoder_.MessageSuccess(metadata);
+    if (!success_sent) {
+      spdlog::trace("Couldn't send success message to the client!");
+      return State::Close;
     }
   }
-  spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
-  return State::Close;
+
+  return State::Idle;
 }
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/value.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,7 +14,7 @@
 #include "utils/algorithm.hpp"
 #include "utils/string.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 #define DEF_GETTER_BY_VAL(type, value_type, field)   \
   value_type &Value::Value##type() {                 \
@@ -461,4 +461,4 @@ std::ostream &operator<<(std::ostream &os, const Value::Type type) {
       return os << "duration";
   }
 }
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/bolt/v1/value.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -20,7 +20,7 @@
 #include "utils/exceptions.hpp"
 #include "utils/temporal.hpp"
 
-namespace memgraph::communication::bolt {
+namespace communication::bolt {
 
 /** Forward declaration of Value class. */
 class Value;
@@ -282,4 +282,4 @@ std::ostream &operator<<(std::ostream &os, const UnboundedEdge &edge);
 std::ostream &operator<<(std::ostream &os, const Path &path);
 std::ostream &operator<<(std::ostream &os, const Value &value);
 std::ostream &operator<<(std::ostream &os, const Value::Type type);
-}  // namespace memgraph::communication::bolt
+}  // namespace communication::bolt

src/communication/buffer.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,7 +13,7 @@
 
 #include "utils/logging.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 Buffer::Buffer() : data_(kBufferInitialSize, 0), read_end_(this), write_end_(this) {}
 
@@ -77,4 +77,4 @@ void Buffer::Resize(size_t len) {
 
 void Buffer::Clear() { have_ = 0; }
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/buffer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -15,7 +15,7 @@
 
 #include "io/network/stream_buffer.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 /**
  * @brief Buffer
@@ -171,4 +171,4 @@ class Buffer final {
   ReadEnd read_end_;
   WriteEnd write_end_;
 };
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/client.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -14,7 +14,7 @@
 #include "communication/helpers.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 Client::Client(ClientContext *context) : context_(context) {}
 
@@ -239,4 +239,4 @@ bool ClientOutputStream::Write(const uint8_t *data, size_t len, bool have_more)
 }
 bool ClientOutputStream::Write(const std::string &str, bool have_more) { return client_.Write(str, have_more); }
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/client.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -21,14 +21,14 @@
 #include "io/network/endpoint.hpp"
 #include "io/network/socket.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 /**
  * This class implements a generic network Client.
  * It uses blocking sockets and provides an API that can be used to receive/send
  * data over the network connection.
  *
- * NOTE: If you use this client you **must** create `memgraph::communication::SSLInit`
+ * NOTE: If you use this client you **must** create `communication::SSLInit`
  * from the `main` function before using the client!
  */
 class Client final {
@@ -167,4 +167,4 @@ class ClientOutputStream final {
   Client &client_;
 };
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/context.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -10,13 +10,10 @@
 // licenses/APL.txt.
 
 #include "communication/context.hpp"
-#include <boost/asio/ssl/context.hpp>
-#include <boost/asio/ssl/verify_mode.hpp>
-#include <boost/system/detail/error_code.hpp>
 
 #include "utils/logging.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 ClientContext::ClientContext(bool use_ssl) : use_ssl_(use_ssl), ctx_(nullptr) {
   if (use_ssl_) {
@@ -76,66 +73,80 @@ SSL_CTX *ClientContext::context() { return ctx_; }
 
 bool ClientContext::use_ssl() { return use_ssl_; }
 
+ServerContext::ServerContext() : use_ssl_(false), ctx_(nullptr) {}
+
 ServerContext::ServerContext(const std::string &key_file, const std::string &cert_file, const std::string &ca_file,
-                             bool verify_peer) {
-  namespace ssl = boost::asio::ssl;
-  ctx_.emplace(ssl::context::tls_server);
-  // NOLINTNEXTLINE(hicpp-signed-bitwise)
-  ctx_->set_options(ssl::context::default_workarounds | ssl::context::no_sslv2 | ssl::context::no_sslv3 |
-                    ssl::context::single_dh_use);
-  ctx_->set_default_verify_paths();
-  // TODO: add support for encrypted private keys
-  // TODO: add certificate revocation list (CRL)
-  boost::system::error_code ec;
-  ctx_->use_certificate_chain_file(cert_file, ec);
-  MG_ASSERT(!ec, "Couldn't load server certificate from file: {}", cert_file);
-  ctx_->use_private_key_file(key_file, ssl::context::pem, ec);
-  MG_ASSERT(!ec, "Couldn't load server private key from file: {}", key_file);
+                             bool verify_peer)
+    : use_ssl_(true),
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+      ctx_(SSL_CTX_new(SSLv23_server_method()))
+#else
+      ctx_(SSL_CTX_new(TLS_server_method()))
+#endif
+{
+  // TODO (mferencevic): add support for encrypted private keys
+  // TODO (mferencevic): add certificate revocation list (CRL)
+  MG_ASSERT(SSL_CTX_use_certificate_file(ctx_, cert_file.c_str(), SSL_FILETYPE_PEM) == 1,
+            "Couldn't load server certificate from file: {}", cert_file);
+  MG_ASSERT(SSL_CTX_use_PrivateKey_file(ctx_, key_file.c_str(), SSL_FILETYPE_PEM) == 1,
+            "Couldn't load server private key from file: {}", key_file);
 
-  ctx_->set_options(SSL_OP_NO_SSLv3, ec);
-  MG_ASSERT(!ec, "Setting options to SSL context failed!");
+  // Disable legacy SSL support. Other options can be seen here:
+  // https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_options.html
+  SSL_CTX_set_options(ctx_, SSL_OP_NO_SSLv3);
 
-  if (!ca_file.empty()) {
+  if (ca_file != "") {
     // Load the certificate authority file.
-    boost::system::error_code ec;
-    ctx_->load_verify_file(ca_file, ec);
-    MG_ASSERT(!ec, "Couldn't load certificate authority from file: {}", ca_file);
+    MG_ASSERT(SSL_CTX_load_verify_locations(ctx_, ca_file.c_str(), nullptr) == 1,
+              "Couldn't load certificate authority from file: {}", ca_file);
 
     if (verify_peer) {
+      // Add the CA to list of accepted CAs that is sent to the client.
+      STACK_OF(X509_NAME) *ca_names = SSL_load_client_CA_file(ca_file.c_str());
+      MG_ASSERT(ca_names != nullptr, "Couldn't load certificate authority from file: {}", ca_file);
+      // `ca_names` doesn' need to be free'd because we pass it to
+      // `SSL_CTX_set_client_CA_list`:
+      // https://mta.openssl.org/pipermail/openssl-users/2015-May/001363.html
+      SSL_CTX_set_client_CA_list(ctx_, ca_names);
+
       // Enable verification of the client certificate.
-      // NOLINTNEXTLINE(hicpp-signed-bitwise)
-      ctx_->set_verify_mode(ssl::verify_peer | ssl::verify_fail_if_no_peer_cert, ec);
-      MG_ASSERT(!ec, "Setting SSL verification mode failed!");
+      SSL_CTX_set_verify(ctx_, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, nullptr);
     }
   }
 }
 
-ServerContext::ServerContext(ServerContext &&other) noexcept { std::swap(ctx_, other.ctx_); }
+ServerContext::ServerContext(ServerContext &&other) noexcept : use_ssl_(other.use_ssl_), ctx_(other.ctx_) {
+  other.use_ssl_ = false;
+  other.ctx_ = nullptr;
+}
 
 ServerContext &ServerContext::operator=(ServerContext &&other) noexcept {
   if (this == &other) return *this;
 
+  // destroy my objects
+  if (use_ssl_) {
+    SSL_CTX_free(ctx_);
+  }
+
   // move other objects to self
-  ctx_ = std::move(other.ctx_);
+  use_ssl_ = other.use_ssl_;
+  ctx_ = other.ctx_;
 
   // reset other objects
-  other.ctx_.reset();
+  other.use_ssl_ = false;
+  other.ctx_ = nullptr;
 
   return *this;
 }
 
-ServerContext::~ServerContext() {}
-
-SSL_CTX *ServerContext::context() {
-  MG_ASSERT(ctx_);
-  return ctx_->native_handle();
+ServerContext::~ServerContext() {
+  if (use_ssl_) {
+    SSL_CTX_free(ctx_);
+  }
 }
 
-boost::asio::ssl::context &ServerContext::context_clone() {
-  MG_ASSERT(ctx_);
-  return *ctx_;
-}
+SSL_CTX *ServerContext::context() { return ctx_; }
 
-bool ServerContext::use_ssl() const { return ctx_.has_value(); }
+bool ServerContext::use_ssl() { return use_ssl_; }
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/context.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -11,13 +11,11 @@
 
 #pragma once
 
-#include <optional>
 #include <string>
 
 #include <openssl/ssl.h>
-#include <boost/asio/ssl/context.hpp>
 
-namespace memgraph::communication {
+namespace communication {
 
 /**
  * This class represents a context that should be used with network clients. One
@@ -71,7 +69,11 @@ class ClientContext final {
  */
 class ServerContext final {
  public:
-  ServerContext() = default;
+  /**
+   * This constructor constructs a ServerContext that doesn't use SSL.
+   */
+  ServerContext();
+
   /**
    * This constructor constructs a ServerContext that uses SSL. The parameters
    * `key_file` and `cert_file` can't be "" because when setting up a server it
@@ -93,15 +95,16 @@ class ServerContext final {
   ServerContext(ServerContext &&other) noexcept;
   ServerContext &operator=(ServerContext &&other) noexcept;
 
+  // Destructor that handles ownership of the SSL object.
   ~ServerContext();
 
   SSL_CTX *context();
-  boost::asio::ssl::context &context_clone();
 
-  bool use_ssl() const;
+  bool use_ssl();
 
  private:
-  std::optional<boost::asio::ssl::context> ctx_;
+  bool use_ssl_;
+  SSL_CTX *ctx_;
 };
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,7 +13,7 @@
 
 #include "utils/exceptions.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 /**
  * This exception is thrown to indicate to the communication stack that the
@@ -22,4 +22,4 @@ namespace memgraph::communication {
 class SessionClosedException : public utils::BasicException {
   using utils::BasicException::BasicException;
 };
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/helpers.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,7 +13,7 @@
 
 #include "communication/helpers.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 const std::string SslGetLastError() {
   char buff[2048];
@@ -21,4 +21,4 @@ const std::string SslGetLastError() {
   ERR_error_string_n(err, buff, sizeof(buff));
   return std::string(buff);
 }
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/helpers.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,11 +13,11 @@
 
 #include <string>
 
-namespace memgraph::communication {
+namespace communication {
 
 /**
  * This function reads and returns a string describing the last OpenSSL error.
  */
 const std::string SslGetLastError();
 
-}  // namespace memgraph::communication
+}  // namespace communication

src/communication/init.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -20,7 +20,7 @@
 #include "utils/signals.hpp"
 #include "utils/spin_lock.hpp"
 
-namespace memgraph::communication {
+namespace communication {
 
 namespace {
 // OpenSSL before 1.1 did not have a out-of-the-box multithreading support
@@ -72,4 +72,4 @@ SSLInit::SSLInit() {
 }
 
 SSLInit::~SSLInit() { Cleanup(); }
-}  // namespace memgraph::communication
+}  // namespace communication