Merge branch 'master' into use-constraints-as-indices-in-planning

* schema.cpp
* mgps.py
* convert.py

.githooks/pre-commit

@@ -33,4 +33,4 @@ for file in $modified_files; do
   fi
 done;
 
-return ${FAIL}
+exit ${FAIL}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,19 +1,18 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG] "
+title: ""
 labels: bug
-assignees: gitbuda, antonio2368
-
+assignees: gitbuda
 ---
 
-
 **Memgraph version**
 Which version did you use?
 
 **Environment**
 Some information about the environment you are using Memgraph on: operating
-system, how do you connect, with or without docker, which driver etc.
+system, architecture (ARM, x86), how do you connect, with or without docker,
+which driver etc.
 
 **Describe the bug**
 A clear and concise description of what the bug is.
@@ -22,6 +21,7 @@ A clear and concise description of what the bug is.
 Steps to reproduce the behavior:
 1. Run the following query '...'
 2. Click on '....'
+3. ... IDEALLY: link to the workload info (DATASET & QUERIES) ...
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -32,3 +32,11 @@ your problem.
 
 **Additional context**
 Add any other context about the problem here.
+
+**Verification Environment**
+Once we fix it, what do you need to verify the fix?
+Do you need:
+* Plain memgraph package -> for which Linux?
+* Plain memgraph Docker image?
+* Which architecture do you use ARM | x86?
+* Full Memgraph platform?

.github/workflows/daily_benchmark.yaml

@@ -73,6 +73,8 @@ jobs:
 
           ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_high_write_set_property.json high_write_set_property
 
+          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results cartesian.json cartesian
+
       - name: Upload mgbench results
         run: |
           cd tools/bench-graph-client
@@ -96,3 +98,9 @@ jobs:
                     --github-run-id "${{ github.run_id }}" \
                     --github-run-number "${{ github.run_number }}" \
                     --head-branch-name "${{ env.BRANCH_NAME }}"
+
+          ./main.py --benchmark-name "cartesian" \
+                    --benchmark-results-path "../../tests/mgbench/cartesian.json" \
+                    --github-run-id "${{ github.run_id }}" \
+                    --github-run-number "${{ github.run_number }}" \
+                    --head-branch-name "${{ env.BRANCH_NAME }}"

.github/workflows/diff.yaml

@@ -43,7 +43,7 @@ jobs:
 
           # Build community binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release -DMG_ENTERPRISE=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMG_ENTERPRISE=OFF ..
           make -j$THREADS
 
       - name: Run unit tests
@@ -244,12 +244,14 @@ jobs:
 
           # Build release binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=Release ..
           make -j$THREADS
 
       - name: Run GQL Behave tests
         run: |
-          cd tests/gql_behave
+          cd tests
+          ./setup.sh /opt/toolchain-v4/activate
+          cd gql_behave
           ./continuous_integration
 
       - name: Save quality assurance status
@@ -349,7 +351,7 @@ jobs:
           ./init
           # Build only memgraph release binarie.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
           make -j$THREADS memgraph
 
       - name: Run Jepsen tests

.github/workflows/package_all.yaml

@@ -8,6 +8,13 @@ on:
       memgraph_version:
         description: "Memgraph version to upload as. If empty upload is skipped. Format: 'X.Y.Z'"
         required: false
+      build_type:
+        type: choice
+        description: "Memgraph Build type. Default value is Release."
+        default: 'Release'
+        options:
+          - Release
+          - RelWithDebInfo
 
 jobs:
   centos-7:
@@ -20,7 +27,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package centos-7
+          ./release/package/run.sh package centos-7 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -37,7 +44,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package centos-9
+          ./release/package/run.sh package centos-9 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -54,7 +61,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package debian-10
+          ./release/package/run.sh package debian-10 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -71,7 +78,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package debian-11
+          ./release/package/run.sh package debian-11 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -89,7 +96,7 @@ jobs:
       - name: "Build package"
         run: |
           cd release/package
-          ./run.sh package debian-11 --for-docker
+          ./run.sh package debian-11 ${{ github.event.inputs.build_type }} --for-docker
           ./run.sh docker
       - name: "Upload package"
         uses: actions/upload-artifact@v3
@@ -107,7 +114,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package ubuntu-18.04
+          ./release/package/run.sh package ubuntu-18.04 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -124,7 +131,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package ubuntu-20.04
+          ./release/package/run.sh package ubuntu-20.04 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -141,7 +148,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package ubuntu-22.04
+          ./release/package/run.sh package ubuntu-22.04 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -158,7 +165,7 @@ 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-11 ${{ github.event.inputs.build_type }} --for-platform
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -175,7 +182,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package fedora-36
+          ./release/package/run.sh package fedora-36 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -192,7 +199,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package amzn-2
+          ./release/package/run.sh package amzn-2 ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -209,7 +216,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package debian-11-arm
+          ./release/package/run.sh package debian-11-arm ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
@@ -226,7 +233,7 @@ jobs:
           fetch-depth: 0 # Required because of release/get_version.py
       - name: "Build package"
         run: |
-          ./release/package/run.sh package ubuntu-22.04-arm
+          ./release/package/run.sh package ubuntu-22.04-arm ${{ github.event.inputs.build_type }}
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:

.github/workflows/performance_benchmarks.yaml

@@ -30,7 +30,7 @@ jobs:
 
           # Build only memgraph release binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ..
+          cmake -DCMAKE_BUILD_TYPE=release ..
           make -j$THREADS
 
       - name: Get branch name (merge)
@@ -52,6 +52,8 @@ jobs:
 
           ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_high_write_set_property.json high_write_set_property
 
+          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_cartesian.json cartesian
+
       - name: Upload benchmark results
         run: |
           cd tools/bench-graph-client
@@ -75,3 +77,9 @@ jobs:
                     --github-run-id "${{ github.run_id }}" \
                     --github-run-number "${{ github.run_number }}" \
                     --head-branch-name "${{ env.BRANCH_NAME }}"
+
+          ./main.py --benchmark-name "cartesian" \
+                    --benchmark-results-path "../../tests/mgbench/cartesian.json" \
+                    --github-run-id "${{ github.run_id }}" \
+                    --github-run-number "${{ github.run_number }}" \
+                    --head-branch-name "${{ env.BRANCH_NAME }}"

.github/workflows/release_centos8.yaml

@@ -2,6 +2,15 @@ name: Release CentOS 8
 
 on:
   workflow_dispatch:
+    inputs:
+      build_type:
+        type: choice
+        description: "Memgraph Build type. Default value is Release."
+        default: 'Release'
+        options:
+          - Release
+          - RelWithDebInfo
+
   schedule:
     - cron: "0 22 * * *"
 
@@ -33,7 +42,7 @@ jobs:
 
           # Build community binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release -DMG_ENTERPRISE=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} -DMG_ENTERPRISE=OFF ..
           make -j$THREADS
 
       - name: Run unit tests
@@ -190,7 +199,7 @@ jobs:
 
           # Build release binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} ..
           make -j$THREADS
 
       - name: Create enterprise RPM package

.github/workflows/release_debian10.yaml

@@ -2,6 +2,15 @@ name: Release Debian 10
 
 on:
   workflow_dispatch:
+    inputs:
+      build_type:
+        type: choice
+        description: "Memgraph Build type. Default value is Release."
+        default: 'Release'
+        options:
+          - Release
+          - RelWithDebInfo
+
   schedule:
     - cron: "0 22 * * *"
 
@@ -33,7 +42,7 @@ jobs:
 
           # Build community binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release -DMG_ENTERPRISE=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} -DMG_ENTERPRISE=OFF ..
           make -j$THREADS
 
       - name: Run unit tests
@@ -190,7 +199,7 @@ jobs:
 
           # Build release binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} ..
           make -j$THREADS
 
       - name: Create enterprise DEB package
@@ -322,7 +331,7 @@ jobs:
           ./init
           # Build only memgraph release binary.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} ..
           make -j$THREADS memgraph
 
       - name: Run Jepsen tests

.github/workflows/release_ubuntu2004.yaml

@@ -2,6 +2,15 @@ name: Release Ubuntu 20.04
 
 on:
   workflow_dispatch:
+    inputs:
+      build_type:
+        type: choice
+        description: "Memgraph Build type. Default value is Release."
+        default: 'Release'
+        options:
+          - Release
+          - RelWithDebInfo
+
   schedule:
     - cron: "0 22 * * *"
 
@@ -33,7 +42,7 @@ jobs:
 
           # Build community binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release -DMG_ENTERPRISE=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} -DMG_ENTERPRISE=OFF ..
           make -j$THREADS
 
       - name: Run unit tests
@@ -190,7 +199,7 @@ jobs:
 
           # Build release binaries.
           cd build
-          cmake -DCMAKE_BUILD_TYPE=release ..
+          cmake -DCMAKE_BUILD_TYPE=${{ github.event.inputs.build_type }} ..
           make -j$THREADS
 
       - name: Create enterprise DEB package

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-<img width="400px" src="https://uploads-ssl.webflow.com/5e7ceb09657a69bdab054b3a/5e7ceb09657a6937ab054bba_Black_Original%20_Logo.png">
+<img src="https://public-assets.memgraph.com/github-readme-images/github-memgraph-repo-banner.png">
 </p>
 
 ---
@@ -141,29 +141,20 @@ guide](https://memgraph.com/docs/memgraph/reference-guide/configuration).
 
 ## :trophy: Contributing
 
-The main purpose of this repository is to continue evolving Memgraph, making it
-faster and easier to use. Development of Memgraph happens in the open on GitHub,
-and we are grateful to the community for contributing bug fixes and
-improvements. Read below to learn how you can take part in improving Memgraph.
+Welcome to the heart of Memgraph development! We're on a mission to supercharge Memgraph, making it faster, more user-friendly, and even more powerful. We owe a big thanks to our fantastic community of contributors who help us fix bugs and bring incredible improvements to life. If you're passionate about databases and open source, here's your chance to make a difference!
+
+### Explore Memgraph Internals
+
+Interested in the nuts and bolts of Memgraph? Our [internals documentation](https://memgraph.notion.site/Memgraph-Internals-12b69132d67a417898972927d6870bd2) is where you can uncover the inner workings of Memgraph's architecture, learn how to build the project from scratch, and discover the secrets of effective contributions. Dive deep into the database!
+
+### Dive into the Contributing Guide
+Ready to jump into the action? Explore our [contributing guide](CONTRIBUTING.md) to get the inside scoop on how we develop Memgraph. It's your roadmap for suggesting bug fixes and enhancements. Contribute your skills and ideas!
 
 ### Code of Conduct
 
-Memgraph has adopted a Code of Conduct that we expect project participants to
-adhere to. Please read [the full text](CODE_OF_CONDUCT.md) so that you can
-understand what actions will and will not be tolerated.
+Our commitment to a respectful and professional community is unwavering. Every participant in Memgraph is expected to adhere to a stringent Code of Conduct. Please carefully review [the complete text](CODE_OF_CONDUCT.md) to gain a comprehensive understanding of the behaviors that are both expected and explicitly prohibited.
 
-### Contributing Guide
-
-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.
+We maintain a zero-tolerance policy towards any violations. Our shared commitment to this Code of Conduct ensures that Memgraph remains a place where integrity and excellence are paramount.
 
 ### :scroll: License
 

config/mappings.json

@@ -1,8 +1,8 @@
 {
     "dbms.components": "mgps.components",
     "apoc.util.validate": "mgps.validate",
-    "db.schema.nodeTypeProperties":"schema.node_type_properties",
-    "db.schema.relTypeProperties":"schema.rel_type_properties",
+    "db.schema.nodeTypeProperties": "schema.NodeTypeOroperties",
+    "db.schema.relTypeProperties": "schema.RelTypeProperties",
     "apoc.coll.contains": "collections.contains",
     "apoc.coll.partition": "collections.partition",
     "apoc.coll.toSet": "collections.to_set",
@@ -23,5 +23,4 @@
     "apoc.refactor.cloneSubgraph": "refactor.clone_subgraph",
     "apoc.refactor.cloneSubgraphFromPath": "refactor.clone_subgraph_from_path",
     "apoc.label.exists": "label.exists"
-
 }

environment/.gitignore

@@ -1,2 +0,0 @@
-archives
-build

environment/README.md

@@ -1,5 +1,10 @@
 # Memgraph Operating Environments
 
+## Issues related to build toolchain
+
+* GCC 11.2 (toolchain-v4) doesn't compile on Fedora 38, multiple definitions of enum issue
+* spdlog 1.10/11 doesn't work with fmt 10.0.0
+
 ## os
 
 Under the `os` directory, you can find scripts to install all required system

environment/os/amzn-2.sh

@@ -18,7 +18,7 @@ TOOLCHAIN_BUILD_DEPS=(
     curl libcurl-devel # for cmake
     readline-devel # for cmake and llvm
     libffi-devel libxml2-devel # for llvm
-    libedit-devel pcre-devel automake bison # for swig
+    libedit-devel pcre-devel pcre2-devel automake bison # for swig
     file
     openssl-devel
     gmp-devel

environment/os/centos-7.sh

@@ -20,7 +20,7 @@ TOOLCHAIN_BUILD_DEPS=(
     curl # snappy
     readline-devel # cmake and llvm
     libffi-devel libxml2-devel perl-Digest-MD5 # llvm
-    libedit-devel pcre-devel automake bison # swig
+    libedit-devel pcre-devel pcre2-devel automake bison # swig
     file
     openssl-devel
     gmp-devel

environment/os/centos-9.sh

@@ -17,7 +17,7 @@ TOOLCHAIN_BUILD_DEPS=(
     expat-devel xz-devel python3-devel texinfo libbabeltrace-devel # for gdb
     readline-devel # for cmake and llvm
     libffi-devel libxml2-devel # for llvm
-    libedit-devel pcre-devel automake bison # for swig
+    libedit-devel pcre-devel pcre2-devel automake bison # for swig
     file
     openssl-devel
     gmp-devel

environment/os/debian-10.sh

@@ -24,7 +24,7 @@ TOOLCHAIN_BUILD_DEPS=(
     libgmp-dev # for gdb
     gperf # for proxygen
     git # for fbthrift
-    libedit-dev libpcre3-dev automake bison # for swig
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
 )
 
 TOOLCHAIN_RUN_DEPS=(

environment/os/debian-11-arm.sh

@@ -18,7 +18,7 @@ TOOLCHAIN_BUILD_DEPS=(
     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
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
     curl # snappy
     file # for libunwind
     libssl-dev # for libevent

environment/os/debian-11.sh

@@ -18,7 +18,7 @@ TOOLCHAIN_BUILD_DEPS=(
     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
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
     curl # snappy
     file # for libunwind
     libssl-dev # for libevent

environment/os/fedora-36.sh

@@ -18,7 +18,7 @@ TOOLCHAIN_BUILD_DEPS=(
     curl libcurl-devel # for cmake
     readline-devel # for cmake and llvm
     libffi-devel libxml2-devel # for llvm
-    libedit-devel pcre-devel automake bison # for swig
+    libedit-devel pcre-devel pcre2-devel automake bison # for swig
     file
     openssl-devel
     gmp-devel

environment/os/fedora-38.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source "$DIR/../util.sh"
+
+check_operating_system "fedora-38"
+check_architecture "x86_64"
+
+TOOLCHAIN_BUILD_DEPS=(
+    coreutils-common gcc gcc-c++ make # generic build tools
+    wget # used for archive download
+    gnupg2 # used for archive signature verification
+    tar gzip bzip2 xz unzip # used for archive unpacking
+    zlib-devel # zlib library used for all builds
+    expat-devel xz-devel python3-devel texinfo libbabeltrace-devel # for gdb
+    curl libcurl-devel # for cmake
+    readline-devel # for cmake and llvm
+    libffi-devel libxml2-devel # for llvm
+    libedit-devel pcre-devel pcre2-devel automake bison # for swig
+    file
+    openssl-devel
+    gmp-devel
+    gperf
+    diffutils
+    libipt libipt-devel # intel
+    patch
+    perl # for openssl
+)
+
+TOOLCHAIN_RUN_DEPS=(
+    make # generic build tools
+    tar gzip bzip2 xz # used for archive unpacking
+    zlib # zlib library used for all builds
+    expat xz-libs python3 # for gdb
+    readline # for cmake and llvm
+    libffi libxml2 # for llvm
+    openssl-devel
+)
+
+MEMGRAPH_BUILD_DEPS=(
+    git # source code control
+    make pkgconf-pkg-config # build system
+    wget # for downloading libs
+    libuuid-devel java-11-openjdk # required by antlr
+    readline-devel # for memgraph console
+    python3-devel # for query modules
+    openssl-devel
+    libseccomp-devel
+    python3 python3-pip python3-virtualenv python3-virtualenvwrapper python3-pyyaml nmap-ncat # for tests
+    libcurl-devel # mg-requests
+    rpm-build rpmlint # for RPM package building
+    doxygen graphviz # source documentation generators
+    which nodejs golang zip unzip java-11-openjdk-devel # for driver tests
+    sbcl # for custom Lisp C++ preprocessing
+    autoconf # for jemalloc code generation
+    libtool  # for protobuf code generation
+)
+
+list() {
+    echo "$1"
+}
+
+check() {
+    if [ -v LD_LIBRARY_PATH ]; then
+      # On Fedora 38 yum/dnf and python11 use newer glibc which is not compatible
+      # with ours, so we need to momentarely disable env
+      local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+      LD_LIBRARY_PATH=""
+    fi
+    local missing=""
+    for pkg in $1; do
+        if ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
+            missing="$pkg $missing"
+        fi
+    done
+    if [ "$missing" != "" ]; then
+        echo "MISSING PACKAGES: $missing"
+        exit 1
+    fi
+    if [ -v OLD_LD_LIBRARY_PATH ]; then
+      echo "Restoring LD_LIBRARY_PATH..."
+      LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
+    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 don't work without the LANG export.
+    if [ -d "/home/gh/actions-runner" ]; then
+        echo "LANG=en_US.utf8" >> /home/gh/actions-runner/.env
+    else
+        echo "NOTE: export LANG=en_US.utf8"
+    fi
+    dnf update -y
+    for pkg in $1; do
+        dnf install -y "$pkg"
+    done
+}
+
+deps=$2"[*]"
+"$1" "${!deps}"

environment/os/ubuntu-18.04.sh

@@ -25,7 +25,7 @@ TOOLCHAIN_BUILD_DEPS=(
     libgmp-dev # for gdb
     gperf # for proxygen
     libssl-dev
-    libedit-dev libpcre3-dev automake bison # swig
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # swig
 )
 
 TOOLCHAIN_RUN_DEPS=(

environment/os/ubuntu-20.04.sh

@@ -24,7 +24,7 @@ TOOLCHAIN_BUILD_DEPS=(
     libgmp-dev # for gdb
     gperf # for proxygen
     libssl-dev
-    libedit-dev libpcre3-dev automake bison # for swig
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
 )
 
 TOOLCHAIN_RUN_DEPS=(

environment/os/ubuntu-22.04-arm.sh

@@ -24,7 +24,7 @@ TOOLCHAIN_BUILD_DEPS=(
     libgmp-dev # for gdb
     gperf # for proxygen
     libssl-dev
-    libedit-dev libpcre3-dev automake bison # for swig
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
 )
 
 TOOLCHAIN_RUN_DEPS=(

environment/os/ubuntu-22.04.sh

@@ -24,7 +24,7 @@ TOOLCHAIN_BUILD_DEPS=(
     libgmp-dev # for gdb
     gperf # for proxygen
     libssl-dev
-    libedit-dev libpcre3-dev automake bison # for swig
+    libedit-dev libpcre2-dev libpcre3-dev automake bison # for swig
 )
 
 TOOLCHAIN_RUN_DEPS=(

environment/toolchain/.gitignore

@@ -1 +1,4 @@
+archives
+build
+output
 *.tar.gz

environment/toolchain/v2/build.sh

@@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CPUS=$( grep -c processor < /proc/cpuinfo )
 cd "$DIR"
 
-source "$DIR/../util.sh"
+source "$DIR/../../util.sh"
 DISTRO="$(operating_system)"
 
 # toolchain version
@@ -30,10 +30,10 @@ LLVM_VERSION=11.0.0
 SWIG_VERSION=4.0.2 # used only for LLVM compilation
 
 # Check for the dependencies.
-echo "ALL BUILD PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
-$DIR/../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
-echo "ALL RUN PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
-$DIR/../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
+echo "ALL BUILD PACKAGES: $($DIR/../../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
+$DIR/../../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
+echo "ALL RUN PACKAGES: $($DIR/../../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
+$DIR/../../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
 
 # check installation directory
 NAME=toolchain-v$TOOLCHAIN_VERSION
@@ -442,7 +442,7 @@ In order to be able to run all of these tools you should install the following
 packages:
 
 \`\`\`
-$($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
+$($DIR/../../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
 \`\`\`
 
 ## Usage

environment/toolchain/v3/build.sh

@@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CPUS=$( grep -c processor < /proc/cpuinfo )
 cd "$DIR"
 
-source "$DIR/../util.sh"
+source "$DIR/../../util.sh"
 DISTRO="$(operating_system)"
 
 # toolchain version
@@ -31,10 +31,10 @@ LLVM_VERSION_LONG=12.0.1-rc4
 SWIG_VERSION=4.0.2 # used only for LLVM compilation
 
 # Check for the dependencies.
-echo "ALL BUILD PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
-$DIR/../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
-echo "ALL RUN PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
-$DIR/../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
+echo "ALL BUILD PACKAGES: $($DIR/../../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
+$DIR/../../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
+echo "ALL RUN PACKAGES: $($DIR/../../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
+$DIR/../../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
 
 # check installation directory
 NAME=toolchain-v$TOOLCHAIN_VERSION
@@ -452,7 +452,7 @@ In order to be able to run all of these tools you should install the following
 packages:
 
 \`\`\`
-$($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
+$($DIR/../../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
 \`\`\`
 
 ## Usage

environment/toolchain/v4/build.sh

@@ -7,7 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CPUS=$( grep -c processor < /proc/cpuinfo )
 cd "$DIR"
 
-source "$DIR/../util.sh"
+source "$DIR/../../util.sh"
 DISTRO="$(operating_system)"
 
 function log_tool_name () {
@@ -51,17 +51,13 @@ CPPCHECK_VERSION=2.6
 LLVM_VERSION=13.0.0
 SWIG_VERSION=4.0.2 # used only for LLVM compilation
 
-# Set the right env script
-ENV_SCRIPT="$DIR/../os/$DISTRO.sh"
+# Set the right operating system setup script.
+ENV_SCRIPT="$DIR/../../os/$DISTRO.sh"
 if [[ "$for_arm" = true ]]; then
-    ENV_SCRIPT="$DIR/../os/$DISTRO-arm.sh"
+    ENV_SCRIPT="$DIR/../../os/$DISTRO-arm.sh"
 fi
-
-# Check for the toolchain build dependencies.
 echo "ALL BUILD PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_BUILD_DEPS)"
 ${ENV_SCRIPT} check TOOLCHAIN_BUILD_DEPS
-
-# Check for the toolchain run dependencies.
 echo "ALL RUN PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_RUN_DEPS)"
 ${ENV_SCRIPT} check TOOLCHAIN_RUN_DEPS
 
@@ -658,7 +654,7 @@ In order to be able to run all of these tools you should install the following
 packages:
 
 \`\`\`
-$($DIR/../os/$ENV_SCRIPT.sh list TOOLCHAIN_RUN_DEPS)
+$($DIR/../../os/$ENV_SCRIPT.sh list TOOLCHAIN_RUN_DEPS)
 \`\`\`
 
 ## Usage

environment/toolchain/v4/snappy.patch

@@ -4,7 +4,7 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
 @@ -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-")
@@ -17,7 +17,7 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
 @@ -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")
@@ -25,5 +25,5 @@ diff -ur a/CMakeLists.txt b/CMakeLists.txt
 +  # 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/v5/clean.sh

@@ -0,0 +1,42 @@
+#!/bin/bash -ex
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+PREFIX=/opt/toolchain-v5
+
+# NOTE: Often times when versions in the build script are changes, something
+# doesn't work. To avoid rebuild of the whole toolchain but rebuild specific
+# lib from 0, just comment specific line under this cript and run it. Don't
+# forget to comment back to avoid unnecessary deletes next time your run this
+# cript.
+
+# rm -rf "$DIR/build"
+# rm -rf "$DIR/output"
+
+# rm -rf "$PREFIX/bin/gcc"
+# rm -rf "$PREFIX/bin/ld.gold"
+# rm -rf "$PREFIX/bin/gdb"
+# rm -rf "$PREFIX/bin/cmake"
+# rm -rf "$PREFIX/bin/clang"
+# rm -rf "$PREFIX/include/bzlib.h"
+# rm -rf "$PREFIX/include/fmt"
+# rm -rf "$PREFIX/include/lz4.h"
+# rm -rf "$PREFIX/include/lzma.h"
+# rm -rf "$PREFIX/include/zlib.h"
+# rm -rf "$PREFIX/include/zstd.h"
+# rm -rf "$PREFIX/include/jemalloc"
+# rm -rf "$PREFIX/include/boost"
+# rm -rf "$PREFIX/include/double-conversion"
+# rm -rf "$PREFIX/include/gflags"
+# rm -rf "$PREFIX/include/libunwind.h"
+# rm -rf "$PREFIX/include/glog"
+# rm -rf "$PREFIX/include/event2"
+# rm -rf "$PREFIX/include/sodium.h"
+# rm -rf "$PREFIX/include/libaio.h"
+# rm -rf "$PREFIX/include/FlexLexer.h"
+# rm -rf "$PREFIX/include/snappy.h"
+# rm -rf "$PREFIX/include/fizz"
+# rm -rf "$PREFIX/include/folly"
+# rm -rf "$PREFIX/include/proxygen"
+# rm -rf "$PREFIX/include/wangle"
+# rm -rf "$PREFIX/include/thrift"
+
+# rm -rf "$PREFIX"

environment/toolchain/v5/folly-2022.01.31.00.patch

@@ -0,0 +1,41 @@
+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/v5/folly-2023.09.25.00.patch

@@ -0,0 +1,26 @@
+diff --git a/folly/CMakeLists.txt b/folly/CMakeLists.txt
+index e0e16df..471131e 100644
+--- a/folly/CMakeLists.txt
++++ b/folly/CMakeLists.txt
+@@ -28,7 +28,7 @@ install(
+ )
+ 
+ add_subdirectory(experimental/exception_tracer)
+-add_subdirectory(logging/example)
++# add_subdirectory(logging/example)
+ 
+ if (PYTHON_EXTENSIONS)
+   # Create tree of symbolic links in structure required for successful
+diff --git a/folly/Portability.h b/folly/Portability.h
+index 365ef1b..42d24b8 100644
+--- a/folly/Portability.h
++++ b/folly/Portability.h
+@@ -560,7 +560,7 @@ constexpr auto kCpplibVer = 0;
+     (defined(__cpp_coroutines) && __cpp_coroutines >= 201703L) ||          \
+     (defined(__cpp_impl_coroutine) && __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/v5/snappy.patch

@@ -0,0 +1,29 @@
+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/v5/xz_pgp.txt

@@ -0,0 +1,75 @@
+-----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-----

include/_mgp.hpp

@@ -265,6 +265,11 @@ inline mgp_edge *graph_edge_set_to(struct mgp_graph *graph, struct mgp_edge *e,
   return MgInvoke<mgp_edge *>(mgp_graph_edge_set_to, graph, e, new_to, memory);
 }
 
+inline mgp_edge *graph_edge_change_type(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_edge_type new_type,
+                                        mgp_memory *memory) {
+  return MgInvoke<mgp_edge *>(mgp_graph_edge_change_type, graph, e, new_type, memory);
+}
+
 inline void graph_delete_edge(mgp_graph *graph, mgp_edge *edge) { MgInvokeVoid(mgp_graph_delete_edge, graph, edge); }
 
 inline mgp_vertex *graph_get_vertex_by_id(mgp_graph *g, mgp_vertex_id id, mgp_memory *memory) {
@@ -355,6 +360,8 @@ inline size_t map_size(mgp_map *map) { return MgInvoke<size_t>(mgp_map_size, map
 
 inline mgp_value *map_at(mgp_map *map, const char *key) { return MgInvoke<mgp_value *>(mgp_map_at, map, key); }
 
+inline bool key_exists(mgp_map *map, const char *key) { return MgInvoke<int>(mgp_key_exists, map, key); }
+
 inline const char *map_item_key(mgp_map_item *item) { return MgInvoke<const char *>(mgp_map_item_key, item); }
 
 inline mgp_value *map_item_value(mgp_map_item *item) { return MgInvoke<mgp_value *>(mgp_map_item_value, item); }

include/mg_procedure.h

@@ -115,19 +115,6 @@ void mgp_global_free(void *p);
 /// State of the graph database.
 struct mgp_graph;
 
-/// Allocations are tracked only for master thread. If new threads are spawned
-/// inside procedure, by calling following function with thread id
-/// you can start tracking allocations for that thread too. This
-/// is important if you need query memory limit to work
-/// for given procedure or per procedure memory limit.
-enum mgp_error mgp_track_thread_allocations(struct mgp_graph *graph, const char *thread_id);
-
-/// Once allocations are tracked for custom thread, you need to stop tracking allocations
-/// for given thread, before thread finishes with execution, or is detached.
-/// Otherwise it might result in slowdown of system due to unnecessary tracking of
-/// allocations.
-enum mgp_error mgp_untrack_thread_allocations(struct mgp_graph *graph, const char *thread_id);
-
 /// Allocations are tracked only for master thread. If new threads are spawned
 /// inside procedure, by calling following function
 /// you can start tracking allocations for current thread too. This
@@ -511,6 +498,9 @@ enum mgp_error mgp_map_size(struct mgp_map *map, size_t *result);
 /// Result is NULL if no mapping exists.
 enum mgp_error mgp_map_at(struct mgp_map *map, const char *key, struct mgp_value **result);
 
+/// Returns true if key in map.
+enum mgp_error mgp_key_exists(struct mgp_map *map, const char *key, int *result);
+
 /// An item in the mgp_map.
 struct mgp_map_item;
 
@@ -934,6 +924,13 @@ enum mgp_error mgp_graph_edge_set_from(struct mgp_graph *graph, struct mgp_edge
 enum mgp_error mgp_graph_edge_set_to(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_vertex *new_to,
                                      struct mgp_memory *memory, struct mgp_edge **result);
 
+/// Change edge type
+/// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `graph` is immutable.
+/// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `edge`, its source or destination vertex has been modified by
+/// another transaction.
+enum mgp_error mgp_graph_edge_change_type(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_edge_type new_type,
+                                          struct mgp_memory *memory, struct mgp_edge **result);
+
 /// Delete an edge from the graph.
 /// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `graph` is immutable.
 /// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `edge`, its source or destination vertex has been modified by

include/mgp.hpp

@@ -260,6 +260,8 @@ class Graph {
   void SetFrom(Relationship &relationship, const Node &new_from);
   /// @brief Changes a relationship to node.
   void SetTo(Relationship &relationship, const Node &new_to);
+  /// @brief Changes the relationship type.
+  void ChangeType(Relationship &relationship, std::string_view new_type);
   /// @brief Deletes a relationship from the graph.
   void DeleteRelationship(const Relationship &relationship);
 
@@ -630,6 +632,9 @@ class Map {
   /// @brief Returns the value at the given `key`.
   Value const At(std::string_view key) const;
 
+  /// @brief Returns true if the given `key` exists.
+  bool KeyExists(std::string_view key) const;
+
   class Iterator {
    public:
     friend class Map;
@@ -2027,6 +2032,13 @@ inline void Graph::SetTo(Relationship &relationship, const Node &new_to) {
   mgp::edge_destroy(edge);
 }
 
+inline void Graph::ChangeType(Relationship &relationship, std::string_view new_type) {
+  mgp_edge *edge = mgp::MemHandlerCallback(mgp::graph_edge_change_type, graph_, relationship.ptr_,
+                                           mgp_edge_type{.name = new_type.data()});
+  relationship = Relationship(edge);
+  mgp::edge_destroy(edge);
+}
+
 inline void Graph::DeleteRelationship(const Relationship &relationship) {
   mgp::graph_delete_edge(graph_, relationship.ptr_);
 }
@@ -2573,6 +2585,8 @@ inline const Value Map::At(std::string_view key) const {
   return Value();
 }
 
+inline bool Map::KeyExists(std::string_view key) const { return mgp::key_exists(ptr_, key.data()); }
+
 inline Map::Iterator::Iterator(mgp_map_items_iterator *map_items_iterator) : map_items_iterator_(map_items_iterator) {
   if (map_items_iterator_ == nullptr) return;
   if (mgp::map_items_iterator_get(map_items_iterator_) == nullptr) {

libs/CMakeLists.txt

@@ -4,7 +4,8 @@ include(GNUInstallDirs)
 
 include(ProcessorCount)
 ProcessorCount(NPROC)
-if (NPROC EQUAL 0)
+
+if(NPROC EQUAL 0)
   set(NPROC 1)
 endif()
 
@@ -12,6 +13,7 @@ find_package(Boost 1.78 REQUIRED)
 find_package(BZip2 1.0.6 REQUIRED)
 find_package(Threads REQUIRED)
 set(GFLAGS_NOTHREADS OFF)
+
 # NOTE: config/generate.py depends on the gflags help XML format.
 find_package(gflags REQUIRED)
 find_package(fmt 8.0.1)
@@ -23,24 +25,27 @@ set(LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 function(import_header_library name include_dir)
   add_library(${name} INTERFACE IMPORTED GLOBAL)
   set_property(TARGET ${name} PROPERTY
-               INTERFACE_INCLUDE_DIRECTORIES ${include_dir})
+    INTERFACE_INCLUDE_DIRECTORIES ${include_dir})
   string(TOUPPER ${name} _upper_name)
   set(${_upper_name}_INCLUDE_DIR ${include_dir} CACHE FILEPATH
-      "Path to ${name} include directory" FORCE)
+    "Path to ${name} include directory" FORCE)
   mark_as_advanced(${_upper_name}_INCLUDE_DIR)
   add_library(lib::${name} ALIAS ${name})
 endfunction(import_header_library)
 
 function(import_library name type location include_dir)
   add_library(${name} ${type} IMPORTED GLOBAL)
-  if (${ARGN})
+
+  if(${ARGN})
     # Optional argument is the name of the external project that we need to
     # depend on.
     add_dependencies(${name} ${ARGN0})
   else()
     add_dependencies(${name} ${name}-proj)
   endif()
+
   set_property(TARGET ${name} PROPERTY IMPORTED_LOCATION ${location})
+
   # We need to create the include directory first in order to be able to add it
   # as an include directory. The header files in the include directory will be
   # generated later during the build process.
@@ -60,29 +65,34 @@ function(add_external_project name)
   set(options NO_C_COMPILER)
   set(one_value_kwargs SOURCE_DIR BUILD_IN_SOURCE)
   set(multi_value_kwargs CMAKE_ARGS DEPENDS INSTALL_COMMAND BUILD_COMMAND
-      CONFIGURE_COMMAND)
+    CONFIGURE_COMMAND)
   cmake_parse_arguments(KW "${options}" "${one_value_kwargs}" "${multi_value_kwargs}" ${ARGN})
   set(source_dir ${CMAKE_CURRENT_SOURCE_DIR}/${name})
-  if (KW_SOURCE_DIR)
+
+  if(KW_SOURCE_DIR)
     set(source_dir ${KW_SOURCE_DIR})
   endif()
+
   set(build_in_source 0)
-  if (KW_BUILD_IN_SOURCE)
+
+  if(KW_BUILD_IN_SOURCE)
     set(build_in_source ${KW_BUILD_IN_SOURCE})
   endif()
-  if (NOT KW_NO_C_COMPILER)
+
+  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}
-                                 -DCMAKE_INSTALL_PREFIX=${source_dir}
-                                 ${KW_CMAKE_ARGS}
-                      INSTALL_COMMAND ${KW_INSTALL_COMMAND}
-                      BUILD_COMMAND ${KW_BUILD_COMMAND})
+    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}
+    -DCMAKE_INSTALL_PREFIX=${source_dir}
+    ${KW_CMAKE_ARGS}
+    INSTALL_COMMAND ${KW_INSTALL_COMMAND}
+    BUILD_COMMAND ${KW_BUILD_COMMAND})
 endfunction(add_external_project)
 
 # Calls `add_external_project`, sets NAME_LIBRARY, NAME_INCLUDE_DIR variables
@@ -91,9 +101,9 @@ macro(import_external_library name type library_location include_dir)
   add_external_project(${name} ${ARGN})
   string(TOUPPER ${name} _upper_name)
   set(${_upper_name}_LIBRARY ${library_location} CACHE FILEPATH
-      "Path to ${name} library" FORCE)
+    "Path to ${name} library" FORCE)
   set(${_upper_name}_INCLUDE_DIR ${include_dir} CACHE FILEPATH
-      "Path to ${name} include directory" FORCE)
+    "Path to ${name} include directory" FORCE)
   mark_as_advanced(${_upper_name}_LIBRARY ${_upper_name}_INCLUDE_DIR)
   import_library(${name} ${type} ${${_upper_name}_LIBRARY} ${${_upper_name}_INCLUDE_DIR})
 endmacro(import_external_library)
@@ -115,10 +125,10 @@ import_external_library(antlr4 STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/antlr4/runtime/Cpp/include/antlr4-runtime
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/antlr4/runtime/Cpp
   CMAKE_ARGS # http://stackoverflow.com/questions/37096062/get-a-basic-c-program-to-compile-using-clang-on-ubuntu-16/38385967#38385967
-             -DWITH_LIBCXX=OFF # because of debian bug
-             -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
-             -DCMAKE_CXX_STANDARD=20
-             -DANTLR_BUILD_CPP_TESTS=OFF
+  -DWITH_LIBCXX=OFF # because of debian bug
+  -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
+  -DCMAKE_CXX_STANDARD=20
+  -DANTLR_BUILD_CPP_TESTS=OFF
   BUILD_COMMAND $(MAKE) antlr4_static
   INSTALL_COMMAND $(MAKE) install)
 
@@ -126,6 +136,7 @@ import_external_library(antlr4 STATIC
 import_external_library(benchmark STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/${CMAKE_INSTALL_LIBDIR}/libbenchmark.a
   ${CMAKE_CURRENT_SOURCE_DIR}/benchmark/include
+
   # Skip testing. The tests don't compile with Clang 8.
   CMAKE_ARGS -DBENCHMARK_ENABLE_TESTING=OFF)
 
@@ -141,15 +152,15 @@ add_subdirectory(rapidcheck EXCLUDE_FROM_ALL)
 # setup google test
 add_external_project(gtest SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest)
 set(GTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/googletest/include
-    CACHE PATH "Path to gtest and gmock include directory" FORCE)
+  CACHE PATH "Path to gtest and gmock include directory" FORCE)
 set(GMOCK_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/googletest/lib/libgmock.a
-    CACHE FILEPATH "Path to gmock library" FORCE)
+  CACHE FILEPATH "Path to gmock library" FORCE)
 set(GMOCK_MAIN_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/googletest/lib/libgmock_main.a
-    CACHE FILEPATH "Path to gmock_main library" FORCE)
+  CACHE FILEPATH "Path to gmock_main library" FORCE)
 set(GTEST_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/googletest/lib/libgtest.a
-    CACHE FILEPATH "Path to gtest library" FORCE)
+  CACHE FILEPATH "Path to gtest library" FORCE)
 set(GTEST_MAIN_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/googletest/lib/libgtest_main.a
-    CACHE FILEPATH "Path to gtest_main library" FORCE)
+  CACHE FILEPATH "Path to gtest_main library" FORCE)
 mark_as_advanced(GTEST_INCLUDE_DIR GMOCK_LIBRARY GMOCK_MAIN_LIBRARY GTEST_LIBRARY GTEST_MAIN_LIBRARY)
 import_library(gtest STATIC ${GTEST_LIBRARY} ${GTEST_INCLUDE_DIR} gtest-proj)
 import_library(gtest_main STATIC ${GTEST_MAIN_LIBRARY} ${GTEST_INCLUDE_DIR} gtest-proj)
@@ -167,10 +178,10 @@ import_external_library(rocksdb STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/lib/librocksdb.a
   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
   CMAKE_ARGS -DUSE_RTTI=ON
-             -DWITH_TESTS=OFF
-             -DGFLAGS_NOTHREADS=OFF
-             -DCMAKE_INSTALL_LIBDIR=lib
-             -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
+  -DWITH_TESTS=OFF
+  -DGFLAGS_NOTHREADS=OFF
+  -DCMAKE_INSTALL_LIBDIR=lib
+  -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
   BUILD_COMMAND $(MAKE) rocksdb)
 
 # Setup libbcrypt
@@ -179,8 +190,8 @@ import_external_library(libbcrypt STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/libbcrypt
   CONFIGURE_COMMAND sed s/-Wcast-align// -i ${CMAKE_CURRENT_SOURCE_DIR}/libbcrypt/crypt_blowfish/Makefile
   BUILD_COMMAND make -C ${CMAKE_CURRENT_SOURCE_DIR}/libbcrypt
-                     CC=${CMAKE_C_COMPILER}
-                     CXX=${CMAKE_CXX_COMPILER}
+  CC=${CMAKE_C_COMPILER}
+  CXX=${CMAKE_CXX_COMPILER}
   INSTALL_COMMAND true)
 
 # Setup mgclient
@@ -188,16 +199,16 @@ import_external_library(mgclient STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/mgclient/lib/libmgclient.a
   ${CMAKE_CURRENT_SOURCE_DIR}/mgclient/include
   CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-             -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-             -DBUILD_TESTING=OFF
-             -DBUILD_CPP_BINDINGS=ON)
+  -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+  -DBUILD_TESTING=OFF
+  -DBUILD_CPP_BINDINGS=ON)
 find_package(OpenSSL REQUIRED)
 target_link_libraries(mgclient INTERFACE ${OPENSSL_LIBRARIES})
 
 add_external_project(mgconsole
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/mgconsole
   CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}
+  -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}
   BUILD_COMMAND $(MAKE) mgconsole)
 
 add_custom_target(mgconsole DEPENDS mgconsole-proj)
@@ -214,14 +225,15 @@ import_external_library(librdkafka STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka/lib/librdkafka.a
   ${CMAKE_CURRENT_SOURCE_DIR}/librdkafka/include
   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)
+  -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)
 
 import_library(librdkafka++ STATIC
@@ -242,24 +254,24 @@ import_external_library(pulsar STATIC
   ${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)
+  -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")
+if(${MG_ARCH} STREQUAL "ARM64")
   set(MG_LIBRDTSC_CMAKE_ARGS -DLIBRDTSC_ARCH_x86=OFF -DLIBRDTSC_ARCH_ARM64=ON)
 endif()
 
@@ -280,3 +292,5 @@ add_subdirectory(absl EXCLUDE_FROM_ALL)
 set_path_external_library(jemalloc STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc/lib/libjemalloc.a
   ${CMAKE_CURRENT_SOURCE_DIR}/jemalloc/include/)
+
+import_header_library(rangev3 ${CMAKE_CURRENT_SOURCE_DIR}/rangev3/include)

libs/setup.sh

@@ -125,6 +125,7 @@ declare -A primary_urls=(
   ["ctre"]="http://$local_cache_host/file/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
   ["absl"]="https://$local_cache_host/git/abseil-cpp.git"
   ["jemalloc"]="https://$local_cache_host/git/jemalloc.git"
+  ["range-v3"]="https://$local_cache_host/git/ericniebler/range-v3.git"
 )
 
 # The goal of secondary urls is to have links to the "source of truth" of
@@ -153,6 +154,7 @@ declare -A secondary_urls=(
   ["ctre"]="https://raw.githubusercontent.com/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
   ["absl"]="https://github.com/abseil/abseil-cpp.git"
   ["jemalloc"]="https://github.com/jemalloc/jemalloc.git"
+  ["range-v3"]="https://github.com/ericniebler/range-v3.git"
 )
 
 # antlr
@@ -255,7 +257,6 @@ cd ..
 absl_ref="20230125.3"
 repo_clone_try_double "${primary_urls[absl]}" "${secondary_urls[absl]}" "absl" "$absl_ref"
 
-
 # jemalloc ea6b3e973b477b8061e0076bb257dbd7f3faa756
 JEMALLOC_COMMIT_VERSION="5.2.1"
 repo_clone_try_double "${secondary_urls[jemalloc]}" "${secondary_urls[jemalloc]}" "jemalloc" "$JEMALLOC_COMMIT_VERSION"
@@ -272,3 +273,7 @@ MALLOC_CONF="retain:false,percpu_arena:percpu,oversize_threshold:0,muzzy_decay_m
 
 make -j$CPUS install
 popd
+
+#range-v3 release-0.12.0
+range_v3_ref="release-0.12.0"
+repo_clone_try_double "${primary_urls[range-v3]}" "${secondary_urls[range-v3]}" "rangev3" "$range_v3_ref"

query_modules/CMakeLists.txt

@@ -40,9 +40,26 @@ install(PROGRAMS $<TARGET_FILE:example_cpp>
 # Also install the source of the example, so user can read it.
 install(FILES example.cpp DESTINATION lib/memgraph/query_modules/src)
 
+add_library(schema SHARED schema.cpp)
+target_include_directories(schema PRIVATE ${CMAKE_SOURCE_DIR}/include)
+target_compile_options(schema PRIVATE -Wall)
+# Strip C++ example in release build.
+if (lower_build_type STREQUAL "release")
+  add_custom_command(TARGET schema POST_BUILD
+                     COMMAND strip -s $<TARGET_FILE:schema>
+                     COMMENT "Stripping symbols and sections from the C++ schema module")
+endif()
+install(PROGRAMS $<TARGET_FILE:schema>
+        DESTINATION lib/memgraph/query_modules
+        RENAME schema.so)
+# Also install the source of the example, so user can read it.
+install(FILES schema.cpp DESTINATION lib/memgraph/query_modules/src)
+
 # Install the Python example and modules
 install(FILES example.py DESTINATION lib/memgraph/query_modules RENAME py_example.py)
 install(FILES graph_analyzer.py DESTINATION lib/memgraph/query_modules)
 install(FILES mgp_networkx.py DESTINATION lib/memgraph/query_modules)
 install(FILES nxalg.py DESTINATION lib/memgraph/query_modules)
 install(FILES wcc.py DESTINATION lib/memgraph/query_modules)
+install(FILES mgps.py DESTINATION lib/memgraph/query_modules)
+install(FILES convert.py DESTINATION lib/memgraph/query_modules)

query_modules/convert.py

@@ -0,0 +1,10 @@
+from json import loads
+
+import mgp
+
+
+@mgp.function
+def str2object(string: str) -> mgp.Any:
+    if string:
+        return loads(string)
+    return None

query_modules/mgps.py

@@ -0,0 +1,8 @@
+import mgp
+
+
+@mgp.read_proc
+def components(
+    context: mgp.ProcCtx,
+) -> mgp.Record(versions=list, edition=str, name=str):
+    return mgp.Record(versions=["5.9.0"], edition="community", name="Memgraph")

query_modules/schema.cpp

@@ -0,0 +1,187 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+#include <mgp.hpp>
+
+namespace Schema {
+
+/*NodeTypeProperties and RelTypeProperties constants*/
+constexpr std::string_view kReturnNodeType = "nodeType";
+constexpr std::string_view kProcedureNodeType = "node_type_properties";
+constexpr std::string_view kProcedureRelType = "rel_type_properties";
+constexpr std::string_view kReturnLabels = "nodeLabels";
+constexpr std::string_view kReturnRelType = "relType";
+constexpr std::string_view kReturnPropertyName = "propertyName";
+constexpr std::string_view kReturnPropertyType = "propertyTypes";
+constexpr std::string_view kReturnMandatory = "mandatory";
+
+std::string TypeOf(const mgp::Type &type);
+
+template <typename T>
+void ProcessPropertiesNode(mgp::Record &record, const std::string &type, const mgp::List &labels,
+                           const std::string &propertyName, const T &propertyType, const bool &mandatory);
+
+template <typename T>
+void ProcessPropertiesRel(mgp::Record &record, const std::string_view &type, const std::string &propertyName,
+                          const T &propertyType, const bool &mandatory);
+
+void NodeTypeProperties(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory);
+void RelTypeProperties(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory);
+}  // namespace Schema
+
+/*we have << operator for type in Cpp API, but in it we return somewhat different strings than I would like in this
+module, so I implemented a small function here*/
+std::string Schema::TypeOf(const mgp::Type &type) {
+  switch (type) {
+    case mgp::Type::Null:
+      return "Null";
+    case mgp::Type::Bool:
+      return "Bool";
+    case mgp::Type::Int:
+      return "Int";
+    case mgp::Type::Double:
+      return "Double";
+    case mgp::Type::String:
+      return "String";
+    case mgp::Type::List:
+      return "List[Any]";
+    case mgp::Type::Map:
+      return "Map[Any]";
+    case mgp::Type::Node:
+      return "Vertex";
+    case mgp::Type::Relationship:
+      return "Edge";
+    case mgp::Type::Path:
+      return "Path";
+    case mgp::Type::Date:
+      return "Date";
+    case mgp::Type::LocalTime:
+      return "LocalTime";
+    case mgp::Type::LocalDateTime:
+      return "LocalDateTime";
+    case mgp::Type::Duration:
+      return "Duration";
+    default:
+      throw mgp::ValueException("Unsupported type");
+  }
+}
+template <typename T>
+void Schema::ProcessPropertiesNode(mgp::Record &record, const std::string &type, const mgp::List &labels,
+                                   const std::string &propertyName, const T &propertyType, const bool &mandatory) {
+  record.Insert(std::string(kReturnNodeType).c_str(), type);
+  record.Insert(std::string(kReturnLabels).c_str(), labels);
+  record.Insert(std::string(kReturnPropertyName).c_str(), propertyName);
+  record.Insert(std::string(kReturnPropertyType).c_str(), propertyType);
+  record.Insert(std::string(kReturnMandatory).c_str(), mandatory);
+}
+
+template <typename T>
+void Schema::ProcessPropertiesRel(mgp::Record &record, const std::string_view &type, const std::string &propertyName,
+                                  const T &propertyType, const bool &mandatory) {
+  record.Insert(std::string(kReturnRelType).c_str(), type);
+  record.Insert(std::string(kReturnPropertyName).c_str(), propertyName);
+  record.Insert(std::string(kReturnPropertyType).c_str(), propertyType);
+  record.Insert(std::string(kReturnMandatory).c_str(), mandatory);
+}
+
+void Schema::NodeTypeProperties(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
+  mgp::MemoryDispatcherGuard guard{memory};
+  ;
+  const auto record_factory = mgp::RecordFactory(result);
+  try {
+    const mgp::Graph graph = mgp::Graph(memgraph_graph);
+    for (auto node : graph.Nodes()) {
+      std::string type = "";
+      mgp::List labels = mgp::List();
+      for (auto label : node.Labels()) {
+        labels.AppendExtend(mgp::Value(label));
+        type += ":`" + std::string(label) + "`";
+      }
+
+      if (node.Properties().size() == 0) {
+        auto record = record_factory.NewRecord();
+        ProcessPropertiesNode<std::string>(record, type, labels, "", "", false);
+        continue;
+      }
+
+      for (auto &[key, prop] : node.Properties()) {
+        auto property_type = mgp::List();
+        auto record = record_factory.NewRecord();
+        property_type.AppendExtend(mgp::Value(TypeOf(prop.Type())));
+        ProcessPropertiesNode<mgp::List>(record, type, labels, key, property_type, true);
+      }
+    }
+
+  } catch (const std::exception &e) {
+    record_factory.SetErrorMessage(e.what());
+    return;
+  }
+}
+
+void Schema::RelTypeProperties(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
+  mgp::MemoryDispatcherGuard guard{memory};
+  ;
+  const auto record_factory = mgp::RecordFactory(result);
+  try {
+    const mgp::Graph graph = mgp::Graph(memgraph_graph);
+
+    for (auto rel : graph.Relationships()) {
+      std::string type = ":`" + std::string(rel.Type()) + "`";
+      if (rel.Properties().size() == 0) {
+        auto record = record_factory.NewRecord();
+        ProcessPropertiesRel<std::string>(record, type, "", "", false);
+        continue;
+      }
+
+      for (auto &[key, prop] : rel.Properties()) {
+        auto property_type = mgp::List();
+        auto record = record_factory.NewRecord();
+        property_type.AppendExtend(mgp::Value(TypeOf(prop.Type())));
+        ProcessPropertiesRel<mgp::List>(record, type, key, property_type, true);
+      }
+    }
+
+  } catch (const std::exception &e) {
+    record_factory.SetErrorMessage(e.what());
+    return;
+  }
+}
+
+extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *memory) {
+  try {
+    mgp::MemoryDispatcherGuard guard{memory};
+    ;
+
+    AddProcedure(Schema::NodeTypeProperties, std::string(Schema::kProcedureNodeType).c_str(), mgp::ProcedureType::Read,
+                 {},
+                 {mgp::Return(std::string(Schema::kReturnNodeType).c_str(), mgp::Type::String),
+                  mgp::Return(std::string(Schema::kReturnLabels).c_str(), {mgp::Type::List, mgp::Type::String}),
+                  mgp::Return(std::string(Schema::kReturnPropertyName).c_str(), mgp::Type::String),
+                  mgp::Return(std::string(Schema::kReturnPropertyType).c_str(), mgp::Type::Any),
+                  mgp::Return(std::string(Schema::kReturnMandatory).c_str(), mgp::Type::Bool)},
+                 module, memory);
+
+    AddProcedure(Schema::RelTypeProperties, std::string(Schema::kProcedureRelType).c_str(), mgp::ProcedureType::Read,
+                 {},
+                 {mgp::Return(std::string(Schema::kReturnRelType).c_str(), mgp::Type::String),
+                  mgp::Return(std::string(Schema::kReturnPropertyName).c_str(), mgp::Type::String),
+                  mgp::Return(std::string(Schema::kReturnPropertyType).c_str(), mgp::Type::Any),
+                  mgp::Return(std::string(Schema::kReturnMandatory).c_str(), mgp::Type::Bool)},
+                 module, memory);
+
+  } catch (const std::exception &e) {
+    return 1;
+  }
+
+  return 0;
+}
+
+extern "C" int mgp_shutdown_module() { return 0; }

release/memgraph.service

@@ -1,12 +1,27 @@
 [Unit]
 Description=Memgraph: High performance, in-memory, transactional graph database
 
+# Auto-restart config
+#StartLimitIntervalSec=300
+#StartLimitBurst=5
+
 [Service]
 User=memgraph
 Group=memgraph
 ExecStart=/usr/lib/memgraph/memgraph
+
 # Uncomment this if Memgraph needs more time to write the snapshot on exit.
 #TimeoutStopSec=5min
 
+# Auto-restart config
+#Restart=on-failure
+#RestartSec=10s
+
 [Install]
 WantedBy=multi-user.target
+
+# Checks processes' memory usage and force kills it when it is taking up enough
+# memory to make the system unstable / about to crash, e.g. on Debian-based OS:
+# apt install systemd-oomd
+# systemctl enable systemd-oomd
+# systemctl start systemd-oomd

release/package/run.sh

@@ -11,6 +11,12 @@ SUPPORTED_OS=(
     amzn-2
 )
 
+SUPPORTED_BUILD_TYPES=(
+    Debug
+    Release
+    RelWithDebInfo
+)
+
 PROJECT_ROOT="$SCRIPT_DIR/../.."
 TOOLCHAIN_VERSION="toolchain-v4"
 ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate"
@@ -18,14 +24,16 @@ HOST_OUTPUT_DIR="$PROJECT_ROOT/build/output"
 
 print_help () {
     # TODO(gitbuda): Update the release/package/run.sh help
-    echo "$0 init|package|docker|test {os} [--for-docker|--for-platform]"
+    echo "$0 init|package|docker|test {os} {build_type} [--for-docker|--for-platform]"
     echo ""
     echo "    OSs: ${SUPPORTED_OS[*]}"
+    echo "    Build types: ${SUPPORTED_BUILD_TYPES[*]}"
     exit 1
 }
 
 make_package () {
     os="$1"
+    build_type="$2"
 
     build_container="mgbuild_$os"
     echo "Building Memgraph for $os on $build_container..."
@@ -44,10 +52,10 @@ make_package () {
         package_command=" cpack -G DEB --config ../CPackConfig.cmake "
     fi
     telemetry_id_override_flag=""
-    if [[ "$#" -gt 1 ]]; then
-        if [[ "$2" == "--for-docker" ]]; then
+    if [[ "$#" -gt 2 ]]; then
+        if [[ "$3" == "--for-docker" ]]; then
             telemetry_id_override_flag=" -DMG_TELEMETRY_ID_OVERRIDE=DOCKER "
-        elif [[ "$2" == "--for-platform" ]]; then
+        elif [[ "$3" == "--for-platform" ]]; then
             telemetry_id_override_flag=" -DMG_TELEMETRY_ID_OVERRIDE=DOCKER-PLATFORM"
         else
           print_help
@@ -89,9 +97,9 @@ make_package () {
     docker exec "$build_container" bash -c "cd $container_build_dir && rm -rf ./*"
     # TODO(gitbuda): cmake fails locally if remote is clone via ssh because of the key -> FIX
     if [[ "$os" =~ "-arm" ]]; then
-        docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release -DMG_ARCH="ARM64" $telemetry_id_override_flag .."
+        docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=$build_type -DMG_ARCH="ARM64" $telemetry_id_override_flag .."
     else
-        docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release $telemetry_id_override_flag .."
+        docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=$build_type $telemetry_id_override_flag .."
     fi
     # ' is used instead of " because we need to run make within the allowed
     # container resources.
@@ -141,20 +149,34 @@ case "$1" in
 
     package)
         shift 1
-        if [[ "$#" -lt 1 ]]; then
+        if [[ "$#" -lt 2 ]]; then
             print_help
         fi
         os="$1"
-        shift 1
+        build_type="$2"
+        shift 2
         is_os_ok=false
         for supported_os in "${SUPPORTED_OS[@]}"; do
             if [[ "$supported_os" == "${os}" ]]; then
                 is_os_ok=true
+                break
             fi
         done
-        if [[ "$is_os_ok" == true ]]; then
-            make_package "$os" "$@"
+        is_build_type_ok=false
+        for supported_build_type in "${SUPPORTED_BUILD_TYPES[@]}"; do
+            if [[ "$supported_build_type" == "${build_type}" ]]; then
+                is_build_type_ok=true
+                break
+            fi
+        done
+        if [[ "$is_os_ok" == true && "$is_build_type_ok" == true ]]; then
+            make_package "$os" "$build_type" "$@"
         else
+            if [[ "$is_os_ok" == false ]]; then
+                echo "Unsupported OS: $os"
+            elif [[ "$is_build_type_ok" == false ]]; then
+                echo "Unsupported build type: $build_type"
+            fi
             print_help
         fi
     ;;

src/CMakeLists.txt

@@ -21,6 +21,7 @@ add_subdirectory(audit)
 add_subdirectory(dbms)
 add_subdirectory(flags)
 add_subdirectory(distributed)
+add_subdirectory(replication)
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
@@ -40,7 +41,7 @@ set(mg_single_node_v2_sources
 add_executable(memgraph ${mg_single_node_v2_sources})
 target_include_directories(memgraph PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(memgraph stdc++fs Threads::Threads
-        mg-telemetry mg-communication mg-memory mg-utils mg-license mg-settings mg-glue mg-flags)
+        mg-telemetry mg-communication mg-communication-metrics mg-memory mg-utils mg-license mg-settings mg-glue mg-flags)
 
 # NOTE: `include/mg_procedure.syms` describes a pattern match for symbols which
 # should be dynamically exported, so that `dlopen` can correctly link the

src/auth/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -21,5 +21,6 @@ namespace memgraph::auth {
 class AuthException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(AuthException)
 };
 }  // namespace memgraph::auth

src/communication/CMakeLists.txt

@@ -16,8 +16,11 @@ set(communication_src_files
 
 find_package(Boost REQUIRED)
 
+add_library(mg-communication-metrics STATIC metrics.cpp)
+target_link_libraries(mg-communication-metrics json)
+
 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 Boost::headers Threads::Threads mg-utils mg-io mg-auth fmt::fmt gflags mg-communication-metrics mg-events)
 
 find_package(OpenSSL REQUIRED)
 target_link_libraries(mg-communication ${OPENSSL_LIBRARIES})

src/communication/bolt/client.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -264,4 +264,5 @@ bool Client::ReadMessageData(Marker marker, Value &ret) {
   }
   return false;
 }
+
 }  // namespace memgraph::communication::bolt

src/communication/bolt/client.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -38,6 +38,7 @@ class FailureResponseException : public utils::BasicException {
       : utils::BasicException{message}, code_{code} {}
 
   const std::string &code() const { return code_; }
+  SPECIALIZE_GET_EXCEPTION_NAME(FailureResponseException)
 
  private:
   std::string code_;
@@ -49,6 +50,7 @@ class FailureResponseException : public utils::BasicException {
 class ClientQueryException : public FailureResponseException {
  public:
   using FailureResponseException::FailureResponseException;
+  SPECIALIZE_GET_EXCEPTION_NAME(ClientQueryException)
 };
 
 /// This exception is thrown whenever a fatal error occurs during query
@@ -57,6 +59,7 @@ class ClientQueryException : public FailureResponseException {
 class ClientFatalException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(ClientFatalException)
 };
 
 // Internal exception used whenever a communication error occurs. You should
@@ -64,6 +67,7 @@ class ClientFatalException : public utils::BasicException {
 class ServerCommunicationException : public ClientFatalException {
  public:
   ServerCommunicationException() : ClientFatalException("Couldn't communicate with the server!") {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ServerCommunicationException)
 };
 
 // Internal exception used whenever a malformed data error occurs. You should
@@ -71,6 +75,7 @@ class ServerCommunicationException : public ClientFatalException {
 class ServerMalformedDataException : public ClientFatalException {
  public:
   ServerMalformedDataException() : ClientFatalException("The server sent malformed data!") {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ServerMalformedDataException)
 };
 
 /// Structure that is used to return results from an executed query.
@@ -155,4 +160,5 @@ class Client final {
   ChunkedEncoderBuffer<communication::ClientOutputStream> encoder_buffer_{output_stream_};
   ClientEncoder encoder_{encoder_buffer_};
 };
+
 }  // namespace memgraph::communication::bolt

src/communication/bolt/metrics.hpp

@@ -0,0 +1,55 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+#pragma once
+
+#include "communication/bolt/v1/value.hpp"
+#include "communication/metrics.hpp"
+
+namespace memgraph::communication::bolt {
+
+template <typename TSession>
+inline void RegisterNewSession(TSession &session, Value &metadata) {
+  auto &data = metadata.ValueMap();
+  session.metrics_ = bolt_metrics.Add(data.contains("user_agent") ? data["user_agent"].ValueString() : "unknown",
+                                      fmt::format("{}.{}", session.version_.major, session.version_.minor),
+                                      session.client_supported_bolt_versions_);
+  ++session.metrics_.value()->sessions;
+  auto conn_type = (!data.contains("scheme") || data["scheme"].ValueString() == "none")
+                       ? BoltMetrics::ConnectionType::kAnonymous
+                       : BoltMetrics::ConnectionType::kBasic;
+  ++session.metrics_.value()->connection_types[(int)conn_type];
+}
+
+template <typename TSession>
+inline void TouchNewSession(TSession &session, Value &metadata) {
+  auto &data = metadata.ValueMap();
+  session.metrics_ = bolt_metrics.Add(data.contains("user_agent") ? data["user_agent"].ValueString() : "unknown");
+}
+
+template <typename TSession>
+inline void UpdateNewSession(TSession &session, Value &metadata) {
+  auto &data = metadata.ValueMap();
+  session.metrics_.value()->bolt_v = fmt::format("{}.{}", session.version_.major, session.version_.minor);
+  session.metrics_.value()->supported_bolt_v = session.client_supported_bolt_versions_;
+  ++session.metrics_.value()->sessions;
+  auto conn_type = (!data.contains("scheme") || data["scheme"].ValueString() == "none")
+                       ? BoltMetrics::ConnectionType::kAnonymous
+                       : BoltMetrics::ConnectionType::kBasic;
+  ++session.metrics_.value()->connection_types[(int)conn_type];
+}
+
+template <typename TSession>
+inline void IncrementQueryMetrics(TSession &session) {
+  ++session.metrics_.value()->queries;
+}
+
+}  // namespace memgraph::communication::bolt

src/communication/bolt/v1/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -30,6 +30,7 @@ namespace memgraph::communication::bolt {
 class ClientError : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(ClientError)
 };
 
 /**
@@ -67,6 +68,7 @@ class VerboseError : public utils::BasicException {
         code_(fmt::format("Memgraph.{}.{}.{}", ClassificationToString(classification), category, title)) {}
 
   const std::string &code() const noexcept { return code_; }
+  SPECIALIZE_GET_EXCEPTION_NAME(VerboseError)
 
  private:
   std::string ClassificationToString(Classification classification) {

src/communication/bolt/v1/session.hpp

@@ -27,6 +27,7 @@
 #include "communication/bolt/v1/states/handshake.hpp"
 #include "communication/bolt/v1/states/init.hpp"
 #include "communication/bolt/v1/value.hpp"
+#include "communication/metrics.hpp"
 #include "dbms/constants.hpp"
 #include "dbms/global.hpp"
 #include "utils/exceptions.hpp"
@@ -43,6 +44,7 @@ namespace memgraph::communication::bolt {
 class SessionException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(SessionException)
 };
 
 /**
@@ -207,6 +209,8 @@ class Session {
   };
 
   Version version_;
+  std::vector<std::string> client_supported_bolt_versions_;
+  std::optional<BoltMetrics::Metrics> metrics_;
 
   virtual std::string GetCurrentDB() const = 0;
   std::string UUID() const { return session_uuid_; }

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

@@ -18,6 +18,7 @@
 #include <string_view>
 #include <vector>
 
+#include "communication/bolt/metrics.hpp"
 #include "communication/bolt/v1/codes.hpp"
 #include "communication/bolt/v1/constants.hpp"
 #include "communication/bolt/v1/exceptions.hpp"
@@ -210,6 +211,9 @@ State HandleRunV1(TSession &session, const State state, const Marker marker) {
 
   spdlog::debug("[Run - {}] '{}'", session.GetCurrentDB(), query.ValueString());
 
+  // Increment number of queries in the metrics
+  IncrementQueryMetrics(session);
+
   try {
     // Interpret can throw.
     const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap(), {});
@@ -274,6 +278,9 @@ State HandleRunV4(TSession &session, const State state, const Marker marker) {
 
   spdlog::debug("[Run - {}] '{}'", session.GetCurrentDB(), query.ValueString());
 
+  // Increment number of queries in the metrics
+  IncrementQueryMetrics(session);
+
   try {
     // Interpret can throw.
     const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap(), extra.ValueMap());

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

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -24,6 +24,31 @@
 
 namespace memgraph::communication::bolt {
 
+inline std::vector<std::string> StringifySupportedVersions(uint8_t *data) {
+  std::vector<std::string> res;
+  uint8_t range_i = 1;
+  uint8_t minor_i = 2;
+  uint8_t major_i = 3;
+  uint8_t chunk_size = 4;
+  uint8_t n_chunks = 4;
+  auto stringify_version = [](uint8_t major, uint8_t minor) { return fmt::format("{}.{}", major, minor); };
+  for (uint8_t i = 0; i < n_chunks; ++i) {
+    const uint32_t full_version = *((uint32_t *)data);
+    if (full_version == 0) break;
+    if (data[1] != 0) {  // Supports a range of versions
+      uint8_t range = data[range_i];
+      auto max_minor = data[minor_i];
+      for (uint8_t r = 0; r <= range; ++r) {
+        res.push_back(stringify_version(data[major_i], max_minor - r));
+      }
+    } else {
+      res.push_back(stringify_version(data[major_i], data[minor_i]));
+    }
+    data += chunk_size;
+  }
+  return res;
+}
+
 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)) {
@@ -71,6 +96,8 @@ State StateHandshakeRun(TSession &session) {
   auto dataPosition = session.input_stream_.data() + sizeof(kPreamble);
   uint8_t protocol[4] = {0x00};
 
+  session.client_supported_bolt_versions_ = std::move(StringifySupportedVersions(dataPosition));
+
   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

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

@@ -11,6 +11,7 @@
 
 #pragma once
 
+#include <fmt/core.h>
 #include <fmt/format.h>
 #include <optional>
 
@@ -18,6 +19,7 @@
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/value.hpp"
 #include "communication/exceptions.hpp"
+#include "communication/metrics.hpp"
 #include "spdlog/spdlog.h"
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
@@ -201,6 +203,9 @@ State StateInitRunV1(TSession &session, const Marker marker, const Signature sig
     return result.value();
   }
 
+  // Register session to metrics
+  RegisterNewSession(session, *maybeMetadata);
+
   return SendSuccessMessage(session);
 }
 
@@ -227,6 +232,9 @@ State StateInitRunV4(TSession &session, Marker marker, Signature signature) {
     return result.value();
   }
 
+  // Register session to metrics
+  RegisterNewSession(session, *maybeMetadata);
+
   return SendSuccessMessage(session);
 }
 
@@ -247,6 +255,10 @@ State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
     if (SendSuccessMessage(session) == State::Close) {
       return State::Close;
     }
+
+    // Register session to metrics
+    TouchNewSession(session, *maybeMetadata);
+
     // Stay in Init
     return State::Init;
   }
@@ -274,6 +286,10 @@ State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
     if (SendSuccessMessage(session) == State::Close) {
       return State::Close;
     }
+
+    // Register session to metrics
+    UpdateNewSession(session, *maybeMetadata);
+
     return State::Idle;
   }
 

src/communication/bolt/v1/value.hpp

@@ -276,6 +276,7 @@ class ValueException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
   ValueException() : BasicException("Incompatible template param and type!") {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ValueException)
 };
 
 /**

src/communication/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -21,5 +21,6 @@ namespace memgraph::communication {
  */
 class SessionClosedException : public utils::BasicException {
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(SessionClosedException)
 };
 }  // namespace memgraph::communication

src/communication/metrics.cpp

@@ -0,0 +1,42 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+#include "metrics.hpp"
+
+namespace {
+constexpr auto kName = "name";
+constexpr auto kSupportedBoltVersions = "supported_bolt_versions";
+constexpr auto kBoltVersion = "bolt_version";
+constexpr auto kConnectionTypes = "connection_types";
+constexpr auto kSessions = "sessions";
+constexpr auto kQueries = "queries";
+}  // namespace
+namespace memgraph::communication {
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+BoltMetrics bolt_metrics;
+
+nlohmann::json BoltMetrics::Info::ToJson() const {
+  nlohmann::json res;
+
+  res[kName] = name;
+  res[kSupportedBoltVersions] = nlohmann::json::array();
+  for (const auto &sbv : supported_bolt_v) {
+    res[kSupportedBoltVersions].push_back(sbv);
+  }
+  res[kBoltVersion] = bolt_v;
+  res[kConnectionTypes] = {{ConnectionTypeStr((ConnectionType)0), connection_types[0].load()},
+                           {ConnectionTypeStr((ConnectionType)1), connection_types[1].load()}};
+  res[kSessions] = sessions.load();
+  res[kQueries] = queries.load();
+  return res;
+}
+}  // namespace memgraph::communication

src/communication/metrics.hpp

@@ -0,0 +1,116 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+#pragma once
+
+#include <atomic>
+#include <map>
+#include <mutex>
+#include <shared_mutex>
+#include <string>
+#include <vector>
+
+#include <json/json.hpp>
+
+namespace memgraph::communication {
+
+class BoltMetrics {
+ public:
+  enum class ConnectionType { kAnonymous = 0, kBasic, Count };
+  static constexpr std::array<std::string_view, (int)ConnectionType::Count> ct_to_str = {"anonymous", "basic"};
+  static std::string ConnectionTypeStr(ConnectionType type) { return std::string(ct_to_str[(int)type]); }
+  class Metrics;
+
+  struct Info {
+    explicit Info(std::string name) : name(std::move(name)) {}
+    Info(std::string name, std::string bolt_v, std::vector<std::string> supported_bolt_v)
+        : name(std::move(name)), bolt_v(std::move(bolt_v)), supported_bolt_v(std::move(supported_bolt_v)) {}
+
+    const std::string name;                                        //!< Driver name
+    std::string bolt_v;                                            //!< Bolt version used
+    std::vector<std::string> supported_bolt_v;                     //!< Bolt versions supported by the driver
+    std::atomic_int connection_types[(int)ConnectionType::Count];  //!< Authentication used when connecting
+    std::atomic_int sessions;                                      //!< Number of sessions using the same driver
+    std::atomic_int queries;                                       //!< Queries executed by the driver
+
+    nlohmann::json ToJson() const;
+
+   private:
+    friend class Metrics;
+    std::atomic_int concurrent_users;
+  };
+
+  class Metrics {
+    friend class BoltMetrics;
+    explicit Metrics(Info &info) : info_(&info) { ++info_->concurrent_users; }
+
+   public:
+    ~Metrics() {
+      if (info_) --info_->concurrent_users;
+    }
+
+    Metrics(const Metrics &other) : info_(other.info_) { ++info_->concurrent_users; }
+    Metrics(Metrics &&other) noexcept : info_(other.info_) { other.info_ = nullptr; }
+    Metrics &operator=(const Metrics &other) {
+      if (this != &other) {
+        if (info_) --info_->concurrent_users;
+        info_ = other.info_;
+        if (info_) ++info_->concurrent_users;
+      }
+      return *this;
+    }
+    Metrics &operator=(Metrics &&other) noexcept {
+      if (this != &other) {
+        if (info_) --info_->concurrent_users;
+        info_ = other.info_;
+        other.info_ = nullptr;  // Invalidate the source object
+      }
+      return *this;
+    }
+
+    Info *operator->() { return info_; }
+
+    Info *info_;
+  };
+
+  Metrics Add(std::string name) {
+    std::unique_lock<std::mutex> l(mtx);
+    auto key = name;
+    auto [it, _] = info.emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)),
+                                std::forward_as_tuple(std::move(name)));
+    return Metrics(it->second);
+  }
+
+  Metrics Add(std::string name, std::string bolt_v, std::vector<std::string> supported_bolt_v) {
+    std::unique_lock<std::mutex> l(mtx);
+    auto key = name;
+    auto [it, _] = info.emplace(std::piecewise_construct, std::forward_as_tuple(std::move(key)),
+                                std::forward_as_tuple(std::move(name), std::move(bolt_v), std::move(supported_bolt_v)));
+    return Metrics(it->second);
+  }
+
+  nlohmann::json ToJson() {
+    std::unique_lock<std::mutex> l(mtx);
+    auto res = nlohmann::json::array();
+    for (const auto &[_, client_info] : info) {
+      res.push_back(client_info.ToJson());
+    }
+    return res;
+  }
+
+ private:
+  mutable std::mutex mtx;
+  std::map<std::string, Info> info;
+};
+
+extern BoltMetrics bolt_metrics;
+
+}  // namespace memgraph::communication

src/communication/websocket/session.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -175,6 +175,11 @@ void Session::OnRead(const boost::beast::error_code ec, const size_t /*bytes_tra
     return;
   }
 
+  if (ec) {
+    LogError(ec, "read");
+    return;
+  }
+
   if (!IsAuthenticated()) {
     auto response = nlohmann::json();
     auto auth_failed = [this, &response](const std::string &message) {

src/communication/websocket/session.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source

src/csv/include/csv/parsing.hpp

@@ -35,6 +35,7 @@ namespace memgraph::csv {
 
 class CsvReadException : public utils::BasicException {
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(CsvReadException)
 };
 
 class FileCsvSource {

src/dbms/database.hpp

@@ -27,6 +27,14 @@
 
 namespace memgraph::dbms {
 
+struct DatabaseInfo {
+  storage::StorageInfo storage_info;
+  uint64_t triggers;
+  uint64_t streams;
+};
+
+static inline nlohmann::json ToJson(const DatabaseInfo &info) { return ToJson(info.storage_info); }
+
 /**
  * @brief Class containing everything associated with a single Database
  *
@@ -89,9 +97,16 @@ class Database {
   /**
    * @brief Get the storage info
    *
-   * @return storage::StorageInfo
+   * @param force_directory Use the configured directory, do not try to decipher the multi-db version
+   * @return DatabaseInfo
    */
-  storage::StorageInfo GetInfo() const { return storage_->GetInfo(); }
+  DatabaseInfo GetInfo(bool force_directory = false) const {
+    DatabaseInfo info;
+    info.storage_info = storage_->GetInfo(force_directory);
+    info.triggers = trigger_store_.GetTriggerInfo().size();
+    info.streams = streams_.GetStreamInfo().size();
+    return info;
+  }
 
   /**
    * @brief Switch storage to OnDisk

src/dbms/dbms_handler.hpp

@@ -25,6 +25,7 @@
 
 #include "auth/auth.hpp"
 #include "constants.hpp"
+#include "dbms/database.hpp"
 #include "dbms/database_handler.hpp"
 #include "global.hpp"
 #include "query/config.hpp"
@@ -32,6 +33,7 @@
 #include "spdlog/spdlog.h"
 #include "storage/v2/durability/durability.hpp"
 #include "storage/v2/durability/paths.hpp"
+#include "storage/v2/isolation_level.hpp"
 #include "utils/exceptions.hpp"
 #include "utils/file.hpp"
 #include "utils/logging.hpp"
@@ -42,6 +44,43 @@
 
 namespace memgraph::dbms {
 
+struct Statistics {
+  uint64_t num_vertex;           //!< Sum of vertexes in every database
+  uint64_t num_edges;            //!< Sum of edges in every database
+  uint64_t triggers;             //!< Sum of triggers in every database
+  uint64_t streams;              //!< Sum of streams in every database
+  uint64_t users;                //!< Number of defined users
+  uint64_t num_databases;        //!< Number of isolated databases
+  uint64_t indices;              //!< Sum of indices in every database
+  uint64_t constraints;          //!< Sum of constraints in every database
+  uint64_t storage_modes[3];     //!< Number of databases in each storage mode [IN_MEM_TX, IN_MEM_ANA, ON_DISK_TX]
+  uint64_t isolation_levels[3];  //!< Number of databases in each isolation level [SNAPSHOT, READ_COMM, READ_UNC]
+  uint64_t snapshot_enabled;     //!< Number of databases with snapshots enabled
+  uint64_t wal_enabled;          //!< Number of databases with WAL enabled
+};
+
+static inline nlohmann::json ToJson(const Statistics &stats) {
+  nlohmann::json res;
+
+  res["edges"] = stats.num_edges;
+  res["vertices"] = stats.num_vertex;
+  res["triggers"] = stats.triggers;
+  res["streams"] = stats.streams;
+  res["users"] = stats.users;
+  res["databases"] = stats.num_databases;
+  res["indices"] = stats.indices;
+  res["constraints"] = stats.constraints;
+  res["storage_modes"] = {{storage::StorageModeToString((storage::StorageMode)0), stats.storage_modes[0]},
+                          {storage::StorageModeToString((storage::StorageMode)1), stats.storage_modes[1]},
+                          {storage::StorageModeToString((storage::StorageMode)2), stats.storage_modes[2]}};
+  res["isolation_levels"] = {{storage::IsolationLevelToString((storage::IsolationLevel)0), stats.isolation_levels[0]},
+                             {storage::IsolationLevelToString((storage::IsolationLevel)1), stats.isolation_levels[1]},
+                             {storage::IsolationLevelToString((storage::IsolationLevel)2), stats.isolation_levels[2]}};
+  res["durability"] = {{"snapshot_enabled", stats.snapshot_enabled}, {"WAL_enabled", stats.wal_enabled}};
+
+  return res;
+}
+
 #ifdef MG_ENTERPRISE
 
 using DeleteResult = utils::BasicResult<DeleteError>;
@@ -54,12 +93,6 @@ class DbmsHandler {
   using LockT = utils::RWLock;
   using NewResultT = utils::BasicResult<NewError, DatabaseAccess>;
 
-  struct Statistics {
-    uint64_t num_vertex;     //!< Sum of vertexes in every database
-    uint64_t num_edges;      //!< Sum of edges in every database
-    uint64_t num_databases;  //! number of isolated databases
-  };
-
   /**
    * @brief Initialize the handler.
    *
@@ -180,25 +213,51 @@ class DbmsHandler {
   }
 
   /**
-   * @brief Return the number of vertex across all databases.
+   * @brief Return the statistics all databases.
    *
-   * @return uint64_t
+   * @return Statistics
    */
-  Statistics Info() {
+  Statistics Stats() {
+    Statistics stats{};
     // TODO: Handle overflow?
-    uint64_t nv = 0;
-    uint64_t ne = 0;
     std::shared_lock<LockT> rd(lock_);
-    const uint64_t ndb = std::distance(db_handler_.cbegin(), db_handler_.cend());
     for (auto &[_, db_gk] : db_handler_) {
       auto db_acc_opt = db_gk.access();
       if (!db_acc_opt) continue;
       auto &db_acc = *db_acc_opt;
       const auto &info = db_acc->GetInfo();
-      nv += info.vertex_count;
-      ne += info.edge_count;
+      const auto &storage_info = info.storage_info;
+      stats.num_vertex += storage_info.vertex_count;
+      stats.num_edges += storage_info.edge_count;
+      stats.triggers += info.triggers;
+      stats.streams += info.streams;
+      ++stats.num_databases;
+      stats.indices += storage_info.label_indices + storage_info.label_property_indices;
+      stats.constraints += storage_info.existence_constraints + storage_info.unique_constraints;
+      ++stats.storage_modes[(int)storage_info.storage_mode];
+      ++stats.isolation_levels[(int)storage_info.isolation_level];
+      stats.snapshot_enabled += storage_info.durability_snapshot_enabled;
+      stats.wal_enabled += storage_info.durability_wal_enabled;
     }
-    return {nv, ne, ndb};
+    return stats;
+  }
+
+  /**
+   * @brief Return a vector with all database info.
+   *
+   * @return std::vector<DatabaseInfo>
+   */
+  std::vector<DatabaseInfo> Info() {
+    std::vector<DatabaseInfo> res;
+    res.reserve(std::distance(db_handler_.cbegin(), db_handler_.cend()));
+    std::shared_lock<LockT> rd(lock_);
+    for (auto &[_, db_gk] : db_handler_) {
+      auto db_acc_opt = db_gk.access();
+      if (!db_acc_opt) continue;
+      auto &db_acc = *db_acc_opt;
+      res.push_back(db_acc->GetInfo());
+    }
+    return res;
   }
 
   /**

src/dbms/global.hpp

@@ -48,6 +48,7 @@ enum class SetForResult : uint8_t {
 class UnknownSessionException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(UnknownSessionException)
 };
 
 /**
@@ -58,6 +59,7 @@ class UnknownSessionException : public utils::BasicException {
 class UnknownDatabaseException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(UnknownDatabaseException)
 };
 
 }  // namespace memgraph::dbms

src/flags/CMakeLists.txt

@@ -5,6 +5,7 @@ add_library(mg-flags STATIC audit.cpp
                             log_level.cpp
                             memory_limit.cpp
                             run_time_configurable.cpp
-                            storage_mode.cpp)
+                            storage_mode.cpp
+                            query.cpp)
 target_include_directories(mg-flags PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(mg-flags PUBLIC spdlog::spdlog mg-settings mg-utils)

src/flags/all.hpp

@@ -16,5 +16,6 @@
 #include "flags/isolation_level.hpp"
 #include "flags/log_level.hpp"
 #include "flags/memory_limit.hpp"
+#include "flags/query.hpp"
 #include "flags/run_time_configurable.hpp"
 #include "flags/storage_mode.hpp"

src/flags/bolt.cpp

@@ -36,7 +36,3 @@ DEFINE_VALIDATED_int32(bolt_session_inactivity_timeout, 1800,
 DEFINE_string(bolt_cert_file, "", "Certificate file which should be used for the Bolt server.");
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_string(bolt_key_file, "", "Key file which should be used for the Bolt server.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(bolt_server_name_for_init, "",
-              "Server name which the database should send to the client in the "
-              "Bolt INIT message.");

src/flags/bolt.hpp

@@ -26,4 +26,4 @@ DECLARE_string(bolt_cert_file);
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DECLARE_string(bolt_key_file);
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(bolt_server_name_for_init);
+// DECLARE_string(bolt_server_name_for_init); Moved to run_time_configurable

src/flags/general.cpp

@@ -145,11 +145,6 @@ DEFINE_string(pulsar_service_url, "", "Default URL used while connecting to Puls
 
 // Query flags.
 
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_double(query_execution_timeout_sec, -1,
-              "Maximum allowed query execution time. Queries exceeding this "
-              "limit will be aborted. Value of 0 means no limit.");
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_uint64(replication_replica_check_frequency_sec, 1,
               "The time duration between two replica checks/pings. If < 1, replicas will NOT be checked at all. NOTE: "

src/flags/general.hpp

@@ -100,7 +100,7 @@ DECLARE_string(pulsar_service_url);
 // Query flags.
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_double(query_execution_timeout_sec);
+// DECLARE_double(query_execution_timeout_sec); Moved to run_time_configurable
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DECLARE_string(query_modules_directory);
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)

src/flags/log_level.cpp

@@ -26,7 +26,6 @@ using namespace std::string_view_literals;
 
 // Logging flags
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_bool(also_log_to_stderr, false, "Log messages go to stderr in addition to logfiles");
 DEFINE_string(log_file, "", "Path to where the log should be stored.");
 
 inline constexpr std::array log_level_mappings{
@@ -34,11 +33,8 @@ inline constexpr std::array log_level_mappings{
     std::pair{"INFO"sv, spdlog::level::info},   std::pair{"WARNING"sv, spdlog::level::warn},
     std::pair{"ERROR"sv, spdlog::level::err},   std::pair{"CRITICAL"sv, spdlog::level::critical}};
 
-const std::string log_level_help_string = fmt::format("Minimum log level. Allowed values: {}",
-                                                      memgraph::utils::GetAllowedEnumValuesString(log_level_mappings));
-
-DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(),
-                        { return memgraph::flags::ValidLogLevel(value); });
+const std::string memgraph::flags::log_level_help_string = fmt::format(
+    "Minimum log level. Allowed values: {}", memgraph::utils::GetAllowedEnumValuesString(log_level_mappings));
 
 bool memgraph::flags::ValidLogLevel(std::string_view value) {
   if (const auto result = memgraph::utils::IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
@@ -65,7 +61,9 @@ std::optional<spdlog::level::level_enum> memgraph::flags::LogLevelToEnum(std::st
 }
 
 spdlog::level::level_enum ParseLogLevel() {
-  const auto log_level = memgraph::flags::LogLevelToEnum(FLAGS_log_level);
+  std::string ll;
+  gflags::GetCommandLineOption("log_level", &ll);
+  const auto log_level = memgraph::flags::LogLevelToEnum(ll);
   MG_ASSERT(log_level, "Invalid log level");
   return *log_level;
 }
@@ -77,10 +75,6 @@ void CreateLoggerFromSink(const auto &sinks, const auto log_level) {
   logger->set_level(log_level);
   logger->flush_on(spdlog::level::trace);
   spdlog::set_default_logger(std::move(logger));
-  // Enable stderr sink
-  if (FLAGS_also_log_to_stderr) {
-    memgraph::flags::LogToStderr(log_level);
-  }
 }
 
 void memgraph::flags::InitializeLogger() {
@@ -117,6 +111,14 @@ void memgraph::flags::AddLoggerSink(spdlog::sink_ptr new_sink) {
 // NOTE: default_logger is not thread-safe and shouldn't be changed during application lifetime
 void memgraph::flags::LogToStderr(spdlog::level::level_enum log_level) {
   auto default_logger = spdlog::default_logger();
-  auto sink = default_logger->sinks().front();
-  sink->set_level(log_level);
+  auto stderr = default_logger->sinks().front();
+  stderr->set_level(log_level);
+}
+
+void memgraph::flags::UpdateStderr(spdlog::level::level_enum log_level) {
+  auto default_logger = spdlog::default_logger();
+  auto stderr = default_logger->sinks().front();
+  if (stderr->level() != spdlog::level::off) {
+    stderr->set_level(log_level);
+  }
 }

src/flags/log_level.hpp

@@ -14,16 +14,19 @@
 #include <optional>
 #include "gflags/gflags.h"
 
-DECLARE_string(log_level);
-DECLARE_bool(also_log_to_stderr);
+// DECLARE_string(log_level); Moved to run_time_configurable
+// DECLARE_bool(also_log_to_stderr); Moved to run_time_configurable
 
 namespace memgraph::flags {
 
+extern const std::string log_level_help_string;
+
 bool ValidLogLevel(std::string_view value);
 std::optional<spdlog::level::level_enum> LogLevelToEnum(std::string_view value);
 
 void InitializeLogger();
 void AddLoggerSink(spdlog::sink_ptr new_sink);
 void LogToStderr(spdlog::level::level_enum log_level);
+void UpdateStderr(spdlog::level::level_enum log_level);
 
 }  // namespace memgraph::flags

src/flags/query.cpp

@@ -0,0 +1,14 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+#include "flags/query.hpp"
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+// DEFINE_bool(cartesian_product_enabled, true, "Enable cartesian product expansion.");  Moved to run_time_configurable

src/flags/query.hpp

@@ -0,0 +1,16 @@
+// Copyright 2023 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+#pragma once
+
+#include "gflags/gflags.h"
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+// DECLARE_bool(cartesian_product_enabled);  Moved to run_time_configurable

src/flags/run_time_configurable.cpp

@@ -10,102 +10,193 @@
 // licenses/APL.txt.
 
 #include "flags/run_time_configurable.hpp"
+
 #include <string>
+#include <tuple>
+
+#include "gflags/gflags.h"
+
 #include "flags/bolt.hpp"
 #include "flags/general.hpp"
 #include "flags/log_level.hpp"
+#include "flags/query.hpp"
 #include "spdlog/cfg/helpers-inl.h"
 #include "spdlog/spdlog.h"
 #include "utils/exceptions.hpp"
+#include "utils/flag_validation.hpp"
 #include "utils/settings.hpp"
 #include "utils/string.hpp"
 
+/*
+ * Setup GFlags
+ */
+
+// Bolt server flags.
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+DEFINE_string(bolt_server_name_for_init, "Neo4j/v5.11.0 compatible graph database server - Memgraph",
+              "Server name which the database should send to the client in the "
+              "Bolt INIT message.");
+
+// Logging flags
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+DEFINE_HIDDEN_bool(also_log_to_stderr, false, "Log messages go to stderr in addition to logfiles");
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables, misc-unused-parameters)
+DEFINE_VALIDATED_string(log_level, "WARNING", memgraph::flags::log_level_help_string.c_str(),
+                        { return memgraph::flags::ValidLogLevel(value); });
+
+// Query flags
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+DEFINE_double(query_execution_timeout_sec, 600,
+              "Maximum allowed query execution time. Queries exceeding this "
+              "limit will be aborted. Value of 0 means no limit.");
+
+// Query plan flags
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+DEFINE_bool(cartesian_product_enabled, true, "Enable cartesian product expansion.");
+
 namespace {
 // Bolt server name
 constexpr auto kServerNameSettingKey = "server.name";
-constexpr auto kDefaultServerName = "Neo4j/v5.11.0 compatible graph database server - Memgraph";
+constexpr auto kServerNameGFlagsKey = "bolt_server_name_for_init";
 // Query timeout
 constexpr auto kQueryTxSettingKey = "query.timeout";
-constexpr auto kDefaultQueryTx = "600";  // seconds
+constexpr auto kQueryTxGFlagsKey = "query_execution_timeout_sec";
 // Log level
 // No default value because it is not persistent
 constexpr auto kLogLevelSettingKey = "log.level";
+constexpr auto kLogLevelGFlagsKey = "log_level";
 // Log to stderr
 // No default value because it is not persistent
 constexpr auto kLogToStderrSettingKey = "log.to_stderr";
+constexpr auto kLogToStderrGFlagsKey = "also_log_to_stderr";
+
+constexpr auto kCartesianProductEnabledSettingKey = "cartesian-product-enabled";
+constexpr auto kCartesianProductEnabledGFlagsKey = "cartesian-product-enabled";
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+std::atomic<double> execution_timeout_sec_;  // Local cache-like thing
+
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+std::atomic<bool> cartesian_product_enabled_{true};  // Local cache-like thing
+
+auto ToLLEnum(std::string_view val) {
+  const auto ll_enum = memgraph::flags::LogLevelToEnum(val);
+  if (!ll_enum) {
+    throw memgraph::utils::BasicException("Unsupported log level {}", val);
+  }
+  return *ll_enum;
+}
+
+bool ValidBoolStr(std::string_view in) {
+  const auto lc = memgraph::utils::ToLowerCase(in);
+  return lc == "false" || lc == "true";
+}
+
+auto GenHandler(std::string flag, std::string key) {
+  return [key = std::move(key), flag = std::move(flag)]() -> std::string {
+    const auto &val = memgraph::utils::global_settings.GetValue(key);
+    MG_ASSERT(val, "Failed to read value at '{}' from settings.", key);
+    gflags::SetCommandLineOption(flag.c_str(), val->c_str());
+    return *val;
+  };
+}
+
 }  // namespace
 
 namespace memgraph::flags::run_time {
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-memgraph::utils::Synchronized<std::string, memgraph::utils::SpinLock> bolt_server_name_;
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-std::atomic<double> execution_timeout_sec_;
 
 void Initialize() {
-  // Register bolt server name settings
-  memgraph::utils::global_settings.RegisterSetting(kServerNameSettingKey, kDefaultServerName, [&] {
-    const auto server_name = memgraph::utils::global_settings.GetValue(kServerNameSettingKey);
-    MG_ASSERT(server_name, "Bolt server name is missing from the settings");
-    *(bolt_server_name_.Lock()) = *server_name;
-  });
-  // Update value from read settings
-  const auto &name = memgraph::utils::global_settings.GetValue(kServerNameSettingKey);
-  MG_ASSERT(name, "Failed to read server name from settings.");
-  *(bolt_server_name_.Lock()) = *name;
-  // Override server name if passed via command line argument
-  if (!FLAGS_bolt_server_name_for_init.empty()) {
-    memgraph::utils::global_settings.SetValue(kServerNameSettingKey, FLAGS_bolt_server_name_for_init);
-  }
+  constexpr bool kRestore = true;  //!< run-time flag is persistent between Memgraph restarts
 
-  // Register query timeout
-  memgraph::utils::global_settings.RegisterSetting(kQueryTxSettingKey, kDefaultQueryTx, [&] {
-    const auto query_tx = memgraph::utils::global_settings.GetValue(kQueryTxSettingKey);
-    MG_ASSERT(query_tx, "Query timeout is missing from the settings");
-    execution_timeout_sec_ = std::stod(*query_tx);
-  });
-  // Update value from read settings
-  const auto &tx = memgraph::utils::global_settings.GetValue(kQueryTxSettingKey);
-  MG_ASSERT(tx, "Failed to read query timeout from settings.");
-  execution_timeout_sec_ = std::stod(*tx);
-  // Override query timeout if passed via command line argument
-  if (FLAGS_query_execution_timeout_sec != -1) {
-    memgraph::utils::global_settings.SetValue(kQueryTxSettingKey, std::to_string(FLAGS_query_execution_timeout_sec));
-  }
+  /**
+   * @brief Helper function that registers a run-time flag
+   *
+   * @param flag - GFlag name
+   * @param key - Settings key used to store the flag
+   * @param restore - true if the flag is persistent between restarts
+   * @param post_update - user defined callback executed post flag update
+   * @param validator - user defined value correctness checker
+   */
+  auto register_flag = [&](
+                           const std::string &flag, const std::string &key, bool restore,
+                           std::function<void(const std::string &)> post_update = [](auto) {},
+                           std::function<bool(std::string_view)> validator = [](std::string_view) { return true; }) {
+    // Get flag info
+    gflags::CommandLineFlagInfo info;
+    gflags::GetCommandLineFlagInfo(flag.c_str(), &info);
+    // Register setting
+    auto update = GenHandler(flag, key);
+    memgraph::utils::global_settings.RegisterSetting(
+        key, info.default_value,
+        [update, post_update = std::move(post_update)] {
+          const auto &val = update();
+          post_update(val);
+        },
+        validator);
 
-  // Register log level
-  auto get_global_log_level = []() {
-    const auto log_level = memgraph::utils::global_settings.GetValue(kLogLevelSettingKey);
-    MG_ASSERT(log_level, "Log level is missing from the settings");
-    const auto ll_enum = memgraph::flags::LogLevelToEnum(*log_level);
-    if (!ll_enum) {
-      throw utils::BasicException("Unsupported log level {}", *log_level);
+    if (restore && info.is_default) {
+      // No input from the user, restore persistent value from settings
+      update();
+    } else {
+      // Override with current value - user defined a new value or the run-time flag is not persistent between starts
+      memgraph::utils::global_settings.SetValue(key, info.current_value);
     }
-    return *ll_enum;
   };
-  memgraph::utils::global_settings.RegisterSetting(
-      kLogLevelSettingKey, FLAGS_log_level, [&] { spdlog::set_level(get_global_log_level()); },
-      memgraph::flags::ValidLogLevel);
-  // Always override log level with command line argument
-  memgraph::utils::global_settings.SetValue(kLogLevelSettingKey, FLAGS_log_level);
 
-  // Register logging to stderr
-  auto bool_to_str = [](bool in) { return in ? "true" : "false"; };
-  const std::string log_to_stderr_s = bool_to_str(FLAGS_also_log_to_stderr);
-  memgraph::utils::global_settings.RegisterSetting(
-      kLogToStderrSettingKey, log_to_stderr_s,
-      [&] {
-        const auto enable = memgraph::utils::global_settings.GetValue(kLogToStderrSettingKey);
-        if (enable == "true") {
-          LogToStderr(get_global_log_level());
+  /*
+   * Register bolt server name settings
+   */
+  register_flag(kServerNameGFlagsKey, kServerNameSettingKey, kRestore);
+
+  /*
+   * Register query timeout
+   */
+  register_flag(kQueryTxGFlagsKey, kQueryTxSettingKey, !kRestore, [&](const std::string &val) {
+    execution_timeout_sec_ = std::stod(val);  // Cache for faster reads
+  });
+
+  /*
+   * Register log level
+   */
+  register_flag(
+      kLogLevelGFlagsKey, kLogLevelSettingKey, !kRestore,
+      [](const std::string &val) {
+        const auto ll_enum = ToLLEnum(val);
+        spdlog::set_level(ll_enum);
+        UpdateStderr(ll_enum);  // Updates level if active
+      },
+      memgraph::flags::ValidLogLevel);
+
+  /*
+   * Register logging to stderr
+   */
+  register_flag(
+      kLogToStderrGFlagsKey, kLogToStderrSettingKey, !kRestore,
+      [](const std::string &val) {
+        if (val == "true") {
+          // No need to check if ll_val exists, we got here, so the log_level must exist already
+          const auto &ll_val = memgraph::utils::global_settings.GetValue(kLogLevelSettingKey);
+          LogToStderr(ToLLEnum(*ll_val));
         } else {
           LogToStderr(spdlog::level::off);
         }
       },
-      [](std::string_view in) {
-        const auto lc = memgraph::utils::ToLowerCase(in);
-        return lc == "false" || lc == "true";
-      });
-  // Always override log to stderr with command line argument
-  memgraph::utils::global_settings.SetValue(kLogToStderrSettingKey, log_to_stderr_s);
+      ValidBoolStr);
+
+  register_flag(
+      kCartesianProductEnabledGFlagsKey, kCartesianProductEnabledSettingKey, !kRestore,
+      [](const std::string &val) { cartesian_product_enabled_ = val == "true"; }, ValidBoolStr);
 }
+
+std::string GetServerName() {
+  std::string s;
+  // Thread safe read of gflag
+  gflags::GetCommandLineOption(kServerNameGFlagsKey, &s);
+  return s;
+}
+
+double GetExecutionTimeout() { return execution_timeout_sec_; }
+
+bool GetCartesianProductEnabled() { return cartesian_product_enabled_; }
+
 }  // namespace memgraph::flags::run_time

src/flags/run_time_configurable.hpp

@@ -15,12 +15,31 @@
 
 namespace memgraph::flags::run_time {
 
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-extern utils::Synchronized<std::string, utils::SpinLock> bolt_server_name_;
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-extern std::atomic<double> execution_timeout_sec_;
-
+/**
+ * @brief Initialize the run-time flags (must be done before run-time flags are used).
+ *
+ */
 void Initialize();
 
+/**
+ * @brief Get the bolt server name value
+ *
+ * @return std::string
+ */
+std::string GetServerName();
+
+/**
+ * @brief Get the query execution timeout value
+ *
+ * @return double
+ */
+double GetExecutionTimeout();
+
+/**
+ * @brief Get the cartesian product enabled value
+ *
+ * @return bool
+ */
+bool GetCartesianProductEnabled();
+
 }  // namespace memgraph::flags::run_time

src/glue/CMakeLists.txt

@@ -7,5 +7,5 @@ target_sources(mg-glue PRIVATE auth.cpp
                                ServerT.cpp
                                MonitoringServerT.cpp
                                run_id.cpp)
-target_link_libraries(mg-glue mg-query mg-auth mg-audit)
+target_link_libraries(mg-glue mg-query mg-auth mg-audit mg-flags)
 target_precompile_headers(mg-glue INTERFACE auth_checker.hpp auth_handler.hpp)

src/glue/SessionHL.cpp

@@ -22,6 +22,7 @@
 #include "license/license.hpp"
 #include "query/discard_value_stream.hpp"
 #include "query/interpreter_context.hpp"
+#include "utils/event_map.hpp"
 #include "utils/spin_lock.hpp"
 
 namespace memgraph::metrics {
@@ -121,8 +122,8 @@ std::string SessionHL::GetCurrentDB() const {
 }
 
 std::optional<std::string> SessionHL::GetServerNameForInit() {
-  auto locked_name = flags::run_time::bolt_server_name_.Lock();
-  return locked_name->empty() ? std::nullopt : std::make_optional(*locked_name);
+  const auto &name = flags::run_time::GetServerName();
+  return name.empty() ? std::nullopt : std::make_optional(name);
 }
 
 bool SessionHL::Authenticate(const std::string &username, const std::string &password) {
@@ -155,6 +156,8 @@ std::map<std::string, memgraph::communication::bolt::Value> SessionHL::Discard(s
     memgraph::query::DiscardValueResultStream stream;
     return DecodeSummary(interpreter_.Pull(&stream, n, qid));
   } catch (const memgraph::query::QueryException &e) {
+    // Count the number of specific exceptions thrown
+    metrics::IncrementCounter(GetExceptionName(e));
     // Wrap QueryException into ClientError, because we want to allow the
     // client to fix their query.
     throw memgraph::communication::bolt::ClientError(e.what());
@@ -169,9 +172,16 @@ std::map<std::string, memgraph::communication::bolt::Value> SessionHL::Pull(Sess
     TypedValueResultStream<TEncoder> stream(encoder, db->storage());
     return DecodeSummary(interpreter_.Pull(&stream, n, qid));
   } catch (const memgraph::query::QueryException &e) {
+    // Count the number of specific exceptions thrown
+    metrics::IncrementCounter(GetExceptionName(e));
     // Wrap QueryException into ClientError, because we want to allow the
     // client to fix their query.
     throw memgraph::communication::bolt::ClientError(e.what());
+  } catch (const utils::BasicException &) {
+    // Exceptions inheriting from BasicException will result in a TransientError
+    // i. e. client will be encouraged to retry execution because it
+    // could succeed if executed again.
+    throw;
   }
 }
 
@@ -212,10 +222,14 @@ std::pair<std::vector<std::string>, std::optional<int>> SessionHL::Interpret(
     return {std::move(result.headers), result.qid};
 
   } catch (const memgraph::query::QueryException &e) {
+    // Count the number of specific exceptions thrown
+    metrics::IncrementCounter(GetExceptionName(e));
     // Wrap QueryException into ClientError, because we want to allow the
     // client to fix their query.
     throw memgraph::communication::bolt::ClientError(e.what());
   } catch (const memgraph::query::ReplicationException &e) {
+    // Count the number of specific exceptions thrown
+    metrics::IncrementCounter(GetExceptionName(e));
     throw memgraph::communication::bolt::ClientError(e.what());
   }
 }

src/http_handlers/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(mg_http_handlers_sources)
 
 add_library(mg-http-handlers STATIC ${mg_http_handlers_sources})
-target_link_libraries(mg-http-handlers mg-query mg-storage-v2)
+target_link_libraries(mg-http-handlers mg-query mg-storage-v2 mg-events)

src/http_handlers/metrics.hpp

@@ -57,10 +57,10 @@ class MetricsService {
   }
 
  private:
-  const storage::Storage *db_;
+  storage::Storage *const db_;
 
   MetricsResponse GetMetrics() {
-    auto info = db_->GetInfo();
+    auto info = db_->GetBaseInfo();
 
     return MetricsResponse{.vertex_count = info.vertex_count,
                            .edge_count = info.edge_count,

src/integrations/kafka/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,12 +18,14 @@
 namespace memgraph::integrations::kafka {
 class KafkaStreamException : public utils::BasicException {
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(KafkaStreamException)
 };
 
 class ConsumerFailedToInitializeException : public KafkaStreamException {
  public:
   ConsumerFailedToInitializeException(const std::string_view consumer_name, const std::string_view error)
       : KafkaStreamException("Failed to initialize Kafka consumer {} : {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerFailedToInitializeException)
 };
 
 class SettingCustomConfigFailed : public ConsumerFailedToInitializeException {
@@ -33,47 +35,55 @@ class SettingCustomConfigFailed : public ConsumerFailedToInitializeException {
       : ConsumerFailedToInitializeException(
             consumer_name,
             fmt::format(R"(failed to set custom config ("{}": "{}"), because of error {})", key, value, error)) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(SettingCustomConfigFailed)
 };
 
 class ConsumerRunningException : public KafkaStreamException {
  public:
   explicit ConsumerRunningException(const std::string_view consumer_name)
       : KafkaStreamException("Kafka consumer {} is already running", consumer_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerRunningException)
 };
 
 class ConsumerStoppedException : public KafkaStreamException {
  public:
   explicit ConsumerStoppedException(const std::string_view consumer_name)
       : KafkaStreamException("Kafka consumer {} is already stopped", consumer_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerStoppedException)
 };
 
 class ConsumerCheckFailedException : public KafkaStreamException {
  public:
   explicit ConsumerCheckFailedException(const std::string_view consumer_name, const std::string_view error)
       : KafkaStreamException("Kafka consumer {} check failed: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerCheckFailedException)
 };
 
 class ConsumerStartFailedException : public KafkaStreamException {
  public:
   explicit ConsumerStartFailedException(const std::string_view consumer_name, const std::string_view error)
       : KafkaStreamException("Starting Kafka consumer {} failed: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerStartFailedException)
 };
 
 class TopicNotFoundException : public KafkaStreamException {
  public:
   TopicNotFoundException(const std::string_view consumer_name, const std::string_view topic_name)
       : KafkaStreamException("Kafka consumer {} cannot find topic {}", consumer_name, topic_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(TopicNotFoundException)
 };
 
 class ConsumerCommitFailedException : public KafkaStreamException {
  public:
   ConsumerCommitFailedException(const std::string_view consumer_name, const std::string_view error)
       : KafkaStreamException("Committing offset of consumer {} failed: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerCommitFailedException)
 };
 
 class ConsumerReadMessagesFailedException : public KafkaStreamException {
  public:
   ConsumerReadMessagesFailedException(const std::string_view consumer_name, const std::string_view error)
       : KafkaStreamException("Error happened in consumer {} while fetching messages: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerReadMessagesFailedException)
 };
 }  // namespace memgraph::integrations::kafka

src/integrations/pulsar/exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,53 +18,62 @@
 namespace memgraph::integrations::pulsar {
 class PulsarStreamException : public utils::BasicException {
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(PulsarStreamException)
 };
 
 class ConsumerFailedToInitializeException : public PulsarStreamException {
  public:
   ConsumerFailedToInitializeException(const std::string &consumer_name, const std::string &error)
       : PulsarStreamException("Failed to initialize Pulsar consumer {} : {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerFailedToInitializeException)
 };
 
 class ConsumerRunningException : public PulsarStreamException {
  public:
   explicit ConsumerRunningException(const std::string &consumer_name)
       : PulsarStreamException("Pulsar consumer {} is already running", consumer_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerRunningException)
 };
 
 class ConsumerStoppedException : public PulsarStreamException {
  public:
   explicit ConsumerStoppedException(const std::string &consumer_name)
       : PulsarStreamException("Pulsar consumer {} is already stopped", consumer_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerStoppedException)
 };
 
 class ConsumerCheckFailedException : public PulsarStreamException {
  public:
   explicit ConsumerCheckFailedException(const std::string &consumer_name, const std::string &error)
       : PulsarStreamException("Pulsar consumer {} check failed: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerCheckFailedException)
 };
 
 class ConsumerStartFailedException : public PulsarStreamException {
  public:
   explicit ConsumerStartFailedException(const std::string &consumer_name, const std::string &error)
       : PulsarStreamException("Starting Pulsar consumer {} failed: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerStartFailedException)
 };
 
 class TopicNotFoundException : public PulsarStreamException {
  public:
   TopicNotFoundException(const std::string &consumer_name, const std::string &topic_name)
       : PulsarStreamException("Pulsar consumer {} cannot find topic {}", consumer_name, topic_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(TopicNotFoundException)
 };
 
 class ConsumerReadMessagesFailedException : public PulsarStreamException {
  public:
   ConsumerReadMessagesFailedException(const std::string_view consumer_name, const std::string_view error)
       : PulsarStreamException("Error happened in consumer {} while fetching messages: {}", consumer_name, error) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerReadMessagesFailedException)
 };
 
 class ConsumerAcknowledgeMessagesFailedException : public PulsarStreamException {
  public:
   explicit ConsumerAcknowledgeMessagesFailedException(const std::string_view consumer_name)
       : PulsarStreamException("Acknowledging a message of consumer {} has failed!", consumer_name) {}
+  SPECIALIZE_GET_EXCEPTION_NAME(ConsumerAcknowledgeMessagesFailedException)
 };
 }  // namespace memgraph::integrations::pulsar

src/io/network/endpoint.cpp

@@ -15,6 +15,7 @@
 
 #include <algorithm>
 
+#include "endpoint.hpp"
 #include "io/network/endpoint.hpp"
 #include "io/network/network_error.hpp"
 #include "utils/logging.hpp"
@@ -23,11 +24,11 @@
 
 namespace memgraph::io::network {
 
-Endpoint::IpFamily Endpoint::GetIpFamily(const std::string &ip_address) {
+Endpoint::IpFamily Endpoint::GetIpFamily(const std::string &address) {
   in_addr addr4;
   in6_addr addr6;
-  int ipv4_result = inet_pton(AF_INET, ip_address.c_str(), &addr4);
-  int ipv6_result = inet_pton(AF_INET6, ip_address.c_str(), &addr6);
+  int ipv4_result = inet_pton(AF_INET, address.c_str(), &addr4);
+  int ipv6_result = inet_pton(AF_INET6, address.c_str(), &addr6);
   if (ipv4_result == 1) {
     return IpFamily::IP4;
   } else if (ipv6_result == 1) {
@@ -86,6 +87,44 @@ std::optional<std::pair<std::string, uint16_t>> Endpoint::ParseSocketOrIpAddress
   return std::nullopt;
 }
 
+std::optional<std::pair<std::string, uint16_t>> Endpoint::ParseHostname(
+    const std::string &address, const std::optional<uint16_t> default_port = {}) {
+  const std::string delimiter = ":";
+  std::string ip_address;
+  std::vector<std::string> parts = utils::Split(address, delimiter);
+  if (parts.size() == 1) {
+    if (default_port) {
+      if (!IsResolvableAddress(address, *default_port)) {
+        return std::nullopt;
+      }
+      return std::pair{address, *default_port};
+    }
+  } else if (parts.size() == 2) {
+    int64_t int_port{0};
+    auto hostname = std::move(parts[0]);
+    try {
+      int_port = utils::ParseInt(parts[1]);
+    } catch (utils::BasicException &e) {
+      spdlog::error(utils::MessageWithLink("Invalid port number {}.", parts[1], "https://memgr.ph/ports"));
+      return std::nullopt;
+    }
+    if (int_port < 0) {
+      spdlog::error(utils::MessageWithLink("Invalid port number {}. The port number must be a positive integer.",
+                                           int_port, "https://memgr.ph/ports"));
+      return std::nullopt;
+    }
+    if (int_port > std::numeric_limits<uint16_t>::max()) {
+      spdlog::error(utils::MessageWithLink("Invalid port number. The port number exceedes the maximum possible size.",
+                                           "https://memgr.ph/ports"));
+      return std::nullopt;
+    }
+    if (IsResolvableAddress(hostname, static_cast<uint16_t>(int_port))) {
+      return std::pair{hostname, static_cast<u_int16_t>(int_port)};
+    }
+  }
+  return std::nullopt;
+}
+
 std::string Endpoint::SocketAddress() const {
   auto ip_address = address.empty() ? "EMPTY" : address;
   return ip_address + ":" + std::to_string(port);
@@ -99,6 +138,16 @@ Endpoint::Endpoint(std::string ip_address, uint16_t port) : address(std::move(ip
   family = ip_family;
 }
 
+// NOLINTNEXTLINE
+Endpoint::Endpoint(needs_resolving_t, std::string hostname, uint16_t port) : port(port) {
+  address = ResolveHostnameIntoIpAddress(hostname, port);
+  IpFamily ip_family = GetIpFamily(address);
+  if (ip_family == IpFamily::NONE) {
+    throw NetworkError("Not a valid IPv4 or IPv6 address: {}", address);
+  }
+  family = ip_family;
+}
+
 std::ostream &operator<<(std::ostream &os, const Endpoint &endpoint) {
   // no need to cover the IpFamily::NONE case, as you can't even construct an
   // Endpoint object if the IpFamily is NONE (i.e. the IP address is invalid)
@@ -109,4 +158,65 @@ std::ostream &operator<<(std::ostream &os, const Endpoint &endpoint) {
   return os << endpoint.address << ":" << endpoint.port;
 }
 
+bool Endpoint::IsResolvableAddress(const std::string &address, uint16_t port) {
+  addrinfo hints{
+      .ai_flags = AI_PASSIVE,
+      .ai_family = AF_UNSPEC,     // IPv4 and IPv6
+      .ai_socktype = SOCK_STREAM  // TCP socket
+  };
+  addrinfo *info = nullptr;
+  auto status = getaddrinfo(address.c_str(), std::to_string(port).c_str(), &hints, &info);
+  freeaddrinfo(info);
+  return status == 0;
+}
+
+std::optional<std::pair<std::string, uint16_t>> Endpoint::ParseSocketOrAddress(
+    const std::string &address, const std::optional<uint16_t> default_port = {}) {
+  const std::string delimiter = ":";
+  std::vector<std::string> parts = utils::Split(address, delimiter);
+  if (parts.size() == 1) {
+    if (GetIpFamily(address) == IpFamily::NONE) {
+      return ParseHostname(address, default_port);
+    }
+    return ParseSocketOrIpAddress(address, default_port);
+  }
+  if (parts.size() == 2) {
+    if (GetIpFamily(parts[0]) == IpFamily::NONE) {
+      return ParseHostname(address, default_port);
+    }
+    return ParseSocketOrIpAddress(address, default_port);
+  }
+  return std::nullopt;
+}
+
+std::string Endpoint::ResolveHostnameIntoIpAddress(const std::string &address, uint16_t port) {
+  addrinfo hints{
+      .ai_flags = AI_PASSIVE,
+      .ai_family = AF_UNSPEC,     // IPv4 and IPv6
+      .ai_socktype = SOCK_STREAM  // TCP socket
+  };
+  addrinfo *info = nullptr;
+  auto status = getaddrinfo(address.c_str(), std::to_string(port).c_str(), &hints, &info);
+  if (status != 0) throw NetworkError(gai_strerror(status));
+
+  for (auto *result = info; result != nullptr; result = result->ai_next) {
+    if (result->ai_family == AF_INET) {
+      char ipstr[INET_ADDRSTRLEN];
+      auto *ipv4 = reinterpret_cast<struct sockaddr_in *>(result->ai_addr);
+      inet_ntop(AF_INET, &(ipv4->sin_addr), ipstr, sizeof(ipstr));
+      freeaddrinfo(info);
+      return ipstr;
+    }
+    if (result->ai_family == AF_INET6) {
+      char ipstr[INET6_ADDRSTRLEN];
+      auto *ipv6 = reinterpret_cast<struct sockaddr_in6 *>(result->ai_addr);
+      inet_ntop(AF_INET6, &(ipv6->sin6_addr), ipstr, sizeof(ipstr));
+      freeaddrinfo(info);
+      return ipstr;
+    }
+  }
+  freeaddrinfo(info);
+  throw NetworkError("Not a valid address: {}", address);
+}
+
 }  // namespace memgraph::io::network

src/io/network/endpoint.hpp

@@ -25,8 +25,12 @@ namespace memgraph::io::network {
  * connection address.
  */
 struct Endpoint {
+  static const struct needs_resolving_t {
+  } needs_resolving;
+
   Endpoint() = default;
   Endpoint(std::string ip_address, uint16_t port);
+  Endpoint(needs_resolving_t, std::string hostname, uint16_t port);
   Endpoint(Endpoint const &) = default;
   Endpoint(Endpoint &&) noexcept = default;
   Endpoint &operator=(Endpoint const &) = default;
@@ -44,6 +48,9 @@ struct Endpoint {
   uint16_t port{0};
   IpFamily family{IpFamily::NONE};
 
+  static std::optional<std::pair<std::string, uint16_t>> ParseSocketOrAddress(
+      const std::string &address, const std::optional<uint16_t> default_port);
+
   /**
    * Tries to parse the given string as either a socket address or ip address.
    * Expected address format:
@@ -57,7 +64,26 @@ struct Endpoint {
   static std::optional<std::pair<std::string, uint16_t>> ParseSocketOrIpAddress(
       const std::string &address, const std::optional<uint16_t> default_port);
 
-  static IpFamily GetIpFamily(const std::string &ip_address);
+  /**
+   * Tries to parse given string as either socket address or hostname.
+   * Expected address format:
+   *    - "hostname:port_number"
+   *    - "hostname"
+   * After we parse hostname and port we try to resolve the hostname into an ip_address.
+   */
+  static std::optional<std::pair<std::string, uint16_t>> ParseHostname(const std::string &address,
+                                                                       const std::optional<uint16_t> default_port);
+
+  static IpFamily GetIpFamily(const std::string &address);
+
+  static bool IsResolvableAddress(const std::string &address, uint16_t port);
+
+  /**
+   * Tries to resolve hostname to its corresponding IP address.
+   * Given a DNS hostname, this function performs resolution and returns
+   * the IP address associated with the hostname.
+   */
+  static std::string ResolveHostnameIntoIpAddress(const std::string &address, uint16_t port);
 };
 
 }  // namespace memgraph::io::network

src/io/network/socket.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source

src/kvstore/CMakeLists.txt

@@ -4,4 +4,5 @@ find_package(ZLIB REQUIRED)
 
 # STATIC library used to store key-value pairs
 add_library(mg-kvstore STATIC kvstore.cpp)
+add_library(mg::kvstore ALIAS mg-kvstore)
 target_link_libraries(mg-kvstore stdc++fs mg-utils rocksdb BZip2::BZip2 ZLIB::ZLIB gflags)

src/kvstore/kvstore.hpp

@@ -25,6 +25,7 @@ namespace memgraph::kvstore {
 class KVStoreError : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
+  SPECIALIZE_GET_EXCEPTION_NAME(KVStoreError)
 };
 
 /**

src/license/license_sender.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source

src/license/license_sender.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2023 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source

src/memgraph.cpp

@@ -10,6 +10,7 @@
 // licenses/APL.txt.
 
 #include "audit/log.hpp"
+#include "communication/metrics.hpp"
 #include "communication/websocket/auth.hpp"
 #include "communication/websocket/server.hpp"
 #include "dbms/constants.hpp"
@@ -22,7 +23,7 @@
 #include "glue/run_id.hpp"
 #include "helpers.hpp"
 #include "license/license_sender.hpp"
-#include "memory/memory_control.hpp"
+#include "memory/global_memory_control.hpp"
 #include "query/config.hpp"
 #include "query/discard_value_stream.hpp"
 #include "query/interpreter.hpp"
@@ -32,6 +33,7 @@
 #include "requests/requests.hpp"
 #include "telemetry/telemetry.hpp"
 #include "utils/signals.hpp"
+#include "utils/skip_list.hpp"
 #include "utils/sysinfo/memory.hpp"
 #include "utils/system_info.hpp"
 #include "utils/terminate_handler.hpp"
@@ -429,31 +431,19 @@ int main(int argc, char **argv) {
   std::optional<memgraph::telemetry::Telemetry> telemetry;
   if (FLAGS_telemetry_enabled) {
     telemetry.emplace(telemetry_server, data_directory / "telemetry", memgraph::glue::run_id_, machine_id,
-                      std::chrono::minutes(10));
+                      service_name == "BoltS", FLAGS_data_directory, std::chrono::minutes(10));
 #ifdef MG_ENTERPRISE
-    telemetry->AddCollector("storage", [&new_handler]() -> nlohmann::json {
-      const auto &info = new_handler.Info();
-      return {{"vertices", info.num_vertex}, {"edges", info.num_edges}, {"databases", info.num_databases}};
-    });
+    telemetry->AddStorageCollector(new_handler, auth_);
+    telemetry->AddDatabaseCollector(new_handler);
 #else
-    telemetry->AddCollector("storage", [gk = &db_gatekeeper]() -> nlohmann::json {
-      auto db_acc = gk->access();
-      MG_ASSERT(db_acc, "Failed to get access to the default database");
-      auto info = db_acc->get()->GetInfo();
-      return {{"vertices", info.vertex_count}, {"edges", info.edge_count}};
-    });
+    telemetry->AddStorageCollector(db_gatekeeper, auth_);
+    telemetry->AddDatabaseCollector();
 #endif
-    telemetry->AddCollector("event_counters", []() -> nlohmann::json {
-      nlohmann::json ret;
-      for (size_t i = 0; i < memgraph::metrics::CounterEnd(); ++i) {
-        ret[memgraph::metrics::GetCounterName(i)] =
-            memgraph::metrics::global_counters[i].load(std::memory_order_relaxed);
-      }
-      return ret;
-    });
-    telemetry->AddCollector("query_module_counters", []() -> nlohmann::json {
-      return memgraph::query::plan::CallProcedure::GetAndResetCounters();
-    });
+    telemetry->AddClientCollector();
+    telemetry->AddEventsCollector();
+    telemetry->AddQueryModuleCollector();
+    telemetry->AddExceptionCollector();
+    telemetry->AddReplicationCollector();
   }
   memgraph::license::LicenseInfoSender license_info_sender(telemetry_server, memgraph::glue::run_id_, machine_id,
                                                            memory_limit,
@@ -522,6 +512,7 @@ int main(int argc, char **argv) {
 
   server.AwaitShutdown();
   websocket_server.AwaitShutdown();
+  memgraph::memory::UnsetHooks();
 #ifdef MG_ENTERPRISE
   if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     metrics_server.AwaitShutdown();

src/memory/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(memory_src_files
     new_delete.cpp
-    memory_control.cpp)
+    global_memory_control.cpp
+    query_memory_control.cpp)
 
 
 
@@ -10,6 +11,6 @@ add_library(mg-memory STATIC ${memory_src_files})
 target_link_libraries(mg-memory mg-utils fmt)
 
 if (ENABLE_JEMALLOC)
-  target_link_libraries(mg-memory Jemalloc::Jemalloc)
+  target_link_libraries(mg-memory Jemalloc::Jemalloc ${CMAKE_DL_LIBS})
   target_compile_definitions(mg-memory PRIVATE USE_JEMALLOC=1)
 endif()

src/memory/global_memory_control.cpp

@@ -9,15 +9,16 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include "memory_control.hpp"
+#include <atomic>
 #include <cstdint>
-#include <sstream>
-#include <thread>
+
+#include "global_memory_control.hpp"
+#include "query_memory_control.hpp"
 #include "utils/logging.hpp"
 #include "utils/memory_tracker.hpp"
 
 #if USE_JEMALLOC
-#include <jemalloc/jemalloc.h>
+#include "jemalloc/jemalloc.h"
 #endif
 
 namespace memgraph::memory {
@@ -27,24 +28,6 @@ namespace memgraph::memory {
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define STRINGIFY(x) STRINGIFY_HELPER(x)
 
-std::string get_string_thread_id(const std::thread::id &thread_id) {
-  std::ostringstream oss;
-  oss << thread_id;
-  return oss.str();
-}
-
-// TODO (af) think if following implementation would make sense
-/*
-std::string get_thread_id() {
-  static thread_local std::thread::id current_thread_id = std::this_thread::get_id();
-  // figure out how to cache this part
-  std::ostringstream oss;
-  oss << current_thread_id;
-  return oss.str();
-}
-*/
-std::string get_thread_id() { return get_string_thread_id(std::this_thread::get_id()); }
-
 #if USE_JEMALLOC
 
 static void *my_alloc(extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t alignment, bool *zero,
@@ -78,8 +61,11 @@ void *my_alloc(extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t
   // This needs to be before, to throw exception in case of too big alloc
   if (*commit) [[likely]] {
     memgraph::utils::total_memory_tracker.Alloc(static_cast<int64_t>(size));
-    if (arena_tracking[arena_ind]) [[unlikely]] {
-      transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Alloc(static_cast<int64_t>(size));
+    if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+      auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+      if (memory_tracker != nullptr) [[likely]] {
+        memory_tracker->Alloc(static_cast<int64_t>(size));
+      }
     }
   }
 
@@ -87,8 +73,11 @@ void *my_alloc(extent_hooks_t *extent_hooks, void *new_addr, size_t size, size_t
   if (ptr == nullptr) [[unlikely]] {
     if (*commit) {
       memgraph::utils::total_memory_tracker.Free(static_cast<int64_t>(size));
-      if (arena_tracking[arena_ind]) [[unlikely]] {
-        transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Free(static_cast<int64_t>(size));
+      if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+        auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+        if (memory_tracker != nullptr) [[likely]] {
+          memory_tracker->Free(static_cast<int64_t>(size));
+        }
       }
     }
     return ptr;
@@ -107,8 +96,11 @@ static bool my_dalloc(extent_hooks_t *extent_hooks, void *addr, size_t size, boo
   if (committed) [[likely]] {
     memgraph::utils::total_memory_tracker.Free(static_cast<int64_t>(size));
 
-    if (arena_tracking[arena_ind]) [[unlikely]] {
-      transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Free(static_cast<int64_t>(size));
+    if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+      auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+      if (memory_tracker != nullptr) [[likely]] {
+        memory_tracker->Free(static_cast<int64_t>(size));
+      }
     }
   }
 
@@ -118,8 +110,11 @@ static bool my_dalloc(extent_hooks_t *extent_hooks, void *addr, size_t size, boo
 static void my_destroy(extent_hooks_t *extent_hooks, void *addr, size_t size, bool committed, unsigned arena_ind) {
   if (committed) [[likely]] {
     memgraph::utils::total_memory_tracker.Free(static_cast<int64_t>(size));
-    if (arena_tracking[arena_ind]) [[unlikely]] {
-      transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Free(static_cast<int64_t>(size));
+    if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+      auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+      if (memory_tracker != nullptr) [[likely]] {
+        memory_tracker->Free(static_cast<int64_t>(size));
+      }
     }
   }
 
@@ -135,8 +130,11 @@ static bool my_commit(extent_hooks_t *extent_hooks, void *addr, size_t size, siz
   }
 
   memgraph::utils::total_memory_tracker.Alloc(static_cast<int64_t>(length));
-  if (arena_tracking[arena_ind]) [[unlikely]] {
-    transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Alloc(static_cast<int64_t>(size));
+  if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+    auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+    if (memory_tracker != nullptr) [[likely]] {
+      memory_tracker->Alloc(static_cast<int64_t>(size));
+    }
   }
 
   return false;
@@ -152,8 +150,11 @@ static bool my_decommit(extent_hooks_t *extent_hooks, void *addr, size_t size, s
   }
 
   memgraph::utils::total_memory_tracker.Free(static_cast<int64_t>(length));
-  if (arena_tracking[arena_ind]) [[unlikely]] {
-    transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Free(static_cast<int64_t>(size));
+  if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+    auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+    if (memory_tracker != nullptr) [[likely]] {
+      memory_tracker->Free(static_cast<int64_t>(size));
+    }
   }
 
   return false;
@@ -169,8 +170,11 @@ static bool my_purge_forced(extent_hooks_t *extent_hooks, void *addr, size_t siz
   }
   memgraph::utils::total_memory_tracker.Free(static_cast<int64_t>(length));
 
-  if (arena_tracking[arena_ind]) [[unlikely]] {
-    transaction_id_tracker[thread_id_to_transaction_id[get_thread_id()]].Free(static_cast<int64_t>(size));
+  if (GetQueriesMemoryControl().IsArenaTracked(arena_ind)) [[unlikely]] {
+    auto *memory_tracker = GetQueriesMemoryControl().GetTrackerCurrentThread();
+    if (memory_tracker != nullptr) [[likely]] {
+      memory_tracker->Alloc(static_cast<int64_t>(size));
+    }
   }
 
   return false;
@@ -192,14 +196,12 @@ void SetHooks() {
     return;
   }
 
-  spdlog::trace("n areanas {}", n_arenas);
-
   if (nullptr != old_hooks) {
     return;
   }
 
   for (int i = 0; i < n_arenas; i++) {
-    arena_tracking[i] = 0;
+    GetQueriesMemoryControl().InitializeArenaCounter(i);
     std::string func_name = "arena." + std::to_string(i) + ".extent_hooks";
 
     size_t hooks_len = sizeof(old_hooks);
@@ -244,55 +246,43 @@ void SetHooks() {
 #endif
 }
 
-unsigned GetArenaForThread() {
+void UnsetHooks() {
 #if USE_JEMALLOC
-  unsigned thread_arena{0};
-  size_t size_thread_arena = sizeof(thread_arena);
-  int err = mallctl("thread.arena", &thread_arena, &size_thread_arena, nullptr, 0);
+
+  uint64_t allocated{0};
+  uint64_t sz{sizeof(allocated)};
+
+  sz = sizeof(unsigned);
+  unsigned n_arenas{0};
+  int err = mallctl("opt.narenas", (void *)&n_arenas, &sz, nullptr, 0);
+
   if (err) {
-    return -1;
+    LOG_FATAL("Error setting default hooks for jemalloc arenas");
   }
-  return thread_arena;
+
+  for (int i = 0; i < n_arenas; i++) {
+    GetQueriesMemoryControl().InitializeArenaCounter(i);
+    std::string func_name = "arena." + std::to_string(i) + ".extent_hooks";
+
+    MG_ASSERT(old_hooks);
+    MG_ASSERT(old_hooks->alloc);
+    MG_ASSERT(old_hooks->dalloc);
+    MG_ASSERT(old_hooks->destroy);
+    MG_ASSERT(old_hooks->commit);
+    MG_ASSERT(old_hooks->decommit);
+    MG_ASSERT(old_hooks->purge_forced);
+    MG_ASSERT(old_hooks->purge_lazy);
+    MG_ASSERT(old_hooks->split);
+    MG_ASSERT(old_hooks->merge);
+
+    err = mallctl(func_name.c_str(), nullptr, nullptr, &old_hooks, sizeof(old_hooks));
+
+    if (err) {
+      LOG_FATAL("Error setting default hooks for jemalloc arena {}", i);
+    }
+  }
+
 #endif
-  return -1;
-}
-
-bool AddTrackingOnArena(unsigned arena_id) {
-#if USE_JEMALLOC
-  arena_tracking[arena_id].fetch_add(1);
-#endif
-  return false;
-}
-
-bool RemoveTrackingOnArena(unsigned arena_id) {
-#if USE_JEMALLOC
-  arena_tracking[arena_id].fetch_sub(1);
-#endif
-  return true;
-}
-
-void UpdateThreadToTransactionId(const std::thread::id &thread_id, uint64_t transaction_id) {
-  thread_id_to_transaction_id[get_string_thread_id(thread_id)] = transaction_id;
-}
-
-void UpdateThreadToTransactionId(const char *thread_id, uint64_t transaction_id) {
-  thread_id_to_transaction_id[std::string(thread_id)] = transaction_id;
-}
-
-void ResetThreadToTransactionId(const std::thread::id &thread_id) {
-  thread_id_to_transaction_id.erase(get_string_thread_id(thread_id));
-}
-
-void ResetThreadToTransactionId(const char *thread_id) { thread_id_to_transaction_id.erase(std::string(thread_id)); }
-
-void AddTrackingsOnCurrentThread(uint64_t transaction_id) {
-  UpdateThreadToTransactionId(std::this_thread::get_id(), transaction_id);
-  AddTrackingOnArena(memgraph::memory::GetArenaForThread());
-}
-
-void RemoveTrackingsOnCurrentThread() {
-  ResetThreadToTransactionId(std::this_thread::get_id());
-  RemoveTrackingOnArena(GetArenaForThread());
 }
 
 void PurgeUnusedMemory() {