Run on docker release version.

.github/workflows/diff.yaml

@@ -266,11 +266,12 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          # TODO(gitbuda): Setup mgclient and pymgclient properly.
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
-          ./run.sh
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
 
       - name: Run stress test (plain)
         run: |
@@ -292,6 +293,7 @@ jobs:
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
+
           cd build
 
           # create mgconsole
@@ -338,8 +340,10 @@ jobs:
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
+
           # Initialize dependencies.
           ./init
+
           # Build only memgraph release binarie.
           cd build
           cmake -DCMAKE_BUILD_TYPE=release ..
@@ -348,7 +352,7 @@ jobs:
       - name: Run Jepsen tests
         run: |
           cd tests/jepsen
-          ./run.sh test-all-individually --binary ../../build/memgraph --ignore-run-stdout-logs --ignore-run-stderr-logs
+          ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
         uses: actions/upload-artifact@v3

.github/workflows/package_all.yaml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       memgraph_version:
-        description: "Memgraph version to upload as. If empty upload is skipped. Format: 'X.Y.Z'"
+        description: "Memgraph version to upload as. If empty upload is skipped. Format: 'vX.Y.Z'"
         required: false
 
 jobs:
@@ -201,7 +201,7 @@ jobs:
 
   debian-11-arm:
     runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
-    timeout-minutes: 120
+    timeout-minutes: 60
     steps:
       - name: "Set up repository"
         uses: actions/checkout@v3
@@ -218,7 +218,7 @@ jobs:
 
   ubuntu-2204-arm:
     runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
-    timeout-minutes: 120
+    timeout-minutes: 60
     steps:
       - name: "Set up repository"
         uses: actions/checkout@v3
@@ -253,4 +253,4 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }}
           AWS_REGION: "eu-west-1"
           SOURCE_DIR: "build/output/release"
-          DEST_DIR: "memgraph/v${{ github.event.inputs.memgraph_version }}/"
+          DEST_DIR: "memgraph/${{ github.event.inputs.memgraph_version }}/"

.github/workflows/release_centos8.yaml

@@ -265,11 +265,12 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          # TODO(gitbuda): Setup mgclient and pymgclient properly.
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
-          ./run.sh
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
 
       - name: Run stress test (plain)
         run: |

.github/workflows/release_debian10.yaml

@@ -264,11 +264,12 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          # TODO(gitbuda): Setup mgclient and pymgclient properly.
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
-          ./run.sh
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
 
       - name: Run stress test (plain)
         run: |
@@ -318,8 +319,10 @@ jobs:
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
+
           # Initialize dependencies.
           ./init
+
           # Build only memgraph release binary.
           cd build
           cmake -DCMAKE_BUILD_TYPE=release ..
@@ -328,7 +331,7 @@ jobs:
       - name: Run Jepsen tests
         run: |
           cd tests/jepsen
-          ./run.sh test-all-individually --binary ../../build/memgraph --ignore-run-stdout-logs --ignore-run-stderr-logs
+          ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
         uses: actions/upload-artifact@v3

.github/workflows/release_ubuntu2004.yaml

@@ -264,11 +264,12 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          # TODO(gitbuda): Setup mgclient and pymgclient properly.
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
-          ./run.sh
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
 
       - name: Run stress test (plain)
         run: |

.github/workflows/upload_to_s3.yaml

@@ -1,32 +0,0 @@
-name: Upload Package All artifacts to S3
-
-on:
-  workflow_dispatch:
-    inputs:
-      memgraph_version:
-        description: "Memgraph version to upload as. Format: 'X.Y.Z'"
-        required: true
-      run_number:
-        description: "# of the package_all workflow run to upload artifacts from. Format: '#XYZ'"
-        required: true
-
-jobs:
-  upload-to-s3:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifacts
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: package_all.yaml
-          workflow_conclusion: success
-          run_number: "${{ github.event.inputs.run_number }}"
-          path: build/output/release
-      - name: Upload to S3
-        uses: jakejarvis/s3-sync-action@v0.5.1
-        env:
-          AWS_S3_BUCKET: "download.memgraph.com"
-          AWS_ACCESS_KEY_ID: ${{ secrets.S3_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: "eu-west-1"
-          SOURCE_DIR: "build/output/release"
-          DEST_DIR: "memgraph/v${{ github.event.inputs.memgraph_version }}/"

.gitignore

@@ -59,5 +59,3 @@ src/raft/storage_info_rpc_messages.hpp
 src/stats/stats_rpc_messages.hpp
 src/storage/distributed/rpc/concurrent_id_mapper_rpc_messages.hpp
 src/transactions/distributed/engine_rpc_messages.hpp
-/tests/manual/js/transaction_timeout/package-lock.json
-/tests/manual/js/transaction_timeout/node_modules/

CMakeLists.txt

@@ -1,7 +1,6 @@
 # MemGraph CMake configuration
 
-cmake_minimum_required(VERSION 3.12)
-cmake_policy(SET CMP0076 NEW)
+cmake_minimum_required(VERSION 3.8)
 
 # !! IMPORTANT !! run ./project_root/init.sh before cmake command
 # to download dependencies
@@ -19,12 +18,10 @@ set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM TRUE)
 # during the code coverage process
 find_program(CCACHE_FOUND ccache)
 option(USE_CCACHE "ccache:" ON)
+message(STATUS "CCache: ${USE_CCACHE}")
 if(CCACHE_FOUND AND USE_CCACHE)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-  message(STATUS "CCache: Used")
-else ()
-  message(STATUS "CCache: Not used")
 endif(CCACHE_FOUND AND USE_CCACHE)
 
 # choose a compiler
@@ -40,14 +37,7 @@ endif()
 
 # -----------------------------------------------------------------------------
 
-project(memgraph LANGUAGES C CXX)
-
-#TODO: upgrade to cmake 3.24 + CheckIPOSupported
-#cmake_policy(SET CMP0138 NEW)
-#include(CheckIPOSupported)
-#check_ipo_supported()
-#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_Release TRUE)
-#set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RelWithDebInfo TRUE)
+project(memgraph)
 
 # Install licenses.
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/licenses/
@@ -153,9 +143,7 @@ endif()
 # files used can be seen here:
 # https://git-scm.com/book/en/v2/Git-Internals-Git-References
 set(git_directory "${CMAKE_SOURCE_DIR}/.git")
-# Check for directory because if the repo is cloned as a git submodule, .git is
-# a file and below code doesn't work.
-if (IS_DIRECTORY "${git_directory}")
+if (EXISTS "${git_directory}")
   set_property(DIRECTORY APPEND PROPERTY
       CMAKE_CONFIGURE_DEPENDS "${git_directory}/HEAD")
   file(STRINGS "${git_directory}/HEAD" git_head_data)
@@ -170,7 +158,7 @@ endif()
 
 # setup CMake module path, defines path for include() and find_package()
 # https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 # custom function definitions
 include(functions)
 # -----------------------------------------------------------------------------
@@ -196,7 +184,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall \
     -Werror=switch -Werror=switch-bool -Werror=return-type \
     -Werror=return-stack-address \
-    -Wno-c99-designator -Wmissing-field-initializers \
+    -Wno-c99-designator \
     -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT")
 
 # Don't omit frame pointer in RelWithDebInfo, for additional callchain debug.
@@ -298,7 +286,7 @@ set(ENABLE_JEMALLOC ON)
 if (ASAN)
   message(WARNING "Disabling jemalloc as it doesn't work well with ASAN")
   set(ENABLE_JEMALLOC OFF)
-  # Enable Address sanitizer and get nicer stack traces in error messages.
+  # Enable Addres sanitizer and get nicer stack traces in error messages.
   # NOTE: AddressSanitizer uses llvm-symbolizer binary from the Clang
   # distribution to symbolize the stack traces (note that ideally the
   # llvm-symbolizer version must match the version of ASan runtime library).

README.md

@@ -175,6 +175,7 @@ license](./licenses/BSL.txt).</br> Memgraph Enterprise is available under the
 
 - :purple_heart: [**Discord**](https://discord.gg/memgraph)
 - :ocean: [**Stack Overflow**](https://stackoverflow.com/questions/tagged/memgraphdb)
+- :busts_in_silhouette: [**Discourse forum**](https://discourse.memgraph.com/)
 - :bird: [**Twitter**](https://twitter.com/memgraphdb)
 - :movie_camera:
   [**YouTube**](https://www.youtube.com/channel/UCZ3HOJvHGxtQ_JHxOselBYg)

config/generate.py

@@ -23,14 +23,6 @@ def wrap_text(s, initial_indent="# "):
 def extract_flags(binary_path):
     ret = {}
     data = subprocess.run([binary_path, "--help-xml"], stdout=subprocess.PIPE).stdout.decode("utf-8")
-    # If something is printed out before the help output, it will break the the
-    # XML parsing -> filter out if something is not XML line because something
-    # can be logged before gflags output (e.g. during the global objects init).
-    # This gets called during memgraph build phase to generate default config
-    # file later installed under /etc/memgraph/memgraph.conf
-    # NOTE: Don't use \n in the gflags description strings.
-    # NOTE: Check here if gflags version changes because of the XML format.
-    data = "\n".join([line for line in data.split("\n") if line.startswith("<")])
     root = ET.fromstring(data)
     for child in root:
         if child.tag == "usage" and child.text.lower().count("warning"):

docs/csv-import-tool/README.md

@@ -202,29 +202,3 @@ for row in csv.reader(stream, delimiter=',', doublequote=True,
 For more information about the meaning of the above values, see:
 https://docs.python.org/3/library/csv.html#csv.Dialect
 
-## Errors
-
-1. [Skipping duplicate node with ID '{}'. For more details, visit:
-   memgr.ph/csv-import-tool.](#error-1)
-2. [Skipping bad relationship with START_ID '{}'. For more details, visit:
-   memgr.ph/csv-import-tool.](#error-2)
-3. [Skipping bad relationship with END_ID '{}'. For more details, visit:
-   memgr.ph/csv-import-tool.](#error-3)
-
-## Skipping duplicate node with ID {} {#error-1}
-
-Duplicate nodes are nodes that have an ID that is the same as another node that
-was already imported. You can instruct the importer to ignore all duplicate
-nodes (instead of raising an error) by using the `--skip-duplicate-nodes` flag.
-
-## Skipping bad relationship with START_ID {} {#error-2}
-
-A node with the id `START_ID` doesn't exist. You can instruct the importer to
-ignore all bad relationships (instead of raising an error) that refer to nodes
-that don't exist in the node files by using the `--skip-bad-relationships` flag.
-
-## Skipping bad relationship with END_ID {} {#error-3}
-
-A node with the id `END_ID` doesn't exist. You can instruct the importer to
-ignore all bad relationships (instead of raising an error) that refer to nodes
-that don't exist in the node files by using the `--skip-bad-relationships` flag.

environment/README.md

@@ -1,10 +0,0 @@
-# Memgraph Operating Environments
-
-## os
-
-Under the `os` directory, you can find scripts to install all required system
-dependencies on operating systems where Memgraph natively builds. The testing
-script helps to see how to install all packages (in the case of a new package),
-or make any adjustments in the overall system setup. Also, the testing script
-helps check if Memgraph runs on a freshly installed operating system (with no
-packages installed).

environment/os/.gitignore

@@ -1,6 +1,3 @@
 *.deb
-*.deb.*
 *.rpm
-*.rpm.*
 *.tar.gz
-*.tar.gz.*

environment/os/amzn-2.sh

@@ -41,7 +41,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake # build system
+    make # build system
     wget # for downloading libs
     libuuid-devel java-11-openjdk # required by antlr
     readline-devel # for memgraph console
@@ -57,18 +57,9 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl-devel # mg-requests
     rpm-build rpmlint # for RPM package building
     doxygen graphviz # source documentation generators
-    which nodejs golang custom-golang1.18.9 zip unzip java-11-openjdk-devel jdk-17 custom-maven3.9.3 # for driver tests
+    which nodejs golang zip unzip java-11-openjdk-devel # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    cyrus-sasl-devel
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -82,18 +73,6 @@ check() {
     local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-""}
     LD_LIBRARY_PATH=""
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
         if [ "$pkg" == "PyYAML" ]; then
             if ! python3 -c "import yaml" >/dev/null 2>/dev/null; then
                 missing="$pkg $missing"
@@ -124,27 +103,8 @@ install() {
     else
         echo "NOTE: export LANG=en_US.utf8"
     fi
-
     yum update -y
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == jdk-17 ]; then
-          if ! yum list installed jdk-17 >/dev/null 2>/dev/null; then
-              wget --no-check-certificate -c --header "Cookie: oraclelicense=accept-securebackup-cookie" https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm
-              rpm -Uvh jdk-17_linux-x64_bin.rpm
-              # NOTE: Set Java 11 as default.
-              update-alternatives --set java java-11-openjdk.x86_64
-              update-alternatives --set javac java-11-openjdk.x86_64
-          fi
-          continue
-        fi
         if [ "$pkg" == libipt ]; then
             if ! yum list installed libipt >/dev/null 2>/dev/null; then
                 yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/libipt-1.6.1-8.el8.x86_64.rpm

environment/os/centos-7.sh

@@ -39,7 +39,7 @@ TOOLCHAIN_RUN_DEPS=(
 )
 
 MEMGRAPH_BUILD_DEPS=(
-    make cmake pkgconfig # build system
+    make pkgconfig # build system
     curl wget # for downloading libs
     libuuid-devel java-11-openjdk # required by antlr
     readline-devel # for memgraph console
@@ -56,19 +56,9 @@ MEMGRAPH_BUILD_DEPS=(
     sbcl # for custom Lisp C++ preprocessing
     rpm-build rpmlint # for RPM package building
     doxygen graphviz # source documentation generators
-    which mono-complete dotnet-sdk-3.1 golang custom-golang1.18.9 # for driver tests
-    nodejs zip unzip java-11-openjdk-devel jdk-17 custom-maven3.9.3 # for driver tests
+    which mono-complete dotnet-sdk-3.1 golang nodejs zip unzip java-11-openjdk-devel # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    cyrus-sasl-devel
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -78,18 +68,6 @@ list() {
 check() {
     local missing=""
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
         if [ "$pkg" == git ]; then
             if ! which "git" >/dev/null; then
                 missing="git $missing"
@@ -132,25 +110,7 @@ install() {
     yum update -y
     yum install -y wget python3 python3-pip
     yum install -y git
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == jdk-17 ]; then
-            if ! yum list installed jdk-17 >/dev/null 2>/dev/null; then
-                wget https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm
-                rpm -ivh jdk-17_linux-x64_bin.rpm
-                update-alternatives --set java java-11-openjdk.x86_64
-                update-alternatives --set javac java-11-openjdk.x86_64
-            fi
-            continue
-        fi
         if [ "$pkg" == libipt ]; then
             if ! yum list installed libipt >/dev/null 2>/dev/null; then
                 yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/libipt-1.6.1-8.el8.x86_64.rpm

environment/os/centos-9.sh

@@ -40,7 +40,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkgconf-pkg-config # build system
+    make pkgconf-pkg-config # build system
     wget # for downloading libs
     libuuid-devel java-11-openjdk # required by antlr
     readline-devel # for memgraph console
@@ -56,20 +56,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl-devel # mg-requests
     rpm-build rpmlint # for RPM package building
     doxygen graphviz # source documentation generators
-    which nodejs golang custom-golang1.18.9 # for driver tests
-    zip unzip java-11-openjdk-devel java-17-openjdk java-17-openjdk-devel custom-maven3.9.3 # for driver tests
+    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
-    cyrus-sasl-devel
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -79,18 +69,6 @@ list() {
 check() {
     local missing=""
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
         if [ "$pkg" == "PyYAML" ]; then
             if ! python3 -c "import yaml" >/dev/null 2>/dev/null; then
                 missing="$pkg $missing"
@@ -125,16 +103,7 @@ install() {
     fi
     yum update -y
     yum install -y wget git python3 python3-pip
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
         # Since there is no support for libipt-devel for CentOS 9 we install
         # Fedoras version of same libs, they are the same version but released
         # for different OS

environment/os/debian-10.sh

@@ -40,7 +40,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # for downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # for memgraph console
@@ -53,19 +53,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless oracle-java17-installer custom-maven3.9.3 # for driver tests
-    dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm # for driver tests
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -73,28 +64,7 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
@@ -105,15 +75,8 @@ deb http://deb.debian.org/debian/ buster-updates main contrib non-free
 deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free
 deb http://security.debian.org/debian-security buster/updates main contrib non-free
 deb-src http://security.debian.org/debian-security buster/updates main contrib non-free
-EOF
-    apt --allow-releaseinfo-change update
-    cat >/etc/apt/sources.list.d/java.list << EOF
-deb http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main
-deb-src http://ppa.launchpad.net/linuxuprising/java/ubuntu bionic main
 EOF
     cd "$DIR"
-    apt install -y gnupg
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EA8CACC073C3DB2A
     apt --allow-releaseinfo-change update
     # If GitHub Actions runner is installed, append LANG to the environment.
     # Python related tests doesn't work the LANG export.
@@ -122,26 +85,8 @@ EOF
     else
         echo "NOTE: export LANG=en_US.utf8"
     fi
-
+    apt install -y wget
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == oracle-java17-installer ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-              echo oracle-java17-installer shared/accepted-oracle-license-v1-3 select true | /usr/bin/debconf-set-selections
-              echo oracle-java17-installer shared/accepted-oracle-license-v1-3 seen true | /usr/bin/debconf-set-selections
-              apt install -y "$pkg"
-              update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-              update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
-            fi
-            continue
-        fi
         if [ "$pkg" == dotnet-sdk-3.1 ]; then
             if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
                 wget -nv https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb

environment/os/debian-11-arm.sh

@@ -54,19 +54,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk custom-maven3.9.3 # for driver tests
-    golang custom-golang1.18.9 nodejs npm
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -74,28 +65,7 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
@@ -119,25 +89,7 @@ EOF
         echo "NOTE: export LANG=en_US.utf8"
     fi
     apt install -y wget
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == openjdk-17-jdk ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-arm64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-arm64/bin/javac
-            fi
-            continue
-        fi
         apt install -y "$pkg"
     done
 }

environment/os/debian-11.sh

@@ -41,7 +41,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # for downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # for memgraph console
@@ -54,19 +54,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk custom-maven3.9.3 # for driver tests
-    dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -74,28 +65,7 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
@@ -119,25 +89,7 @@ EOF
         echo "NOTE: export LANG=en_US.utf8"
     fi
     apt install -y wget
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == openjdk-17-jdk ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
-            fi
-            continue
-        fi
         if [ "$pkg" == dotnet-sdk-3.1  ]; then
             if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
                 wget -nv https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb

environment/os/fedora-36.sh

@@ -41,7 +41,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkgconf-pkg-config # build system
+    make pkgconf-pkg-config # build system
     wget # for downloading libs
     libuuid-devel java-11-openjdk # required by antlr
     readline-devel # for memgraph console
@@ -52,21 +52,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl-devel # mg-requests
     rpm-build rpmlint # for RPM package building
     doxygen graphviz # source documentation generators
-    java-11-openjdk-devel java-17-openjdk-devel custom-maven3.9.3 # for driver tests
-    which zip unzip
-    nodejs golang custom-golang1.18.9 # for driver tests
+    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
-    cyrus-sasl-devel
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -75,25 +64,11 @@ list() {
 
 check() {
     local missing=""
-    if [ -v LD_LIBRARY_PATH ]; then
-        # On Fedora yum/dnf and python10 use newer glibc which is not compatible
-        # with ours, so we need to momentarely disable env
-        local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=""
-    fi
+    # On Fedora yum/dnf and python10 use newer glibc which is not compatible
+    # with ours, so we need to momentarely disable env
+    local OLD_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=""
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
         if ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
             missing="$pkg $missing"
         fi
@@ -102,10 +77,7 @@ check() {
         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
+    LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
 }
 
 install() {
@@ -122,25 +94,7 @@ install() {
         echo "NOTE: export LANG=en_US.utf8"
     fi
     dnf update -y
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == java-17-openjdk-devel ]; then
-            if ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
-                dnf install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java java-11-openjdk.x86_64
-                update-alternatives --set javac java-11-openjdk.x86_64
-            fi
-            continue
-        fi
         dnf install -y "$pkg"
     done
 }

environment/os/run.sh

@@ -1,145 +0,0 @@
-#!/bin/bash
-set -Eeuo pipefail
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-IFS=' '
-# NOTE: docker_image_name could be local image build based on release/package images.
-# NOTE: each line has to be under quotes, docker_container_type, script_name and docker_image_name separate with a space.
-# "docker_container_type script_name docker_image_name"
-OPERATING_SYSTEMS=(
-  "mgrun amzn-2 amazonlinux:2"
-  "mgrun centos-7 centos:7"
-  "mgrun centos-9 dokken/centos-stream-9"
-  "mgrun debian-10 debian:10"
-  "mgrun debian-11 debian:11"
-  "mgrun fedora-36 fedora:36"
-  "mgrun ubuntu-18.04 ubuntu:18.04"
-  "mgrun ubuntu-20.04 ubuntu:20.04"
-  "mgrun ubuntu-22.04 ubuntu:22.04"
-  # "mgbuild centos-7 package-mgbuild_centos-7"
-)
-
-if [ ! "$(docker info)" ]; then
-  echo "ERROR: Docker is required"
-  exit 1
-fi
-print_help () {
-  echo -e "$0 all\t\t\t\t  => start + init all containers in the background"
-  echo -e "$0 check\t\t\t\t  => check all containers"
-  echo -e "$0 delete\t\t\t\t  => stop + remove all containers"
-  echo -e "$0 copy src_container dst_container => copy build package from src to dst container"
-  exit 1
-}
-
-# NOTE: This is an idempotent operation!
-# TODO(gitbuda): Consider making docker_run always delete + start a new container or add a new function.
-docker_run () {
-  cnt_name="$1"
-  cnt_image="$2"
-  if [ ! "$(docker ps -q -f name=$cnt_name)" ]; then
-      if [ "$(docker ps -aq -f status=exited -f name=$cnt_name)" ]; then
-          echo "Cleanup of the old exited container..."
-          docker rm $cnt_name
-      fi
-      docker run -d --volume "$SCRIPT_DIR/../../:/memgraph" --network host --name "$cnt_name" "$cnt_image" sleep infinity
-  fi
-  echo "The $cnt_image container is active under $cnt_name name!"
-}
-
-docker_exec () {
-  cnt_name="$1"
-  cnt_cmd="$2"
-  docker exec -it "$cnt_name" bash -c "$cnt_cmd"
-}
-
-docker_stop_and_rm () {
-  cnt_name="$1"
-  if [ "$(docker ps -q -f name=$cnt_name)" ]; then
-      docker stop "$1"
-      if [ "$(docker ps -aq -f status=exited -f name=$cnt_name)" ]; then
-        docker rm "$1"
-      fi
-  fi
-}
-
-# TODO(gitbuda): Make the call to `install NEW_DEPS` configurable, the question what else is useful?
-start_all () {
-  for script_docker_pair in "${OPERATING_SYSTEMS[@]}"; do
-    read -a script_docker <<< "$script_docker_pair"
-    docker_container_type="${script_docker[0]}"
-    script_name="${script_docker[1]}"
-    docker_image="${script_docker[2]}"
-    docker_name="${docker_container_type}_$script_name"
-    echo ""
-    echo "~~~~ OPERATING ON $docker_image as $docker_name..."
-    docker_run "$docker_name" "$docker_image"
-    docker_exec "$docker_name" "/memgraph/environment/os/$script_name.sh install NEW_DEPS"
-    echo "---- DONE EVERYHING FOR $docker_image as $docker_name..."
-    echo ""
-  done
-}
-
-check_all () {
-  for script_docker_pair in "${OPERATING_SYSTEMS[@]}"; do
-    read -a script_docker <<< "$script_docker_pair"
-    docker_container_type="${script_docker[0]}"
-    script_name="${script_docker[1]}"
-    docker_image="${script_docker[2]}"
-    docker_name="${docker_container_type}_$script_name"
-    echo ""
-    echo "~~~~ OPERATING ON $docker_image as $docker_name..."
-    docker_exec "$docker_name" "/memgraph/environment/os/$script_name.sh check NEW_DEPS"
-    echo "---- DONE EVERYHING FOR $docker_image as $docker_name..."
-    echo ""
-  done
-}
-
-delete_all () {
-  for script_docker_pair in "${OPERATING_SYSTEMS[@]}"; do
-    read -a script_docker <<< "$script_docker_pair"
-    docker_container_type="${script_docker[0]}"
-    script_name="${script_docker[1]}"
-    docker_image="${script_docker[2]}"
-    docker_name="${docker_container_type}_$script_name"
-    docker_stop_and_rm "$docker_name"
-    echo "~~~~ $docker_image as $docker_name DELETED"
-  done
-}
-
-# TODO(gitbuda): Copy file between containers is a useful util, also delete, + consider copying of a whole folder.
-# TODO(gitbuda): Add args: src_cnt dst_cnt abs_path; both file and recursive folder, always delete + copy.
-copy_build_package () {
-  src_container="$1"
-  dst_container="$2"
-  src="$src_container:/memgraph/build/output"
-  tmp_dst="$SCRIPT_DIR/../../build"
-  mkdir -p "$tmp_dst"
-  rm -rf "$tmp_dst/output"
-  dst="$dst_container:/"
-  docker cp "$src" "$tmp_dst"
-  docker cp "$tmp_dst/output" "$dst"
-}
-
-if [ "$#" -eq 0 ]; then
-  print_help
-else
-  case $1 in
-    all)
-      start_all
-    ;;
-    check)
-      check_all
-    ;;
-    delete)
-      delete_all
-    ;;
-    copy) # src_container dst_container
-      if [ "$#" -ne 3 ]; then
-        print_help
-      fi
-      copy_build_package "$2" "$3"
-    ;;
-    *)
-      print_help
-    ;;
-  esac
-fi

environment/os/template.sh

@@ -6,7 +6,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
 check_operating_system "todo-os-name"
-check_architecture "todo-arch-name"
 
 TOOLCHAIN_BUILD_DEPS=(
     pkg
@@ -20,16 +19,6 @@ MEMGRAPH_BUILD_DEPS=(
     pkg
 )
 
-MEMGRAPH_RUN_DEPS=(
-    pkg
-)
-
-# NEW_DEPS is useful when you won't to test the installation of a new package.
-# During the test you can put here packages like wget curl tar gzip
-NEW_DEPS=(
-  pkg
-)
-
 list() {
     echo "$1"
 }

environment/os/ubuntu-18.04.sh

@@ -41,7 +41,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # memgraph console
@@ -53,19 +53,9 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs nodejs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.3 # driver tests
-    custom-golang1.18.9 # for driver tests
+    mono-runtime mono-mcs nodejs zip unzip default-jdk-headless # driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp2
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -73,53 +63,11 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
-    apt update -y
-
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
-        if [ "$pkg" == openjdk-17-jdk-headless ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
-            fi
-            continue
-        fi
-        apt install -y "$pkg"
-    done
+    apt install -y $1
 }
 
 deps=$2"[*]"

environment/os/ubuntu-20.04.sh

@@ -40,7 +40,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # for downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # for memgraph console
@@ -53,19 +53,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.3 # for driver tests
-    dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm # for driver tests
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    dotnet-sdk-3.1 golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp2
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -73,35 +64,12 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
     cd "$DIR"
-    export DEBIAN_FRONTEND=noninteractive
-    apt update -y
-    apt install -y wget
+    apt update
     # If GitHub Actions runner is installed, append LANG to the environment.
     # Python related tests doesn't work the LANG export.
     if [ -d "/home/gh/actions-runner" ]; then
@@ -109,16 +77,8 @@ install() {
     else
         echo "NOTE: export LANG=en_US.utf8"
     fi
-
+    apt install -y wget
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
         if [ "$pkg" == dotnet-sdk-3.1 ]; then
             if ! dpkg -s dotnet-sdk-3.1 2>/dev/null >/dev/null; then
                 wget -nv https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
@@ -128,15 +88,6 @@ install() {
             fi
             continue
         fi
-        if [ "$pkg" == openjdk-17-jdk-headless ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
-            fi
-            continue
-        fi
         apt install -y "$pkg"
     done
 }

environment/os/ubuntu-22.04-arm.sh

@@ -40,7 +40,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # for downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # for memgraph console
@@ -53,19 +53,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.3 # for driver tests
-    dotnet-sdk-6.0 golang custom-golang1.18.9 nodejs npm
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    dotnet-sdk-6.0 golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp2
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -73,28 +64,7 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
@@ -108,16 +78,7 @@ install() {
         echo "NOTE: export LANG=en_US.utf8"
     fi
     apt install -y wget
-
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
         if [ "$pkg" == dotnet-sdk-6.0 ]; then
             if ! dpkg -s dotnet-sdk-6.0 2>/dev/null >/dev/null; then
                 wget -nv https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
@@ -127,15 +88,6 @@ install() {
             fi
             continue
         fi
-        if [ "$pkg" == openjdk-17-jdk-headless ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-arm64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-arm64/bin/javac
-            fi
-            continue
-        fi
         apt install -y "$pkg"
     done
 }

environment/os/ubuntu-22.04.sh

@@ -40,7 +40,7 @@ TOOLCHAIN_RUN_DEPS=(
 
 MEMGRAPH_BUILD_DEPS=(
     git # source code control
-    make cmake pkg-config # build system
+    make pkg-config # build system
     curl wget # for downloading libs
     uuid-dev default-jre-headless # required by antlr
     libreadline-dev # for memgraph console
@@ -53,19 +53,10 @@ MEMGRAPH_BUILD_DEPS=(
     libcurl4-openssl-dev # mg-requests
     sbcl # for custom Lisp C++ preprocessing
     doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.3 # for driver tests
-    dotnet-sdk-6.0 golang custom-golang1.18.9 nodejs npm # for driver tests
+    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
+    dotnet-sdk-6.0 golang nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
-    libsasl2-dev
-)
-
-MEMGRAPH_RUN_DEPS=(
-    logrotate openssl python3 libseccomp2
-)
-
-NEW_DEPS=(
-    wget curl tar gzip
 )
 
 list() {
@@ -73,34 +64,12 @@ list() {
 }
 
 check() {
-    local missing=""
-    for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            if [ ! -f "/opt/go1.18.9/go/bin/go" ]; then
-              missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! dpkg -s "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
+    check_all_dpkg "$1"
 }
 
 install() {
     cd "$DIR"
-    apt update -y
-    apt install -y wget
+    apt update
     # If GitHub Actions runner is installed, append LANG to the environment.
     # Python related tests doesn't work the LANG export.
     if [ -d "/home/gh/actions-runner" ]; then
@@ -108,16 +77,8 @@ install() {
     else
         echo "NOTE: export LANG=en_US.utf8"
     fi
-
+    apt install -y wget
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
-            continue
-        fi
-        if [ "$pkg" == custom-golang1.18.9 ]; then
-            install_custom_golang "1.18.9"
-            continue
-        fi
         if [ "$pkg" == dotnet-sdk-6.0 ]; then
             if ! dpkg -s dotnet-sdk-6.0 2>/dev/null >/dev/null; then
                 wget -nv https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
@@ -127,15 +88,6 @@ install() {
             fi
             continue
         fi
-        if [ "$pkg" == openjdk-17-jdk-headless ]; then
-            if ! dpkg -s "$pkg" 2>/dev/null >/dev/null; then
-                apt install -y "$pkg"
-                # The default Java version should be Java 11
-                update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java
-                update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac
-            fi
-            continue
-        fi
         apt install -y "$pkg"
     done
 }

environment/util.sh

@@ -1,15 +1,8 @@
 #!/bin/bash
 
 function operating_system() {
-    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-        grep -E '^(VERSION_)?ID=' /etc/os-release | \
-        sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-'
-    elif [[ "$OSTYPE" == "darwin"* ]]; then
-        echo "$(sw_vers -productName)-$(sw_vers -productVersion | cut -d '.' -f 1)"
-    else
-        echo "operating_system called on an unknown OS"
-        exit 1
-    fi
+    grep -E '^(VERSION_)?ID=' /etc/os-release | \
+    sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-'
 }
 
 function check_operating_system() {
@@ -83,28 +76,3 @@ function install_all_apt() {
         apt install -y "$pkg"
     done
 }
-
-function install_custom_golang() {
-    # NOTE: The official https://go.dev/doc/manage-install doesn't seem to be working.
-    GOVERSION="$1"
-    GOINSTALLDIR="/opt/go$GOVERSION"
-    GOROOT="$GOINSTALLDIR/go" # GOPATH=$HOME/go
-    if [ ! -f "$GOROOT/bin/go" ]; then
-      curl -LO https://go.dev/dl/go$GOVERSION.linux-amd64.tar.gz
-      mkdir -p "$GOINSTALLDIR"
-      tar -C "$GOINSTALLDIR" -xzf go$GOVERSION.linux-amd64.tar.gz
-    fi
-    echo "go $GOVERSION installed under $GOROOT"
-}
-
-function install_custom_maven() {
-  MVNVERSION="$1"
-  MVNINSTALLDIR="/opt/apache-maven-$MVNVERSION"
-  MVNURL="https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/maven/apache-maven-$MVNVERSION-bin.tar.gz"
-  if [ ! -f "$MVNINSTALLDIR/bin/mvn" ]; then
-    echo "Downloading maven from $MVNURL"
-    curl -LO "$MVNURL"
-    tar -C "/opt" -xzf "apache-maven-$MVNVERSION-bin.tar.gz"
-  fi
-  echo "maven $MVNVERSION installed under $MVNINSTALLDIR"
-}

import/mglogs2cypherl.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -e
-COLOR_ORANGE="\e[38;5;208m"
-COLOR_GREEN="\e[38;5;35m"
-COLOR_RED="\e[0;31m"
-COLOR_NULL="\e[0m"
-
-print_help() {
-    echo -e "${COLOR_ORANGE}HOW TO RUN:${COLOR_NULL} $0 memgraph_logs_file_path cypherl_output_path"
-    exit 1
-}
-
-if [ "$#" -ne 2 ]; then
-    print_help
-fi
-INPUT="$1"
-OUTPUT="$2"
-if [ ! -f "$INPUT" ]; then
-    echo -e "${COLOR_RED}ERROR:${COLOR_NULL} memgraph_logs_file_path is not a file!"
-    print_help
-fi
-
-awk -v RS="Run] '" 'NR>1 { print $0 }' < "$INPUT" | sed -e "/^\[/d;" -e "s/'\([^']*\)$/;/g" > "$OUTPUT"
-
-echo -e "${COLOR_GREEN}DONE!${COLOR_NULL} Please find Memgraph compatible cypherl file under $OUTPUT"
-echo ""
-echo "Import can be done by executing => \`cat $OUTPUT | mgconsole\`"

import/n2mg_cypherl.sh

@@ -1,35 +0,0 @@
-#!/bin/bash -e
-COLOR_ORANGE="\e[38;5;208m"
-COLOR_GREEN="\e[38;5;35m"
-COLOR_RED="\e[0;31m"
-COLOR_NULL="\e[0m"
-
-print_help() {
-    echo -e "${COLOR_ORANGE}HOW TO RUN:${COLOR_NULL} $0 input_file_path output_file_path"
-    exit 1
-}
-
-if [ "$#" -ne 2 ]; then
-    print_help
-fi
-INPUT="$1"
-OUTPUT="$2"
-if [ ! -f "$INPUT" ]; then
-    echo -e "${COLOR_RED}ERROR:${COLOR_NULL} input_file_path is not a file!"
-    print_help
-fi
-
-echo -e "${COLOR_ORANGE}NOTE:${COLOR_NULL} BEGIN and COMMIT are required because variables share the same name (e.g. row)"
-echo -e "${COLOR_ORANGE}NOTE:${COLOR_NULL} CONSTRAINTS are just skipped -> ${COLOR_RED}please create consraints manually if needed${COLOR_NULL}"
-
-sed -e 's/^:begin/BEGIN/g; s/^BEGIN$/BEGIN;/g;' \
-    -e 's/^:commit/COMMIT/g; s/^COMMIT$/COMMIT;/g;' \
-    -e '/^CALL/d; /^SCHEMA AWAIT/d;' \
-    -e 's/CREATE RANGE INDEX FOR (n:/CREATE INDEX ON :/g;' \
-    -e 's/) ON (n./(/g;' \
-    -e '/^CREATE CONSTRAINT/d; /^DROP CONSTRAINT/d;' "$INPUT" > "$OUTPUT"
-
-echo ""
-echo -e "${COLOR_GREEN}DONE!${COLOR_NULL} Please find Memgraph compatible cypherl|.cypher file under $OUTPUT"
-echo ""
-echo "Please import data by executing => \`cat $OUTPUT | mgconsole\`"

include/_mgp.hpp

@@ -135,13 +135,6 @@ inline int64_t value_get_int(mgp_value *val) { return MgInvoke<int64_t>(mgp_valu
 
 inline double value_get_double(mgp_value *val) { return MgInvoke<double>(mgp_value_get_double, val); }
 
-inline double value_get_numeric(mgp_value *val) {
-  if (MgInvoke<int>(mgp_value_is_int, val)) {
-    return static_cast<double>(value_get_int(val));
-  }
-  return value_get_double(val);
-}
-
 inline const char *value_get_string(mgp_value *val) { return MgInvoke<const char *>(mgp_value_get_string, val); }
 
 inline mgp_list *value_get_list(mgp_value *val) { return MgInvoke<mgp_list *>(mgp_value_get_list, val); }
@@ -178,8 +171,6 @@ inline bool value_is_int(mgp_value *val) { return MgInvoke<int>(mgp_value_is_int
 
 inline bool value_is_double(mgp_value *val) { return MgInvoke<int>(mgp_value_is_double, val); }
 
-inline bool value_is_numeric(mgp_value *val) { return value_is_int(val) || value_is_double(val); }
-
 inline bool value_is_string(mgp_value *val) { return MgInvoke<int>(mgp_value_is_string, val); }
 
 inline bool value_is_list(mgp_value *val) { return MgInvoke<int>(mgp_value_is_list, val); }
@@ -335,12 +326,6 @@ inline void map_insert(mgp_map *map, const char *key, mgp_value *value) {
   MgInvokeVoid(mgp_map_insert, map, key, value);
 }
 
-inline void map_update(mgp_map *map, const char *key, mgp_value *value) {
-  MgInvokeVoid(mgp_map_update, map, key, value);
-}
-
-inline void map_erase(mgp_map *map, const char *key) { MgInvokeVoid(mgp_map_erase, map, key); }
-
 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); }
@@ -389,10 +374,6 @@ inline bool vertex_has_label_named(mgp_vertex *v, const char *label_name) {
 
 inline void vertex_add_label(mgp_vertex *vertex, mgp_label label) { MgInvokeVoid(mgp_vertex_add_label, vertex, label); }
 
-inline void vertex_remove_label(mgp_vertex *vertex, mgp_label label) {
-  MgInvokeVoid(mgp_vertex_remove_label, vertex, label);
-}
-
 inline mgp_value *vertex_get_property(mgp_vertex *v, const char *property_name, mgp_memory *memory) {
   return MgInvoke<mgp_value *>(mgp_vertex_get_property, v, property_name, memory);
 }
@@ -696,16 +677,6 @@ inline mgp_proc *module_add_write_procedure(mgp_module *module, const char *name
   return MgInvoke<mgp_proc *>(mgp_module_add_write_procedure, module, name, cb);
 }
 
-inline mgp_proc *module_add_batch_read_procedure(mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                 mgp_proc_initializer initializer, mgp_proc_cleanup cleanup) {
-  return MgInvoke<mgp_proc *>(mgp_module_add_batch_read_procedure, module, name, cb, initializer, cleanup);
-}
-
-inline mgp_proc *module_add_batch_write_procedure(mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                  mgp_proc_initializer initializer, mgp_proc_cleanup cleanup) {
-  return MgInvoke<mgp_proc *>(mgp_module_add_batch_write_procedure, module, name, cb, initializer, cleanup);
-}
-
 inline void proc_add_arg(mgp_proc *proc, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_proc_add_arg, proc, name, type);
 }
@@ -722,7 +693,7 @@ inline void proc_add_deprecated_result(mgp_proc *proc, const char *name, mgp_typ
   MgInvokeVoid(mgp_proc_add_deprecated_result, proc, name, type);
 }
 
-inline int must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
+inline bool must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
 
 // mgp_result
 

include/mg_exceptions.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -13,96 +13,45 @@
 
 #include <exception>
 #include <iostream>
-#include <sstream>
-#include <string>
 
 namespace mg_exception {
-
-// Instead of writing this utility function, we could have used `fmt::format`, but that's not an ideal option here
-// because that would introduce dependency that would be propagated to the client code (if exceptions here would be
-// used). Since the functionality here is not complex + the code is not on a critical path, we opted for a pure C++
-// solution.
-template <typename FirstArg, typename... Args>
-std::string StringSerialize(FirstArg &&firstArg, Args &&...args) {
-  std::stringstream stream;
-  stream << firstArg;
-  ((stream << " " << args), ...);
-  return stream.str();
-}
-
-struct UnknownException : public std::exception {
-  const char *what() const noexcept override { return "Unknown exception!"; }
-};
-
 struct NotEnoughMemoryException : public std::exception {
-  NotEnoughMemoryException()
-      : message_{
-            StringSerialize("Not enough memory! For more details please visit", "https://memgr.ph/memory-control")} {}
-  const char *what() const noexcept override { return message_.c_str(); }
-
- private:
-  std::string message_;
+  const char *what() const throw() { return "Not enough memory!"; }
+};
+struct UnknownException : public std::exception {
+  const char *what() const throw() { return "Unknown exception!"; }
 };
-
 struct AllocationException : public std::exception {
-  AllocationException()
-      : message_{StringSerialize("Could not allocate memory. For more details please visit",
-                                 "https://memgr.ph/memory-control")} {}
-  const char *what() const noexcept override { return message_.c_str(); }
-
- private:
-  std::string message_;
+  const char *what() const throw() { return "Could not allocate memory!"; }
 };
-
 struct InsufficientBufferException : public std::exception {
-  const char *what() const noexcept override { return "Buffer is not sufficient to process procedure!"; }
+  const char *what() const throw() { return "Buffer is not sufficient to process procedure!"; }
 };
-
 struct OutOfRangeException : public std::exception {
-  const char *what() const noexcept override { return "Index out of range!"; }
+  const char *what() const throw() { return "Index out of range!"; }
 };
-
 struct LogicException : public std::exception {
-  const char *what() const noexcept override { return "Logic exception, check the procedure signature!"; }
+  const char *what() const throw() { return "Logic exception, check the procedure signature!"; }
 };
-
 struct DeletedObjectException : public std::exception {
-  const char *what() const noexcept override { return "Object is deleted!"; }
+  const char *what() const throw() { return "Object is deleted!"; }
 };
-
 struct InvalidArgumentException : public std::exception {
-  const char *what() const noexcept override { return "Invalid argument!"; }
+  const char *what() const throw() { return "Invalid argument!"; }
 };
-
 struct InvalidIDException : public std::exception {
-  InvalidIDException() : message_{"Invalid ID!"} {}
-  explicit InvalidIDException(std::uint64_t identifier) : message_{StringSerialize("Invalid ID =", identifier)} {}
-  const char *what() const noexcept override { return message_.c_str(); }
-
- private:
-  std::string message_;
+  const char *what() const throw() { return "Invalid ID!"; }
 };
-
 struct KeyAlreadyExistsException : public std::exception {
-  KeyAlreadyExistsException() : message_{"Key you are trying to set already exists!"} {}
-  explicit KeyAlreadyExistsException(const std::string &key)
-      : message_{StringSerialize("Key you are trying to set already exists! KEY = ", key)} {}
-  const char *what() const noexcept override { return message_.c_str(); }
-
- private:
-  std::string message_;
+  const char *what() const throw() { return "Key you are trying to set already exists!"; }
 };
-
 struct ImmutableObjectException : public std::exception {
-  const char *what() const noexcept override { return "Object you are trying to change is immutable!"; }
+  const char *what() const throw() { return "Object you are trying to change is immutable!"; }
 };
-
 struct ValueConversionException : public std::exception {
-  const char *what() const noexcept override { return "Error in value conversion!"; }
+  const char *what() const throw() { return "Error in value conversion!"; }
 };
-
 struct SerializationException : public std::exception {
-  const char *what() const noexcept override { return "Error in serialization!"; }
+  const char *what() const throw() { return "Error in serialization!"; }
 };
-
 }  // namespace mg_exception

include/mg_procedure.h

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -462,18 +462,6 @@ void mgp_map_destroy(struct mgp_map *map);
 /// Return mgp_error::MGP_ERROR_KEY_ALREADY_EXISTS if a previous mapping already exists.
 enum mgp_error mgp_map_insert(struct mgp_map *map, const char *key, struct mgp_value *value);
 
-/// Insert a mapping from a NULL terminated character string to a value.
-/// If a mapping with the same key already exists, it is replaced.
-/// In case of update, both the string and the value are copied into the map.
-/// Therefore, the map does not take ownership of the original key nor value, so
-/// you still need to free their memory explicitly.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE is returned if unable to allocate for insertion.
-enum mgp_error mgp_map_update(struct mgp_map *map, const char *key, struct mgp_value *value);
-
-// Erase a mapping by key.
-// If the key doesn't exist in the map nothing happens
-enum mgp_error mgp_map_erase(struct mgp_map *map, const char *key);
-
 /// Get the number of items stored in mgp_map.
 /// Current implementation always returns without errors.
 enum mgp_error mgp_map_size(struct mgp_map *map, size_t *result);
@@ -1330,13 +1318,6 @@ MGP_ENUM_CLASS mgp_log_level{
 /// to allocate global resources.
 typedef void (*mgp_proc_cb)(struct mgp_list *, struct mgp_graph *, struct mgp_result *, struct mgp_memory *);
 
-/// Cleanup for a query module read procedure. Can't be invoked through OpenCypher. Cleans batched stream.
-typedef void (*mgp_proc_cleanup)();
-
-/// Initializer for a query module batched read procedure. Can't be invoked through OpenCypher. Initializes batched
-/// stream.
-typedef void (*mgp_proc_initializer)(struct mgp_list *, struct mgp_graph *, struct mgp_memory *);
-
 /// Register a read-only procedure to a module.
 ///
 /// The `name` must be a sequence of digits, underscores, lowercase and
@@ -1361,30 +1342,6 @@ enum mgp_error mgp_module_add_read_procedure(struct mgp_module *module, const ch
 enum mgp_error mgp_module_add_write_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
                                               struct mgp_proc **result);
 
-/// Register a readable batched procedure to a module.
-///
-/// The `name` must be a valid identifier, following the same rules as the
-/// procedure`name` in mgp_module_add_read_procedure.
-///
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for mgp_proc.
-/// Return mgp_error::MGP_ERROR_INVALID_ARGUMENT if `name` is not a valid procedure name.
-/// RETURN mgp_error::MGP_ERROR_LOGIC_ERROR if a procedure with the same name was already registered.
-enum mgp_error mgp_module_add_batch_read_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                   mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                                                   struct mgp_proc **result);
-
-/// Register a writeable batched procedure to a module.
-///
-/// The `name` must be a valid identifier, following the same rules as the
-/// procedure`name` in mgp_module_add_read_procedure.
-///
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for mgp_proc.
-/// Return mgp_error::MGP_ERROR_INVALID_ARGUMENT if `name` is not a valid procedure name.
-/// RETURN mgp_error::MGP_ERROR_LOGIC_ERROR if a procedure with the same name was already registered.
-enum mgp_error mgp_module_add_batch_write_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                    mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                                                    struct mgp_proc **result);
-
 /// Add a required argument to a procedure.
 ///
 /// The order of adding arguments will correspond to the order the procedure
@@ -1460,10 +1417,7 @@ enum mgp_error mgp_log(enum mgp_log_level log_level, const char *output);
 /// @{
 
 /// Return non-zero if the currently executing procedure should abort as soon as
-/// possible. If non-zero the reasons are:
-/// (1) The transaction was requested to be terminated
-/// (2) The server is gracefully shutting down
-/// (3) The transaction has hit its timeout threshold
+/// possible.
 ///
 /// Procedures which perform heavyweight processing run the risk of running too
 /// long and going over the query execution time limit. To prevent this, such

include/mgp.hpp

@@ -11,17 +11,14 @@
 
 #pragma once
 
-#include <cstdlib>
 #include <cstring>
 #include <functional>
 #include <map>
 #include <set>
 #include <string>
-#include <string_view>
 #include <vector>
 
 #include "_mgp.hpp"
-#include "mg_exceptions.hpp"
 #include "mg_procedure.h"
 
 namespace mgp {
@@ -53,6 +50,11 @@ class NotFoundException : public std::exception {
   std::string message_;
 };
 
+class NotEnoughMemoryException : public std::exception {
+ public:
+  const char *what() const throw() { return "Not enough memory!"; }
+};
+
 class MustAbortException : public std::exception {
  public:
   explicit MustAbortException(const std::string &message) : message_(message) {}
@@ -62,21 +64,6 @@ class MustAbortException : public std::exception {
   std::string message_;
 };
 
-class TerminatedMustAbortException : public MustAbortException {
- public:
-  explicit TerminatedMustAbortException() : MustAbortException("Query was asked to terminate directly.") {}
-};
-
-class ShutdownMustAbortException : public MustAbortException {
- public:
-  explicit ShutdownMustAbortException() : MustAbortException("Query was asked to because of server shutdown.") {}
-};
-
-class TimeoutMustAbortException : public MustAbortException {
- public:
-  explicit TimeoutMustAbortException() : MustAbortException("Query was asked to because of timeout was hit.") {}
-};
-
 // Forward declarations
 class Nodes;
 using GraphNodes = Nodes;
@@ -119,19 +106,6 @@ class Id {
   int64_t id_;
 };
 
-enum class AbortReason : uint8_t {
-  NO_ABORT = 0,
-
-  // transaction has been requested to terminate, ie. "TERMINATE TRANSACTIONS ..."
-  TERMINATED = 1,
-
-  // server is gracefully shutting down
-  SHUTDOWN = 2,
-
-  // the transaction timeout has been reached. Either via "--query-execution-timeout-sec", or a per-transaction timeout
-  TIMEOUT = 3,
-};
-
 /// @brief Wrapper class for @ref mgp_graph.
 class Graph {
  private:
@@ -176,13 +150,8 @@ class Graph {
   /// @brief Deletes a relationship from the graph.
   void DeleteRelationship(const Relationship &relationship);
 
-  /// @brief Checks if process must abort
-  /// @return AbortReason the reason to abort, if no need to abort then AbortReason::NO_ABORT is returned
-  AbortReason MustAbort() const;
+  bool MustAbort() const;
 
-  /// @brief Checks if process must abort
-  /// @throws MustAbortException If process must abort for any reason
-  /// @note For the reason why the process must abort consider using MustAbort method instead
   void CheckMustAbort() const;
 
  private:
@@ -427,9 +396,6 @@ class List {
   /// @brief Returns the value at the given `index`.
   const Value operator[](size_t index) const;
 
-  ///@brief Same as above, but non const value
-  Value operator[](size_t index);
-
   class Iterator {
    private:
     friend class List;
@@ -492,7 +458,6 @@ class Map {
  public:
   /// @brief Creates a Map from the copy of the given @ref mgp_map.
   explicit Map(mgp_map *ptr);
-
   /// @brief Creates a Map from the copy of the given @ref mgp_map.
   explicit Map(const mgp_map *const_ptr);
 
@@ -501,7 +466,6 @@ class Map {
 
   /// @brief Creates a Map from the given vector.
   explicit Map(const std::map<std::string_view, Value> &items);
-
   /// @brief Creates a Map from the given vector.
   explicit Map(std::map<std::string_view, Value> &&items);
 
@@ -518,13 +482,11 @@ class Map {
 
   /// @brief Returns the size of the map.
   size_t Size() const;
-
   /// @brief Returns whether the map is empty.
   bool Empty() const;
 
   /// @brief Returns the value at the given `key`.
   Value const operator[](std::string_view key) const;
-
   /// @brief Returns the value at the given `key`.
   Value const At(std::string_view key) const;
 
@@ -565,30 +527,16 @@ class Map {
 
   /// @brief Inserts the given `key`-`value` pair into the map. The `value` is copied.
   void Insert(std::string_view key, const Value &value);
-
   /// @brief Inserts the given `key`-`value` pair into the map.
   /// @note Takes the ownership of `value` by moving it. The behavior of accessing `value` after performing this
   /// operation is undefined.
   void Insert(std::string_view key, Value &&value);
 
-  /// @brief Updates the `key`-`value` pair in the map. If the key doesn't exist, the value gets inserted. The `value`
-  /// is copied.
-  void Update(std::string_view key, const Value &value);
-
-  /// @brief Updates the `key`-`value` pair in the map. If the key doesn't exist, the value gets inserted. The `value`
-  /// is copied.
-  /// @note Takes the ownership of `value` by moving it. The behavior of accessing `value` after performing this
-  /// operation is undefined.
-  void Update(std::string_view key, Value &&value);
-
-  /// @brief Erases the element associated with the key from the map, if it doesn't exist does nothing.
-  void Erase(std::string_view key);
-
+  // void Erase(std::string_view key);  // not implemented (requires mgp_map_erase in the MGP API)
   // void Clear();  // not implemented (requires mgp_map_clear in the MGP API)
 
   /// @exception std::runtime_error Map contains value of unknown type.
   bool operator==(const Map &other) const;
-
   /// @exception std::runtime_error Map contains value of unknown type.
   bool operator!=(const Map &other) const;
 
@@ -610,7 +558,6 @@ class Node {
 
   /// @brief Creates a Node from the copy of the given @ref mgp_vertex.
   explicit Node(mgp_vertex *ptr);
-
   /// @brief Creates a Node from the copy of the given @ref mgp_vertex.
   explicit Node(const mgp_vertex *const_ptr);
 
@@ -637,29 +584,20 @@ class Node {
   /// @brief Sets the chosen property to the given value.
   void SetProperty(std::string property, Value value);
 
-  /// @brief Removes the chosen property.
-  void RemoveProperty(std::string property);
-
   /// @brief Retrieves the value of the chosen property.
   Value GetProperty(const std::string &property) const;
 
   /// @brief Returns an iterable structure of the node’s inbound relationships.
   Relationships InRelationships() const;
-
   /// @brief Returns an iterable structure of the node’s outbound relationships.
   Relationships OutRelationships() const;
-
   /// @brief Adds a label to the node.
   void AddLabel(const std::string_view label);
 
-  /// @brief Removes a label from the node.
-  void RemoveLabel(const std::string_view label);
-
   bool operator<(const Node &other) const;
 
   /// @exception std::runtime_error Node properties contain value(s) of unknown type.
   bool operator==(const Node &other) const;
-
   /// @exception std::runtime_error Node properties contain value(s) of unknown type.
   bool operator!=(const Node &other) const;
 
@@ -1008,7 +946,6 @@ class Duration {
 /* #region Value */
 enum class Type : uint8_t {
   Null,
-  Any,
   Bool,
   Int,
   Double,
@@ -1127,46 +1064,32 @@ class Value {
 
   /// @pre Value type needs to be Type::Bool.
   bool ValueBool() const;
-  bool ValueBool();
   /// @pre Value type needs to be Type::Int.
   int64_t ValueInt() const;
-  int64_t ValueInt();
   /// @pre Value type needs to be Type::Double.
   double ValueDouble() const;
-  double ValueDouble();
   /// @pre Value type needs to be Type::Numeric.
   double ValueNumeric() const;
-  double ValueNumeric();
   /// @pre Value type needs to be Type::String.
   std::string_view ValueString() const;
-  std::string_view ValueString();
   /// @pre Value type needs to be Type::List.
   const List ValueList() const;
-  List ValueList();
   /// @pre Value type needs to be Type::Map.
   const Map ValueMap() const;
-  Map ValueMap();
   /// @pre Value type needs to be Type::Node.
   const Node ValueNode() const;
-  Node ValueNode();
   /// @pre Value type needs to be Type::Relationship.
   const Relationship ValueRelationship() const;
-  Relationship ValueRelationship();
   /// @pre Value type needs to be Type::Path.
   const Path ValuePath() const;
-  Path ValuePath();
   /// @pre Value type needs to be Type::Date.
   const Date ValueDate() const;
-  Date ValueDate();
   /// @pre Value type needs to be Type::LocalTime.
   const LocalTime ValueLocalTime() const;
-  LocalTime ValueLocalTime();
   /// @pre Value type needs to be Type::LocalDateTime.
   const LocalDateTime ValueLocalDateTime() const;
-  LocalDateTime ValueLocalDateTime();
   /// @pre Value type needs to be Type::Duration.
   const Duration ValueDuration() const;
-  Duration ValueDuration();
 
   /// @brief Returns whether the value is null.
   bool IsNull() const;
@@ -1204,10 +1127,6 @@ class Value {
   /// @exception std::runtime_error Unknown value type.
   bool operator!=(const Value &other) const;
 
-  bool operator<(const Value &other) const;
-
-  friend std::ostream &operator<<(std::ostream &os, const mgp::Value &value);
-
  private:
   mgp_value *ptr_;
 };
@@ -1260,8 +1179,6 @@ class Record {
   void Insert(const char *field_name, const LocalDateTime &local_date_time);
   /// @brief Inserts a @ref Duration value under field `field_name`.
   void Insert(const char *field_name, const Duration &duration);
-  /// @brief Inserts a @ref Value value under field `field_name`, and then call appropriate insert.
-  void Insert(const char *field_name, const Value &value);
 
  private:
   mgp_result_record *record_;
@@ -1401,20 +1318,6 @@ inline void AddProcedure(mgp_proc_cb callback, std::string_view name, ProcedureT
                          std::vector<Parameter> parameters, std::vector<Return> returns, mgp_module *module,
                          mgp_memory *memory);
 
-/// @brief Adds a batch procedure to the query module.
-/// @param callback - procedure callback
-/// @param initializer - procedure initializer
-/// @param cleanup - procedure cleanup
-/// @param name - procedure name
-/// @param proc_type - procedure type (read/write)
-/// @param parameters - procedure parameters
-/// @param returns - procedure return values
-/// @param module - the query module that the procedure is added to
-/// @param memory - access to memory
-inline void AddBatchProcedure(mgp_proc_cb callback, mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                              std::string_view name, ProcedureType proc_type, std::vector<Parameter> parameters,
-                              std::vector<Return> returns, mgp_module *module, mgp_memory *memory);
-
 /// @brief Adds a function to the query module.
 /// @param callback - function callback
 /// @param name - function name
@@ -1427,67 +1330,6 @@ inline void AddFunction(mgp_func_cb callback, std::string_view name, std::vector
 /* #endregion */
 
 namespace util {
-inline uint64_t Fnv(const std::string_view s) {
-  // fnv1a is recommended so use it as the default implementation.
-  uint64_t hash = 14695981039346656037UL;
-
-  for (const auto &ch : s) {
-    hash = (hash ^ (uint64_t)ch) * 1099511628211UL;
-  }
-
-  return hash;
-}
-
-/**
- * Does FNV-like hashing on a collection. Not truly FNV
- * because it operates on 8-bit elements, while this
- * implementation uses size_t elements (collection item
- * hash).
- *
- * https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
- *
- *
- * @tparam TIterable A collection type that has begin() and end().
- * @tparam TElement Type of element in the collection.
- * @tparam THash Hash type (has operator() that accepts a 'const TEelement &'
- *  and returns size_t. Defaults to std::hash<TElement>.
- * @param iterable A collection of elements.
- * @param element_hash Function for hashing a single element.
- * @return The hash of the whole collection.
- */
-template <typename TIterable, typename TElement, typename THash = std::hash<TElement>>
-struct FnvCollection {
-  size_t operator()(const TIterable &iterable) const {
-    uint64_t hash = 14695981039346656037u;
-    THash element_hash;
-    for (const TElement &element : iterable) {
-      hash *= fnv_prime;
-      hash ^= element_hash(element);
-    }
-    return hash;
-  }
-
- private:
-  static const uint64_t fnv_prime = 1099511628211u;
-};
-
-/**
- * Like FNV hashing for a collection, just specialized for two elements to avoid
- * iteration overhead.
- */
-template <typename TA, typename TB, typename TAHash = std::hash<TA>, typename TBHash = std::hash<TB>>
-struct HashCombine {
-  size_t operator()(const TA &a, const TB &b) const {
-    static constexpr size_t fnv_prime = 1099511628211UL;
-    static constexpr size_t fnv_offset = 14695981039346656037UL;
-    size_t ret = fnv_offset;
-    ret ^= TAHash()(a);
-    ret *= fnv_prime;
-    ret ^= TBHash()(b);
-    return ret;
-  }
-};
-
 // uint to int conversion in C++ is a bit tricky. Take a look here
 // https://stackoverflow.com/questions/14623266/why-cant-i-reinterpret-cast-uint-to-int
 // for more details.
@@ -1610,10 +1452,6 @@ inline bool ValuesEqual(mgp_value *value1, mgp_value *value2) {
   if (value1 == value2) {
     return true;
   }
-  // Make int and double comparable, (ex. this is true -> 1.0 == 1)
-  if (mgp::value_is_numeric(value1) && mgp::value_is_numeric(value2)) {
-    return mgp::value_get_numeric(value1) == mgp::value_get_numeric(value2);
-  }
   if (mgp::value_get_type(value1) != mgp::value_get_type(value2)) {
     return false;
   }
@@ -1653,8 +1491,6 @@ inline bool ValuesEqual(mgp_value *value1, mgp_value *value2) {
 /// @brief Converts C++ API types to their MGP API equivalents.
 inline mgp_type *ToMGPType(Type type) {
   switch (type) {
-    case Type::Any:
-      return mgp::type_any();
     case Type::Bool:
       return mgp::type_bool();
     case Type::Int:
@@ -1749,31 +1585,11 @@ inline Id::Id(int64_t id) : id_(id) {}
 
 inline Graph::Graph(mgp_graph *graph) : graph_(graph) {}
 
-inline AbortReason Graph::MustAbort() const {
-  const auto reason = must_abort(graph_);
-  switch (reason) {
-    case 1:
-      return AbortReason::TERMINATED;
-    case 2:
-      return AbortReason::SHUTDOWN;
-    case 3:
-      return AbortReason::TIMEOUT;
-    default:
-      break;
-  }
-  return AbortReason::NO_ABORT;
-}
+inline bool Graph::MustAbort() const { return must_abort(graph_); }
 
 inline void Graph::CheckMustAbort() const {
-  switch (MustAbort()) {
-    case AbortReason::TERMINATED:
-      throw TerminatedMustAbortException();
-    case AbortReason::SHUTDOWN:
-      throw ShutdownMustAbortException();
-    case AbortReason::TIMEOUT:
-      throw TimeoutMustAbortException();
-    case AbortReason::NO_ABORT:
-      break;
+  if (MustAbort()) {
+    throw MustAbortException("Query was asked to abort.");
   }
 }
 
@@ -2277,8 +2093,6 @@ inline bool List::Empty() const { return Size() == 0; }
 
 inline const Value List::operator[](size_t index) const { return Value(mgp::list_at(ptr_, index)); }
 
-inline Value List::operator[](size_t index) { return Value(mgp::list_at(ptr_, index)); }
-
 inline bool List::Iterator::operator==(const Iterator &other) const {
   return iterable_ == other.iterable_ && index_ == other.index_;
 }
@@ -2387,14 +2201,7 @@ inline bool Map::Empty() const { return Size() == 0; }
 
 inline const Value Map::operator[](std::string_view key) const { return Value(mgp::map_at(ptr_, key.data())); }
 
-inline const Value Map::At(std::string_view key) const {
-  auto *ptr = mgp::map_at(ptr_, key.data());
-  if (ptr) {
-    return Value(ptr);
-  }
-
-  return Value();
-}
+inline const Value Map::At(std::string_view key) const { return Value(mgp::map_at(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;
@@ -2468,20 +2275,9 @@ inline void Map::Insert(std::string_view key, const Value &value) { mgp::map_ins
 
 inline void Map::Insert(std::string_view key, Value &&value) {
   mgp::map_insert(ptr_, key.data(), value.ptr_);
-  value.~Value();
   value.ptr_ = nullptr;
 }
 
-inline void Map::Update(std::string_view key, const Value &value) { mgp::map_update(ptr_, key.data(), value.ptr_); }
-
-inline void Map::Update(std::string_view key, Value &&value) {
-  mgp::map_update(ptr_, key.data(), value.ptr_);
-  value.~Value();
-  value.ptr_ = nullptr;
-}
-
-inline void Map::Erase(std::string_view key) { mgp::map_erase(ptr_, key.data()); }
-
 inline bool Map::operator==(const Map &other) const { return util::MapsEqual(ptr_, other.ptr_); }
 
 inline bool Map::operator!=(const Map &other) const { return !(*this == other); }
@@ -2541,7 +2337,7 @@ inline bool Node::HasLabel(std::string_view label) const {
 inline Relationships Node::InRelationships() const {
   auto relationship_iterator = mgp::vertex_iter_in_edges(ptr_, memory);
   if (relationship_iterator == nullptr) {
-    throw mg_exception::NotEnoughMemoryException();
+    throw NotEnoughMemoryException();
   }
   return Relationships(relationship_iterator);
 }
@@ -2549,7 +2345,7 @@ inline Relationships Node::InRelationships() const {
 inline Relationships Node::OutRelationships() const {
   auto relationship_iterator = mgp::vertex_iter_out_edges(ptr_, memory);
   if (relationship_iterator == nullptr) {
-    throw mg_exception::NotEnoughMemoryException();
+    throw NotEnoughMemoryException();
   }
   return Relationships(relationship_iterator);
 }
@@ -2558,10 +2354,6 @@ inline void Node::AddLabel(const std::string_view label) {
   mgp::vertex_add_label(this->ptr_, mgp_label{.name = label.data()});
 }
 
-inline void Node::RemoveLabel(const std::string_view label) {
-  mgp::vertex_remove_label(this->ptr_, mgp_label{.name = label.data()});
-}
-
 inline std::map<std::string, Value> Node::Properties() const {
   mgp_properties_iterator *properties_iterator = mgp::vertex_iter_properties(ptr_, memory);
   std::map<std::string, Value> property_map;
@@ -2577,8 +2369,6 @@ inline void Node::SetProperty(std::string property, Value value) {
   mgp::vertex_set_property(ptr_, property.data(), value.ptr());
 }
 
-inline void Node::RemoveProperty(std::string property) { SetProperty(property, Value()); }
-
 inline Value Node::GetProperty(const std::string &property) const {
   mgp_value *vertex_prop = mgp::vertex_get_property(ptr_, property.data(), memory);
   return Value(steal, vertex_prop);
@@ -2722,7 +2512,6 @@ inline void Path::Expand(const Relationship &relationship) { mgp::path_expand(pt
 inline bool Path::operator==(const Path &other) const { return util::PathsEqual(ptr_, other.ptr_); }
 
 inline bool Path::operator!=(const Path &other) const { return !(*this == other); }
-
 /* #endregion */
 
 /* #region Temporal types (Date, LocalTime, LocalDateTime, Duration) */
@@ -3244,12 +3033,6 @@ inline bool Value::ValueBool() const {
   }
   return mgp::value_get_bool(ptr_);
 }
-inline bool Value::ValueBool() {
-  if (Type() != Type::Bool) {
-    throw ValueException("Type of value is wrong: expected Bool.");
-  }
-  return mgp::value_get_bool(ptr_);
-}
 
 inline std::int64_t Value::ValueInt() const {
   if (Type() != Type::Int) {
@@ -3257,12 +3040,6 @@ inline std::int64_t Value::ValueInt() const {
   }
   return mgp::value_get_int(ptr_);
 }
-inline std::int64_t Value::ValueInt() {
-  if (Type() != Type::Int) {
-    throw ValueException("Type of value is wrong: expected Int.");
-  }
-  return mgp::value_get_int(ptr_);
-}
 
 inline double Value::ValueDouble() const {
   if (Type() != Type::Double) {
@@ -3270,12 +3047,6 @@ inline double Value::ValueDouble() const {
   }
   return mgp::value_get_double(ptr_);
 }
-inline double Value::ValueDouble() {
-  if (Type() != Type::Double) {
-    throw ValueException("Type of value is wrong: expected Double.");
-  }
-  return mgp::value_get_double(ptr_);
-}
 
 inline double Value::ValueNumeric() const {
   if (Type() != Type::Int && Type() != Type::Double) {
@@ -3286,15 +3057,6 @@ inline double Value::ValueNumeric() const {
   }
   return mgp::value_get_double(ptr_);
 }
-inline double Value::ValueNumeric() {
-  if (Type() != Type::Int && Type() != Type::Double) {
-    throw ValueException("Type of value is wrong: expected Int or Double.");
-  }
-  if (Type() == Type::Int) {
-    return static_cast<double>(mgp::value_get_int(ptr_));
-  }
-  return mgp::value_get_double(ptr_);
-}
 
 inline std::string_view Value::ValueString() const {
   if (Type() != Type::String) {
@@ -3302,12 +3064,6 @@ inline std::string_view Value::ValueString() const {
   }
   return mgp::value_get_string(ptr_);
 }
-inline std::string_view Value::ValueString() {
-  if (Type() != Type::String) {
-    throw ValueException("Type of value is wrong: expected String.");
-  }
-  return mgp::value_get_string(ptr_);
-}
 
 inline const List Value::ValueList() const {
   if (Type() != Type::List) {
@@ -3315,12 +3071,6 @@ inline const List Value::ValueList() const {
   }
   return List(mgp::value_get_list(ptr_));
 }
-inline List Value::ValueList() {
-  if (Type() != Type::List) {
-    throw ValueException("Type of value is wrong: expected List.");
-  }
-  return List(mgp::value_get_list(ptr_));
-}
 
 inline const Map Value::ValueMap() const {
   if (Type() != Type::Map) {
@@ -3328,12 +3078,6 @@ inline const Map Value::ValueMap() const {
   }
   return Map(mgp::value_get_map(ptr_));
 }
-inline Map Value::ValueMap() {
-  if (Type() != Type::Map) {
-    throw ValueException("Type of value is wrong: expected Map.");
-  }
-  return Map(mgp::value_get_map(ptr_));
-}
 
 inline const Node Value::ValueNode() const {
   if (Type() != Type::Node) {
@@ -3341,12 +3085,6 @@ inline const Node Value::ValueNode() const {
   }
   return Node(mgp::value_get_vertex(ptr_));
 }
-inline Node Value::ValueNode() {
-  if (Type() != Type::Node) {
-    throw ValueException("Type of value is wrong: expected Node.");
-  }
-  return Node(mgp::value_get_vertex(ptr_));
-}
 
 inline const Relationship Value::ValueRelationship() const {
   if (Type() != Type::Relationship) {
@@ -3354,12 +3092,6 @@ inline const Relationship Value::ValueRelationship() const {
   }
   return Relationship(mgp::value_get_edge(ptr_));
 }
-inline Relationship Value::ValueRelationship() {
-  if (Type() != Type::Relationship) {
-    throw ValueException("Type of value is wrong: expected Relationship.");
-  }
-  return Relationship(mgp::value_get_edge(ptr_));
-}
 
 inline const Path Value::ValuePath() const {
   if (Type() != Type::Path) {
@@ -3367,12 +3099,6 @@ inline const Path Value::ValuePath() const {
   }
   return Path(mgp::value_get_path(ptr_));
 }
-inline Path Value::ValuePath() {
-  if (Type() != Type::Path) {
-    throw ValueException("Type of value is wrong: expected Path.");
-  }
-  return Path(mgp::value_get_path(ptr_));
-}
 
 inline const Date Value::ValueDate() const {
   if (Type() != Type::Date) {
@@ -3380,12 +3106,6 @@ inline const Date Value::ValueDate() const {
   }
   return Date(mgp::value_get_date(ptr_));
 }
-inline Date Value::ValueDate() {
-  if (Type() != Type::Date) {
-    throw ValueException("Type of value is wrong: expected Date.");
-  }
-  return Date(mgp::value_get_date(ptr_));
-}
 
 inline const LocalTime Value::ValueLocalTime() const {
   if (Type() != Type::LocalTime) {
@@ -3393,12 +3113,6 @@ inline const LocalTime Value::ValueLocalTime() const {
   }
   return LocalTime(mgp::value_get_local_time(ptr_));
 }
-inline LocalTime Value::ValueLocalTime() {
-  if (Type() != Type::LocalTime) {
-    throw ValueException("Type of value is wrong: expected LocalTime.");
-  }
-  return LocalTime(mgp::value_get_local_time(ptr_));
-}
 
 inline const LocalDateTime Value::ValueLocalDateTime() const {
   if (Type() != Type::LocalDateTime) {
@@ -3406,12 +3120,6 @@ inline const LocalDateTime Value::ValueLocalDateTime() const {
   }
   return LocalDateTime(mgp::value_get_local_date_time(ptr_));
 }
-inline LocalDateTime Value::ValueLocalDateTime() {
-  if (Type() != Type::LocalDateTime) {
-    throw ValueException("Type of value is wrong: expected LocalDateTime.");
-  }
-  return LocalDateTime(mgp::value_get_local_date_time(ptr_));
-}
 
 inline const Duration Value::ValueDuration() const {
   if (Type() != Type::Duration) {
@@ -3419,12 +3127,6 @@ inline const Duration Value::ValueDuration() const {
   }
   return Duration(mgp::value_get_duration(ptr_));
 }
-inline Duration Value::ValueDuration() {
-  if (Type() != Type::Duration) {
-    throw ValueException("Type of value is wrong: expected Duration.");
-  }
-  return Duration(mgp::value_get_duration(ptr_));
-}
 
 inline bool Value::IsNull() const { return mgp::value_is_null(ptr_); }
 
@@ -3459,128 +3161,6 @@ inline bool Value::IsDuration() const { return mgp::value_is_duration(ptr_); }
 inline bool Value::operator==(const Value &other) const { return util::ValuesEqual(ptr_, other.ptr_); }
 
 inline bool Value::operator!=(const Value &other) const { return !(*this == other); }
-
-inline bool Value::operator<(const Value &other) const {
-  const mgp::Type &type = Type();
-  if (type != other.Type() && !(IsNumeric() && other.IsNumeric())) {
-    throw ValueException("Values have to be of the same type");
-  }
-
-  switch (type) {
-    case Type::Null:
-      throw ValueException("Cannot compare Null types");
-    case Type::Bool:
-      return ValueBool() < other.ValueBool();
-    case Type::Int:
-      return ValueNumeric() < other.ValueNumeric();
-    case Type::Double:
-      return ValueNumeric() < other.ValueNumeric();
-    case Type::String:
-      return ValueString() < other.ValueString();
-    case Type::Node:
-      return ValueNode() < other.ValueNode();
-    case Type::Relationship:
-      return ValueRelationship() < other.ValueRelationship();
-    case Type::Date:
-      return ValueDate() < other.ValueDate();
-    case Type::LocalTime:
-      return ValueLocalTime() < other.ValueLocalTime();
-    case Type::LocalDateTime:
-      return ValueLocalDateTime() < other.ValueLocalDateTime();
-    case Type::Duration:
-      return ValueDuration() < other.ValueDuration();
-    case Type::Path:
-    case Type::List:
-    case Type::Map:
-      throw ValueException("Operator < is not defined for this Path, List or Map data type");
-    default:
-      throw ValueException("Undefined behaviour");
-  }
-}
-
-inline std::ostream &operator<<(std::ostream &os, const mgp::Value &value) {
-  switch (value.Type()) {
-    case mgp::Type::Null:
-      return os << "null";
-    case mgp::Type::Any:
-      return os << "any";
-    case mgp::Type::Bool:
-      return os << (value.ValueBool() ? "true" : "false");
-    case mgp::Type::Int:
-      return os << std::to_string(value.ValueInt());
-    case mgp::Type::Double:
-      return os << std::to_string(value.ValueDouble());
-    case mgp::Type::String:
-      return os << std::string(value.ValueString());
-    case mgp::Type::List:
-      throw mgp::ValueException("Printing mgp::List type currently not supported.");
-    case mgp::Type::Map:
-      throw mgp::ValueException("Printing mgp::Map type currently not supported.");
-    case mgp::Type::Node:
-      return os << "Node[" + std::to_string(value.ValueNode().Id().AsInt()) + "]";
-    case mgp::Type::Relationship:
-      return os << "Relationship[" + std::to_string(value.ValueRelationship().Id().AsInt()) + "]";
-    case mgp::Type::Path:
-      throw mgp::ValueException("Printing mgp::Path type currently not supported.");
-    case mgp::Type::Date: {
-      const auto date{value.ValueDate()};
-      return os << std::to_string(date.Year()) + "-" + std::to_string(date.Month()) + "-" + std::to_string(date.Day());
-    }
-    case mgp::Type::LocalTime: {
-      const auto localTime{value.ValueLocalTime()};
-      return os << std::to_string(localTime.Hour()) + ":" + std::to_string(localTime.Minute()) + ":" +
-                       std::to_string(localTime.Second()) + "," + std::to_string(localTime.Millisecond()) +
-                       std::to_string(localTime.Microsecond());
-    }
-    case mgp::Type::LocalDateTime: {
-      const auto localDateTime = value.ValueLocalDateTime();
-      return os << std::to_string(localDateTime.Year()) + "-" + std::to_string(localDateTime.Month()) + "-" +
-                       std::to_string(localDateTime.Day()) + "T" + std::to_string(localDateTime.Hour()) + ":" +
-                       std::to_string(localDateTime.Minute()) + ":" + std::to_string(localDateTime.Second()) + "," +
-                       std::to_string(localDateTime.Millisecond()) + std::to_string(localDateTime.Microsecond());
-    }
-    case mgp::Type::Duration:
-      return os << std::to_string(value.ValueDuration().Microseconds()) + "ms";
-    default:
-      throw mgp::ValueException("Unknown value type");
-  }
-}
-
-inline std::ostream &operator<<(std::ostream &os, const mgp::Type &type) {
-  switch (type) {
-    case mgp::Type::Null:
-      return os << "null";
-    case mgp::Type::Bool:
-      return os << "bool";
-    case mgp::Type::Int:
-      return os << "int";
-    case mgp::Type::Double:
-      return os << "double";
-    case mgp::Type::String:
-      return os << "string";
-    case mgp::Type::List:
-      return os << "list";
-    case mgp::Type::Map:
-      return os << "map";
-    case mgp::Type::Node:
-      return os << "vertex";
-    case mgp::Type::Relationship:
-      return os << "edge";
-    case mgp::Type::Path:
-      return os << "path";
-    case mgp::Type::Date:
-      return os << "date";
-    case mgp::Type::LocalTime:
-      return os << "local_time";
-    case mgp::Type::LocalDateTime:
-      return os << "local_date_time";
-    case mgp::Type::Duration:
-      return os << "duration";
-    default:
-      throw ValueException("Unknown type");
-  }
-}
-
 /* #endregion */
 
 /* #region Record */
@@ -3672,40 +3252,6 @@ inline void Record::Insert(const char *field_name, const Duration &duration) {
   mgp::value_destroy(mgp_val);
 }
 
-inline void Record::Insert(const char *field_name, const Value &value) {
-  switch (value.Type()) {
-    case Type::Bool:
-      return Insert(field_name, value.ValueBool());
-    case Type::Int:
-      return Insert(field_name, value.ValueInt());
-    case Type::Double:
-      return Insert(field_name, value.ValueDouble());
-    case Type::String:
-      return Insert(field_name, value.ValueString());
-    case Type::List:
-      return Insert(field_name, value.ValueList());
-    case Type::Map:
-      return Insert(field_name, value.ValueMap());
-    case Type::Node:
-      return Insert(field_name, value.ValueNode());
-    case Type::Relationship:
-      return Insert(field_name, value.ValueRelationship());
-    case Type::Path:
-      return Insert(field_name, value.ValuePath());
-    case Type::Date:
-      return Insert(field_name, value.ValueDate());
-    case Type::LocalTime:
-      return Insert(field_name, value.ValueLocalTime());
-    case Type::LocalDateTime:
-      return Insert(field_name, value.ValueLocalDateTime());
-    case Type::Duration:
-      return Insert(field_name, value.ValueDuration());
-
-    default:
-      throw ValueException("No Record.Insert for this datatype");
-  }
-}
-
 // RecordFactory:
 
 inline RecordFactory::RecordFactory(mgp_result *result) : result_(result) {}
@@ -3713,7 +3259,7 @@ inline RecordFactory::RecordFactory(mgp_result *result) : result_(result) {}
 inline const Record RecordFactory::NewRecord() const {
   auto record = mgp::result_new_record(result_);
   if (record == nullptr) {
-    throw mg_exception::NotEnoughMemoryException();
+    throw NotEnoughMemoryException();
   }
   return Record(record);
 }
@@ -3881,12 +3427,14 @@ inline mgp_type *Return::GetMGPType() const {
   return util::ToMGPType(type_);
 }
 
-// do not enter
-namespace detail {
-inline void AddParamsReturnsToProc(mgp_proc *proc, std::vector<Parameter> &parameters,
-                                   const std::vector<Return> &returns) {
+void AddProcedure(mgp_proc_cb callback, std::string_view name, ProcedureType proc_type,
+                  std::vector<Parameter> parameters, std::vector<Return> returns, mgp_module *module,
+                  mgp_memory *memory) {
+  auto proc = (proc_type == ProcedureType::Read) ? mgp::module_add_read_procedure(module, name.data(), callback)
+                                                 : mgp::module_add_write_procedure(module, name.data(), callback);
+
   for (const auto &parameter : parameters) {
-    const auto *parameter_name = parameter.name.data();
+    auto parameter_name = parameter.name.data();
     if (!parameter.optional) {
       mgp::proc_add_arg(proc, parameter_name, parameter.GetMGPType());
     } else {
@@ -3895,35 +3443,18 @@ inline void AddParamsReturnsToProc(mgp_proc *proc, std::vector<Parameter> &param
   }
 
   for (const auto return_ : returns) {
-    const auto *return_name = return_.name.data();
+    auto return_name = return_.name.data();
+
     mgp::proc_add_result(proc, return_name, return_.GetMGPType());
   }
 }
-}  // namespace detail
-
-void AddProcedure(mgp_proc_cb callback, std::string_view name, ProcedureType proc_type,
-                  std::vector<Parameter> parameters, std::vector<Return> returns, mgp_module *module,
-                  mgp_memory *memory) {
-  auto *proc = (proc_type == ProcedureType::Read) ? mgp::module_add_read_procedure(module, name.data(), callback)
-                                                  : mgp::module_add_write_procedure(module, name.data(), callback);
-  detail::AddParamsReturnsToProc(proc, parameters, returns);
-}
-
-void AddBatchProcedure(mgp_proc_cb callback, mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                       std::string_view name, ProcedureType proc_type, std::vector<Parameter> parameters,
-                       std::vector<Return> returns, mgp_module *module, mgp_memory *memory) {
-  auto *proc = (proc_type == ProcedureType::Read)
-                   ? mgp::module_add_batch_read_procedure(module, name.data(), callback, initializer, cleanup)
-                   : mgp::module_add_batch_write_procedure(module, name.data(), callback, initializer, cleanup);
-  detail::AddParamsReturnsToProc(proc, parameters, returns);
-}
 
 void AddFunction(mgp_func_cb callback, std::string_view name, std::vector<Parameter> parameters, mgp_module *module,
                  mgp_memory *memory) {
-  auto *func = mgp::module_add_function(module, name.data(), callback);
+  auto func = mgp::module_add_function(module, name.data(), callback);
 
   for (const auto &parameter : parameters) {
-    const auto *parameter_name = parameter.name.data();
+    auto parameter_name = parameter.name.data();
 
     if (!parameter.optional) {
       mgp::func_add_arg(func, parameter_name, parameter.GetMGPType());
@@ -3953,28 +3484,6 @@ struct hash<mgp::Relationship> {
   size_t operator()(const mgp::Relationship &x) const { return hash<int64_t>()(x.Id().AsInt()); };
 };
 
-template <>
-struct hash<mgp::Path> {
-  size_t operator()(const mgp::Path &x) const {
-    // https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function
-    // See mgp::util::FnvCollection
-    constexpr const uint64_t fnv_prime = 1099511628211U;
-    uint64_t hash = 14695981039346656037U;
-
-    auto multiply_and_xor = [](uint64_t &hash, size_t element_hash) {
-      hash *= fnv_prime;
-      hash ^= element_hash;
-    };
-
-    for (size_t i = 0; i < x.Length() - 1; ++i) {
-      multiply_and_xor(hash, std::hash<mgp::Node>{}(x.GetNodeAt(i)));
-      multiply_and_xor(hash, std::hash<mgp::Relationship>{}(x.GetRelationshipAt(i)));
-    }
-    multiply_and_xor(hash, std::hash<mgp::Node>{}(x.GetNodeAt(x.Length())));
-    return hash;
-  }
-};
-
 template <>
 struct hash<mgp::Date> {
   size_t operator()(const mgp::Date &x) const { return hash<int64_t>()(x.Timestamp()); };
@@ -3999,59 +3508,4 @@ template <>
 struct hash<mgp::MapItem> {
   size_t operator()(const mgp::MapItem &x) const { return hash<std::string_view>()(x.key); };
 };
-
-template <>
-struct hash<mgp::Map> {
-  size_t operator()(const mgp::Map &x) const {
-    return mgp::util::FnvCollection<mgp::Map, mgp::MapItem, std::hash<mgp::MapItem>>{}(x);
-  }
-};
-
-template <>
-struct hash<mgp::Value> {
-  size_t operator()(const mgp::Value &x) const {
-    switch (x.Type()) {
-      case mgp::Type::Null:
-        return 31;
-      case mgp::Type::Any:
-        throw mg_exception::InvalidArgumentException();
-      case mgp::Type::Bool:
-        return std::hash<bool>{}(x.ValueBool());
-      case mgp::Type::Int:
-        // we cast int to double for hashing purposes
-        // to be consistent with equality (2.0 == 2) == true
-        return std::hash<double>{}((double)x.ValueInt());
-      case mgp::Type::Double:
-        return std::hash<double>{}(x.ValueDouble());
-      case mgp::Type::String:
-        return std::hash<std::string_view>{}(x.ValueString());
-      case mgp::Type::List:
-        return mgp::util::FnvCollection<mgp::List, mgp::Value, std::hash<mgp::Value>>{}(x.ValueList());
-      case mgp::Type::Map:
-        return std::hash<mgp::Map>{}(x.ValueMap());
-      case mgp::Type::Node:
-        return std::hash<mgp::Node>{}(x.ValueNode());
-      case mgp::Type::Relationship:
-        return std::hash<mgp::Relationship>{}(x.ValueRelationship());
-      case mgp::Type::Path:
-        return std::hash<mgp::Path>{}(x.ValuePath());
-      case mgp::Type::Date:
-        return std::hash<mgp::Date>{}(x.ValueDate());
-      case mgp::Type::LocalTime:
-        return std::hash<mgp::LocalTime>{}(x.ValueLocalTime());
-      case mgp::Type::LocalDateTime:
-        return std::hash<mgp::LocalDateTime>{}(x.ValueLocalDateTime());
-      case mgp::Type::Duration:
-        return std::hash<mgp::Duration>{}(x.ValueDuration());
-    }
-    throw mg_exception::InvalidArgumentException();
-  }
-};
-
-template <>
-struct hash<mgp::List> {
-  size_t operator()(const mgp::List &x) {
-    return mgp::util::FnvCollection<mgp::List, mgp::Value, std::hash<mgp::Value>>{}(x);
-  }
-};
 }  // namespace std

include/mgp.py

@@ -1402,13 +1402,6 @@ class UnsupportedTypingError(Exception):
         super().__init__("Unsupported typing annotation '{}'".format(type_))
 
 
-class UnequalTypesError(Exception):
-    """Signals a typing annotation is not equal between types"""
-
-    def __init__(self, type1_: typing.Any, type2_: typing.Any):
-        super().__init__(f"Unequal typing annotation '{type1_}' and '{type2_}'")
-
-
 def _typing_to_cypher_type(type_):
     """Convert typing annotation to a _mgp.CypherType instance."""
     simple_types = {
@@ -1521,72 +1514,6 @@ def _typing_to_cypher_type(type_):
         return parse_typing(str(type_))
 
 
-def _is_typing_same(type1_, type2_):
-    """Convert typing annotation to a _mgp.CypherType instance."""
-    simple_types = {
-        typing.Any: 1,
-        object: 2,
-        list: 3,
-        Any: 4,
-        bool: 5,
-        str: 6,
-        int: 7,
-        float: 8,
-        Number: 9,
-        Map: 10,
-        Vertex: 11,
-        Edge: 12,
-        Path: 13,
-        Date: 14,
-        LocalTime: 15,
-        LocalDateTime: 16,
-        Duration: 17,
-    }
-    try:
-        return simple_types[type1_] == simple_types[type2_]
-    except KeyError:
-        pass
-
-    if sys.version_info < (3, 8):
-        # skip type checks
-        return True
-
-    complex_type1 = typing.get_origin(type1_)
-    type_args1 = typing.get_args(type2_)
-
-    complex_type2 = typing.get_origin(type1_)
-    type_args2 = typing.get_args(type2_)
-
-    if complex_type2 != complex_type1:
-        raise UnequalTypesError(type1_, type2_)
-
-    if complex_type1 == typing.Union:
-        contains_none_arg1 = type(None) in type_args1
-        contains_none_arg2 = type(None) in type_args2
-
-        if contains_none_arg1 != contains_none_arg2:
-            raise UnequalTypesError(type1_, type2_)
-
-        if contains_none_arg1:
-            types1 = tuple(t for t in type_args1 if t is not type(None))  # noqa E721
-            types2 = tuple(t for t in type_args2 if t is not type(None))  # noqa E721
-            if len(types1) != len(types2):
-                raise UnequalTypesError(types1, types2)
-            if len(types1) == 1:
-                (type_arg1,) = types1
-                (type_arg2,) = types2
-            else:
-                type_arg1 = typing.Union.__getitem__(types1)
-                type_arg2 = typing.Union.__getitem__(types2)
-            return _is_typing_same(type_arg1, type_arg2)
-    elif complex_type1 == list:
-        (type_arg1,) = type_args1
-        (type_arg2,) = type_args2
-        return _is_typing_same(type_arg1, type_arg2)
-    # skip type checks
-    return True
-
-
 # Procedure registration
 
 
@@ -1746,92 +1673,6 @@ def write_proc(func: typing.Callable[..., Record]):
     return _register_proc(func, True)
 
 
-def _register_batch_proc(
-    func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable, is_write: bool
-):
-    raise_if_does_not_meet_requirements(func)
-    register_func = _mgp.Module.add_batch_write_procedure if is_write else _mgp.Module.add_batch_read_procedure
-    func_sig = inspect.signature(func)
-    func_params = tuple(func_sig.parameters.values())
-
-    initializer_sig = inspect.signature(initializer)
-    initializer_params = tuple(initializer_sig.parameters.values())
-
-    assert (
-        func_params and initializer_params or not func_params and not initializer_params
-    ), "Both function params and initializer params must exist or not exist"
-
-    assert len(func_params) == len(initializer_params), "Number of params must be same"
-
-    assert initializer_sig.return_annotation is initializer_sig.empty, "Initializer can't return anything"
-
-    if func_params and func_params[0].annotation is ProcCtx:
-        assert (
-            initializer_params and initializer_params[0].annotation is ProcCtx
-        ), "Initializer must have mgp.ProcCtx as first parameter"
-
-        @wraps(func)
-        def wrapper_func(graph, args):
-            return func(ProcCtx(graph), *args)
-
-        @wraps(initializer)
-        def wrapper_initializer(graph, args):
-            return initializer(ProcCtx(graph), *args)
-
-        func_params = func_params[1:]
-        initializer_params = initializer_params[1:]
-        mgp_proc = register_func(_mgp._MODULE, wrapper_func, wrapper_initializer, cleanup)
-    else:
-
-        @wraps(func)
-        def wrapper_func(graph, args):
-            return func(*args)
-
-        @wraps(initializer)
-        def wrapper_initializer(graph, args):
-            return initializer(*args)
-
-        mgp_proc = register_func(_mgp._MODULE, wrapper_func, wrapper_initializer, cleanup)
-
-    for func_param, initializer_param in zip(func_params, initializer_params):
-        func_param_name = func_param.name
-        func_param_type_ = func_param.annotation
-        if func_param_type_ is func_param.empty:
-            func_param_type_ = object
-        initializer_param_type_ = initializer_param.annotation
-        if initializer_param.annotation is initializer_param.empty:
-            initializer_param_type_ = object
-
-        assert _is_typing_same(
-            func_param_type_, initializer_param_type_
-        ), "Types of initializer and function must be same"
-
-        func_cypher_type = _typing_to_cypher_type(func_param_type_)
-        if func_param.default is func_param.empty:
-            mgp_proc.add_arg(func_param_name, func_cypher_type)
-        else:
-            mgp_proc.add_opt_arg(func_param_name, func_cypher_type, func_param.default)
-    if func_sig.return_annotation is not func_sig.empty:
-        record = func_sig.return_annotation
-        if not isinstance(record, Record):
-            raise TypeError("Expected '{}' to return 'mgp.Record', got '{}'".format(func.__name__, type(record)))
-        for name, type_ in record.fields.items():
-            if isinstance(type_, Deprecated):
-                cypher_type = _typing_to_cypher_type(type_.field_type)
-                mgp_proc.add_deprecated_result(name, cypher_type)
-            else:
-                mgp_proc.add_result(name, _typing_to_cypher_type(type_))
-    return func
-
-
-def add_batch_write_proc(func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable):
-    return _register_batch_proc(func, initializer, cleanup, True)
-
-
-def add_batch_read_proc(func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable):
-    return _register_batch_proc(func, initializer, cleanup, False)
-
-
 class InvalidMessageError(Exception):
     """
     Signals using a message instance outside of the registered transformation.

init

@@ -77,9 +77,7 @@ fi
 
 # Fix for centos 7 during release
 if [ "${DISTRO}" = "centos-7" ] || [ "${DISTRO}" = "debian-11" ] || [ "${DISTRO}" = "amzn-2" ]; then
-  if python3 -m pip show virtualenv >/dev/null 2>/dev/null; then
-    python3 -m pip uninstall -y virtualenv
-  fi
+  python3 -m pip uninstall -y virtualenv
   python3 -m pip install virtualenv
 fi
 
@@ -93,10 +91,6 @@ setup_virtualenv tests/stress
 setup_virtualenv tests/integration/ldap
 
 # Setup tests dependencies.
-# NOTE: This is commented out because of the build order (at the time of
-# execution mgclient is not built yet) which makes this setup to fail. mgclient
-# is built during the make phase. The tests/setup.sh is called under GHA CI
-# jobs.
 # cd tests
 # ./setup.sh
 # cd ..
@@ -106,15 +100,11 @@ setup_virtualenv tests/integration/ldap
 
 echo "Done installing dependencies for Memgraph"
 
-echo "Linking git hooks OR skip if .git folder is not there"
-if [ -d "$DIR/.git" ]; then
-  for hook in $(find $DIR/.githooks -type f -printf "%f\n"); do
-    ln -s -f "$DIR/.githooks/$hook" "$DIR/.git/hooks/$hook"
-    echo "Added $hook hook"
-  done;
-else
-  echo "WARNING: .git folder not present, skip adding hooks"
-fi
+echo "Linking git hooks"
+for hook in $(find $DIR/.githooks -type f -printf "%f\n"); do
+  ln -s -f "$DIR/.githooks/$hook" "$DIR/.git/hooks/$hook"
+  echo "Added $hook hook"
+done;
 
 # Install precommit hook except on old operating systems because we don't
 # develop on them -> pre-commit hook not required -> we can use latest

libs/CMakeLists.txt

@@ -12,7 +12,6 @@ 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)
 find_package(Jemalloc REQUIRED)
@@ -29,7 +28,6 @@ function(import_header_library name include_dir)
   set(${_upper_name}_INCLUDE_DIR ${include_dir} CACHE FILEPATH
       "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)
@@ -258,6 +256,3 @@ import_external_library(librdtsc STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/librdtsc/include
   CMAKE_ARGS ${MG_LIBRDTSC_CMAKE_ARGS}
   BUILD_COMMAND $(MAKE) rdtsc)
-
-# setup ctre
-import_header_library(ctre ${CMAKE_CURRENT_SOURCE_DIR})

libs/setup.sh

@@ -71,8 +71,8 @@ file_get_try_double () {
     if [ -z "$primary_url" ]; then echo "Primary should not be empty." && exit 1; fi
     if [ -z "$secondary_url" ]; then echo "Secondary should not be empty." && exit 1; fi
     filename="$(basename "$secondary_url")"
-    # Redirect primary/cache to /dev/null to make it less confusing for a new contributor because only CI has access to the cache.
-    wget -nv "$primary_url" -O "$filename" >/dev/null 2>&1 || wget -nv "$secondary_url" -O "$filename" || exit 1
+    wget -nv "$primary_url" -O "$filename" || wget -nv "$secondary_url" -O "$filename" || exit 1
+    echo ""
 }
 
 repo_clone_try_double () {
@@ -86,8 +86,8 @@ repo_clone_try_double () {
     if [ -z "$secondary_url" ]; then echo "Secondary should not be empty." && exit 1; fi
     if [ -z "$folder_name" ]; then echo "Clone folder should not be empty." && exit 1; fi
     if [ -z "$ref" ]; then echo "Git clone ref should not be empty." && exit 1; fi
-    # Redirect primary/cache to /dev/null to make it less confusing for a new contributor because only CI has access to the cache.
-    clone "$primary_url" "$folder_name" "$ref" "$shallow" >/dev/null 2>&1 || clone "$secondary_url" "$folder_name" "$ref" "$shallow" || exit 1
+    clone "$primary_url" "$folder_name" "$ref" "$shallow" || clone "$secondary_url" "$folder_name" "$ref" "$shallow" || exit 1
+    echo ""
 }
 
 # List all dependencies.
@@ -122,7 +122,6 @@ declare -A primary_urls=(
   ["protobuf"]="http://$local_cache_host/git/protobuf.git"
   ["pulsar"]="http://$local_cache_host/git/pulsar.git"
   ["librdtsc"]="http://$local_cache_host/git/librdtsc.git"
-  ["ctre"]="http://$local_cache_host/file/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
 )
 
 # The goal of secondary urls is to have links to the "source of truth" of
@@ -148,7 +147,6 @@ declare -A secondary_urls=(
   ["protobuf"]="https://github.com/protocolbuffers/protobuf.git"
   ["pulsar"]="https://github.com/apache/pulsar.git"
   ["librdtsc"]="https://github.com/gabrieleara/librdtsc.git"
-  ["ctre"]="https://raw.githubusercontent.com/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
 )
 
 # antlr
@@ -210,7 +208,7 @@ pymgclient_tag="4f85c179e56302d46a1e3e2cf43509db65f062b3" # (2021-01-15)
 repo_clone_try_double "${primary_urls[pymgclient]}" "${secondary_urls[pymgclient]}" "pymgclient" "$pymgclient_tag"
 
 # mgconsole
-mgconsole_tag="v1.4.0" # (2023-05-21)
+mgconsole_tag="v1.3.0" # (2022-11-20)
 repo_clone_try_double "${primary_urls[mgconsole]}" "${secondary_urls[mgconsole]}" "mgconsole" "$mgconsole_tag" true
 
 spdlog_tag="v1.9.2" # (2021-08-12)
@@ -240,9 +238,3 @@ repo_clone_try_double "${primary_urls[librdtsc]}" "${secondary_urls[librdtsc]}"
 pushd librdtsc
 git apply ../librdtsc.patch
 popd
-
-#ctre
-mkdir -p ctre
-cd ctre
-file_get_try_double "${primary_urls[ctre]}" "${secondary_urls[ctre]}"
-cd ..

licenses/BSL.txt

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

release/CMakeLists.txt

@@ -14,7 +14,7 @@ set(CPACK_PACKAGE_VENDOR "Memgraph Ltd.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
     "High performance, in-memory, transactional graph database")
 
-# Setting architecture extension for deb packages
+# Setting arhitecture extension for deb packages
 set(MG_ARCH_EXTENSION_DEB "all")
 
 if(${MG_ARCH} STREQUAL "x86_64")
@@ -48,9 +48,9 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
 
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0), libstdc++6")
 
-# Setting architecture extension for rpm packages
+# Setting arhitecture extension for rpm packages
 set(MG_ARCH_EXTENSION_RPM "noarch")
 
 if(${MG_ARCH} STREQUAL "x86_64")
@@ -69,12 +69,6 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 set(CPACK_RPM_PACKAGE_REQUIRES_PRE "shadow-utils")
 set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm/memgraph.spec.in")
 set(CPACK_RPM_PACKAGE_LICENSE "Memgraph License")
-# CPACK deduces dependency to libstdc++ which:
-#   * can't be easily installed on Centos 7 (the one from the toolchain,
-#     only required to avoid printing issue within query modules)
-#   * it causes issues with glibcxx 2.4
-#     `if(DISTRO STREQUAL "Amazon Linux" AND DISTRO_VERSION STREQUAL "2")`
-set(CPACK_RPM_PACKAGE_AUTOREQ " no")
 
 # Description formatting is important, no line must be greater than 80 characters.
 set(CPACK_RPM_PACKAGE_DESCRIPTION "Contains Memgraph, the graph database.
@@ -83,7 +77,13 @@ the next generation of applications driver by real-time connected data.")
 
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, logrotate")
+set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc++ >= 3.4.29, logrotate")
+
+# If amzn-2
+if(DISTRO STREQUAL "Amazon Linux" AND DISTRO_VERSION STREQUAL "2")
+    # It causes issues with glibcxx 2.4
+    set(CPACK_RPM_PACKAGE_AUTOREQ " no")
+endif()
 
 # All variables must be set before including.
 include(CPack)

release/docker/package_docker

@@ -55,8 +55,7 @@ image_name="memgraph:${version}"
 image_package_name="memgraph-${version}-docker.tar.gz"
 
 # Build docker image.
-# NOTE: --pull is here to always pull that latest base image because of security patches.
-docker build --pull -t ${image_name} ${tag_latest} -f ${dockerfile_path} \
+docker build -t ${image_name} ${tag_latest} -f ${dockerfile_path} \
 --build-arg BINARY_NAME=${package_name} \
 --build-arg EXTENSION=${extension} \
 --build-arg TARGETARCH="" .

release/package/amzn-2/Dockerfile

@@ -9,7 +9,6 @@ RUN yum -y update \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-amzn-2-x86_64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/centos-7/Dockerfile

@@ -9,7 +9,6 @@ RUN yum -y update \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-centos-7-x86_64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-centos-7-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-7-x86_64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-centos-7-x86_64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-7-x86_64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/centos-9/Dockerfile

@@ -9,7 +9,6 @@ RUN yum -y update \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-centos-9-x86_64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-centos-9-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-9-x86_64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-centos-9-x86_64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-centos-9-x86_64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/debian-10/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-debian-10-amd64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-debian-10-amd64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-10-amd64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-debian-10-amd64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-10-amd64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/debian-11-arm/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-debian-11-arm64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-debian-11-arm64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-11-arm64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-debian-11-arm64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-11-arm64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/debian-11/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-debian-11-amd64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-debian-11-amd64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-11-amd64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-debian-11-amd64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-debian-11-amd64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/fedora-36/Dockerfile

@@ -10,7 +10,6 @@ RUN yum -y update \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-fedora-36-x86_64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/run.sh

@@ -17,8 +17,7 @@ ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate"
 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 {os} [--for-docker|--for-platform]|docker|test"
     echo ""
     echo "    OSs: ${SUPPORTED_OS[*]}"
     exit 1
@@ -36,7 +35,7 @@ make_package () {
         package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint --file='../../release/rpm/rpmlintrc' memgraph*.rpm "
     fi
     if [[ "$os" =~ ^"debian".* ]]; then
-        docker exec "$build_container" bash -c "apt --allow-releaseinfo-change -y update"
+        docker exec "$build_container" bash -c "apt update"
         package_command=" cpack -G DEB --config ../CPackConfig.cmake "
     fi
     if [[ "$os" =~ ^"ubuntu".* ]]; then
@@ -65,7 +64,6 @@ make_package () {
         git fetch origin master:master
     fi
     docker exec "$build_container" mkdir -p /memgraph
-    # TODO(gitbuda): Revisit copying the whole repo -> makese sense under CI.
     docker cp "$PROJECT_ROOT/." "$build_container:/memgraph/"
 
     container_build_dir="/memgraph/build"
@@ -76,8 +74,6 @@ make_package () {
     # environment/os/{os}.sh does not come within the toolchain package. When
     # migrating to the next version of toolchain do that, and remove the
     # TOOLCHAIN_RUN_DEPS installation from here.
-    # TODO(gitbuda): On the other side, having this here allows updating deps
-    # wihout reruning the build containers.
     echo "Installing dependencies using '/memgraph/environment/os/$os.sh' script..."
     docker exec "$build_container" bash -c "/memgraph/environment/os/$os.sh install TOOLCHAIN_RUN_DEPS"
     docker exec "$build_container" bash -c "/memgraph/environment/os/$os.sh install MEMGRAPH_BUILD_DEPS"
@@ -87,7 +83,6 @@ make_package () {
     docker exec "$build_container" bash -c "cd /memgraph && git config --global --add safe.directory '*'"
     docker exec "$build_container" bash -c "cd /memgraph && $ACTIVATE_TOOLCHAIN && ./init"
     docker exec "$build_container" bash -c "cd $container_build_dir && rm -rf ./*"
-    # 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 .."
     else
@@ -113,13 +108,8 @@ make_package () {
 case "$1" in
     init)
         cd "$SCRIPT_DIR"
-        if ! which "docker-compose" >/dev/null; then
-            docker_compose_cmd="docker compose"
-        else
-            docker_compose_cmd="docker-compose"
-        fi
-        $docker_compose_cmd build --build-arg TOOLCHAIN_VERSION="${TOOLCHAIN_VERSION}"
-        $docker_compose_cmd up -d
+        docker-compose build --build-arg TOOLCHAIN_VERSION="${TOOLCHAIN_VERSION}"
+        docker-compose up -d
     ;;
 
     docker)
@@ -159,19 +149,6 @@ case "$1" in
         fi
     ;;
 
-    build)
-      shift 1
-      if [[ "$#" -ne 2 ]]; then
-          print_help
-      fi
-      # in the vX format, e.g. v5
-      toolchain_version="$1"
-      # a name of the os folder, e.g. ubuntu-22.04-arm
-      os="$2"
-      cd "$SCRIPT_DIR/$os"
-      docker build -f Dockerfile --build-arg TOOLCHAIN_VERSION="toolchain-$toolchain_version" -t "memgraph/memgraph-builder:${toolchain_version}_$os" .
-    ;;
-
     test)
         echo "TODO(gitbuda): Test all packages on mgtest containers."
     ;;

release/package/ubuntu-18.04/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04-amd64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04-amd64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04-amd64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04-amd64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-18.04-amd64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/ubuntu-20.04/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04-amd64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04-amd64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04-amd64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04-amd64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-20.04-amd64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/ubuntu-22.04-arm/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-arm64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

release/package/ubuntu-22.04/Dockerfile

@@ -12,7 +12,6 @@ RUN apt update && apt install -y \
 
 RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz \
     -O ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz \
-    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz -C /opt \
-    && rm ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz
+    && tar xzvf ${TOOLCHAIN_VERSION}-binaries-ubuntu-22.04-amd64.tar.gz -C /opt
 
 ENTRYPOINT ["sleep", "infinity"]

src/CMakeLists.txt

@@ -1,7 +1,6 @@
 # CMake configuration for the main memgraph library and executable
 
 # add memgraph sub libraries, ordered by dependency
-add_subdirectory(csv)
 add_subdirectory(utils)
 add_subdirectory(requests)
 add_subdirectory(io)
@@ -17,7 +16,10 @@ add_subdirectory(slk)
 add_subdirectory(rpc)
 add_subdirectory(license)
 add_subdirectory(auth)
-add_subdirectory(audit)
+
+if(MG_ENTERPRISE)
+        add_subdirectory(audit)
+endif()
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
@@ -34,7 +36,12 @@ set(mg_single_node_v2_sources
 )
 
 set(mg_single_node_v2_libs stdc++fs Threads::Threads
-        mg-telemetry mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-glue mg-audit)
+        mg-telemetry mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-glue)
+
+if(MG_ENTERPRISE)
+        # These are enterprise subsystems
+        set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)
+endif()
 
 # memgraph main executable
 add_executable(memgraph ${mg_single_node_v2_sources})

src/audit/log.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -116,12 +116,12 @@ Log::~Log() {
 }
 
 void Log::Record(const std::string &address, const std::string &username, const std::string &query,
-                 const storage::PropertyValue &params, const std::string &db) {
+                 const storage::PropertyValue &params) {
   if (!started_.load(std::memory_order_relaxed)) return;
   auto timestamp =
       std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch())
           .count();
-  buffer_->emplace(Item{timestamp, address, username, query, params, db});
+  buffer_->emplace(Item{timestamp, address, username, query, params});
 }
 
 void Log::ReopenLog() {
@@ -136,8 +136,8 @@ void Log::Flush() {
   for (uint64_t i = 0; i < buffer_size_; ++i) {
     auto item = buffer_->pop();
     if (!item) break;
-    log_.Write(fmt::format("{}.{:06d},{},{},{},{},{}\n", item->timestamp / 1000000, item->timestamp % 1000000,
-                           item->address, item->username, item->db, utils::Escape(item->query),
+    log_.Write(fmt::format("{}.{:06d},{},{},{},{}\n", item->timestamp / 1000000, item->timestamp % 1000000,
+                           item->address, item->username, utils::Escape(item->query),
                            utils::Escape(PropertyValueToJson(item->params).dump())));
   }
   log_.Sync();

src/audit/log.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -32,7 +32,6 @@ class Log {
     std::string username;
     std::string query;
     storage::PropertyValue params;
-    std::string db;
   };
 
  public:
@@ -52,7 +51,7 @@ class Log {
 
   /// Adds an entry to the audit log. Thread-safe.
   void Record(const std::string &address, const std::string &username, const std::string &query,
-              const storage::PropertyValue &params, const std::string &db);
+              const storage::PropertyValue &params);
 
   /// Reopens the log file. Used for log file rotation. Thread-safe.
   void ReopenLog();

src/auth/auth.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -314,57 +314,4 @@ std::vector<auth::User> Auth::AllUsersForRole(const std::string &rolename_orig)
   return ret;
 }
 
-#ifdef MG_ENTERPRISE
-bool Auth::GrantDatabaseToUser(const std::string &db, const std::string &name) {
-  auto user = GetUser(name);
-  if (user) {
-    if (db == kAllDatabases) {
-      user->db_access().GrantAll();
-    } else {
-      user->db_access().Add(db);
-    }
-    SaveUser(*user);
-    return true;
-  }
-  return false;
-}
-
-bool Auth::RevokeDatabaseFromUser(const std::string &db, const std::string &name) {
-  auto user = GetUser(name);
-  if (user) {
-    if (db == kAllDatabases) {
-      user->db_access().DenyAll();
-    } else {
-      user->db_access().Remove(db);
-    }
-    SaveUser(*user);
-    return true;
-  }
-  return false;
-}
-
-void Auth::DeleteDatabase(const std::string &db) {
-  for (auto it = storage_.begin(kUserPrefix); it != storage_.end(kUserPrefix); ++it) {
-    auto username = it->first.substr(kUserPrefix.size());
-    auto user = GetUser(username);
-    if (user) {
-      user->db_access().Delete(db);
-      SaveUser(*user);
-    }
-  }
-}
-
-bool Auth::SetMainDatabase(const std::string &db, const std::string &name) {
-  auto user = GetUser(name);
-  if (user) {
-    if (!user->db_access().SetDefault(db)) {
-      throw AuthException("Couldn't set default database '{}' for user '{}'!", db, name);
-    }
-    SaveUser(*user);
-    return true;
-  }
-  return false;
-}
-#endif
-
 }  // namespace memgraph::auth

src/auth/auth.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Licensed as a Memgraph Enterprise file under the Memgraph Enterprise
 // License (the "License"); by using this file, you agree to be bound by the terms of the License, and you may not use
@@ -19,9 +19,6 @@
 #include "utils/settings.hpp"
 
 namespace memgraph::auth {
-
-static const constexpr char *const kAllDatabases = "*";
-
 /**
  * This class serves as the main Authentication/Authorization storage.
  * It provides functions for managing Users, Roles, Permissions and FineGrainedAccessPermissions.
@@ -158,46 +155,6 @@ class Auth final {
    */
   std::vector<User> AllUsersForRole(const std::string &rolename) const;
 
-#ifdef MG_ENTERPRISE
-  /**
-   * @brief Revoke access to individual database for a user.
-   *
-   * @param db name of the database to revoke
-   * @param name user's username
-   * @return true on success
-   * @throw AuthException if unable to find or update the user
-   */
-  bool RevokeDatabaseFromUser(const std::string &db, const std::string &name);
-
-  /**
-   * @brief Grant access to individual database for a user.
-   *
-   * @param db name of the database to revoke
-   * @param name user's username
-   * @return true on success
-   * @throw AuthException if unable to find or update the user
-   */
-  bool GrantDatabaseToUser(const std::string &db, const std::string &name);
-
-  /**
-   * @brief Delete a database from all users.
-   *
-   * @param db name of the database to delete
-   * @throw AuthException if unable to read data
-   */
-  void DeleteDatabase(const std::string &db);
-
-  /**
-   * @brief Set main database for an individual user.
-   *
-   * @param db name of the database to revoke
-   * @param name user's username
-   * @return true on success
-   * @throw AuthException if unable to find or update the user
-   */
-  bool SetMainDatabase(const std::string &db, const std::string &name);
-#endif
-
  private:
   // Even though the `kvstore::KVStore` class is guaranteed to be thread-safe,
   // Auth is not thread-safe because modifying users and roles might require

src/auth/models.cpp

@@ -15,10 +15,8 @@
 
 #include "auth/crypto.hpp"
 #include "auth/exceptions.hpp"
-#include "dbms/constants.hpp"
 #include "license/license.hpp"
 #include "query/constants.hpp"
-#include "spdlog/spdlog.h"
 #include "utils/cast.hpp"
 #include "utils/logging.hpp"
 #include "utils/settings.hpp"
@@ -37,31 +35,18 @@ namespace memgraph::auth {
 namespace {
 
 // Constant list of all available permissions.
-const std::vector<Permission> kPermissionsAll = {Permission::MATCH,
-                                                 Permission::CREATE,
-                                                 Permission::MERGE,
-                                                 Permission::DELETE,
-                                                 Permission::SET,
-                                                 Permission::REMOVE,
-                                                 Permission::INDEX,
-                                                 Permission::STATS,
-                                                 Permission::CONSTRAINT,
-                                                 Permission::DUMP,
-                                                 Permission::AUTH,
-                                                 Permission::REPLICATION,
-                                                 Permission::DURABILITY,
-                                                 Permission::READ_FILE,
-                                                 Permission::FREE_MEMORY,
-                                                 Permission::TRIGGER,
-                                                 Permission::CONFIG,
-                                                 Permission::STREAM,
-                                                 Permission::MODULE_READ,
-                                                 Permission::MODULE_WRITE,
-                                                 Permission::WEBSOCKET,
-                                                 Permission::TRANSACTION_MANAGEMENT,
-                                                 Permission::STORAGE_MODE,
-                                                 Permission::MULTI_DATABASE_EDIT,
-                                                 Permission::MULTI_DATABASE_USE};
+const std::vector<Permission> kPermissionsAll = {Permission::MATCH,       Permission::CREATE,
+                                                 Permission::MERGE,       Permission::DELETE,
+                                                 Permission::SET,         Permission::REMOVE,
+                                                 Permission::INDEX,       Permission::STATS,
+                                                 Permission::CONSTRAINT,  Permission::DUMP,
+                                                 Permission::AUTH,        Permission::REPLICATION,
+                                                 Permission::DURABILITY,  Permission::READ_FILE,
+                                                 Permission::FREE_MEMORY, Permission::TRIGGER,
+                                                 Permission::CONFIG,      Permission::STREAM,
+                                                 Permission::MODULE_READ, Permission::MODULE_WRITE,
+                                                 Permission::WEBSOCKET,   Permission::TRANSACTION_MANAGEMENT,
+                                                 Permission::STORAGE_MODE};
 
 }  // namespace
 
@@ -113,10 +98,6 @@ std::string PermissionToString(Permission permission) {
       return "TRANSACTION_MANAGEMENT";
     case Permission::STORAGE_MODE:
       return "STORAGE_MODE";
-    case Permission::MULTI_DATABASE_EDIT:
-      return "MULTI_DATABASE_EDIT";
-    case Permission::MULTI_DATABASE_USE:
-      return "MULTI_DATABASE_USE";
   }
 }
 
@@ -463,11 +444,10 @@ Role Role::Deserialize(const nlohmann::json &data) {
   auto permissions = Permissions::Deserialize(data["permissions"]);
 #ifdef MG_ENTERPRISE
   if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    FineGrainedAccessHandler fine_grained_access_handler;
-    // We can have an empty fine_grained if the user was created without a valid license
-    if (data["fine_grained_access_handler"].is_object()) {
-      fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
+    if (!data["fine_grained_access_handler"].is_object()) {
+      throw AuthException("Couldn't load user data!");
     }
+    auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
     return {data["rolename"], permissions, std::move(fine_grained_access_handler)};
   }
 #endif
@@ -484,82 +464,6 @@ bool operator==(const Role &first, const Role &second) {
   return first.rolename_ == second.rolename_ && first.permissions_ == second.permissions_;
 }
 
-#ifdef MG_ENTERPRISE
-void Databases::Add(const std::string &db) {
-  if (allow_all_) {
-    grants_dbs_.clear();
-    allow_all_ = false;
-  }
-  grants_dbs_.emplace(db);
-  denies_dbs_.erase(db);
-}
-
-void Databases::Remove(const std::string &db) {
-  denies_dbs_.emplace(db);
-  grants_dbs_.erase(db);
-}
-
-void Databases::Delete(const std::string &db) {
-  denies_dbs_.erase(db);
-  if (!allow_all_) {
-    grants_dbs_.erase(db);
-  }
-  // Reset if default deleted
-  if (default_db_ == db) {
-    default_db_ = "";
-  }
-}
-
-void Databases::GrantAll() {
-  allow_all_ = true;
-  grants_dbs_.clear();
-  denies_dbs_.clear();
-}
-
-void Databases::DenyAll() {
-  allow_all_ = false;
-  grants_dbs_.clear();
-  denies_dbs_.clear();
-}
-
-bool Databases::SetDefault(const std::string &db) {
-  if (!Contains(db)) return false;
-  default_db_ = db;
-  return true;
-}
-
-[[nodiscard]] bool Databases::Contains(const std::string &db) const {
-  return !denies_dbs_.contains(db) && (allow_all_ || grants_dbs_.contains(db));
-}
-
-const std::string &Databases::GetDefault() const {
-  if (!Contains(default_db_)) {
-    throw AuthException("No access to the set default database \"{}\".", default_db_);
-  }
-  return default_db_;
-}
-
-nlohmann::json Databases::Serialize() const {
-  nlohmann::json data = nlohmann::json::object();
-  data["grants"] = grants_dbs_;
-  data["denies"] = denies_dbs_;
-  data["allow_all"] = allow_all_;
-  data["default"] = default_db_;
-  return data;
-}
-
-Databases Databases::Deserialize(const nlohmann::json &data) {
-  if (!data.is_object()) {
-    throw AuthException("Couldn't load database data!");
-  }
-  if (!data["grants"].is_structured() || !data["denies"].is_structured() || !data["allow_all"].is_boolean() ||
-      !data["default"].is_string()) {
-    throw AuthException("Couldn't load database data!");
-  }
-  return {data["allow_all"], data["grants"], data["denies"], data["default"]};
-}
-#endif
-
 User::User() {}
 
 User::User(const std::string &username) : username_(utils::ToLowerCase(username)) {}
@@ -568,12 +472,11 @@ User::User(const std::string &username, const std::string &password_hash, const
 
 #ifdef MG_ENTERPRISE
 User::User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-           FineGrainedAccessHandler fine_grained_access_handler, Databases db_access)
+           FineGrainedAccessHandler fine_grained_access_handler)
     : username_(utils::ToLowerCase(username)),
       password_hash_(password_hash),
       permissions_(permissions),
-      fine_grained_access_handler_(std::move(fine_grained_access_handler)),
-      database_access_(db_access) {}
+      fine_grained_access_handler_(std::move(fine_grained_access_handler)) {}
 #endif
 
 bool User::CheckPassword(const std::string &password) {
@@ -673,10 +576,8 @@ nlohmann::json User::Serialize() const {
 #ifdef MG_ENTERPRISE
   if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     data["fine_grained_access_handler"] = fine_grained_access_handler_.Serialize();
-    data["databases"] = database_access_.Serialize();
   } else {
     data["fine_grained_access_handler"] = {};
-    data["databases"] = {};
   }
 #endif
   // The role shouldn't be serialized here, it is stored as a foreign key.
@@ -693,21 +594,11 @@ User User::Deserialize(const nlohmann::json &data) {
   auto permissions = Permissions::Deserialize(data["permissions"]);
 #ifdef MG_ENTERPRISE
   if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    Databases db_access;
-    if (data["databases"].is_structured()) {
-      db_access = Databases::Deserialize(data["databases"]);
-    } else {
-      // Back-compatibility
-      spdlog::warn("User without specified database access. Given access to the default database.");
-      db_access.Add(dbms::kDefaultDB);
-      db_access.SetDefault(dbms::kDefaultDB);
+    if (!data["fine_grained_access_handler"].is_object()) {
+      throw AuthException("Couldn't load user data!");
     }
-    FineGrainedAccessHandler fine_grained_access_handler;
-    // We can have an empty fine_grained if the user was created without a valid license
-    if (data["fine_grained_access_handler"].is_object()) {
-      fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
-    }
-    return {data["username"], data["password_hash"], permissions, std::move(fine_grained_access_handler), db_access};
+    auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
+    return {data["username"], data["password_hash"], permissions, fine_grained_access_handler};
   }
 #endif
   return {data["username"], data["password_hash"], permissions};

src/auth/models.hpp

@@ -9,13 +9,10 @@
 #pragma once
 
 #include <optional>
-#include <set>
 #include <string>
 #include <unordered_map>
 
 #include <json/json.hpp>
-#include "dbms/constants.hpp"
-#include "utils/logging.hpp"
 
 namespace memgraph::auth {
 // These permissions must have values that are applicable for usage in a
@@ -44,9 +41,7 @@ enum class Permission : uint64_t {
   MODULE_WRITE = 1U << 19U,
   WEBSOCKET    = 1U << 20U,
   TRANSACTION_MANAGEMENT = 1U << 21U,
-  STORAGE_MODE = 1U << 22U,
-  MULTI_DATABASE_EDIT = 1U << 23U,
-  MULTI_DATABASE_USE  = 1U << 24U,
+  STORAGE_MODE    = 1U << 22U
 };
 // clang-format on
 
@@ -242,85 +237,6 @@ class Role final {
 
 bool operator==(const Role &first, const Role &second);
 
-#ifdef MG_ENTERPRISE
-class Databases final {
- public:
-  Databases() : grants_dbs_({dbms::kDefaultDB}), allow_all_(false), default_db_(dbms::kDefaultDB) {}
-
-  Databases(const Databases &) = default;
-  Databases &operator=(const Databases &) = default;
-  Databases(Databases &&) noexcept = default;
-  Databases &operator=(Databases &&) noexcept = default;
-  ~Databases() = default;
-
-  /**
-   * @brief Add database to the list of granted access. @note allow_all_ will be false after execution
-   *
-   * @param db name of the database to grant access to
-   */
-  void Add(const std::string &db);
-
-  /**
-   * @brief Remove database to the list of granted access.
-   * @note if allow_all_ is set, the flag will remain set and the
-   * database will be added to the set of denied databases.
-   *
-   * @param db name of the database to grant access to
-   */
-  void Remove(const std::string &db);
-
-  /**
-   * @brief Called when database is dropped. Removes it from granted (if allow_all is false) and denied set.
-   * @note allow_all_ is not changed
-   *
-   * @param db name of the database to grant access to
-   */
-  void Delete(const std::string &db);
-
-  /**
-   * @brief Set allow_all_ to true and clears grants and denied sets.
-   */
-  void GrantAll();
-
-  /**
-   * @brief Set allow_all_ to false and clears grants and denied sets.
-   */
-  void DenyAll();
-
-  /**
-   * @brief Set the default database.
-   */
-  bool SetDefault(const std::string &db);
-
-  /**
-   * @brief Checks if access is grated to the database.
-   *
-   * @param db name of the database
-   * @return true if allow_all and not denied or granted
-   */
-  bool Contains(const std::string &db) const;
-
-  bool GetAllowAll() const { return allow_all_; }
-  const std::set<std::string> &GetGrants() const { return grants_dbs_; }
-  const std::set<std::string> &GetDenies() const { return denies_dbs_; }
-  const std::string &GetDefault() const;
-
-  nlohmann::json Serialize() const;
-  /// @throw AuthException if unable to deserialize.
-  static Databases Deserialize(const nlohmann::json &data);
-
- private:
-  Databases(bool allow_all, std::set<std::string> grant, std::set<std::string> deny,
-            const std::string &default_db = dbms::kDefaultDB)
-      : grants_dbs_(grant), denies_dbs_(deny), allow_all_(allow_all), default_db_(default_db) {}
-
-  std::set<std::string> grants_dbs_;  //!< set of databases with granted access
-  std::set<std::string> denies_dbs_;  //!< set of databases with denied access
-  bool allow_all_;                    //!< flag to allow access to everything (denied overrides this)
-  std::string default_db_;            //!< user's default database
-};
-#endif
-
 // TODO (mferencevic): Implement password expiry.
 class User final {
  public:
@@ -330,7 +246,7 @@ class User final {
   User(const std::string &username, const std::string &password_hash, const Permissions &permissions);
 #ifdef MG_ENTERPRISE
   User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-       FineGrainedAccessHandler fine_grained_access_handler, Databases db_access = {});
+       FineGrainedAccessHandler fine_grained_access_handler);
 #endif
   User(const User &) = default;
   User &operator=(const User &) = default;
@@ -363,11 +279,6 @@ class User final {
 
   const Role *role() const;
 
-#ifdef MG_ENTERPRISE
-  Databases &db_access() { return database_access_; }
-  const Databases &db_access() const { return database_access_; }
-#endif
-
   nlohmann::json Serialize() const;
 
   /// @throw AuthException if unable to deserialize.
@@ -381,7 +292,6 @@ class User final {
   Permissions permissions_;
 #ifdef MG_ENTERPRISE
   FineGrainedAccessHandler fine_grained_access_handler_;
-  Databases database_access_;
 #endif
   std::optional<Role> role_;
 };

src/communication/bolt/v1/codes.hpp

@@ -19,7 +19,7 @@ inline constexpr uint8_t kPreamble[4] = {0x60, 0x60, 0xB0, 0x17};
 
 enum class Signature : uint8_t {
   Noop = 0x00,
-  Init = 0x01,  // v3+ now HELLO
+  Init = 0x01,
   LogOn = 0x6A,
   LogOff = 0x6B,
   AckFailure = 0x0E,  // only v1

src/communication/bolt/v1/session.hpp

@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include <concepts>
-#include <cstddef>
 #include <optional>
 #include <thread>
 
@@ -26,12 +24,8 @@
 #include "communication/bolt/v1/states/executing.hpp"
 #include "communication/bolt/v1/states/handshake.hpp"
 #include "communication/bolt/v1/states/init.hpp"
-#include "communication/bolt/v1/value.hpp"
-#include "dbms/constants.hpp"
-#include "dbms/global.hpp"
 #include "utils/exceptions.hpp"
 #include "utils/logging.hpp"
-#include "utils/uuid.hpp"
 
 namespace memgraph::communication::bolt {
 
@@ -54,26 +48,14 @@ class SessionException : public utils::BasicException {
  * @tparam TOutputStream type of output stream that will be used
  */
 template <typename TInputStream, typename TOutputStream>
-class Session : public dbms::SessionInterface {
+class Session {
  public:
   using TEncoder = Encoder<ChunkedEncoderBuffer<TOutputStream>>;
 
-  /**
-   * @brief Construct a new Session object
-   *
-   * @param input_stream stream to read from
-   * @param output_stream stream to write to
-   * @param impl a default high-level implementation to use (has to be defined)
-   */
   Session(TInputStream *input_stream, TOutputStream *output_stream)
-      : input_stream_(*input_stream), output_stream_(*output_stream), session_uuid_(utils::GenerateUUID()) {}
+      : input_stream_(*input_stream), output_stream_(*output_stream) {}
 
-  virtual ~Session() = default;
-
-  Session(const Session &) = delete;
-  Session &operator=(const Session &) = delete;
-  Session(Session &&) noexcept = delete;
-  Session &operator=(Session &&) noexcept = delete;
+  virtual ~Session() {}
 
   /**
    * Process the given `query` with `params`.
@@ -82,9 +64,7 @@ class Session : public dbms::SessionInterface {
    */
   virtual std::pair<std::vector<std::string>, std::optional<int>> Interpret(
       const std::string &query, const std::map<std::string, Value> &params,
-      const std::map<std::string, memgraph::communication::bolt::Value> &extra) = 0;
-
-  virtual void Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) = 0;
+      const std::map<std::string, memgraph::communication::bolt::Value> &metadata) = 0;
 
   /**
    * Put results of the processed query in the `encoder`.
@@ -106,7 +86,7 @@ class Session : public dbms::SessionInterface {
    */
   virtual std::map<std::string, Value> Discard(std::optional<int> n, std::optional<int> qid) = 0;
 
-  virtual void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &params) = 0;
+  virtual void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &) = 0;
   virtual void CommitTransaction() = 0;
   virtual void RollbackTransaction() = 0;
 
@@ -119,6 +99,7 @@ class Session : public dbms::SessionInterface {
   /** Return the name of the server that should be used for the Bolt INIT
    * message. */
   virtual std::optional<std::string> GetServerNameForInit() = 0;
+
   /**
    * Executes the session after data has been read into the buffer.
    * Goes through the bolt states in order to execute commands from the client.
@@ -180,7 +161,8 @@ class Session : public dbms::SessionInterface {
     }
   }
 
-  // TODO: Rethink if there is a way to hide some members. At the momement all of them are public.
+  // TODO: Rethink if there is a way to hide some members. At the momement all
+  // of them are public.
   TInputStream &input_stream_;
   TOutputStream &output_stream_;
 
@@ -200,9 +182,6 @@ class Session : public dbms::SessionInterface {
 
   Version version_;
 
-  std::string GetDatabaseName() const override = 0;
-  std::string UUID() const final { return session_uuid_; }
-
  private:
   void ClientFailureInvalidData() {
     // Set the state to Close.
@@ -218,8 +197,6 @@ class Session : public dbms::SessionInterface {
     // of the session to trigger session cleanup and socket close.
     throw SessionException("Something went wrong during session execution!");
   }
-
-  const std::string session_uuid_;  //!< unique identifier of the session (auto generated)
 };
 
 }  // namespace memgraph::communication::bolt

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

@@ -152,7 +152,6 @@ State StateExecutingRun(TSession &session, State state) {
       return RunHandlerV4<TSession>(signature, session, state, marker);
     }
     case 5:
-      memgraph::metrics::IncrementCounter(memgraph::metrics::BoltMessages);
       return RunHandlerV5<TSession>(signature, session, state, marker);
     default:
       spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);

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

@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <exception>
 #include <map>
 #include <optional>
 #include <string>
@@ -74,6 +73,23 @@ inline std::pair<std::string, std::string> ExceptionToErrorMessage(const std::ex
           "should be in database logs."};
 }
 
+namespace helpers {
+
+/** Extracts metadata from the extras field.
+ * NOTE: In order to avoid a copy, the metadata in moved.
+ * TODO: Update if extra field is used for anything else.
+ */
+inline std::map<std::string, Value> ConsumeMetadata(Value &extra) {
+  std::map<std::string, Value> md;
+  auto &md_tv = extra.ValueMap()["tx_metadata"];
+  if (md_tv.IsMap()) {
+    md = std::move(md_tv.ValueMap());
+  }
+  return md;
+}
+
+}  // namespace helpers
+
 namespace details {
 
 template <bool is_pull, typename TSession>
@@ -208,7 +224,7 @@ State HandleRunV1(TSession &session, const State state, const Marker marker) {
 
   DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
 
-  spdlog::debug("[Run - {}] '{}'", session.GetDatabaseName(), query.ValueString());
+  spdlog::debug("[Run] '{}'", query.ValueString());
 
   try {
     // Interpret can throw.
@@ -266,17 +282,12 @@ State HandleRunV4(TSession &session, const State state, const Marker marker) {
 
   DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
 
-  try {
-    session.Configure(extra.ValueMap());
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-
-  spdlog::debug("[Run - {}] '{}'", session.GetDatabaseName(), query.ValueString());
+  spdlog::debug("[Run] '{}'", query.ValueString());
 
   try {
     // Interpret can throw.
-    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap(), extra.ValueMap());
+    const auto [header, qid] =
+        session.Interpret(query.ValueString(), params.ValueMap(), helpers::ConsumeMetadata(extra));
     // Convert std::string to Value
     std::vector<Value> vec;
     std::map<std::string, Value> data;
@@ -388,8 +399,7 @@ State HandleBegin(TSession &session, const State state, const Marker marker) {
   }
 
   try {
-    session.Configure(extra.ValueMap());
-    session.BeginTransaction(extra.ValueMap());
+    session.BeginTransaction(helpers::ConsumeMetadata(extra));
   } catch (const std::exception &e) {
     return HandleFailure(session, e);
   }
@@ -497,7 +507,7 @@ State HandleRoute(TSession &session, const Marker marker) {
 
 template <typename TSession>
 State HandleLogOff() {
-  // No arguments sent, the user just needs to reauthenticate
+  // Not arguments sent, the user just needs to reauthenticate
   return State::Init;
 }
 }  // namespace memgraph::communication::bolt

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

@@ -18,7 +18,6 @@
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/value.hpp"
 #include "communication/exceptions.hpp"
-#include "spdlog/spdlog.h"
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 
@@ -249,9 +248,8 @@ State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
     }
     // Stay in Init
     return State::Init;
-  }
 
-  if (signature == Signature::LogOn) {
+  } else if (signature == Signature::LogOn) {
     if (marker != Marker::TinyStruct1) [[unlikely]] {
       spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
       spdlog::trace(
@@ -275,10 +273,11 @@ State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
       return State::Close;
     }
     return State::Idle;
-  }
 
-  spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
-  return State::Close;
+  } else [[unlikely]] {
+    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
+    return State::Close;
+  }
 }
 }  // namespace details
 

src/communication/bolt/v1/value.hpp

@@ -112,7 +112,7 @@ struct Path {
     for (uint i = 0; i < edges.size(); i++) {
       const auto &e = edges[i];
       const auto &v = vertices[i + 1];
-      UnboundedEdge unbounded_edge{e.id, e.type, e.properties, e.element_id};
+      UnboundedEdge unbounded_edge{e.id, e.type, e.properties};
       add_element(this->edges, unbounded_edge, e.to == v.id ? 1 : -1, 1);
       add_element(this->vertices, v, 1, 0);
     }

src/communication/http/listener.hpp

@@ -27,11 +27,11 @@
 
 namespace memgraph::communication::http {
 
-template <class TRequestHandler, typename TSessionContext>
-class Listener final : public std::enable_shared_from_this<Listener<TRequestHandler, TSessionContext>> {
+template <class TRequestHandler, typename TSessionData>
+class Listener final : public std::enable_shared_from_this<Listener<TRequestHandler, TSessionData>> {
   using tcp = boost::asio::ip::tcp;
-  using SessionHandler = Session<TRequestHandler, TSessionContext>;
-  using std::enable_shared_from_this<Listener<TRequestHandler, TSessionContext>>::shared_from_this;
+  using SessionHandler = Session<TRequestHandler, TSessionData>;
+  using std::enable_shared_from_this<Listener<TRequestHandler, TSessionData>>::shared_from_this;
 
  public:
   Listener(const Listener &) = delete;
@@ -50,9 +50,8 @@ class Listener final : public std::enable_shared_from_this<Listener<TRequestHand
   tcp::endpoint GetEndpoint() const { return acceptor_.local_endpoint(); }
 
  private:
-  Listener(boost::asio::io_context &ioc, TSessionContext *session_context, ServerContext *context,
-           tcp::endpoint endpoint)
-      : ioc_(ioc), session_context_(session_context), context_(context), acceptor_(ioc) {
+  Listener(boost::asio::io_context &ioc, TSessionData *data, ServerContext *context, tcp::endpoint endpoint)
+      : ioc_(ioc), data_(data), context_(context), acceptor_(ioc) {
     boost::beast::error_code ec;
 
     // Open the acceptor
@@ -96,13 +95,13 @@ class Listener final : public std::enable_shared_from_this<Listener<TRequestHand
       return LogError(ec, "accept");
     }
 
-    SessionHandler::Create(std::move(socket), session_context_, *context_)->Run();
+    SessionHandler::Create(std::move(socket), data_, *context_)->Run();
 
     DoAccept();
   }
 
   boost::asio::io_context &ioc_;
-  TSessionContext *session_context_;
+  TSessionData *data_;
   ServerContext *context_;
   tcp::acceptor acceptor_;
 };

src/communication/http/server.hpp

@@ -21,15 +21,14 @@
 
 namespace memgraph::communication::http {
 
-template <class TRequestHandler, typename TSessionContext>
+template <class TRequestHandler, typename TSessionData>
 class Server final {
   using tcp = boost::asio::ip::tcp;
 
  public:
-  explicit Server(io::network::Endpoint endpoint, TSessionContext *session_context, ServerContext *context)
-      : listener_{Listener<TRequestHandler, TSessionContext>::Create(
-            ioc_, session_context, context,
-            tcp::endpoint{boost::asio::ip::make_address(endpoint.address), endpoint.port})} {}
+  explicit Server(io::network::Endpoint endpoint, TSessionData *data, ServerContext *context)
+      : listener_{Listener<TRequestHandler, TSessionData>::Create(
+            ioc_, data, context, tcp::endpoint{boost::asio::ip::make_address(endpoint.address), endpoint.port})} {}
 
   Server(const Server &) = delete;
   Server(Server &&) = delete;
@@ -60,7 +59,7 @@ class Server final {
  private:
   boost::asio::io_context ioc_;
 
-  std::shared_ptr<Listener<TRequestHandler, TSessionContext>> listener_;
+  std::shared_ptr<Listener<TRequestHandler, TSessionData>> listener_;
   std::optional<std::thread> background_thread_;
 };
 }  // namespace memgraph::communication::http

src/communication/http/session.hpp

@@ -42,10 +42,10 @@ inline void LogError(boost::beast::error_code ec, const std::string_view what) {
   spdlog::warn("HTTP session failed on {}: {}", what, ec.message());
 }
 
-template <class TRequestHandler, typename TSessionContext>
-class Session : public std::enable_shared_from_this<Session<TRequestHandler, TSessionContext>> {
+template <class TRequestHandler, typename TSessionData>
+class Session : public std::enable_shared_from_this<Session<TRequestHandler, TSessionData>> {
   using tcp = boost::asio::ip::tcp;
-  using std::enable_shared_from_this<Session<TRequestHandler, TSessionContext>>::shared_from_this;
+  using std::enable_shared_from_this<Session<TRequestHandler, TSessionData>>::shared_from_this;
 
  public:
   template <typename... Args>
@@ -72,7 +72,7 @@ class Session : public std::enable_shared_from_this<Session<TRequestHandler, TSe
   using PlainSocket = boost::beast::tcp_stream;
   using SSLSocket = boost::beast::ssl_stream<boost::beast::tcp_stream>;
 
-  explicit Session(tcp::socket &&socket, TSessionContext *data, ServerContext &context)
+  explicit Session(tcp::socket &&socket, TSessionData *data, ServerContext &context)
       : stream_(CreateSocket(std::move(socket), context)),
         handler_(data),
         strand_{boost::asio::make_strand(GetExecutor())} {}

src/communication/listener.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -39,7 +39,7 @@ namespace memgraph::communication {
  * second, checks all sessions for expiration and shuts them down if they have
  * expired.
  */
-template <class TSession, class TSessionContext>
+template <class TSession, class TSessionData>
 class Listener final {
  private:
   // The maximum number of events handled per execution thread is 1. This is
@@ -48,10 +48,10 @@ class Listener final {
   // can take a long time.
   static const int kMaxEvents = 1;
 
-  using SessionHandler = Session<TSession, TSessionContext>;
+  using SessionHandler = Session<TSession, TSessionData>;
 
  public:
-  Listener(TSessionContext *data, ServerContext *context, int inactivity_timeout_sec, const std::string &service_name,
+  Listener(TSessionData *data, ServerContext *context, int inactivity_timeout_sec, const std::string &service_name,
            size_t workers_count)
       : data_(data),
         alive_(false),
@@ -259,7 +259,7 @@ class Listener final {
 
   io::network::Epoll epoll_;
 
-  TSessionContext *data_;
+  TSessionData *data_;
 
   utils::SpinLock lock_;
   std::vector<std::unique_ptr<SessionHandler>> sessions_;

src/communication/server.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -46,10 +46,10 @@ namespace memgraph::communication {
  * @tparam TSession the server can handle different Sessions, each session
  *         represents a different protocol so the same network infrastructure
  *         can be used for handling different protocols
- * @tparam TSessionContext the class with objects that will be forwarded to the
+ * @tparam TSessionData the class with objects that will be forwarded to the
  *         session
  */
-template <typename TSession, typename TSessionContext>
+template <typename TSession, typename TSessionData>
 class Server final {
  public:
   using Socket = io::network::Socket;
@@ -58,12 +58,12 @@ class Server final {
    * Constructs and binds server to endpoint, operates on session data and
    * invokes workers_count workers
    */
-  Server(const io::network::Endpoint &endpoint, TSessionContext *session_context, ServerContext *context,
+  Server(const io::network::Endpoint &endpoint, TSessionData *session_data, ServerContext *context,
          int inactivity_timeout_sec, const std::string &service_name,
          size_t workers_count = std::thread::hardware_concurrency())
       : alive_(false),
         endpoint_(endpoint),
-        listener_(session_context, context, inactivity_timeout_sec, service_name, workers_count),
+        listener_(session_data, context, inactivity_timeout_sec, service_name, workers_count),
         service_name_(service_name) {}
 
   ~Server() {
@@ -156,7 +156,7 @@ class Server final {
 
   Socket socket_;
   io::network::Endpoint endpoint_;
-  Listener<TSession, TSessionContext> listener_;
+  Listener<TSession, TSessionData> listener_;
 
   const std::string service_name_;
 };

src/communication/session.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -69,10 +69,10 @@ class OutputStream final {
  * sessions. It handles socket ownership, inactivity timeout and protocol
  * wrapping.
  */
-template <class TSession, class TSessionContext>
+template <class TSession, class TSessionData>
 class Session final {
  public:
-  Session(io::network::Socket &&socket, TSessionContext *data, ServerContext *context, int inactivity_timeout_sec)
+  Session(io::network::Socket &&socket, TSessionData *data, ServerContext *context, int inactivity_timeout_sec)
       : socket_(std::move(socket)),
         output_stream_([this](const uint8_t *data, size_t len, bool have_more) { return Write(data, len, have_more); }),
         session_(data, socket_.endpoint(), input_buffer_.read_end(), &output_stream_),

src/communication/v2/listener.hpp

@@ -36,11 +36,11 @@
 
 namespace memgraph::communication::v2 {
 
-template <class TSession, class TSessionContext>
-class Listener final : public std::enable_shared_from_this<Listener<TSession, TSessionContext>> {
+template <class TSession, class TSessionData>
+class Listener final : public std::enable_shared_from_this<Listener<TSession, TSessionData>> {
   using tcp = boost::asio::ip::tcp;
-  using SessionHandler = Session<TSession, TSessionContext>;
-  using std::enable_shared_from_this<Listener<TSession, TSessionContext>>::shared_from_this;
+  using SessionHandler = Session<TSession, TSessionData>;
+  using std::enable_shared_from_this<Listener<TSession, TSessionData>>::shared_from_this;
 
  public:
   Listener(const Listener &) = delete;
@@ -59,10 +59,10 @@ class Listener final : public std::enable_shared_from_this<Listener<TSession, TS
   bool IsRunning() const noexcept { return alive_.load(std::memory_order_relaxed); }
 
  private:
-  Listener(boost::asio::io_context &io_context, TSessionContext *session_context, ServerContext *server_context,
+  Listener(boost::asio::io_context &io_context, TSessionData *data, ServerContext *server_context,
            tcp::endpoint &endpoint, const std::string_view service_name, const uint64_t inactivity_timeout_sec)
       : io_context_(io_context),
-        session_context_(session_context),
+        data_(data),
         server_context_(server_context),
         acceptor_(io_context_),
         endpoint_{endpoint},
@@ -111,8 +111,8 @@ class Listener final : public std::enable_shared_from_this<Listener<TSession, TS
       return OnError(ec, "accept");
     }
 
-    auto session = SessionHandler::Create(std::move(socket), session_context_, *server_context_, endpoint_,
-                                          inactivity_timeout_, service_name_);
+    auto session = SessionHandler::Create(std::move(socket), data_, *server_context_, endpoint_, inactivity_timeout_,
+                                          service_name_);
     session->Start();
     DoAccept();
   }
@@ -123,7 +123,7 @@ class Listener final : public std::enable_shared_from_this<Listener<TSession, TS
   }
 
   boost::asio::io_context &io_context_;
-  TSessionContext *session_context_;
+  TSessionData *data_;
   ServerContext *server_context_;
   tcp::acceptor acceptor_;
 

src/communication/v2/server.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -60,27 +60,27 @@ using ServerEndpoint = boost::asio::ip::tcp::endpoint;
  * @tparam TSession the server can handle different Sessions, each session
  *         represents a different protocol so the same network infrastructure
  *         can be used for handling different protocols
- * @tparam TSessionContext the class with objects that will be forwarded to the
+ * @tparam TSessionData the class with objects that will be forwarded to the
  *         session
  */
-template <typename TSession, typename TSessionContext>
+template <typename TSession, typename TSessionData>
 class Server final {
-  using ServerHandler = Server<TSession, TSessionContext>;
+  using ServerHandler = Server<TSession, TSessionData>;
 
  public:
   /**
    * Constructs and binds server to endpoint, operates on session data and
    * invokes workers_count workers
    */
-  Server(ServerEndpoint &endpoint, TSessionContext *session_context, ServerContext *server_context,
+  Server(ServerEndpoint &endpoint, TSessionData *session_data, ServerContext *server_context,
          const int inactivity_timeout_sec, const std::string_view service_name,
          size_t workers_count = std::thread::hardware_concurrency())
       : endpoint_{endpoint},
         service_name_{service_name},
         context_thread_pool_{workers_count},
-        listener_{Listener<TSession, TSessionContext>::Create(context_thread_pool_.GetIOContext(), session_context,
-                                                              server_context, endpoint_, service_name_,
-                                                              inactivity_timeout_sec)} {}
+        listener_{Listener<TSession, TSessionData>::Create(context_thread_pool_.GetIOContext(), session_data,
+                                                           server_context, endpoint_, service_name_,
+                                                           inactivity_timeout_sec)} {}
 
   ~Server() { MG_ASSERT(!IsRunning(), "Server wasn't shutdown properly"); }
 
@@ -122,7 +122,7 @@ class Server final {
   std::string service_name_;
 
   IOContextThreadPool context_thread_pool_;
-  std::shared_ptr<Listener<TSession, TSessionContext>> listener_;
+  std::shared_ptr<Listener<TSession, TSessionData>> listener_;
 };
 
 }  // namespace memgraph::communication::v2

src/communication/v2/session.hpp

@@ -16,12 +16,10 @@
 #include <cstdint>
 #include <cstring>
 #include <deque>
-#include <exception>
 #include <functional>
 #include <memory>
 #include <string>
 #include <string_view>
-#include <unordered_map>
 #include <utility>
 #include <variant>
 
@@ -43,11 +41,9 @@
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/system/detail/error_code.hpp>
 
-#include "communication/bolt/v1/session.hpp"
 #include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/exceptions.hpp"
-#include "dbms/global.hpp"
 #include "utils/event_counter.hpp"
 #include "utils/logging.hpp"
 #include "utils/on_scope_exit.hpp"
@@ -99,10 +95,10 @@ class OutputStream final {
  * Websocket Sessions. It handles socket ownership, inactivity timeout and protocol
  * wrapping.
  */
-template <typename TSession, typename TSessionContext>
-class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TSession, TSessionContext>> {
+template <typename TSession, typename TSessionData>
+class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TSession, TSessionData>> {
   using WebSocket = boost::beast::websocket::stream<boost::beast::tcp_stream>;
-  using std::enable_shared_from_this<WebsocketSession<TSession, TSessionContext>>::shared_from_this;
+  using std::enable_shared_from_this<WebsocketSession<TSession, TSessionData>>::shared_from_this;
 
  public:
   template <typename... Args>
@@ -110,17 +106,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
     return std::shared_ptr<WebsocketSession>(new WebsocketSession(std::forward<Args>(args)...));
   }
 
-#ifdef MG_ENTERPRISE
-  ~WebsocketSession() { session_context_->Delete(session_); }
-#else
-  ~WebsocketSession() = default;
-#endif
-
-  WebsocketSession(const WebsocketSession &) = delete;
-  WebsocketSession &operator=(const WebsocketSession &) = delete;
-  WebsocketSession(WebsocketSession &&) noexcept = delete;
-  WebsocketSession &operator=(WebsocketSession &&) noexcept = delete;
-
   // Start the asynchronous accept operation
   template <class Body, class Allocator>
   void DoAccept(boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>> req) {
@@ -166,20 +151,15 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
 
  private:
   // Take ownership of the socket
-  explicit WebsocketSession(tcp::socket &&socket, TSessionContext *session_context, tcp::endpoint endpoint,
+  explicit WebsocketSession(tcp::socket &&socket, TSessionData *data, tcp::endpoint endpoint,
                             std::string_view service_name)
       : ws_(std::move(socket)),
         strand_{boost::asio::make_strand(ws_.get_executor())},
         output_stream_([this](const uint8_t *data, size_t len, bool /*have_more*/) { return Write(data, len); }),
-        session_{*session_context, endpoint, input_buffer_.read_end(), &output_stream_},
-        session_context_{session_context},
+        session_(data, endpoint, input_buffer_.read_end(), &output_stream_),
         endpoint_{endpoint},
         remote_endpoint_{ws_.next_layer().socket().remote_endpoint()},
-        service_name_{service_name} {
-#ifdef MG_ENTERPRISE
-    session_context_->Register(session_);
-#endif
-  }
+        service_name_{service_name} {}
 
   void OnAccept(boost::beast::error_code ec) {
     if (ec) {
@@ -262,7 +242,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
   communication::Buffer input_buffer_;
   OutputStream output_stream_;
   TSession session_;
-  TSessionContext *session_context_;
   tcp::endpoint endpoint_;
   tcp::endpoint remote_endpoint_;
   std::string_view service_name_;
@@ -274,11 +253,11 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
  * Sessions. It handles socket ownership, inactivity timeout and protocol
  * wrapping.
  */
-template <typename TSession, typename TSessionContext>
-class Session final : public std::enable_shared_from_this<Session<TSession, TSessionContext>> {
+template <typename TSession, typename TSessionData>
+class Session final : public std::enable_shared_from_this<Session<TSession, TSessionData>> {
   using TCPSocket = tcp::socket;
   using SSLSocket = boost::asio::ssl::stream<TCPSocket>;
-  using std::enable_shared_from_this<Session<TSession, TSessionContext>>::shared_from_this;
+  using std::enable_shared_from_this<Session<TSession, TSessionData>>::shared_from_this;
 
  public:
   template <typename... Args>
@@ -286,16 +265,11 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     return std::shared_ptr<Session>(new Session(std::forward<Args>(args)...));
   }
 
-#ifdef MG_ENTERPRISE
-  ~Session() { session_context_->Delete(session_); }
-#else
-  ~Session() = default;
-#endif
-
   Session(const Session &) = delete;
   Session(Session &&) = delete;
   Session &operator=(const Session &) = delete;
   Session &operator=(Session &&) = delete;
+  ~Session() = default;
 
   bool Start() {
     if (execution_active_) {
@@ -360,23 +334,18 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   }
 
  private:
-  explicit Session(tcp::socket &&socket, TSessionContext *session_context, ServerContext &server_context,
-                   tcp::endpoint endpoint, const std::chrono::seconds inactivity_timeout_sec,
-                   std::string_view service_name)
+  explicit Session(tcp::socket &&socket, TSessionData *data, ServerContext &server_context, tcp::endpoint endpoint,
+                   const std::chrono::seconds inactivity_timeout_sec, std::string_view service_name)
       : socket_(CreateSocket(std::move(socket), server_context)),
         strand_{boost::asio::make_strand(GetExecutor())},
         output_stream_([this](const uint8_t *data, size_t len, bool have_more) { return Write(data, len, have_more); }),
-        session_{*session_context, endpoint, input_buffer_.read_end(), &output_stream_},
-        session_context_{session_context},
+        session_(data, endpoint, input_buffer_.read_end(), &output_stream_),
+        data_{data},
         endpoint_{endpoint},
         remote_endpoint_{GetRemoteEndpoint()},
         service_name_{service_name},
         timeout_seconds_(inactivity_timeout_sec),
         timeout_timer_(GetExecutor()) {
-#ifdef MG_ENTERPRISE
-    // TODO Try to remove Register (see comment at SessionInterface declaration)
-    session_context_->Register(session_);
-#endif
     ExecuteForSocket([](auto &&socket) {
       socket.lowest_layer().set_option(tcp::no_delay(true));                         // enable PSH
       socket.lowest_layer().set_option(boost::asio::socket_base::keep_alive(true));  // enable SO_KEEPALIVE
@@ -427,8 +396,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
         spdlog::info("Switching {} to websocket connection", remote_endpoint_);
         if (std::holds_alternative<TCPSocket>(socket_)) {
           auto sock = std::get<TCPSocket>(std::move(socket_));
-          WebsocketSession<TSession, TSessionContext>::Create(std::move(sock), session_context_, endpoint_,
-                                                              service_name_)
+          WebsocketSession<TSession, TSessionData>::Create(std::move(sock), data_, endpoint_, service_name_)
               ->DoAccept(parser.release());
           execution_active_ = false;
           return;
@@ -567,7 +535,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   communication::Buffer input_buffer_;
   OutputStream output_stream_;
   TSession session_;
-  TSessionContext *session_context_;
+  TSessionData *data_;
   tcp::endpoint endpoint_;
   tcp::endpoint remote_endpoint_;
   std::string_view service_name_;

src/csv/CMakeLists.txt

@@ -1,18 +0,0 @@
-add_library(mg-csv STATIC)
-add_library(mg::csv ALIAS mg-csv)
-target_sources(mg-csv
-        PUBLIC
-        include/csv/parsing.hpp
-
-        PRIVATE
-        parsing.cpp
-        )
-target_include_directories(mg-csv PUBLIC include)
-
-find_package(Boost REQUIRED COMPONENTS iostreams)
-target_link_libraries(mg-csv
-        PUBLIC mg-utils
-        PRIVATE lib::ctre mg-requests Boost::iostreams
-        )
-
-add_subdirectory(fuzz)

src/csv/fuzz/CMakeLists.txt

@@ -1,5 +0,0 @@
-add_executable(fuzz_csv EXCLUDE_FROM_ALL)
-target_sources(fuzz_csv PRIVATE fuzz_reader.cpp)
-target_link_libraries(fuzz_csv PRIVATE mg::csv)
-target_compile_options(fuzz_csv PRIVATE -fsanitize=fuzzer)
-target_link_libraries(fuzz_csv PRIVATE -fsanitize=fuzzer)

src/csv/fuzz/fuzz_reader.cpp

@@ -1,78 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#include <cstdint>
-#include <optional>
-#include <sstream>
-
-#include "csv/parsing.hpp"
-#include "utils/string.hpp"
-
-namespace mg = memgraph;
-namespace csv = mg::csv;
-
-using pmr_str = mg::utils::pmr::string;
-
-extern "C" int LLVMFuzzerTestOneInput(std::uint8_t const *data, std::size_t size) {
-  // need to parse a config
-  if (size < 4) return 0;
-  auto const with_header = bool(data[0]);
-  auto const ignore_bad = bool(data[1]);
-  auto const delim_size = data[2];
-  auto const quote_size = data[3];
-  // 0 will be nullopt, everything else will be one smaller
-  // 0      , 1, 2, 3, 4
-  // nullopt, 0, 1, 2, 3
-  auto const delim_real_size = delim_size == 0 ? 0 : delim_size - 1;
-  auto const quote_real_size = quote_size == 0 ? 0 : quote_size - 1;
-  // not worth testing if too large
-  if (delim_real_size > 3 || quote_real_size > 3) return 0;
-
-  // is there enough space for them to exist
-  if (size < 4 + delim_real_size + quote_real_size) return 0;
-  auto const delim_start = 4;
-  auto const delim_end = delim_start + delim_real_size;
-  auto const quote_start = delim_end;
-  auto const quote_end = quote_start + quote_real_size;
-
-  auto *mem = mg::utils::NewDeleteResource();
-  auto delim = delim_size == 0 ? std::optional<pmr_str>{} : pmr_str(&data[delim_start], &data[delim_end], mem);
-  auto quote = quote_size == 0 ? std::optional<pmr_str>{} : pmr_str(&data[quote_start], &data[quote_end], mem);
-
-  auto const remaining = static_cast<int64_t>(size) - quote_end;
-  if (remaining < 0) __builtin_trap();  // if this hits, above parsing is wrong
-
-  // #############################################################################################################
-
-  // build Config
-  auto cfg = csv::Reader::Config{with_header, ignore_bad, std::move(delim), std::move(quote)};
-
-  // build CSV source
-  auto ss = std::stringstream{};
-  ss.write(reinterpret_cast<char const *>(&data[quote_end]), static_cast<std::streamsize>(remaining));
-  auto source = csv::StreamCsvSource{std::move(ss)};
-
-  // #############################################################################################################
-  try {
-    auto reader = memgraph::csv::Reader(std::move(source), std::move(cfg));
-    auto const header = reader.GetHeader();
-    asm volatile("" : : "g"(header) : "memory");
-    while (true) {
-      auto row = reader.GetNextRow(mem);
-      if (!row) break;
-      asm volatile("" : : "g"(row) : "memory");
-    }
-  } catch (csv::CsvReadException const &) {
-    // CsvReadException is ok
-  }
-
-  return 0;
-}

src/dbms/constants.hpp

@@ -1,18 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-namespace memgraph::dbms {
-
-constexpr static const char *kDefaultDB = "memgraph";  //!< Name of the default database
-
-}  // namespace memgraph::dbms

src/dbms/global.hpp

@@ -1,110 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#include <concepts>
-#include <cstdint>
-#include <string>
-
-#include "utils/exceptions.hpp"
-
-namespace memgraph::dbms {
-
-enum class DeleteError : uint8_t {
-  DEFAULT_DB,
-  USING,
-  NON_EXISTENT,
-  FAIL,
-  DISK_FAIL,
-};
-
-enum class NewError : uint8_t {
-  NO_CONFIGS,
-  EXISTS,
-  DEFUNCT,
-  GENERIC,
-};
-
-enum class SetForResult : uint8_t {
-  SUCCESS,
-  ALREADY_SET,
-  FAIL,
-};
-
-/**
- * UnknownSession Exception
- *
- * Used to indicate that an unknown session was used.
- */
-class UnknownSessionException : public utils::BasicException {
- public:
-  using utils::BasicException::BasicException;
-};
-
-/**
- * UnknownDatabase Exception
- *
- * Used to indicate that an unknown database was used.
- */
-class UnknownDatabaseException : public utils::BasicException {
- public:
-  using utils::BasicException::BasicException;
-};
-
-/**
- * @brief Session interface used by the DBMS to handle the the active sessions.
- * @todo Try to remove this dependency from SessionContextHandler. OnDelete could be removed, as it only does an assert.
- * OnChange could be removed if SetFor returned the pointer and the called then handled the OnChange execution.
- * However, the interface is very useful to  decouple the interpreter's query execution and the sessions themselves.
- */
-class SessionInterface {
- public:
-  SessionInterface() = default;
-  virtual ~SessionInterface() = default;
-
-  SessionInterface(const SessionInterface &) = default;
-  SessionInterface &operator=(const SessionInterface &) = default;
-  SessionInterface(SessionInterface &&) noexcept = default;
-  SessionInterface &operator=(SessionInterface &&) noexcept = default;
-
-  /**
-   * @brief Return the unique string identifying the session.
-   *
-   * @return std::string
-   */
-  virtual std::string UUID() const = 0;
-
-  /**
-   * @brief Return the currently active database.
-   *
-   * @return std::string
-   */
-  virtual std::string GetDatabaseName() const = 0;
-
-#ifdef MG_ENTERPRISE
-  /**
-   * @brief Gets called on database change.
-   *
-   * @return SetForResult enum (SUCCESS, ALREADY_SET or FAIL)
-   */
-  virtual dbms::SetForResult OnChange(const std::string &) = 0;
-
-  /**
-   * @brief Callback that gets called on database delete (drop).
-   *
-   * @return true on success
-   */
-  virtual bool OnDelete(const std::string &) = 0;
-#endif
-};
-
-}  // namespace memgraph::dbms

src/dbms/handler.hpp

@@ -1,142 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#include <filesystem>
-#include <memory>
-#include <optional>
-#include <string_view>
-#include <unordered_map>
-
-#include "global.hpp"
-#include "utils/result.hpp"
-#include "utils/sync_ptr.hpp"
-
-namespace memgraph::dbms {
-
-/**
- * @brief Generic multi-database content handler.
- *
- * @tparam TContext
- * @tparam TConfig
- */
-template <typename TContext, typename TConfig>
-class Handler {
- public:
-  using NewResult = utils::BasicResult<NewError, std::shared_ptr<TContext>>;
-
-  /**
-   * @brief Empty Handler constructor.
-   *
-   */
-  Handler() {}
-
-  /**
-   * @brief Generate a new context and corresponding configuration.
-   *
-   * @tparam T1 Variadic template of context constructor arguments
-   * @tparam T2 Variadic template of config constructor arguments
-   * @param name Name associated with the new context/config pair
-   * @param args1 Arguments passed (as a tuple) to the context constructor
-   * @param args2 Arguments passed (as a tuple) to the config constructor
-   * @return NewResult
-   */
-  template <typename... T1, typename... T2>
-  NewResult New(std::string name, std::tuple<T1...> args1, std::tuple<T2...> args2) {
-    return New_(name, args1, args2, std::make_index_sequence<sizeof...(T1)>{},
-                std::make_index_sequence<sizeof...(T2)>{});
-  }
-
-  /**
-   * @brief Get pointer to context.
-   *
-   * @param name Name associated with the wanted context
-   * @return std::optional<std::shared_ptr<TContext>>
-   */
-  std::optional<std::shared_ptr<TContext>> Get(const std::string &name) {
-    if (auto search = items_.find(name); search != items_.end()) {
-      return search->second.get();
-    }
-    return {};
-  }
-
-  /**
-   * @brief Get the config.
-   *
-   * @param name Name associated with the wanted config
-   * @return std::optional<TConfig>
-   */
-  std::optional<TConfig> GetConfig(const std::string &name) const {
-    if (auto search = items_.find(name); search != items_.end()) {
-      return search->second.config();
-    }
-    return {};
-  }
-
-  /**
-   * @brief Delete the context/config pair associated with the name.
-   *
-   * @param name Name associated with the context/config pair to delete
-   * @return true on success
-   */
-  bool Delete(const std::string &name) {
-    if (auto itr = items_.find(name); itr != items_.end()) {
-      itr->second.DestroyAndSync();
-      items_.erase(itr);
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Check if a name is already used.
-   *
-   * @param name Name to check
-   * @return true if a context/config pair is already associated with the name
-   */
-  bool Has(const std::string &name) const { return items_.find(name) != items_.end(); }
-
-  auto begin() { return items_.begin(); }
-  auto end() { return items_.end(); }
-  auto begin() const { return items_.begin(); }
-  auto end() const { return items_.end(); }
-  auto cbegin() const { return items_.cbegin(); }
-  auto cend() const { return items_.cend(); }
-
- private:
-  /**
-   * @brief Lower level handler that hides some ugly code.
-   *
-   * @tparam T1 Variadic template of context constructor arguments
-   * @tparam T2 Variadic template of config constructor arguments
-   * @tparam I1 List of indexes associated with the first tuple
-   * @tparam I2 List of indexes associated with the second tuple
-   */
-  template <typename... T1, typename... T2, std::size_t... I1, std::size_t... I2>
-  NewResult New_(std::string name, std::tuple<T1...> &args1, std::tuple<T2...> &args2,
-                 std::integer_sequence<std::size_t, I1...> /*not-used*/,
-                 std::integer_sequence<std::size_t, I2...> /*not-used*/) {
-    // Make sure the emplace will succeed, since we don't want to create temporary objects that could break something
-    if (!Has(name)) {
-      auto [itr, _] = items_.emplace(std::piecewise_construct, std::forward_as_tuple(name),
-                                     std::forward_as_tuple(TConfig{std::forward<T1>(std::get<I1>(args1))...},
-                                                           std::forward<T2>(std::get<I2>(args2))...));
-      return itr->second.get();
-    }
-    spdlog::info("Item with name \"{}\" already exists.", name);
-    return NewError::EXISTS;
-  }
-
-  std::unordered_map<std::string, utils::SyncPtr<TContext, TConfig>> items_;  //!< map to all active items
-};
-
-}  // namespace memgraph::dbms

src/dbms/interp_handler.hpp

@@ -1,106 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#ifdef MG_ENTERPRISE
-
-#include "global.hpp"
-#include "query/auth_checker.hpp"
-#include "query/config.hpp"
-#include "query/interpreter.hpp"
-#include "storage/v2/storage.hpp"
-
-#include "handler.hpp"
-
-namespace memgraph::dbms {
-
-/**
- * @brief Simple class that adds useful information to the query's InterpreterContext
- *
- * @tparam T Multi-database handler type
- */
-template <typename T>
-class ExpandedInterpContext : public query::InterpreterContext {
- public:
-  template <typename... TArgs>
-  explicit ExpandedInterpContext(T &ref, TArgs &&...args)
-      : query::InterpreterContext(std::forward<TArgs>(args)...), sc_handler_(ref) {}
-
-  T &sc_handler_;  //!< Multi-database/SessionContext handler (used in some queries)
-};
-
-/**
- * @brief Simple structure that expands on the query's InterpreterConfig
- *
- */
-struct ExpandedInterpConfig {
-  storage::Config storage_config;          //!< Storage configuration
-  query::InterpreterConfig interp_config;  //!< Interpreter configuration
-};
-
-/**
- * @brief Multi-database interpreter context handler
- *
- * @tparam TSCHandler High-level multi-database/SessionContext handler type
- */
-template <typename TSCHandler>
-class InterpContextHandler : public Handler<ExpandedInterpContext<TSCHandler>, ExpandedInterpConfig> {
- public:
-  using InterpContextT = ExpandedInterpContext<TSCHandler>;
-  using HandlerT = Handler<InterpContextT, ExpandedInterpConfig>;
-
-  /**
-   * @brief Generate a new interpreter context associated with the passed name.
-   *
-   * @param name Name associating the new interpreter context
-   * @param sc_handler Multi-database/SessionContext handler used (some queries might use it)
-   * @param db Storage associated with the interpreter context
-   * @param config Interpreter's configuration
-   * @param dir Directory used by the interpreter
-   * @param auth_handler AuthQueryHandler used
-   * @param auth_checker AuthChecker used
-   * @return HandlerT::NewResult
-   */
-  typename HandlerT::NewResult New(const std::string &name, TSCHandler &sc_handler, storage::Config storage_config,
-                                   const query::InterpreterConfig &interpreter_config,
-                                   query::AuthQueryHandler &auth_handler, query::AuthChecker &auth_checker) {
-    // Check if compatible with the existing interpreters
-    if (std::any_of(HandlerT::cbegin(), HandlerT::cend(), [&](const auto &elem) {
-          const auto &config = elem.second.config().storage_config;
-          return config.durability.storage_directory == storage_config.durability.storage_directory;
-        })) {
-      spdlog::info("Tried to generate a new context using claimed directory and/or storage.");
-      return NewError::EXISTS;
-    }
-    const auto dir = storage_config.durability.storage_directory;
-    storage_config.name = name;  // Set storage id via config
-    return HandlerT::New(
-        name, std::forward_as_tuple(storage_config, interpreter_config),
-        std::forward_as_tuple(sc_handler, storage_config, interpreter_config, dir, &auth_handler, &auth_checker));
-  }
-
-  /**
-   * @brief All currently active storage.
-   *
-   * @return std::vector<std::string>
-   */
-  std::vector<std::string> All() const {
-    std::vector<std::string> res;
-    res.reserve(std::distance(HandlerT::cbegin(), HandlerT::cend()));
-    std::for_each(HandlerT::cbegin(), HandlerT::cend(), [&](const auto &elem) { res.push_back(elem.first); });
-    return res;
-  }
-};
-
-}  // namespace memgraph::dbms
-
-#endif

src/dbms/session_context.hpp

@@ -1,61 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#include "auth/auth.hpp"
-#include "query/interpreter.hpp"
-#include "storage/v2/storage.hpp"
-#include "utils/synchronized.hpp"
-
-#if MG_ENTERPRISE
-#include "audit/log.hpp"
-#endif
-namespace memgraph::dbms {
-
-/**
- * @brief Structure encapsulating storage and interpreter context.
- *
- * @note Each session contains a copy.
- */
-struct SessionContext {
-  // Explicit constructor here to ensure that pointers to all objects are
-  // supplied.
-
-  SessionContext(std::shared_ptr<memgraph::query::InterpreterContext> interpreter_context, std::string run,
-                 memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth
-#ifdef MG_ENTERPRISE
-                 ,
-                 memgraph::audit::Log *audit_log
-#endif
-                 )
-      : interpreter_context(interpreter_context),
-        run_id(run),
-        auth(auth)
-#ifdef MG_ENTERPRISE
-        ,
-        audit_log(audit_log)
-#endif
-  {
-  }
-
-  std::shared_ptr<memgraph::query::InterpreterContext> interpreter_context;
-  std::string run_id;
-
-  // std::shared_ptr<AuthContext> auth_context;
-  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth;
-
-#ifdef MG_ENTERPRISE
-  memgraph::audit::Log *audit_log;
-#endif
-};
-
-}  // namespace memgraph::dbms

src/dbms/session_context_handler.hpp

@@ -1,603 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-
-#pragma once
-
-#include <algorithm>
-#include <concepts>
-#include <cstdint>
-#include <filesystem>
-#include <memory>
-#include <mutex>
-#include <optional>
-#include <ostream>
-#include <stdexcept>
-#include <system_error>
-#include <unordered_map>
-
-#include "constants.hpp"
-#include "global.hpp"
-#include "interp_handler.hpp"
-#include "query/auth_checker.hpp"
-#include "query/config.hpp"
-#include "query/interpreter.hpp"
-#include "session_context.hpp"
-#include "spdlog/spdlog.h"
-#include "storage/v2/durability/durability.hpp"
-#include "storage/v2/durability/paths.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/file.hpp"
-#include "utils/logging.hpp"
-#include "utils/result.hpp"
-#include "utils/rw_lock.hpp"
-#include "utils/synchronized.hpp"
-#include "utils/uuid.hpp"
-
-#include "handler.hpp"
-
-namespace memgraph::dbms {
-
-#ifdef MG_ENTERPRISE
-
-using DeleteResult = utils::BasicResult<DeleteError>;
-
-/**
- * @brief Multi-database session contexts handler.
- */
-class SessionContextHandler {
- public:
-  using StorageT = storage::Storage;
-  using StorageConfigT = storage::Config;
-  using LockT = utils::RWLock;
-  using NewResultT = utils::BasicResult<NewError, SessionContext>;
-
-  struct Config {
-    StorageConfigT storage_config;           //!< Storage configuration
-    query::InterpreterConfig interp_config;  //!< Interpreter context configuration
-    std::function<void(utils::Synchronized<auth::Auth, utils::WritePrioritizedRWLock> *,
-                       std::unique_ptr<query::AuthQueryHandler> &, std::unique_ptr<query::AuthChecker> &)>
-        glue_auth;
-  };
-
-  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.
-   *
-   * @param audit_log pointer to the audit logger (ENTERPRISE only)
-   * @param configs storage and interpreter configurations
-   * @param recovery_on_startup restore databases (and its content) and authentication data
-   */
-  SessionContextHandler(memgraph::audit::Log &audit_log, Config configs, bool recovery_on_startup, bool delete_on_drop)
-      : lock_{utils::RWLock::Priority::READ},
-        default_configs_(configs),
-        run_id_{utils::GenerateUUID()},
-        audit_log_(&audit_log),
-        delete_on_drop_(delete_on_drop) {
-    const auto &root = configs.storage_config.durability.storage_directory;
-    utils::EnsureDirOrDie(root);
-    // Verify that the user that started the process is the same user that is
-    // the owner of the storage directory.
-    storage::durability::VerifyStorageDirectoryOwnerAndProcessUserOrDie(root);
-
-    // Create the lock file and open a handle to it. This will crash the
-    // database if it can't open the file for writing or if any other process is
-    // holding the file opened.
-    lock_file_path_ = root / ".lock";
-    lock_file_handle_.Open(lock_file_path_, utils::OutputFile::Mode::OVERWRITE_EXISTING);
-    MG_ASSERT(lock_file_handle_.AcquireLock(),
-              "Couldn't acquire lock on the storage directory {}"
-              "!\nAnother Memgraph process is currently running with the same "
-              "storage directory, please stop it first before starting this "
-              "process!",
-              root);
-
-    // TODO: Figure out if this is needed/wanted
-    // Clear auth database since we are not recovering
-    // if (!recovery_on_startup) {
-    //   const auto &auth_dir = root / "auth";
-    //   // Backup if auth present
-    //   if (utils::DirExists(auth_dir)) {
-    //     auto backup_dir = root / storage::durability::kBackupDirectory;
-    //     std::error_code error_code;
-    //     utils::EnsureDirOrDie(backup_dir);
-    //     std::error_code ec;
-    //     const auto now = std::chrono::system_clock::now();
-    //     std::ostringstream os;
-    //     os << now.time_since_epoch().count();
-    //     std::filesystem::rename(auth_dir, backup_dir / ("auth-" + os.str()), ec);
-    //     MG_ASSERT(!ec, "Couldn't backup auth directory because of: {}", ec.message());
-    //     spdlog::warn(
-    //         "Since Memgraph was not supposed to recover on startup the authentication files will be "
-    //         "overwritten. To prevent important data loss, Memgraph has stored those files into .backup directory "
-    //         "inside the storage directory.");
-    //   }
-
-    //   // Clear
-    //   if (std::filesystem::exists(auth_dir)) {
-    //     std::filesystem::remove_all(auth_dir);
-    //   }
-    // }
-
-    // Lazy initialization of auth_
-    auth_ = std::make_unique<utils::Synchronized<auth::Auth, utils::WritePrioritizedRWLock>>(root / "auth");
-    configs.glue_auth(auth_.get(), auth_handler_, auth_checker_);
-
-    // TODO: Decouple storage config from dbms config
-    // TODO: Save individual db configs inside the kvstore and restore from there
-    storage::UpdatePaths(default_configs_->storage_config,
-                         default_configs_->storage_config.durability.storage_directory / "databases");
-    const auto &db_dir = default_configs_->storage_config.durability.storage_directory;
-    const auto durability_dir = db_dir / ".durability";
-    utils::EnsureDirOrDie(db_dir);
-    utils::EnsureDirOrDie(durability_dir);
-    durability_ = std::make_unique<kvstore::KVStore>(durability_dir);
-
-    // Generate the default database
-    MG_ASSERT(!NewDefault_().HasError(), "Failed while creating the default DB.");
-
-    // Recover previous databases
-    if (recovery_on_startup) {
-      for (const auto &[name, _] : *durability_) {
-        if (name == kDefaultDB) continue;  // Already set
-        spdlog::info("Restoring database {}.", name);
-        MG_ASSERT(!New_(name).HasError(), "Failed while creating database {}.", name);
-        spdlog::info("Database {} restored.", name);
-      }
-    } else {  // Clear databases from the durability list and auth
-      auto locked_auth = auth_->Lock();
-      for (const auto &[name, _] : *durability_) {
-        if (name == kDefaultDB) continue;
-        locked_auth->DeleteDatabase(name);
-        durability_->Delete(name);
-      }
-    }
-  }
-
-  void Shutdown() {
-    for (auto &ic : interp_handler_) memgraph::query::Shutdown(ic.second.get().get());
-  }
-
-  /**
-   * @brief Create a new SessionContext associated with the "name" database
-   *
-   * @param name name of the database
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT New(const std::string &name) {
-    std::lock_guard<LockT> wr(lock_);
-    return New_(name, name);
-  }
-
-  /**
-   * @brief Get the context associated with the "name" database
-   *
-   * @param name
-   * @return SessionContext
-   * @throw UnknownDatabaseException if getting unknown database
-   */
-  SessionContext Get(const std::string &name) {
-    std::shared_lock<LockT> rd(lock_);
-    return Get_(name);
-  }
-
-  /**
-   * @brief Set the undelying database for a particular session.
-   *
-   * @param uuid unique session identifier
-   * @param db_name unique database name
-   * @return SetForResult enum
-   * @throws UnknownDatabaseException, UnknownSessionException or anything OnChange throws
-   */
-  SetForResult SetFor(const std::string &uuid, const std::string &db_name) {
-    std::shared_lock<LockT> rd(lock_);
-    (void)Get_(
-        db_name);  // throws if db doesn't exist (TODO: Better to pass it via OnChange - but injecting dependency)
-    try {
-      auto &s = sessions_.at(uuid);
-      return s.OnChange(db_name);
-    } catch (std::out_of_range &) {
-      throw UnknownSessionException("Unknown session \"{}\"", uuid);
-    }
-  }
-
-  /**
-   * @brief Set the undelying database from a session itself. SessionContext handler.
-   *
-   * @param db_name unique database name
-   * @param handler function that gets called in place with the appropriate SessionContext
-   * @return SetForResult enum
-   */
-  template <typename THandler>
-  requires std::invocable<THandler, SessionContext> SetForResult SetInPlace(const std::string &db_name,
-                                                                            THandler handler) {
-    std::shared_lock<LockT> rd(lock_);
-    return handler(Get_(db_name));
-  }
-
-  /**
-   * @brief Call void handler under a shared lock.
-   *
-   * @param handler function that gets called in place
-   */
-  template <typename THandler>
-  requires std::invocable<THandler>
-  void CallInPlace(THandler handler) {
-    std::shared_lock<LockT> rd(lock_);
-    handler();
-  }
-
-  /**
-   * @brief Register an active session (used to handle callbacks).
-   *
-   * @param session
-   * @return true on success
-   */
-  bool Register(SessionInterface &session) {
-    std::lock_guard<LockT> wr(lock_);
-    auto [_, success] = sessions_.emplace(session.UUID(), session);
-    return success;
-  }
-
-  /**
-   * @brief Delete a session.
-   *
-   * @param session
-   */
-  bool Delete(const SessionInterface &session) {
-    std::lock_guard<LockT> wr(lock_);
-    return sessions_.erase(session.UUID()) > 0;
-  }
-
-  /**
-   * @brief Delete database.
-   *
-   * @param db_name database name
-   * @return DeleteResult error on failure
-   */
-  DeleteResult Delete(const std::string &db_name) {
-    std::lock_guard<LockT> wr(lock_);
-    if (db_name == kDefaultDB) {
-      // MSG cannot delete the default db
-      return DeleteError::DEFAULT_DB;
-    }
-    // Check if db exists
-    try {
-      auto sc = Get_(db_name);
-      // Check if a session is using the db
-      if (!sc.interpreter_context->interpreters->empty()) {
-        return DeleteError::USING;
-      }
-    } catch (UnknownDatabaseException &) {
-      return DeleteError::NON_EXISTENT;
-    }
-
-    // High level handlers
-    for (auto &[_, s] : sessions_) {
-      if (!s.OnDelete(db_name)) {
-        spdlog::error("Partial failure while deleting database \"{}\".", db_name);
-        defunct_dbs_.emplace(db_name);
-        return DeleteError::FAIL;
-      }
-    }
-
-    // Low level handlers
-    const auto storage_path = StorageDir_(db_name);
-    MG_ASSERT(storage_path, "Missing storage for {}", db_name);
-    if (!interp_handler_.Delete(db_name)) {
-      spdlog::error("Partial failure while deleting database \"{}\".", db_name);
-      defunct_dbs_.emplace(db_name);
-      return DeleteError::FAIL;
-    }
-
-    // Remove from auth
-    auth_->Lock()->DeleteDatabase(db_name);
-    // Remove from durability list
-    if (durability_) durability_->Delete(db_name);
-
-    // Delete disk storage
-    if (delete_on_drop_) {
-      std::error_code ec;
-      (void)std::filesystem::remove_all(*storage_path, ec);
-      if (ec) {
-        spdlog::error("Failed to clean disk while deleting database \"{}\".", db_name);
-        defunct_dbs_.emplace(db_name);
-        return DeleteError::DISK_FAIL;
-      }
-    }
-
-    // Delete from defunct_dbs_ (in case a second delete call was successful)
-    defunct_dbs_.erase(db_name);
-
-    return {};  // Success
-  }
-
-  /**
-   * @brief Set the default configurations.
-   *
-   * @param configs storage, interpreter and authorization configurations
-   */
-  void SetDefaultConfigs(Config configs) {
-    std::lock_guard<LockT> wr(lock_);
-    default_configs_ = configs;
-  }
-
-  /**
-   * @brief Get the default configurations.
-   *
-   * @return std::optional<Config>
-   */
-  std::optional<Config> GetDefaultConfigs() const {
-    std::shared_lock<LockT> rd(lock_);
-    return default_configs_;
-  }
-
-  /**
-   * @brief Return all active databases.
-   *
-   * @return std::vector<std::string>
-   */
-  std::vector<std::string> All() const {
-    std::shared_lock<LockT> rd(lock_);
-    return interp_handler_.All();
-  }
-
-  /**
-   * @brief Return the number of vertex across all databases.
-   *
-   * @return uint64_t
-   */
-  Statistics Info() const {
-    // TODO: Handle overflow
-    uint64_t nv = 0;
-    uint64_t ne = 0;
-    std::shared_lock<LockT> rd(lock_);
-    const uint64_t ndb = std::distance(interp_handler_.cbegin(), interp_handler_.cend());
-    for (const auto &ic : interp_handler_) {
-      const auto &info = ic.second.get()->db->GetInfo();
-      nv += info.vertex_count;
-      ne += info.edge_count;
-    }
-    return {nv, ne, ndb};
-  }
-
-  /**
-   * @brief Return the currently active database for a particular session.
-   *
-   * @param uuid session's unique identifier
-   * @return std::string name of the database
-   * @throw
-   */
-  std::string Current(const std::string &uuid) const {
-    std::shared_lock<LockT> rd(lock_);
-    return sessions_.at(uuid).GetDatabaseName();
-  }
-
-  /**
-   * @brief Restore triggers for all currently defined databases.
-   * @note: Triggers can execute query procedures, so we need to reload the modules first and then the triggers
-   */
-  void RestoreTriggers() {
-    std::lock_guard<LockT> wr(lock_);
-    for (auto &ic_itr : interp_handler_) {
-      auto ic = ic_itr.second.get();
-      spdlog::debug("Restoring trigger for database \"{}\"", ic->db->id());
-      auto storage_accessor = ic->db->Access();
-      auto dba = memgraph::query::DbAccessor{storage_accessor.get()};
-      ic->trigger_store.RestoreTriggers(&ic->ast_cache, &dba, ic->config.query, ic->auth_checker);
-    }
-  }
-
-  /**
-   * @brief Restore streams of all currently defined databases.
-   * @note: Stream transformations are using modules, they have to be restored after the query modules are loaded.
-   */
-  void RestoreStreams() {
-    std::lock_guard<LockT> wr(lock_);
-    for (auto &ic_itr : interp_handler_) {
-      auto ic = ic_itr.second.get();
-      spdlog::debug("Restoring streams for database \"{}\"", ic->db->id());
-      ic->streams.RestoreStreams();
-    }
-  }
-
- private:
-  std::optional<std::filesystem::path> StorageDir_(const std::string &name) const {
-    const auto conf = interp_handler_.GetConfig(name);
-    if (conf) {
-      return conf->storage_config.durability.storage_directory;
-    }
-    spdlog::debug("Failed to find storage dir for database \"{}\"", name);
-    return {};
-  }
-
-  /**
-   * @brief Create a new SessionContext associated with the "name" database
-   *
-   * @param name name of the database
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT New_(const std::string &name) { return New_(name, name); }
-
-  /**
-   * @brief Create a new SessionContext associated with the "name" database
-   *
-   * @param name name of the database
-   * @param storage_subdir undelying RocksDB directory
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT New_(const std::string &name, std::filesystem::path storage_subdir) {
-    if (default_configs_) {
-      auto storage = default_configs_->storage_config;
-      storage::UpdatePaths(storage, storage.durability.storage_directory / storage_subdir);
-      return New_(name, storage, default_configs_->interp_config);
-    }
-    spdlog::info("Trying to generate session context without any configurations.");
-    return NewError::NO_CONFIGS;
-  }
-
-  /**
-   * @brief Create a new SessionContext associated with the "name" database
-   *
-   * @param name name of the database
-   * @param storage_config storage configuration
-   * @param inter_config interpreter configuration
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT New_(const std::string &name, StorageConfigT &storage_config, query::InterpreterConfig &inter_config/*,
-                  const std::string &ah_flags*/) {
-    MG_ASSERT(auth_handler_, "No high level AuthQueryHandler has been supplied.");
-    MG_ASSERT(auth_checker_, "No high level AuthChecker has been supplied.");
-
-    if (defunct_dbs_.contains(name)) {
-      spdlog::warn("Failed to generate database due to the unknown state of the previously defunct database \"{}\".",
-                   name);
-      return NewError::DEFUNCT;
-    }
-
-    auto new_interp = interp_handler_.New(name, *this, storage_config, inter_config, *auth_handler_, *auth_checker_);
-
-    if (new_interp.HasValue()) {
-      // Success
-      if (durability_) durability_->Put(name, "ok");
-      return SessionContext{new_interp.GetValue(), run_id_, auth_.get(), audit_log_};
-    }
-    return new_interp.GetError();
-  }
-
-  /**
-   * @brief Create a new SessionContext associated with the default database
-   *
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT NewDefault_() {
-    // Create the default DB in the root (this is how it was done pre multi-tenancy)
-    auto res = New_(kDefaultDB, "..");
-    if (res.HasValue()) {
-      // For back-compatibility...
-      // Recreate the dbms layout for the default db and symlink to the root
-      const auto dir = StorageDir_(kDefaultDB);
-      MG_ASSERT(dir, "Failed to find storage path.");
-      const auto main_dir = *dir / "databases" / kDefaultDB;
-
-      if (!std::filesystem::exists(main_dir)) {
-        std::filesystem::create_directory(main_dir);
-      }
-
-      // Force link on-disk directories
-      const auto conf = interp_handler_.GetConfig(kDefaultDB);
-      MG_ASSERT(conf, "No configuration for the default database.");
-      const auto &tmp_conf = conf->storage_config.disk;
-      std::vector<std::filesystem::path> to_link{
-          tmp_conf.main_storage_directory,         tmp_conf.label_index_directory,
-          tmp_conf.label_property_index_directory, tmp_conf.unique_constraints_directory,
-          tmp_conf.name_id_mapper_directory,       tmp_conf.id_name_mapper_directory,
-          tmp_conf.durability_directory,           tmp_conf.wal_directory,
-      };
-
-      // Add in-memory paths
-      // Some directories are redundant (skip those)
-      const std::vector<std::string> skip{".lock", "audit_log", "auth", "databases", "internal_modules", "settings"};
-      for (auto const &item : std::filesystem::directory_iterator{*dir}) {
-        const auto dir_name = std::filesystem::relative(item.path(), item.path().parent_path());
-        if (std::find(skip.begin(), skip.end(), dir_name) != skip.end()) continue;
-        to_link.push_back(item.path());
-      }
-
-      // Symlink to root dir
-      for (auto const &item : to_link) {
-        const auto dir_name = std::filesystem::relative(item, item.parent_path());
-        const auto link = main_dir / dir_name;
-        const auto to = std::filesystem::relative(item, main_dir);
-        if (!std::filesystem::is_symlink(link) && !std::filesystem::exists(link)) {
-          std::filesystem::create_directory_symlink(to, link);
-        } else {  // Check existing link
-          std::error_code ec;
-          const auto test_link = std::filesystem::read_symlink(link, ec);
-          if (ec || test_link != to) {
-            MG_ASSERT(false,
-                      "Memgraph storage directory incompatible with new version.\n"
-                      "Please use a clean directory or remove \"{}\" and try again.",
-                      link.string());
-          }
-        }
-      }
-    }
-    return res;
-  }
-
-  /**
-   * @brief Get the context associated with the "name" database
-   *
-   * @param name
-   * @return SessionContext
-   * @throw UnknownDatabaseException if trying to get unknown database
-   */
-  SessionContext Get_(const std::string &name) {
-    auto interp = interp_handler_.Get(name);
-    if (interp) {
-      return SessionContext{*interp, run_id_, auth_.get(), audit_log_};
-    }
-    throw UnknownDatabaseException("Tried to retrieve an unknown database \"{}\".", name);
-  }
-
-  // Should storage objects ever be deleted?
-  mutable LockT lock_;                                          //!< protective lock
-  std::filesystem::path lock_file_path_;                        //!< Lock file protecting the main storage
-  utils::OutputFile lock_file_handle_;                          //!< Handler the lock (crash if already open)
-  InterpContextHandler<SessionContextHandler> interp_handler_;  //!< multi-tenancy interpreter handler
-  // AuthContextHandler auth_handler_; //!< multi-tenancy authorization handler (currently we use a single global
-  // auth)
-  std::unique_ptr<utils::Synchronized<auth::Auth, utils::WritePrioritizedRWLock>> auth_;
-  std::unique_ptr<query::AuthQueryHandler> auth_handler_;
-  std::unique_ptr<query::AuthChecker> auth_checker_;
-  std::optional<Config> default_configs_;                         //!< default storage and interpreter configurations
-  const std::string run_id_;                                      //!< run's unique identifier (auto generated)
-  memgraph::audit::Log *audit_log_;                               //!< pointer to the audit logger
-  std::unordered_map<std::string, SessionInterface &> sessions_;  //!< map of active/registered sessions
-  std::unique_ptr<kvstore::KVStore> durability_;  //!< list of active dbs (pointer so we can postpone its creation)
-
-  std::set<std::string> defunct_dbs_;  //!< Databases that are in an unknown state due to various failures
-  bool delete_on_drop_;                //!< Flag defining if dropping storage also deletes its directory
- public:
-  static SessionContextHandler &ExtractSCH(query::InterpreterContext *interpreter_context) {
-    return static_cast<typename decltype(interp_handler_)::InterpContextT *>(interpreter_context)->sc_handler_;
-  }
-};
-
-#else
-/**
- * @brief Initialize the handler.
- *
- * @param auth pointer to the authenticator
- * @param configs storage and interpreter configurations
- */
-static inline SessionContext Init(storage::Config &storage_config, query::InterpreterConfig &interp_config,
-                                  utils::Synchronized<auth::Auth, utils::WritePrioritizedRWLock> *auth,
-                                  query::AuthQueryHandler *auth_handler, query::AuthChecker *auth_checker) {
-  MG_ASSERT(auth, "Passed a nullptr auth");
-  MG_ASSERT(auth_handler, "Passed a nullptr auth_handler");
-  MG_ASSERT(auth_checker, "Passed a nullptr auth_checker");
-
-  storage_config.name = kDefaultDB;
-  auto interp_context = std::make_shared<query::InterpreterContext>(
-      storage_config, interp_config, storage_config.durability.storage_directory, auth_handler, auth_checker);
-  MG_ASSERT(interp_context, "Failed to construct main interpret context.");
-
-  return SessionContext{interp_context, utils::GenerateUUID(), auth};
-}
-#endif
-
-}  // namespace memgraph::dbms

src/glue/auth.cpp

@@ -62,10 +62,6 @@ auth::Permission PrivilegeToPermission(query::AuthQuery::Privilege privilege) {
       return auth::Permission::STORAGE_MODE;
     case query::AuthQuery::Privilege::TRANSACTION_MANAGEMENT:
       return auth::Permission::TRANSACTION_MANAGEMENT;
-    case query::AuthQuery::Privilege::MULTI_DATABASE_EDIT:
-      return auth::Permission::MULTI_DATABASE_EDIT;
-    case query::AuthQuery::Privilege::MULTI_DATABASE_USE:
-      return auth::Permission::MULTI_DATABASE_USE;
   }
 }
 

src/glue/auth_checker.cpp

@@ -71,8 +71,7 @@ AuthChecker::AuthChecker(
     : auth_(auth) {}
 
 bool AuthChecker::IsUserAuthorized(const std::optional<std::string> &username,
-                                   const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                                   const std::string &db_name) const {
+                                   const std::vector<memgraph::query::AuthQuery::Privilege> &privileges) const {
   std::optional<memgraph::auth::User> maybe_user;
   {
     auto locked_auth = auth_->ReadLock();
@@ -84,7 +83,7 @@ bool AuthChecker::IsUserAuthorized(const std::optional<std::string> &username,
     }
   }
 
-  return maybe_user.has_value() && IsUserAuthorized(*maybe_user, privileges, db_name);
+  return maybe_user.has_value() && IsUserAuthorized(*maybe_user, privileges);
 }
 
 #ifdef MG_ENTERPRISE
@@ -95,14 +94,12 @@ std::unique_ptr<memgraph::query::FineGrainedAuthChecker> AuthChecker::GetFineGra
   }
   try {
     auto locked_auth = auth_->Lock();
-    if (username != user_.username()) {
-      auto maybe_user = locked_auth->GetUser(username);
-      if (!maybe_user) {
-        throw memgraph::query::QueryRuntimeException("User '{}' doesn't exist .", username);
-      }
-      user_ = std::move(*maybe_user);
+    auto user = locked_auth->GetUser(username);
+    if (!user) {
+      throw memgraph::query::QueryRuntimeException("User '{}' doesn't exist .", username);
     }
-    return std::make_unique<memgraph::glue::FineGrainedAuthChecker>(user_, dba);
+
+    return std::make_unique<memgraph::glue::FineGrainedAuthChecker>(std::move(*user), dba);
 
   } catch (const memgraph::auth::AuthException &e) {
     throw memgraph::query::QueryRuntimeException(e.what());
@@ -111,13 +108,7 @@ std::unique_ptr<memgraph::query::FineGrainedAuthChecker> AuthChecker::GetFineGra
 #endif
 
 bool AuthChecker::IsUserAuthorized(const memgraph::auth::User &user,
-                                   const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                                   const std::string &db_name) {  // NOLINT
-#ifdef MG_ENTERPRISE
-  if (!db_name.empty() && !user.db_access().Contains(db_name)) {
-    return false;
-  }
-#endif
+                                   const std::vector<memgraph::query::AuthQuery::Privilege> &privileges) {
   const auto user_permissions = user.GetPermissions();
   return std::all_of(privileges.begin(), privileges.end(), [&user_permissions](const auto privilege) {
     return user_permissions.Has(memgraph::glue::PrivilegeToPermission(privilege)) ==

src/glue/auth_checker.hpp

@@ -25,8 +25,7 @@ class AuthChecker : public query::AuthChecker {
       memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth);
 
   bool IsUserAuthorized(const std::optional<std::string> &username,
-                        const std::vector<query::AuthQuery::Privilege> &privileges,
-                        const std::string &db_name) const override;
+                        const std::vector<query::AuthQuery::Privilege> &privileges) const override;
 
 #ifdef MG_ENTERPRISE
   std::unique_ptr<memgraph::query::FineGrainedAuthChecker> GetFineGrainedAuthChecker(
@@ -34,12 +33,10 @@ class AuthChecker : public query::AuthChecker {
 
 #endif
   [[nodiscard]] static bool IsUserAuthorized(const memgraph::auth::User &user,
-                                             const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                                             const std::string &db_name = "");
+                                             const std::vector<memgraph::query::AuthQuery::Privilege> &privileges);
 
  private:
   memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
-  mutable auth::User user_;
 };
 #ifdef MG_ENTERPRISE
 class FineGrainedAuthChecker : public query::FineGrainedAuthChecker {

src/glue/auth_handler.cpp

@@ -16,7 +16,6 @@
 #include <fmt/format.h>
 
 #include "auth/models.hpp"
-#include "dbms/constants.hpp"
 #include "glue/auth.hpp"
 #include "license/license.hpp"
 #include "query/constants.hpp"
@@ -123,29 +122,6 @@ std::vector<std::vector<memgraph::query::TypedValue>> ShowRolePrivileges(
 }
 
 #ifdef MG_ENTERPRISE
-std::vector<std::vector<memgraph::query::TypedValue>> ShowDatabasePrivileges(
-    const std::optional<memgraph::auth::User> &user) {
-  if (!memgraph::license::global_license_checker.IsEnterpriseValidFast() || !user) {
-    return {};
-  }
-
-  const auto &db = user->db_access();
-  const auto &allows = db.GetAllowAll();
-  const auto &grants = db.GetGrants();
-  const auto &denies = db.GetDenies();
-
-  std::vector<memgraph::query::TypedValue> res;  // First element is a list of granted databases, second of revoked ones
-  if (allows) {
-    res.emplace_back("*");
-  } else {
-    std::vector<memgraph::query::TypedValue> grants_vec(grants.cbegin(), grants.cend());
-    res.emplace_back(std::move(grants_vec));
-  }
-  std::vector<memgraph::query::TypedValue> denies_vec(denies.cbegin(), denies.cend());
-  res.emplace_back(std::move(denies_vec));
-  return {res};
-}
-
 std::vector<FineGrainedPermissionForPrivilegeResult> GetFineGrainedPermissionForPrivilegeForUserOrRole(
     const memgraph::auth::FineGrainedAccessPermissions &permissions, const std::string &permission_type,
     const std::string &user_or_role) {
@@ -292,10 +268,6 @@ bool AuthQueryHandler::CreateUser(const std::string &username, const std::option
           }
 #endif
       );
-#ifdef MG_ENTERPRISE
-      GrantDatabaseToUser(auth::kAllDatabases, username);
-      SetMainDatabase(username, dbms::kDefaultDB);
-#endif
     }
 
     return user_added;
@@ -347,67 +319,6 @@ bool AuthQueryHandler::CreateRole(const std::string &rolename) {
   }
 }
 
-#ifdef MG_ENTERPRISE
-bool AuthQueryHandler::RevokeDatabaseFromUser(const std::string &db, const std::string &username) {
-  if (!std::regex_match(username, name_regex_)) {
-    throw memgraph::query::QueryRuntimeException("Invalid user name.");
-  }
-  try {
-    auto locked_auth = auth_->Lock();
-    auto user = locked_auth->GetUser(username);
-    if (!user) return false;
-    return locked_auth->RevokeDatabaseFromUser(db, username);
-  } catch (const memgraph::auth::AuthException &e) {
-    throw memgraph::query::QueryRuntimeException(e.what());
-  }
-}
-
-bool AuthQueryHandler::GrantDatabaseToUser(const std::string &db, const std::string &username) {
-  if (!std::regex_match(username, name_regex_)) {
-    throw memgraph::query::QueryRuntimeException("Invalid user name.");
-  }
-  try {
-    auto locked_auth = auth_->Lock();
-    auto user = locked_auth->GetUser(username);
-    if (!user) return false;
-    return locked_auth->GrantDatabaseToUser(db, username);
-  } catch (const memgraph::auth::AuthException &e) {
-    throw memgraph::query::QueryRuntimeException(e.what());
-  }
-}
-
-std::vector<std::vector<memgraph::query::TypedValue>> AuthQueryHandler::GetDatabasePrivileges(
-    const std::string &username) {
-  if (!std::regex_match(username, name_regex_)) {
-    throw memgraph::query::QueryRuntimeException("Invalid user or role name.");
-  }
-  try {
-    auto locked_auth = auth_->ReadLock();
-    auto user = locked_auth->GetUser(username);
-    if (!user) {
-      throw memgraph::query::QueryRuntimeException("User '{}' doesn't exist.", username);
-    }
-    return ShowDatabasePrivileges(user);
-  } catch (const memgraph::auth::AuthException &e) {
-    throw memgraph::query::QueryRuntimeException(e.what());
-  }
-}
-
-bool AuthQueryHandler::SetMainDatabase(const std::string &db, const std::string &username) {
-  if (!std::regex_match(username, name_regex_)) {
-    throw memgraph::query::QueryRuntimeException("Invalid user name.");
-  }
-  try {
-    auto locked_auth = auth_->Lock();
-    auto user = locked_auth->GetUser(username);
-    if (!user) return false;
-    return locked_auth->SetMainDatabase(db, username);
-  } catch (const memgraph::auth::AuthException &e) {
-    throw memgraph::query::QueryRuntimeException(e.what());
-  }
-}
-#endif
-
 bool AuthQueryHandler::DropRole(const std::string &rolename) {
   if (!std::regex_match(rolename, name_regex_)) {
     throw memgraph::query::QueryRuntimeException("Invalid role name.");

src/glue/auth_handler.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -38,16 +38,6 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
 
   void SetPassword(const std::string &username, const std::optional<std::string> &password) override;
 
-#ifdef MG_ENTERPRISE
-  bool RevokeDatabaseFromUser(const std::string &db, const std::string &username) override;
-
-  bool GrantDatabaseToUser(const std::string &db, const std::string &username) override;
-
-  std::vector<std::vector<memgraph::query::TypedValue>> GetDatabasePrivileges(const std::string &username) override;
-
-  bool SetMainDatabase(const std::string &db, const std::string &username) override;
-#endif
-
   bool CreateRole(const std::string &rolename) override;
 
   bool DropRole(const std::string &rolename) override;

src/http_handlers/metrics.hpp

@@ -47,10 +47,10 @@ struct MetricsResponse {
   std::vector<std::tuple<std::string, std::string, uint64_t>> event_histograms{};
 };
 
-template <typename TSessionContext>
+template <typename TSessionData>
 class MetricsService {
  public:
-  explicit MetricsService(TSessionContext *session_context) : db_(session_context->interpreter_context->db.get()) {}
+  explicit MetricsService(TSessionData *data) : db_(data->db) {}
 
   nlohmann::json GetMetricsJSON() {
     auto response = GetMetrics();
@@ -141,10 +141,10 @@ class MetricsService {
   }
 };
 
-template <typename TSessionContext>
+template <typename TSessionData>
 class MetricsRequestHandler final {
  public:
-  explicit MetricsRequestHandler(TSessionContext *session_context) : service_(session_context) {
+  explicit MetricsRequestHandler(TSessionData *data) : service_(data) {
     spdlog::info("Basic request handler started!");
   }
 
@@ -206,6 +206,6 @@ class MetricsRequestHandler final {
   }
 
  private:
-  MetricsService<TSessionContext> service_;
+  MetricsService<TSessionData> service_;
 };
 }  // namespace memgraph::http

src/integrations/kafka/consumer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -86,8 +86,8 @@ struct ConsumerInfo {
   std::string bootstrap_servers;
   std::chrono::milliseconds batch_interval;
   int64_t batch_size;
-  std::unordered_map<std::string, std::string> public_configs{};
-  std::unordered_map<std::string, std::string> private_configs{};
+  std::unordered_map<std::string, std::string> public_configs;
+  std::unordered_map<std::string, std::string> private_configs;
 };
 
 /// Memgraphs Kafka consumer wrapper.

src/kvstore/kvstore.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -36,13 +36,7 @@ KVStore::KVStore(std::filesystem::path storage) : pimpl_(std::make_unique<impl>(
   pimpl_->db.reset(db);
 }
 
-KVStore::~KVStore() {
-  spdlog::debug("Destroying KVStore at {}", pimpl_->storage.string());
-  const auto sync = pimpl_->db->SyncWAL();
-  if (!sync.ok()) spdlog::error("KVStore sync failed!");
-  const auto close = pimpl_->db->Close();
-  if (!close.ok()) spdlog::error("KVStore close failed!");
-}
+KVStore::~KVStore() {}
 
 KVStore::KVStore(KVStore &&other) { pimpl_ = std::move(other.pimpl_); }
 

src/memgraph.cpp

@@ -34,15 +34,11 @@
 #include <spdlog/sinks/dist_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
 
-#include "audit/log.hpp"
 #include "auth/models.hpp"
 #include "communication/bolt/v1/constants.hpp"
 #include "communication/http/server.hpp"
 #include "communication/websocket/auth.hpp"
 #include "communication/websocket/server.hpp"
-#include "dbms/constants.hpp"
-#include "dbms/global.hpp"
-#include "dbms/session_context.hpp"
 #include "glue/auth_checker.hpp"
 #include "glue/auth_handler.hpp"
 #include "helpers.hpp"
@@ -56,13 +52,9 @@
 #include "query/frontend/ast/ast.hpp"
 #include "query/interpreter.hpp"
 #include "query/plan/operator.hpp"
-#include "query/procedure/callable_alias_mapper.hpp"
 #include "query/procedure/module.hpp"
 #include "query/procedure/py_module.hpp"
 #include "requests/requests.hpp"
-#include "storage/v2/config.hpp"
-#include "storage/v2/disk/storage.hpp"
-#include "storage/v2/inmemory/storage.hpp"
 #include "storage/v2/isolation_level.hpp"
 #include "storage/v2/storage.hpp"
 #include "storage/v2/view.hpp"
@@ -101,12 +93,15 @@
 #include "communication/init.hpp"
 #include "communication/v2/server.hpp"
 #include "communication/v2/session.hpp"
-#include "dbms/session_context_handler.hpp"
 #include "glue/communication.hpp"
 
 #include "auth/auth.hpp"
 #include "glue/auth.hpp"
 
+#ifdef MG_ENTERPRISE
+#include "audit/log.hpp"
+#endif
+
 constexpr const char *kMgUser = "MEMGRAPH_USER";
 constexpr const char *kMgPassword = "MEMGRAPH_PASSWORD";
 constexpr const char *kMgPassfile = "MEMGRAPH_PASSFILE";
@@ -161,10 +156,6 @@ DEFINE_string(init_data_file, "", "Path to cypherl file that is used for creatin
 // `mg_import_csv`. If you change it, make sure to change it there as well.
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_string(data_directory, "mg_data", "Path to directory in which to save all permanent data.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(data_recovery_on_startup, false, "Controls whether the database recovers persisted data on startup.");
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_uint64(memory_warning_threshold, 1024,
               "Memory warning threshold, in MB. If Memgraph detects there is "
@@ -182,11 +173,8 @@ DEFINE_VALIDATED_uint64(storage_gc_cycle_sec, 30, "Storage garbage collector int
 // `mg_import_csv`. If you change it, make sure to change it there as well.
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(storage_properties_on_edges, false, "Controls whether edges have properties.");
-
-// storage_recover_on_startup deprecated; use data_recovery_on_startup instead
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_bool(storage_recover_on_startup, false,
-                   "Controls whether the storage recovers persisted data on startup.");
+DEFINE_bool(storage_recover_on_startup, false, "Controls whether the storage recovers persisted data on startup.");
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_VALIDATED_uint64(storage_snapshot_interval_sec, 0,
                         "Storage snapshot creation interval (in seconds). Set "
@@ -226,12 +214,6 @@ DEFINE_uint64(storage_recovery_thread_count,
                        memgraph::storage::Config::Durability().recovery_thread_count),
               "The number of threads used to recover persisted data from disk.");
 
-#ifdef MG_ENTERPRISE
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_delete_on_drop, true,
-            "If set to true the query 'DROP DATABASE x' will delete the underlying storage as well.");
-#endif
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(telemetry_enabled, false,
             "Set to true to enable telemetry. We collect information about the "
@@ -279,8 +261,6 @@ DEFINE_double(query_execution_timeout_sec, 600,
 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: "
               "The MAIN instance allocates a new thread for each REPLICA.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(replication_restore_state_on_startup, false, "Restore replication state on startup, e.g. recover replica");
 
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_uint64(
@@ -373,12 +353,6 @@ DEFINE_VALIDATED_string(query_modules_directory, "",
                           return true;
                         });
 
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(query_callable_mappings_path, "",
-              "The path to mappings that describes aliases to callables in cypher queries in the form of key-value "
-              "pairs in a json file. With this option query module procedures that do not exist in memgraph can be "
-              "mapped to ones that exist.");
-
 // 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");
@@ -464,231 +438,141 @@ void AddLoggerSink(spdlog::sink_ptr new_sink) {
 DEFINE_HIDDEN_string(license_key, "", "License key for Memgraph Enterprise.");
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_HIDDEN_string(organization_name, "", "Organization name.");
+
+/// Encapsulates Dbms and Interpreter that are passed through the network server
+/// and worker to the session.
+struct SessionData {
+  // Explicit constructor here to ensure that pointers to all objects are
+  // supplied.
+#if MG_ENTERPRISE
+
+  SessionData(memgraph::storage::Storage *db, memgraph::query::InterpreterContext *interpreter_context,
+              memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth,
+              memgraph::audit::Log *audit_log)
+      : db(db), interpreter_context(interpreter_context), auth(auth), audit_log(audit_log) {}
+  memgraph::storage::Storage *db;
+  memgraph::query::InterpreterContext *interpreter_context;
+  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth;
+  memgraph::audit::Log *audit_log;
+
+#else
+
+  SessionData(memgraph::storage::Storage *db, memgraph::query::InterpreterContext *interpreter_context,
+              memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth)
+      : db(db), interpreter_context(interpreter_context), auth(auth) {}
+  memgraph::storage::Storage *db;
+  memgraph::query::InterpreterContext *interpreter_context;
+  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth;
+
+#endif
+  // NOTE: run_id should be const but that complicates code a lot.
+  std::optional<std::string> run_id;
+};
+
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_string(auth_user_or_role_name_regex, memgraph::glue::kDefaultUserRoleRegex.data(),
               "Set to the regular expression that each user or role name must fulfill.");
 
-void InitFromCypherlFile(memgraph::query::InterpreterContext &ctx, std::string cypherl_file_path,
-                         memgraph::audit::Log *audit_log = nullptr) {
+void InitFromCypherlFile(memgraph::query::InterpreterContext &ctx, std::string cypherl_file_path
+#ifdef MG_ENTERPRISE
+                         ,
+                         memgraph::audit::Log *audit_log
+#endif
+) {
   memgraph::query::Interpreter interpreter(&ctx);
   std::ifstream file(cypherl_file_path);
+  if (file.is_open()) {
+    std::string line;
+    while (std::getline(file, line)) {
+      if (!line.empty()) {
+        auto results = interpreter.Prepare(line, {}, {});
+        memgraph::query::DiscardValueResultStream stream;
+        interpreter.Pull(&stream, {}, results.qid);
 
-  if (!file.is_open()) {
-    spdlog::trace("Could not find init file {}", cypherl_file_path);
-    return;
-  }
-
-  std::string line;
-  while (std::getline(file, line)) {
-    if (!line.empty()) {
-      auto results = interpreter.Prepare(line, {}, {});
-      memgraph::query::DiscardValueResultStream stream;
-      interpreter.Pull(&stream, {}, results.qid);
-
-      if (audit_log) {
-        audit_log->Record("", "", line, {}, memgraph::dbms::kDefaultDB);
+#ifdef MG_ENTERPRISE
+        if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
+          audit_log->Record("", "", line, {});
+        }
+#endif
       }
     }
+    file.close();
   }
-
-  file.close();
 }
 
 namespace memgraph::metrics {
 extern const Event ActiveBoltSessions;
 }  // namespace memgraph::metrics
 
-auto ToQueryExtras(memgraph::communication::bolt::Value const &extra) -> memgraph::query::QueryExtras {
-  auto const &as_map = extra.ValueMap();
-
-  auto metadata_pv = std::map<std::string, memgraph::storage::PropertyValue>{};
-
-  if (auto const it = as_map.find("tx_metadata"); it != as_map.cend() && it->second.IsMap()) {
-    for (const auto &[key, bolt_md] : it->second.ValueMap()) {
-      metadata_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_md));
-    }
-  }
-
-  auto tx_timeout = std::optional<int64_t>{};
-  if (auto const it = as_map.find("tx_timeout"); it != as_map.cend() && it->second.IsInt()) {
-    tx_timeout = it->second.ValueInt();
-  }
-
-  return memgraph::query::QueryExtras{std::move(metadata_pv), tx_timeout};
-}
-
-class SessionHL final : public memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
-                                                                      memgraph::communication::v2::OutputStream> {
+class BoltSession final : public memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
+                                                                        memgraph::communication::v2::OutputStream> {
  public:
-  struct ContextWrapper {
-    explicit ContextWrapper(memgraph::dbms::SessionContext sc)
-        : session_context(sc),
-          interpreter(std::make_unique<memgraph::query::Interpreter>(session_context.interpreter_context.get())),
-          defunct_(false) {
-      session_context.interpreter_context->interpreters.WithLock(
-          [this](auto &interpreters) { interpreters.insert(interpreter.get()); });
-    }
-    ~ContextWrapper() { Defunct(); }
-
-    void Defunct() {
-      if (!defunct_) {
-        session_context.interpreter_context->interpreters.WithLock(
-            [this](auto &interpreters) { interpreters.erase(interpreter.get()); });
-        defunct_ = true;
-      }
-    }
-
-    ContextWrapper(const ContextWrapper &) = delete;
-    ContextWrapper &operator=(const ContextWrapper &) = delete;
-
-    ContextWrapper(ContextWrapper &&in) noexcept
-        : session_context(std::move(in.session_context)),
-          interpreter(std::move(in.interpreter)),
-          defunct_(in.defunct_) {
-      in.defunct_ = true;
-    }
-
-    ContextWrapper &operator=(ContextWrapper &&in) noexcept {
-      if (this != &in) {
-        Defunct();
-        session_context = std::move(in.session_context);
-        interpreter = std::move(in.interpreter);
-        defunct_ = in.defunct_;
-        in.defunct_ = true;
-      }
-      return *this;
-    }
-
-    memgraph::query::InterpreterContext *interpreter_context() { return session_context.interpreter_context.get(); }
-    memgraph::query::Interpreter *interp() { return interpreter.get(); }
-    memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth() const {
-      return session_context.auth;
-    }
-#ifdef MG_ENTERPRISE
-    memgraph::audit::Log *audit_log() const { return session_context.audit_log; }
-#endif
-    std::string run_id() const { return session_context.run_id; }
-    bool defunct() const { return defunct_; }
-
-   private:
-    memgraph::dbms::SessionContext session_context;
-    std::unique_ptr<memgraph::query::Interpreter> interpreter;
-    bool defunct_;
-  };
-
-  SessionHL(
-#ifdef MG_ENTERPRISE
-      memgraph::dbms::SessionContextHandler &sc_handler,
-#else
-      memgraph::dbms::SessionContext sc,
-#endif
-      const memgraph::communication::v2::ServerEndpoint &endpoint,
-      memgraph::communication::v2::InputStream *input_stream, memgraph::communication::v2::OutputStream *output_stream,
-      const std::string &default_db = memgraph::dbms::kDefaultDB)  // NOLINT
+  BoltSession(SessionData *data, const memgraph::communication::v2::ServerEndpoint &endpoint,
+              memgraph::communication::v2::InputStream *input_stream,
+              memgraph::communication::v2::OutputStream *output_stream)
       : memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                memgraph::communication::v2::OutputStream>(input_stream, output_stream),
-#ifdef MG_ENTERPRISE
-        sc_handler_(sc_handler),
-        current_(sc_handler_.Get(default_db)),
-#else
-        current_(sc),
-#endif
-        interpreter_context_(current_.interpreter_context()),
-        interpreter_(current_.interp()),
-        auth_(current_.auth()),
-#ifdef MG_ENTERPRISE
-        audit_log_(current_.audit_log()),
+        db_(data->db),
+        interpreter_context_(data->interpreter_context),
+        interpreter_(data->interpreter_context),
+        auth_(data->auth),
+#if MG_ENTERPRISE
+        audit_log_(data->audit_log),
 #endif
         endpoint_(endpoint),
-        run_id_(current_.run_id()) {
+        run_id_(data->run_id) {
     memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveBoltSessions);
+    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.insert(&interpreter_); });
   }
 
-  ~SessionHL() override { memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveBoltSessions); }
+  ~BoltSession() override {
+    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveBoltSessions);
+    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.erase(&interpreter_); });
+  }
 
-  SessionHL(const SessionHL &) = delete;
-  SessionHL &operator=(const SessionHL &) = delete;
-  SessionHL(SessionHL &&) = delete;
-  SessionHL &operator=(SessionHL &&) = delete;
+  using memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
+                                               memgraph::communication::v2::OutputStream>::TEncoder;
 
-  void Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) override {
-#ifdef MG_ENTERPRISE
-    std::string db;
-    bool update = false;
-    // Check if user explicitly defined the database to use
-    if (run_time_info.contains("db")) {
-      const auto &db_info = run_time_info.at("db");
-      if (!db_info.IsString()) {
-        throw memgraph::communication::bolt::ClientError("Malformed database name.");
-      }
-      db = db_info.ValueString();
-      update = db != current_.interpreter_context()->db->id();
-      in_explicit_db_ = true;
-      // NOTE: Once in a transaction, the drivers stop explicitly sending the db and count on using it until commit
-    } else if (in_explicit_db_ && !interpreter_->in_explicit_transaction_) {  // Just on a switch
-      db = GetDefaultDB();
-      update = db != current_.interpreter_context()->db->id();
-      in_explicit_db_ = false;
+  void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &metadata) override {
+    std::map<std::string, memgraph::storage::PropertyValue> metadata_pv;
+    for (const auto &[key, bolt_value] : metadata) {
+      metadata_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_value));
     }
-
-    // Check if the underlying database needs to be updated
-    if (update) {
-      sc_handler_.SetInPlace(db, [this](auto new_sc) mutable {
-        const auto &db_name = new_sc.interpreter_context->db->id();
-        MultiDatabaseAuth(db_name);
-        try {
-          Update(ContextWrapper(new_sc));
-          return memgraph::dbms::SetForResult::SUCCESS;
-        } catch (memgraph::dbms::UnknownDatabaseException &e) {
-          throw memgraph::communication::bolt::ClientError("No database named \"{}\" found!", db_name);
-        }
-      });
-    }
-#endif
+    interpreter_.BeginTransaction(metadata_pv);
   }
 
-  using TEncoder = memgraph::communication::bolt::Encoder<
-      memgraph::communication::bolt::ChunkedEncoderBuffer<memgraph::communication::v2::OutputStream>>;
+  void CommitTransaction() override { interpreter_.CommitTransaction(); }
 
-  void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &extra) override {
-    interpreter_->BeginTransaction(ToQueryExtras(extra));
-  }
-
-  void CommitTransaction() override { interpreter_->CommitTransaction(); }
-
-  void RollbackTransaction() override { interpreter_->RollbackTransaction(); }
+  void RollbackTransaction() override { interpreter_.RollbackTransaction(); }
 
   std::pair<std::vector<std::string>, std::optional<int>> Interpret(
       const std::string &query, const std::map<std::string, memgraph::communication::bolt::Value> &params,
-      const std::map<std::string, memgraph::communication::bolt::Value> &extra) override {
+      const std::map<std::string, memgraph::communication::bolt::Value> &metadata) override {
     std::map<std::string, memgraph::storage::PropertyValue> params_pv;
+    std::map<std::string, memgraph::storage::PropertyValue> metadata_pv;
     for (const auto &[key, bolt_param] : params) {
       params_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_param));
     }
+    for (const auto &[key, bolt_md] : metadata) {
+      metadata_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_md));
+    }
     const std::string *username{nullptr};
     if (user_) {
       username = &user_->username();
     }
-
 #ifdef MG_ENTERPRISE
     if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
       audit_log_->Record(endpoint_.address().to_string(), user_ ? *username : "", query,
-                         memgraph::storage::PropertyValue(params_pv), interpreter_context_->db->id());
+                         memgraph::storage::PropertyValue(params_pv));
     }
 #endif
     try {
-      auto result = interpreter_->Prepare(query, params_pv, username, ToQueryExtras(extra), UUID());
-      const std::string db_name = result.db ? *result.db : "";
-      if (user_ && !memgraph::glue::AuthChecker::IsUserAuthorized(*user_, result.privileges, db_name)) {
-        interpreter_->Abort();
-        if (db_name.empty()) {
-          throw memgraph::communication::bolt::ClientError(
-              "You are not authorized to execute this query! Please contact your database administrator.");
-        }
+      auto result = interpreter_.Prepare(query, params_pv, username, metadata_pv);
+      if (user_ && !memgraph::glue::AuthChecker::IsUserAuthorized(*user_, result.privileges)) {
+        interpreter_.Abort();
         throw memgraph::communication::bolt::ClientError(
-            "You are not authorized to execute this query on database \"{}\"! Please contact your database "
-            "administrator.",
-            db_name);
+            "You are not authorized to execute this query! Please contact "
+            "your database administrator.");
       }
       return {result.headers, result.qid};
 
@@ -703,7 +587,7 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
 
   std::map<std::string, memgraph::communication::bolt::Value> Pull(TEncoder *encoder, std::optional<int> n,
                                                                    std::optional<int> qid) override {
-    TypedValueResultStream stream(encoder, interpreter_context_);
+    TypedValueResultStream stream(encoder, db_);
     return PullResults(stream, n, qid);
   }
 
@@ -713,26 +597,14 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
     return PullResults(stream, n, qid);
   }
 
-  void Abort() override { interpreter_->Abort(); }
+  void Abort() override { interpreter_.Abort(); }
 
-  // Called during Init
-  // During Init, the user cannot choose the landing DB (switch is done during query execution)
   bool Authenticate(const std::string &username, const std::string &password) override {
     auto locked_auth = auth_->Lock();
     if (!locked_auth->HasUsers()) {
       return true;
     }
     user_ = locked_auth->Authenticate(username, password);
-#ifdef MG_ENTERPRISE
-    if (user_.has_value()) {
-      const auto &db = user_->db_access().GetDefault();
-      // Check if the underlying database needs to be updated
-      if (db != current_.interpreter_context()->db->id()) {
-        const auto &res = sc_handler_.SetFor(UUID(), db);
-        return res == memgraph::dbms::SetForResult::SUCCESS || res == memgraph::dbms::SetForResult::ALREADY_SET;
-      }
-    }
-#endif
     return user_.has_value();
   }
 
@@ -741,35 +613,15 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
     return FLAGS_bolt_server_name_for_init;
   }
 
-#ifdef MG_ENTERPRISE
-  memgraph::dbms::SetForResult OnChange(const std::string &db_name) override {
-    MultiDatabaseAuth(db_name);
-    if (db_name != current_.interpreter_context()->db->id()) {
-      UpdateAndDefunct(db_name);  // Done during Pull, so we cannot just replace the current db
-      return memgraph::dbms::SetForResult::SUCCESS;
-    }
-    return memgraph::dbms::SetForResult::ALREADY_SET;
-  }
-
-  bool OnDelete(const std::string &db_name) override {
-    MG_ASSERT(current_.interpreter_context()->db->id() != db_name && (!defunct_ || defunct_->defunct()),
-              "Trying to delete a database while still in use.");
-    return true;
-  }
-#endif
-
-  std::string GetDatabaseName() const override { return interpreter_context_->db->id(); }
-
  private:
   template <typename TStream>
   std::map<std::string, memgraph::communication::bolt::Value> PullResults(TStream &stream, std::optional<int> n,
                                                                           std::optional<int> qid) {
     try {
-      const auto &summary = interpreter_->Pull(&stream, n, qid);
+      const auto &summary = interpreter_.Pull(&stream, n, qid);
       std::map<std::string, memgraph::communication::bolt::Value> decoded_summary;
       for (const auto &kv : summary) {
-        auto maybe_value =
-            memgraph::glue::ToBoltValue(kv.second, *interpreter_context_->db, memgraph::storage::View::NEW);
+        auto maybe_value = memgraph::glue::ToBoltValue(kv.second, *db_, memgraph::storage::View::NEW);
         if (maybe_value.HasError()) {
           switch (maybe_value.GetError()) {
             case memgraph::storage::Error::DELETED_OBJECT:
@@ -790,11 +642,6 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
         decoded_summary.emplace("run_id", *run_id);
       }
 
-      // Clean up previous session (session gets defunct when switching between databases)
-      if (defunct_) {
-        defunct_.reset();
-      }
-
       return decoded_summary;
     } catch (const memgraph::query::QueryException &e) {
       // Wrap QueryException into ClientError, because we want to allow the
@@ -803,71 +650,17 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
     }
   }
 
-#ifdef MG_ENTERPRISE
-  /**
-   * @brief Update setup to the new database.
-   *
-   * @param db_name name of the target database
-   * @throws UnknownDatabaseException if handler cannot get it
-   */
-  void UpdateAndDefunct(const std::string &db_name) { UpdateAndDefunct(ContextWrapper(sc_handler_.Get(db_name))); }
-
-  void UpdateAndDefunct(ContextWrapper &&cntxt) {
-    defunct_.emplace(std::move(current_));
-    Update(std::forward<ContextWrapper>(cntxt));
-    defunct_->Defunct();
-  }
-
-  void Update(const std::string &db_name) {
-    ContextWrapper tmp(sc_handler_.Get(db_name));
-    Update(std::move(tmp));
-  }
-
-  void Update(ContextWrapper &&cntxt) {
-    current_ = std::move(cntxt);
-    interpreter_ = current_.interp();
-    interpreter_->in_explicit_db_ = in_explicit_db_;
-    interpreter_context_ = current_.interpreter_context();
-  }
-
-  /**
-   * @brief Authenticate user on passed database.
-   *
-   * @param db database to check against
-   * @throws bolt::ClientError when user is not authorized
-   */
-  void MultiDatabaseAuth(const std::string &db) {
-    if (user_ && !memgraph::glue::AuthChecker::IsUserAuthorized(*user_, {}, db)) {
-      throw memgraph::communication::bolt::ClientError(
-          "You are not authorized on the database \"{}\"! Please contact your database administrator.", db);
-    }
-  }
-
-  /**
-   * @brief Get the user's default database
-   *
-   * @return std::string
-   */
-  std::string GetDefaultDB() {
-    if (user_.has_value()) {
-      return user_->db_access().GetDefault();
-    }
-    return memgraph::dbms::kDefaultDB;
-  }
-#endif
-
   /// Wrapper around TEncoder which converts TypedValue to Value
   /// before forwarding the calls to original TEncoder.
   class TypedValueResultStream {
    public:
-    TypedValueResultStream(TEncoder *encoder, memgraph::query::InterpreterContext *ic)
-        : encoder_(encoder), interpreter_context_(ic) {}
+    TypedValueResultStream(TEncoder *encoder, const memgraph::storage::Storage *db) : encoder_(encoder), db_(db) {}
 
     void Result(const std::vector<memgraph::query::TypedValue> &values) {
       std::vector<memgraph::communication::bolt::Value> decoded_values;
       decoded_values.reserve(values.size());
       for (const auto &v : values) {
-        auto maybe_value = memgraph::glue::ToBoltValue(v, *interpreter_context_->db, memgraph::storage::View::NEW);
+        auto maybe_value = memgraph::glue::ToBoltValue(v, *db_, memgraph::storage::View::NEW);
         if (maybe_value.HasError()) {
           switch (maybe_value.GetError()) {
             case memgraph::storage::Error::DELETED_OBJECT:
@@ -888,36 +681,26 @@ class SessionHL final : public memgraph::communication::bolt::Session<memgraph::
    private:
     TEncoder *encoder_;
     // NOTE: Needed only for ToBoltValue conversions
-    memgraph::query::InterpreterContext *interpreter_context_;
+    const memgraph::storage::Storage *db_;
   };
 
-#ifdef MG_ENTERPRISE
-  memgraph::dbms::SessionContextHandler &sc_handler_;
-#endif
-  ContextWrapper current_;
-  std::optional<ContextWrapper> defunct_;
-
+  // NOTE: Needed only for ToBoltValue conversions
+  const memgraph::storage::Storage *db_;
   memgraph::query::InterpreterContext *interpreter_context_;
-  memgraph::query::Interpreter *interpreter_;
+  memgraph::query::Interpreter interpreter_;
   memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
   std::optional<memgraph::auth::User> user_;
 #ifdef MG_ENTERPRISE
   memgraph::audit::Log *audit_log_;
-  bool in_explicit_db_{false};  //!< If true, the user has defined the database to use via metadata
 #endif
   memgraph::communication::v2::ServerEndpoint endpoint_;
   // NOTE: run_id should be const but that complicates code a lot.
   std::optional<std::string> run_id_;
 };
 
-#ifdef MG_ENTERPRISE
-using ServerT = memgraph::communication::v2::Server<SessionHL, memgraph::dbms::SessionContextHandler>;
-#else
-using ServerT = memgraph::communication::v2::Server<SessionHL, memgraph::dbms::SessionContext>;
-#endif
+using ServerT = memgraph::communication::v2::Server<BoltSession, SessionData>;
 using MonitoringServerT =
-    memgraph::communication::http::Server<memgraph::http::MetricsRequestHandler<memgraph::dbms::SessionContext>,
-                                          memgraph::dbms::SessionContext>;
+    memgraph::communication::http::Server<memgraph::http::MetricsRequestHandler<SessionData>, SessionData>;
 using memgraph::communication::ServerContext;
 
 // Needed to correctly handle memgraph destruction from a signal handler.
@@ -1080,6 +863,10 @@ int main(int argc, char **argv) {
 
   // Begin enterprise features initialization
 
+  // Auth
+  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> auth{data_directory /
+                                                                                                    "auth"};
+
 #ifdef MG_ENTERPRISE
   // Audit log
   memgraph::audit::Log audit_log{data_directory / "audit", FLAGS_audit_buffer_size,
@@ -1103,24 +890,16 @@ int main(int argc, char **argv) {
              .interval = std::chrono::seconds(FLAGS_storage_gc_cycle_sec)},
       .items = {.properties_on_edges = FLAGS_storage_properties_on_edges},
       .durability = {.storage_directory = FLAGS_data_directory,
-                     .recover_on_startup = FLAGS_storage_recover_on_startup || FLAGS_data_recovery_on_startup,
+                     .recover_on_startup = FLAGS_storage_recover_on_startup,
                      .snapshot_retention_count = FLAGS_storage_snapshot_retention_count,
                      .wal_file_size_kibibytes = FLAGS_storage_wal_file_size_kib,
                      .wal_file_flush_every_n_tx = FLAGS_storage_wal_file_flush_every_n_tx,
                      .snapshot_on_exit = FLAGS_storage_snapshot_on_exit,
-                     .restore_replication_state_on_startup = FLAGS_replication_restore_state_on_startup,
+                     .restore_replicas_on_startup = true,
                      .items_per_batch = FLAGS_storage_items_per_batch,
                      .recovery_thread_count = FLAGS_storage_recovery_thread_count,
                      .allow_parallel_index_creation = FLAGS_storage_parallel_index_recovery},
-      .transaction = {.isolation_level = ParseIsolationLevel()},
-      .disk = {.main_storage_directory = FLAGS_data_directory + "/rocksdb_main_storage",
-               .label_index_directory = FLAGS_data_directory + "/rocksdb_label_index",
-               .label_property_index_directory = FLAGS_data_directory + "/rocksdb_label_property_index",
-               .unique_constraints_directory = FLAGS_data_directory + "/rocksdb_unique_constraints",
-               .name_id_mapper_directory = FLAGS_data_directory + "/rocksdb_name_id_mapper",
-               .id_name_mapper_directory = FLAGS_data_directory + "/rocksdb_id_name_mapper",
-               .durability_directory = FLAGS_data_directory + "/rocksdb_durability",
-               .wal_directory = FLAGS_data_directory + "/rocksdb_wal"}};
+      .transaction = {.isolation_level = ParseIsolationLevel()}};
   if (FLAGS_storage_snapshot_interval_sec == 0) {
     if (FLAGS_storage_wal_enabled) {
       LOG_FATAL(
@@ -1139,92 +918,66 @@ int main(int argc, char **argv) {
     }
     db_config.durability.snapshot_interval = std::chrono::seconds(FLAGS_storage_snapshot_interval_sec);
   }
+  memgraph::storage::Storage db(db_config);
 
-  // Default interpreter configuration
-  memgraph::query::InterpreterConfig interp_config{
-      .query = {.allow_load_csv = FLAGS_allow_load_csv},
-      .execution_timeout_sec = FLAGS_query_execution_timeout_sec,
-      .replication_replica_check_frequency = std::chrono::seconds(FLAGS_replication_replica_check_frequency_sec),
-      .default_kafka_bootstrap_servers = FLAGS_kafka_bootstrap_servers,
-      .default_pulsar_service_url = FLAGS_pulsar_service_url,
-      .stream_transaction_conflict_retries = FLAGS_stream_transaction_conflict_retries,
-      .stream_transaction_retry_interval = std::chrono::milliseconds(FLAGS_stream_transaction_retry_interval)};
-
-  auto auth_glue =
-      [flag = FLAGS_auth_user_or_role_name_regex](
-          memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth,
-          std::unique_ptr<memgraph::query::AuthQueryHandler> &ah, std::unique_ptr<memgraph::query::AuthChecker> &ac) {
-        // Glue high level auth implementations to the query side
-        ah = std::make_unique<memgraph::glue::AuthQueryHandler>(auth, flag);
-        ac = std::make_unique<memgraph::glue::AuthChecker>(auth);
-        // Handle users passed via arguments
-        auto *maybe_username = std::getenv(kMgUser);
-        auto *maybe_password = std::getenv(kMgPassword);
-        auto *maybe_pass_file = std::getenv(kMgPassfile);
-        if (maybe_username && maybe_password) {
-          ah->CreateUser(maybe_username, maybe_password);
-        } else if (maybe_pass_file) {
-          const auto [username, password] = LoadUsernameAndPassword(maybe_pass_file);
-          if (!username.empty() && !password.empty()) {
-            ah->CreateUser(username, password);
-          }
-        }
-      };
-
+  memgraph::query::InterpreterContext interpreter_context{
+      &db,
+      {.query = {.allow_load_csv = FLAGS_allow_load_csv},
+       .execution_timeout_sec = FLAGS_query_execution_timeout_sec,
+       .replication_replica_check_frequency = std::chrono::seconds(FLAGS_replication_replica_check_frequency_sec),
+       .default_kafka_bootstrap_servers = FLAGS_kafka_bootstrap_servers,
+       .default_pulsar_service_url = FLAGS_pulsar_service_url,
+       .stream_transaction_conflict_retries = FLAGS_stream_transaction_conflict_retries,
+       .stream_transaction_retry_interval = std::chrono::milliseconds(FLAGS_stream_transaction_retry_interval)},
+      FLAGS_data_directory};
 #ifdef MG_ENTERPRISE
-  // SessionContext handler (multi-tenancy)
-  memgraph::dbms::SessionContextHandler sc_handler(audit_log, {db_config, interp_config, auth_glue},
-                                                   FLAGS_storage_recover_on_startup || FLAGS_data_recovery_on_startup,
-                                                   FLAGS_storage_delete_on_drop);
-  // Just for current support... TODO remove
-  auto session_context = sc_handler.Get(memgraph::dbms::kDefaultDB);
+  SessionData session_data{&db, &interpreter_context, &auth, &audit_log};
 #else
-
-  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> auth_{data_directory /
-                                                                                                     "auth"};
-  std::unique_ptr<memgraph::query::AuthQueryHandler> auth_handler;
-  std::unique_ptr<memgraph::query::AuthChecker> auth_checker;
-  auth_glue(&auth_, auth_handler, auth_checker);
-  auto session_context = memgraph::dbms::Init(db_config, interp_config, &auth_, auth_handler.get(), auth_checker.get());
-
+  SessionData session_data{&db, &interpreter_context, &auth};
 #endif
 
-  auto *auth = session_context.auth;
-  auto &interpreter_context = *session_context.interpreter_context;  // TODO remove
-
   memgraph::query::procedure::gModuleRegistry.SetModulesDirectory(query_modules_directories, FLAGS_data_directory);
   memgraph::query::procedure::gModuleRegistry.UnloadAndLoadModulesFromDirectories();
-  memgraph::query::procedure::gCallableAliasMapper.LoadMapping(FLAGS_query_callable_mappings_path);
+
+  memgraph::glue::AuthQueryHandler auth_handler(&auth, FLAGS_auth_user_or_role_name_regex);
+  memgraph::glue::AuthChecker auth_checker{&auth};
+  interpreter_context.auth = &auth_handler;
+  interpreter_context.auth_checker = &auth_checker;
 
   if (!FLAGS_init_file.empty()) {
-    spdlog::info("Running init file...");
+    spdlog::info("Running init file.");
 #ifdef MG_ENTERPRISE
     if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
       InitFromCypherlFile(interpreter_context, FLAGS_init_file, &audit_log);
-    } else {
-      InitFromCypherlFile(interpreter_context, FLAGS_init_file);
     }
 #else
     InitFromCypherlFile(interpreter_context, FLAGS_init_file);
 #endif
   }
 
-#ifdef MG_ENTERPRISE
-  sc_handler.RestoreTriggers();
-  sc_handler.RestoreStreams();
-#else
+  auto *maybe_username = std::getenv(kMgUser);
+  auto *maybe_password = std::getenv(kMgPassword);
+  auto *maybe_pass_file = std::getenv(kMgPassfile);
+  if (maybe_username && maybe_password) {
+    auth_handler.CreateUser(maybe_username, maybe_password);
+  } else if (maybe_pass_file) {
+    const auto [username, password] = LoadUsernameAndPassword(maybe_pass_file);
+    if (!username.empty() && !password.empty()) {
+      auth_handler.CreateUser(username, password);
+    }
+  }
+
   {
     // Triggers can execute query procedures, so we need to reload the modules first and then
     // the triggers
     auto storage_accessor = interpreter_context.db->Access();
-    auto dba = memgraph::query::DbAccessor{storage_accessor.get()};
+    auto dba = memgraph::query::DbAccessor{&storage_accessor};
     interpreter_context.trigger_store.RestoreTriggers(
         &interpreter_context.ast_cache, &dba, interpreter_context.config.query, interpreter_context.auth_checker);
   }
 
   // As the Stream transformations are using modules, they have to be restored after the query modules are loaded.
   interpreter_context.streams.RestoreStreams();
-#endif
 
   ServerContext context;
   std::string service_name = "Bolt";
@@ -1236,35 +989,25 @@ int main(int argc, char **argv) {
     spdlog::warn(
         memgraph::utils::MessageWithLink("Using non-secure Bolt connection (without SSL).", "https://memgr.ph/ssl"));
   }
+
   auto server_endpoint = memgraph::communication::v2::ServerEndpoint{
       boost::asio::ip::address::from_string(FLAGS_bolt_address), static_cast<uint16_t>(FLAGS_bolt_port)};
-#ifdef MG_ENTERPRISE
-  ServerT server(server_endpoint, &sc_handler, &context, FLAGS_bolt_session_inactivity_timeout, service_name,
+  ServerT server(server_endpoint, &session_data, &context, FLAGS_bolt_session_inactivity_timeout, service_name,
                  FLAGS_bolt_num_workers);
-#else
-  ServerT server(server_endpoint, &session_context, &context, FLAGS_bolt_session_inactivity_timeout, service_name,
-                 FLAGS_bolt_num_workers);
-#endif
 
+  const auto run_id = memgraph::utils::GenerateUUID();
   const auto machine_id = memgraph::utils::GetMachineId();
-  const auto run_id = session_context.run_id;  // For current compatibility
+  session_data.run_id = run_id;
 
   // Setup telemetry
   static constexpr auto telemetry_server{"https://telemetry.memgraph.com/88b5e7e8-746a-11e8-9f85-538a9e9690cc/"};
   std::optional<memgraph::telemetry::Telemetry> telemetry;
   if (FLAGS_telemetry_enabled) {
     telemetry.emplace(telemetry_server, data_directory / "telemetry", run_id, machine_id, std::chrono::minutes(10));
-#ifdef MG_ENTERPRISE
-    telemetry->AddCollector("storage", [&sc_handler]() -> nlohmann::json {
-      const auto &info = sc_handler.Info();
-      return {{"vertices", info.num_vertex}, {"edges", info.num_edges}, {"databases", info.num_databases}};
-    });
-#else
-    telemetry->AddCollector("storage", [&interpreter_context]() -> nlohmann::json {
-      auto info = interpreter_context.db->GetInfo();
+    telemetry->AddCollector("storage", [&db]() -> nlohmann::json {
+      auto info = db.GetInfo();
       return {{"vertices", info.vertex_count}, {"edges", info.edge_count}};
     });
-#endif
     telemetry->AddCollector("event_counters", []() -> nlohmann::json {
       nlohmann::json ret;
       for (size_t i = 0; i < memgraph::metrics::CounterEnd(); ++i) {
@@ -1280,25 +1023,25 @@ int main(int argc, char **argv) {
   memgraph::license::LicenseInfoSender license_info_sender(telemetry_server, run_id, machine_id, memory_limit,
                                                            memgraph::license::global_license_checker.GetLicenseInfo());
 
-  memgraph::communication::websocket::SafeAuth websocket_auth{auth};
+  memgraph::communication::websocket::SafeAuth websocket_auth{&auth};
   memgraph::communication::websocket::Server websocket_server{
       {FLAGS_monitoring_address, static_cast<uint16_t>(FLAGS_monitoring_port)}, &context, websocket_auth};
   AddLoggerSink(websocket_server.GetLoggingSink());
 
   MonitoringServerT metrics_server{
-      {FLAGS_metrics_address, static_cast<uint16_t>(FLAGS_metrics_port)}, &session_context, &context};
+      {FLAGS_metrics_address, static_cast<uint16_t>(FLAGS_metrics_port)}, &session_data, &context};
 
 #ifdef MG_ENTERPRISE
   if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     // Handler for regular termination signals
-    auto shutdown = [&metrics_server, &websocket_server, &server, &sc_handler] {
+    auto shutdown = [&metrics_server, &websocket_server, &server, &interpreter_context] {
       // Server needs to be shutdown first and then the database. This prevents
       // a race condition when a transaction is accepted during server shutdown.
       server.Shutdown();
       // After the server is notified to stop accepting and processing
       // connections we tell the execution engine to stop processing all pending
       // queries.
-      sc_handler.Shutdown();
+      memgraph::query::Shutdown(&interpreter_context);
 
       websocket_server.Shutdown();
       metrics_server.Shutdown();
@@ -1352,8 +1095,6 @@ int main(int argc, char **argv) {
 #ifdef MG_ENTERPRISE
     if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
       InitFromCypherlFile(interpreter_context, FLAGS_init_data_file, &audit_log);
-    } else {
-      InitFromCypherlFile(interpreter_context, FLAGS_init_data_file);
     }
 #else
     InitFromCypherlFile(interpreter_context, FLAGS_init_data_file);

src/mg_import_csv.cpp

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

src/query/CMakeLists.txt

@@ -27,7 +27,6 @@ set(mg_query_sources
     procedure/mg_procedure_helpers.cpp
     procedure/module.cpp
     procedure/py_module.cpp
-    procedure/callable_alias_mapper.cpp
     serialization/property_value.cpp
     stream/streams.cpp
     stream/sources.cpp
@@ -38,9 +37,12 @@ set(mg_query_sources
     graph.cpp
     db_accessor.cpp)
 
+find_package(Boost REQUIRED)
+
 add_library(mg-query STATIC ${mg_query_sources})
 target_include_directories(mg-query PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(mg-query PUBLIC dl cppitertools Python3::Python mg-integrations-pulsar mg-integrations-kafka mg-storage-v2 mg-license mg-utils mg-kvstore mg-memory mg::csv)
+target_link_libraries(mg-query dl cppitertools Boost::headers)
+target_link_libraries(mg-query mg-integrations-pulsar mg-integrations-kafka mg-storage-v2 mg-license mg-utils mg-kvstore mg-memory)
 if(NOT "${MG_PYTHON_PATH}" STREQUAL "")
     set(Python3_ROOT_DIR "${MG_PYTHON_PATH}")
 endif()
@@ -49,6 +51,7 @@ if("${MG_PYTHON_VERSION}" STREQUAL "")
 else()
     find_package(Python3 "${MG_PYTHON_VERSION}" EXACT REQUIRED COMPONENTS Development)
 endif()
+target_link_libraries(mg-query Python3::Python)
 
 # Generate Antlr openCypher parser
 
@@ -91,4 +94,4 @@ add_library(antlr_opencypher_parser_lib STATIC ${antlr_opencypher_generated_src}
 add_dependencies(antlr_opencypher_parser_lib generate_opencypher_parser)
 target_link_libraries(antlr_opencypher_parser_lib antlr4)
 
-target_link_libraries(mg-query PUBLIC antlr_opencypher_parser_lib)
+target_link_libraries(mg-query antlr_opencypher_parser_lib)

src/query/auth_checker.hpp

@@ -24,8 +24,7 @@ class AuthChecker {
   virtual ~AuthChecker() = default;
 
   [[nodiscard]] virtual bool IsUserAuthorized(const std::optional<std::string> &username,
-                                              const std::vector<query::AuthQuery::Privilege> &privileges,
-                                              const std::string &db_name) const = 0;
+                                              const std::vector<query::AuthQuery::Privilege> &privileges) const = 0;
 
 #ifdef MG_ENTERPRISE
   [[nodiscard]] virtual std::unique_ptr<FineGrainedAuthChecker> GetFineGrainedAuthChecker(
@@ -93,8 +92,7 @@ class AllowEverythingFineGrainedAuthChecker final : public query::FineGrainedAut
 class AllowEverythingAuthChecker final : public query::AuthChecker {
  public:
   bool IsUserAuthorized(const std::optional<std::string> & /*username*/,
-                        const std::vector<query::AuthQuery::Privilege> & /*privileges*/,
-                        const std::string & /*db*/) const override {
+                        const std::vector<query::AuthQuery::Privilege> & /*privileges*/) const override {
     return true;
   }
 

src/query/constants.hpp

@@ -14,6 +14,8 @@
 #include <string>
 
 namespace memgraph::query {
+inline constexpr uint16_t kDefaultReplicationPort = 10000;
+inline constexpr auto *kDefaultReplicationServerIp = "0.0.0.0";
 inline const std::string kAsterisk = "*";
-inline constexpr uint16_t kComputeStatisticsNumResults = 7;
+inline constexpr uint16_t kDeleteStatisticsNumResults = 6;
 }  // namespace memgraph::query

src/query/context.hpp

@@ -43,14 +43,14 @@ struct EvaluationContext {
   /// it as if the lifetime is only valid during the Pull.
   utils::MemoryResource *memory{utils::NewDeleteResource()};
   int64_t timestamp{-1};
-  Parameters parameters{};
+  Parameters parameters;
   /// All properties indexable via PropertyIx
-  std::vector<storage::PropertyId> properties{};
+  std::vector<storage::PropertyId> properties;
   /// All labels indexable via LabelIx
-  std::vector<storage::LabelId> labels{};
+  std::vector<storage::LabelId> labels;
   /// All counters generated by `counter` function, mutable because the function
   /// modifies the values
-  mutable std::unordered_map<std::string, int64_t> counters{};
+  mutable std::unordered_map<std::string, int64_t> counters;
 };
 
 inline std::vector<storage::PropertyId> NamesToProperties(const std::vector<std::string> &property_names,
@@ -85,7 +85,7 @@ struct ExecutionContext {
   ExecutionStats execution_stats;
   TriggerContextCollector *trigger_context_collector{nullptr};
   FrameChangeCollector *frame_change_collector{nullptr};
-  std::shared_ptr<utils::AsyncTimer> timer;
+  utils::AsyncTimer timer;
 #ifdef MG_ENTERPRISE
   std::unique_ptr<FineGrainedAuthChecker> auth_checker{nullptr};
 #endif
@@ -94,18 +94,11 @@ struct ExecutionContext {
 static_assert(std::is_move_assignable_v<ExecutionContext>, "ExecutionContext must be move assignable!");
 static_assert(std::is_move_constructible_v<ExecutionContext>, "ExecutionContext must be move constructible!");
 
-inline auto MustAbort(const ExecutionContext &context) noexcept -> AbortReason {
-  if (context.transaction_status != nullptr &&
-      context.transaction_status->load(std::memory_order_acquire) == TransactionStatus::TERMINATED) {
-    return AbortReason::TERMINATED;
-  }
-  if (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) {
-    return AbortReason::SHUTDOWN;
-  }
-  if (context.timer && context.timer->IsExpired()) {
-    return AbortReason::TIMEOUT;
-  }
-  return AbortReason::NO_ABORT;
+inline bool MustAbort(const ExecutionContext &context) noexcept {
+  return (context.transaction_status != nullptr &&
+          context.transaction_status->load(std::memory_order_acquire) == TransactionStatus::TERMINATED) ||
+         (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) ||
+         context.timer.IsExpired();
 }
 
 inline plan::ProfilingStatsWithTotalTime GetStatsWithTotalTime(const ExecutionContext &context) {

src/query/cypher_query_interpreter.cpp

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

src/query/cypher_query_interpreter.hpp

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

src/query/db_accessor.cpp

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