Fix v2.9 release build issues -> manual v2.9.0

.github/workflows/diff.yaml

@@ -267,8 +267,8 @@ jobs:
       - name: Run e2e tests
         run: |
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
           ./run.sh
 

.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

@@ -266,8 +266,8 @@ jobs:
       - name: Run e2e tests
         run: |
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
           ./run.sh
 

.github/workflows/release_debian10.yaml

@@ -265,8 +265,8 @@ jobs:
       - name: Run e2e tests
         run: |
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
           ./run.sh
 

.github/workflows/release_ubuntu2004.yaml

@@ -265,8 +265,8 @@ jobs:
       - name: Run e2e tests
         run: |
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
           ./run.sh
 

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

.pre-commit-config.yaml

@@ -19,16 +19,3 @@ repos:
     rev: v13.0.0
     hooks:
       - id: clang-format
-#  - repo: local
-#    hooks:
-#      - id: clang-tidy
-#        name: clang-tidy
-#        description: Runs clang-tidy and checks for errors
-#        entry: python ./tools/pre-commit/clang-tidy.py
-#        language: python
-#        files: ^src/
-#        types: [c++, text]
-#        fail_fast: true
-#        require_serial: true
-#        args: [--compile_commands_path=build]
-#        pass_filenames: false

CMakeLists.txt

@@ -42,10 +42,6 @@ endif()
 
 project(memgraph LANGUAGES C CXX)
 
-# NOTE: once in a while this needs to be toggled to check headers are
-#       correct and PCH isn't masking any include issues
-set(CMAKE_DISABLE_PRECOMPILE_HEADERS OFF)
-
 #TODO: upgrade to cmake 3.24 + CheckIPOSupported
 #cmake_policy(SET CMP0138 NEW)
 #include(CheckIPOSupported)
@@ -68,7 +64,7 @@ option(MG_ENTERPRISE "Build Memgraph Enterprise Edition" ON)
 # Set the current version here to override the automatic version detection. The
 # version must be specified as `X.Y.Z`. Primarily used when building new patch
 # versions.
-set(MEMGRAPH_OVERRIDE_VERSION "")
+set(MEMGRAPH_OVERRIDE_VERSION "2.9.0")
 
 # Custom suffix that this version should have. The suffix can be any arbitrary
 # string. Primarily used when building a version for a specific customer.
@@ -200,7 +196,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.
@@ -215,8 +211,8 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
 # ** Static linking is allowed only for executables! **
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
 
-# Use lld linker to speedup build
-add_link_options(-fuse-ld=lld) # TODO: use mold linker
+# Use gold linker to speedup build
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
 
 # release flags
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
@@ -302,7 +298,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)

environment/os/amzn-2.sh

@@ -57,7 +57,7 @@ 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 custom-golang1.18.9 zip unzip java-11-openjdk-devel jdk-17 custom-maven3.9.2 # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
     cyrus-sasl-devel
@@ -82,8 +82,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -127,8 +127,8 @@ install() {
 
     yum update -y
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/centos-7.sh

@@ -57,7 +57,7 @@ MEMGRAPH_BUILD_DEPS=(
     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
+    nodejs zip unzip java-11-openjdk-devel jdk-17 custom-maven3.9.2 # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
     cyrus-sasl-devel
@@ -78,8 +78,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -134,8 +134,8 @@ install() {
     yum install -y git
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/centos-9.sh

@@ -57,7 +57,7 @@ MEMGRAPH_BUILD_DEPS=(
     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
+    zip unzip java-11-openjdk-devel java-17-openjdk java-17-openjdk-devel custom-maven3.9.2 # for driver tests
     sbcl # for custom Lisp C++ preprocessing
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -79,8 +79,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -127,8 +127,8 @@ install() {
     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"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/debian-10.sh

@@ -53,7 +53,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless oracle-java17-installer custom-maven3.9.2 # for driver tests
     dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -75,8 +75,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -124,8 +124,8 @@ EOF
     fi
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/debian-11-arm.sh

@@ -54,7 +54,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk custom-maven3.9.2 # for driver tests
     golang custom-golang1.18.9 nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -76,8 +76,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -121,8 +121,8 @@ EOF
     apt install -y wget
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/debian-11.sh

@@ -54,7 +54,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk custom-maven3.9.2 # for driver tests
     dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -76,8 +76,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -121,8 +121,8 @@ EOF
     apt install -y wget
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/fedora-36.sh

@@ -52,7 +52,7 @@ 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
+    java-11-openjdk-devel java-17-openjdk-devel custom-maven3.9.2 # for driver tests
     which zip unzip
     nodejs golang custom-golang1.18.9 # for driver tests
     sbcl # for custom Lisp C++ preprocessing
@@ -82,8 +82,8 @@ check() {
         LD_LIBRARY_PATH=""
     fi
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            if [ ! -f "/opt/apache-maven-3.9.3/bin/mvn" ]; then
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -124,8 +124,8 @@ install() {
     dnf update -y
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/ubuntu-18.04.sh

@@ -53,7 +53,7 @@ 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
+    mono-runtime mono-mcs nodejs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.2 # driver tests
     custom-golang1.18.9 # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -75,8 +75,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -101,8 +101,8 @@ install() {
     apt update -y
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/ubuntu-20.04.sh

@@ -53,7 +53,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.2 # for driver tests
     dotnet-sdk-3.1 golang custom-golang1.18.9 nodejs npm # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -75,8 +75,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -111,8 +111,8 @@ install() {
     fi
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/ubuntu-22.04-arm.sh

@@ -53,7 +53,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.2 # for driver tests
     dotnet-sdk-6.0 golang custom-golang1.18.9 nodejs npm
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -75,8 +75,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -110,8 +110,8 @@ install() {
     apt install -y wget
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

environment/os/ubuntu-22.04.sh

@@ -53,7 +53,7 @@ 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
+    mono-runtime mono-mcs zip unzip default-jdk-headless openjdk-17-jdk-headless custom-maven3.9.2 # for driver tests
     dotnet-sdk-6.0 golang custom-golang1.18.9 nodejs npm # for driver tests
     autoconf # for jemalloc code generation
     libtool  # for protobuf code generation
@@ -75,8 +75,8 @@ 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
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            if [ ! -f "/opt/apache-maven-3.9.2/bin/mvn" ]; then
               missing="$pkg $missing"
             fi
             continue
@@ -110,8 +110,8 @@ install() {
     fi
 
     for pkg in $1; do
-        if [ "$pkg" == custom-maven3.9.3 ]; then
-            install_custom_maven "3.9.3"
+        if [ "$pkg" == custom-maven3.9.2 ]; then
+            install_custom_maven "3.9.2"
             continue
         fi
         if [ "$pkg" == custom-golang1.18.9 ]; then

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() {
@@ -100,10 +93,8 @@ function install_custom_golang() {
 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"
+    curl -LO "https://dlcdn.apache.org/maven/maven-3/$MVNVERSION/binaries/apache-maven-$MVNVERSION-bin.tar.gz"
     tar -C "/opt" -xzf "apache-maven-$MVNVERSION-bin.tar.gz"
   fi
   echo "maven $MVNVERSION installed under $MVNINSTALLDIR"

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);
 }
@@ -722,7 +703,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

@@ -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);
@@ -1460,10 +1448,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

init

@@ -93,10 +93,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 ..

libs/CMakeLists.txt

@@ -261,7 +261,3 @@ import_external_library(librdtsc STATIC
 
 # setup ctre
 import_header_library(ctre ${CMAKE_CURRENT_SOURCE_DIR})
-
-# setup absl (cmake sub_directory tolerant)
-set(ABSL_PROPAGATE_CXX_STD ON)
-add_subdirectory(absl EXCLUDE_FROM_ALL)

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.
@@ -123,7 +123,6 @@ declare -A primary_urls=(
   ["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"
-  ["absl"]="https://$local_cache_host/git/abseil-cpp.git"
 )
 
 # The goal of secondary urls is to have links to the "source of truth" of
@@ -141,7 +140,7 @@ declare -A secondary_urls=(
   ["rocksdb"]="https://github.com/facebook/rocksdb.git"
   ["mgclient"]="https://github.com/memgraph/mgclient.git"
   ["pymgclient"]="https://github.com/memgraph/pymgclient.git"
-  ["mgconsole"]="https://github.com/memgraph/mgconsole.git"
+  ["mgconsole"]="http://github.com/memgraph/mgconsole.git"
   ["spdlog"]="https://github.com/gabime/spdlog"
   ["nlohmann"]="https://raw.githubusercontent.com/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
   ["neo4j"]="https://dist.neo4j.org/neo4j-community-5.6.0-unix.tar.gz"
@@ -150,7 +149,6 @@ declare -A secondary_urls=(
   ["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"
-  ["absl"]="https://github.com/abseil/abseil-cpp.git"
 )
 
 # antlr
@@ -212,7 +210,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)
@@ -248,7 +246,3 @@ mkdir -p ctre
 cd ctre
 file_get_try_double "${primary_urls[ctre]}" "${secondary_urls[ctre]}"
 cd ..
-
-# abseil 20230125.3
-absl_ref="20230125.3"
-repo_clone_try_double "${primary_urls[absl]}" "${secondary_urls[absl]}" "absl" "$absl_ref"

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-20-07
 CHANGE LICENSE:         Apache License, Version 2.0
 
 For information about alternative licensing arrangements, please visit: https://memgraph.com/legal.

licenses/third-party/abseil-cpp/LICENSE

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

licenses/third-party/compile-time-regular-expressions/LICENSE

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

query_modules/example.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -18,11 +18,7 @@ void ProcImpl(std::vector<mgp::Value> arguments, mgp::Graph graph, mgp::RecordFa
 
 void SampleReadProc(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
   try {
-    // The outcommented way of assigning the memory pointer is still
-    // working, but it is deprecated because of certain concurrency
-    // issues. Please use the guard instead.
-    // mgp::memory = memory;
-    mgp::MemoryDispatcherGuard guard(memory);
+    mgp::memory = memory;
 
     std::vector<mgp::Value> arguments;
     for (size_t i = 0; i < mgp::list_size(args); i++) {
@@ -38,11 +34,7 @@ void SampleReadProc(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *resul
 }
 
 void AddXNodes(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mgp_memory *memory) {
-  // The outcommented way of assigning the memory pointer is still
-  // working, but it is deprecated because of certain concurrency
-  // issues. Please use the guard instead.
-  // mgp::memory = memory;
-  mgp::MemoryDispatcherGuard guard(memory);
+  mgp::memory = memory;
   auto graph = mgp::Graph(memgraph_graph);
 
   std::vector<mgp::Value> arguments;
@@ -57,11 +49,7 @@ void AddXNodes(mgp_list *args, mgp_graph *memgraph_graph, mgp_result *result, mg
 }
 
 void Multiply(mgp_list *args, mgp_func_context *ctx, mgp_func_result *res, mgp_memory *memory) {
-  // The outcommented way of assigning the memory pointer is still
-  // working, but it is deprecated because of certain concurrency
-  // issues. Please use the guard instead.
-  // mgp::memory = memory;
-  mgp::MemoryDispatcherGuard guard(memory);
+  mgp::memory = memory;
 
   std::vector<mgp::Value> arguments;
   for (size_t i = 0; i < mgp::list_size(args); i++) {
@@ -79,11 +67,7 @@ void Multiply(mgp_list *args, mgp_func_context *ctx, mgp_func_result *res, mgp_m
 
 extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *memory) {
   try {
-    // The outcommented way of assigning the memory pointer is still
-    // working, but it is deprecated because of certain concurrency
-    // issues. Please use the guard instead.
-    // mgp::memory = memory;
-    mgp::MemoryDispatcherGuard guard(memory);
+    mgp::memory = memory;
 
     AddProcedure(SampleReadProc, "return_true", mgp::ProcedureType::Read,
                  {mgp::Parameter("param_1", mgp::Type::Int), mgp::Parameter("param_2", mgp::Type::Double, 2.3)},
@@ -93,11 +77,7 @@ extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *mem
   }
 
   try {
-    // The outcommented way of assigning the memory pointer is still
-    // working, but it is deprecated because of certain concurrency
-    // issues. Please use the guard instead.
-    // mgp::memory = memory;
-    mgp::MemoryDispatcherGuard guard(memory);
+    mgp::memory = memory;
 
     mgp::AddProcedure(AddXNodes, "add_x_nodes", mgp::ProcedureType::Write, {mgp::Parameter("param_1", mgp::Type::Int)},
                       {}, module, memory);
@@ -107,11 +87,7 @@ extern "C" int mgp_init_module(struct mgp_module *module, struct mgp_memory *mem
   }
 
   try {
-    // The outcommented way of assigning the memory pointer is still
-    // working, but it is deprecated because of certain concurrency
-    // issues. Please use the guard instead.
-    // mgp::memory = memory;
-    mgp::MemoryDispatcherGuard guard(memory);
+    mgp::memory = memory;
 
     mgp::AddFunction(Multiply, "multiply",
                      {mgp::Parameter("int", mgp::Type::Int), mgp::Parameter("int", mgp::Type::Int, (int64_t)3)}, module,

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")
@@ -50,7 +50,7 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
 # We also depend on `python3` because we embed it in Memgraph.
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0)")
 
-# Setting architecture extension for rpm packages
+# Setting arhitecture extension for rpm packages
 set(MG_ARCH_EXTENSION_RPM "noarch")
 
 if(${MG_ARCH} STREQUAL "x86_64")

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

@@ -159,19 +159,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

@@ -31,19 +31,15 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # ----------------------------------------------------------------------------
 set(mg_single_node_v2_sources
         memgraph.cpp
-        flags/isolation_level.cpp
-        flags/memory_limit.cpp
-        flags/log_level.cpp
-        flags/general.cpp
-        flags/audit.cpp
-        flags/bolt.cpp
 )
 
+set(mg_single_node_v2_libs stdc++fs Threads::Threads
+        mg-telemetry mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-glue mg-audit)
+
 # memgraph main executable
 add_executable(memgraph ${mg_single_node_v2_sources})
 target_include_directories(memgraph PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(memgraph stdc++fs Threads::Threads
-        mg-telemetry mg-communication mg-memory mg-utils mg-license mg-settings mg-glue)
+target_link_libraries(memgraph ${mg_single_node_v2_libs})
 
 # NOTE: `include/mg_procedure.syms` describes a pattern match for symbols which
 # should be dynamically exported, so that `dlopen` can correctly link the

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

@@ -22,4 +22,3 @@ target_link_libraries(mg-communication Boost::headers Threads::Threads mg-utils
 find_package(OpenSSL REQUIRED)
 target_link_libraries(mg-communication ${OPENSSL_LIBRARIES})
 target_include_directories(mg-communication SYSTEM PUBLIC ${OPENSSL_INCLUDE_DIR})
-target_precompile_headers(mg-communication INTERFACE http/server.hpp <boost/beast/websocket.hpp> bolt/v1/session.hpp)

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/buffer.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
@@ -43,7 +43,6 @@ class Buffer final {
   Buffer(Buffer &&) = delete;
   Buffer &operator=(const Buffer &) = delete;
   Buffer &operator=(Buffer &&) = delete;
-  ~Buffer() = default;
 
   /**
    * This class provides all functions from the buffer that are needed to allow
@@ -51,13 +50,12 @@ class Buffer final {
    */
   class ReadEnd {
    public:
-    explicit ReadEnd(Buffer *buffer);
+    ReadEnd(Buffer *buffer);
 
     ReadEnd(const ReadEnd &) = delete;
     ReadEnd(ReadEnd &&) = delete;
     ReadEnd &operator=(const ReadEnd &) = delete;
     ReadEnd &operator=(ReadEnd &&) = delete;
-    ~ReadEnd() = default;
 
     uint8_t *data();
 
@@ -79,13 +77,12 @@ class Buffer final {
    */
   class WriteEnd {
    public:
-    explicit WriteEnd(Buffer *buffer);
+    WriteEnd(Buffer *buffer);
 
     WriteEnd(const WriteEnd &) = delete;
     WriteEnd(WriteEnd &&) = delete;
     WriteEnd &operator=(const WriteEnd &) = delete;
     WriteEnd &operator=(WriteEnd &&) = delete;
-    ~WriteEnd() = default;
 
     io::network::StreamBuffer Allocate();
 

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,12 +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);
+  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;
@@ -38,7 +40,11 @@ class Server final {
               "Server wasn't shutdown properly");
   }
 
-  void Start();
+  void Start() {
+    MG_ASSERT(!background_thread_, "The server was already started!");
+    listener_->Run();
+    background_thread_.emplace([this] { ioc_.run(); });
+  }
 
   void Shutdown() { ioc_.stop(); }
 
@@ -48,30 +54,12 @@ class Server final {
     }
   }
   bool IsRunning() const { return background_thread_ && !ioc_.stopped(); }
-  tcp::endpoint GetEndpoint() const;
+  tcp::endpoint GetEndpoint() const { return listener_->GetEndpoint(); }
 
  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_;
 };
-template <class TRequestHandler, typename TSessionContext>
-Server<TRequestHandler, TSessionContext>::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})} {}
-
-template <class TRequestHandler, typename TSessionContext>
-void Server<TRequestHandler, TSessionContext>::Start() {
-  MG_ASSERT(!background_thread_, "The server was already started!");
-  listener_->Run();
-  background_thread_.emplace([this] { ioc_.run(); });
-}
-
-template <class TRequestHandler, typename TSessionContext>
-boost::asio::ip::tcp::endpoint Server<TRequestHandler, TSessionContext>::GetEndpoint() const {
-  return listener_->GetEndpoint();
-}
 }  // 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(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_(std::move(endpoint)),
-        listener_(session_context, context, inactivity_timeout_sec, service_name, workers_count),
+        endpoint_(endpoint),
+        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,32 +60,53 @@ 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,
-         int inactivity_timeout_sec, std::string_view service_name,
-         size_t workers_count = std::thread::hardware_concurrency());
+  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, TSessionData>::Create(context_thread_pool_.GetIOContext(), session_data,
+                                                           server_context, endpoint_, service_name_,
+                                                           inactivity_timeout_sec)} {}
 
-  ~Server();
+  ~Server() { MG_ASSERT(!IsRunning(), "Server wasn't shutdown properly"); }
 
   Server(const Server &) = delete;
   Server(Server &&) = delete;
   Server &operator=(const Server &) = delete;
   Server &operator=(Server &&) = delete;
 
-  const auto &Endpoint() const;
+  const auto &Endpoint() const {
+    MG_ASSERT(IsRunning(), "You can't get the server endpoint when it's not running!");
+    return endpoint_;
+  }
 
-  bool Start();
+  bool Start() {
+    if (IsRunning()) {
+      spdlog::error("The server is already running");
+      return false;
+    }
+    listener_->Start();
+
+    spdlog::info("{} server is fully armed and operational", service_name_);
+    spdlog::info("{} listening on {}", service_name_, endpoint_.address());
+    context_thread_pool_.Run();
+
+    return true;
+  }
 
   void Shutdown() {
     context_thread_pool_.Shutdown();
@@ -94,56 +115,14 @@ class Server final {
 
   void AwaitShutdown() { context_thread_pool_.AwaitShutdown(); }
 
-  bool IsRunning() const noexcept;
+  bool IsRunning() const noexcept { return context_thread_pool_.IsRunning() && listener_->IsRunning(); }
 
  private:
   ServerEndpoint endpoint_;
   std::string service_name_;
 
   IOContextThreadPool context_thread_pool_;
-  std::shared_ptr<Listener<TSession, TSessionContext>> listener_;
+  std::shared_ptr<Listener<TSession, TSessionData>> listener_;
 };
 
-template <typename TSession, typename TSessionContext>
-Server<TSession, TSessionContext>::~Server() {
-  MG_ASSERT(!IsRunning(), "Server wasn't shutdown properly");
-}
-
-template <typename TSession, typename TSessionContext>
-Server<TSession, TSessionContext>::Server(ServerEndpoint &endpoint, TSessionContext *session_context,
-                                          ServerContext *server_context, const int inactivity_timeout_sec,
-                                          const std::string_view service_name, size_t workers_count)
-    : 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)} {}
-
-template <typename TSession, typename TSessionContext>
-bool Server<TSession, TSessionContext>::Start() {
-  if (IsRunning()) {
-    spdlog::error("The server is already running");
-    return false;
-  }
-  listener_->Start();
-
-  spdlog::info("{} server is fully armed and operational", service_name_);
-  spdlog::info("{} listening on {}", service_name_, endpoint_.address());
-  context_thread_pool_.Run();
-
-  return true;
-}
-
-template <typename TSession, typename TSessionContext>
-const auto &Server<TSession, TSessionContext>::Endpoint() const {
-  MG_ASSERT(IsRunning(), "You can't get the server endpoint when it's not running!");
-  return endpoint_;
-}
-
-template <typename TSession, typename TSessionContext>
-bool Server<TSession, TSessionContext>::IsRunning() const noexcept {
-  return context_thread_pool_.IsRunning() && listener_->IsRunning();
-}
-
 }  // 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/data_structures/ring_buffer.hpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -31,7 +31,7 @@
 template <typename TElement>
 class RingBuffer {
  public:
-  explicit RingBuffer(int capacity) : capacity_(capacity), buffer_{std::make_unique<TElement[]>(capacity_)} {}
+  explicit RingBuffer(int capacity) : capacity_(capacity) { buffer_ = std::make_unique<TElement[]>(capacity_); }
 
   RingBuffer(const RingBuffer &) = delete;
   RingBuffer(RingBuffer &&) = delete;

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/flags/all.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
-
-#include "flags/audit.hpp"
-#include "flags/bolt.hpp"
-#include "flags/general.hpp"
-#include "flags/isolation_level.hpp"
-#include "flags/log_level.hpp"
-#include "flags/memory_limit.hpp"

src/flags/audit.cpp

@@ -1,28 +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 "flags/audit.hpp"
-
-#include "audit/log.hpp"
-
-#include "utils/flag_validation.hpp"
-
-// Audit logging flags.
-#ifdef MG_ENTERPRISE
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(audit_enabled, false, "Set to true to enable audit logging.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(audit_buffer_size, memgraph::audit::kBufferSizeDefault,
-                       "Maximum number of items in the audit log buffer.", FLAG_IN_RANGE(1, INT32_MAX));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(audit_buffer_flush_interval_ms, memgraph::audit::kBufferFlushIntervalMillisDefault,
-                       "Interval (in milliseconds) used for flushing the audit log buffer.",
-                       FLAG_IN_RANGE(10, INT32_MAX));
-#endif

src/flags/audit.hpp

@@ -1,23 +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 "gflags/gflags.h"
-
-// Audit logging flags.
-#ifdef MG_ENTERPRISE
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(audit_enabled);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(audit_buffer_size);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(audit_buffer_flush_interval_ms);
-#endif

src/flags/bolt.cpp

@@ -1,38 +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 "flags/bolt.hpp"
-
-#include "utils/flag_validation.hpp"
-
-#include <limits>
-#include <thread>
-
-// Bolt server flags.
-DEFINE_string(bolt_address, "0.0.0.0", "IP address on which the Bolt server should listen.");
-
-DEFINE_VALIDATED_int32(bolt_port, 7687, "Port on which the Bolt server should listen.",
-                       FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(bolt_num_workers, std::max(std::thread::hardware_concurrency(), 1U),
-                       "Number of workers used by the Bolt server. By default, this will be the "
-                       "number of processing units available on the machine.",
-                       FLAG_IN_RANGE(1, INT32_MAX));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(bolt_session_inactivity_timeout, 1800,
-                       "Time in seconds after which inactive Bolt sessions will be "
-                       "closed.",
-                       FLAG_IN_RANGE(1, INT32_MAX));
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(bolt_cert_file, "", "Certificate file which should be used for the Bolt server.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(bolt_key_file, "", "Key file which should be used for the Bolt server.");

src/flags/bolt.hpp

@@ -1,27 +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 "gflags/gflags.h"
-
-// Bolt server flags.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(bolt_address);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(bolt_port);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(bolt_num_workers);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(bolt_session_inactivity_timeout);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(bolt_cert_file);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(bolt_key_file);

src/flags/general.cpp

@@ -1,194 +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 "general.hpp"
-
-#include "utils/flag_validation.hpp"
-
-#include "glue/auth_handler.hpp"
-
-// Short help flag.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_bool(h, false, "Print usage and exit.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(monitoring_address, "0.0.0.0",
-              "IP address on which the websocket server for Memgraph monitoring should listen.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(metrics_address, "0.0.0.0",
-              "IP address on which the Memgraph server for exposing metrics should listen.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(monitoring_port, 7444,
-                       "Port on which the websocket server for Memgraph monitoring should listen.",
-                       FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(metrics_port, 9091, "Port on which the Memgraph server for exposing metrics should listen.",
-                       FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(init_file, "",
-              "Path to cypherl file that is used for configuring users and database schema before server starts.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(init_data_file, "", "Path to cypherl file that is used for creating data after server starts.");
-
-// General purpose flags.
-// NOTE: The `data_directory` flag must be the same here and in
-// `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 "
-              "less available RAM it will log a warning. Set to 0 to "
-              "disable.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(allow_load_csv, true, "Controls whether LOAD CSV clause is allowed in queries.");
-
-// Storage flags.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_uint64(storage_gc_cycle_sec, 30, "Storage garbage collector interval (in seconds).",
-                        FLAG_IN_RANGE(1, 24 * 3600));
-// NOTE: The `storage_properties_on_edges` flag must be the same here and in
-// `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.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_uint64(storage_snapshot_interval_sec, 0,
-                        "Storage snapshot creation interval (in seconds). Set "
-                        "to 0 to disable periodic snapshot creation.",
-                        FLAG_IN_RANGE(0, 7 * 24 * 3600));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_wal_enabled, false,
-            "Controls whether the storage uses write-ahead-logging. To enable "
-            "WAL periodic snapshots must be enabled.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_uint64(storage_snapshot_retention_count, 3, "The number of snapshots that should always be kept.",
-                        FLAG_IN_RANGE(1, 1000000));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_uint64(storage_wal_file_size_kib, memgraph::storage::Config::Durability().wal_file_size_kibibytes,
-                        "Minimum file size of each WAL file.",
-                        FLAG_IN_RANGE(1, static_cast<unsigned long>(1000) * 1024));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_uint64(storage_wal_file_flush_every_n_tx,
-                        memgraph::storage::Config::Durability().wal_file_flush_every_n_tx,
-                        "Issue a 'fsync' call after this amount of transactions are written to the "
-                        "WAL file. Set to 1 for fully synchronous operation.",
-                        FLAG_IN_RANGE(1, 1000000));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_snapshot_on_exit, false, "Controls whether the storage creates another snapshot on exit.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_items_per_batch, memgraph::storage::Config::Durability().items_per_batch,
-              "The number of edges and vertices stored in a batch in a snapshot file.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_parallel_index_recovery, false,
-            "Controls whether the index creation can be done in a multithreaded fashion.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_recovery_thread_count,
-              std::max(static_cast<uint64_t>(std::thread::hardware_concurrency()),
-                       memgraph::storage::Config::Durability().recovery_thread_count),
-              "The number of threads used to recover persisted data from disk.");
-
-#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 "
-            "running system (CPU and memory information) and information about "
-            "the database runtime (vertex and edge counts and resource usage) "
-            "to allow for easier improvement of the product.");
-
-// Streams flags
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint32(
-    stream_transaction_conflict_retries, 30,
-    "Number of times to retry when a stream transformation fails to commit because of conflicting transactions");
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint32(
-    stream_transaction_retry_interval, 500,
-    "Retry interval in milliseconds when a stream transformation fails to commit because of conflicting transactions");
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(kafka_bootstrap_servers, "",
-              "List of default Kafka brokers as a comma separated list of broker host or host:port.");
-
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(pulsar_service_url, "", "Default URL used while connecting to Pulsar brokers.");
-
-// Query flags.
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_double(query_execution_timeout_sec, 600,
-              "Maximum allowed query execution time. Queries exceeding this "
-              "limit will be aborted. Value of 0 means no limit.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(replication_replica_check_frequency_sec, 1,
-              "The time duration between two replica checks/pings. If < 1, replicas will NOT be checked at all. NOTE: "
-              "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");
-
-DEFINE_VALIDATED_string(query_modules_directory, "",
-                        "Directory where modules with custom query procedures are stored. "
-                        "NOTE: Multiple comma-separated directories can be defined.",
-                        {
-                          if (value.empty()) return true;
-                          const auto directories = memgraph::utils::Split(value, ",");
-                          for (const auto &dir : directories) {
-                            if (!memgraph::utils::DirExists(dir)) {
-                              std::cout << "Expected --" << flagname << " to point to directories." << std::endl;
-                              std::cout << dir << " is not a directory." << std::endl;
-                              return false;
-                            }
-                          }
-                          return true;
-                        });
-
-auto memgraph::flags::ParseQueryModulesDirectory() -> std::vector<std::filesystem::path> {
-  const auto directories = memgraph::utils::Split(FLAGS_query_modules_directory, ",");
-  std::vector<std::filesystem::path> query_modules_directories;
-  query_modules_directories.reserve(directories.size());
-  std::transform(directories.begin(), directories.end(), std::back_inserter(query_modules_directories),
-                 [](const auto &dir) { return dir; });
-
-  return query_modules_directories;
-}
-
-// 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.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_string(license_key, "", "License key for Memgraph Enterprise.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_string(organization_name, "", "Organization name.");
-// 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.");

src/flags/general.hpp

@@ -1,122 +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 "gflags/gflags.h"
-
-#include <filesystem>
-
-// Short help flag.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(h);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(monitoring_address);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(monitoring_port);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(metrics_address);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_int32(metrics_port);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(init_file);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(init_data_file);
-
-// General purpose flags.
-// NOTE: The `data_directory` flag must be the same here and in
-// `mg_import_csv`. If you change it, make sure to change it there as well.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(data_directory);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(data_recovery_on_startup);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(memory_warning_threshold);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(allow_load_csv);
-
-// Storage flags.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_gc_cycle_sec);
-// NOTE: The `storage_properties_on_edges` flag must be the same here and in
-// `mg_import_csv`. If you change it, make sure to change it there as well.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_properties_on_edges);
-// storage_recover_on_startup deprecated; use data_recovery_on_startup instead
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_recover_on_startup);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_snapshot_interval_sec);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_wal_enabled);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_snapshot_retention_count);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_wal_file_size_kib);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_wal_file_flush_every_n_tx);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_snapshot_on_exit);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_items_per_batch);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_parallel_index_recovery);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(storage_recovery_thread_count);
-#ifdef MG_ENTERPRISE
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(storage_delete_on_drop);
-#endif
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(telemetry_enabled);
-
-// Streams flags
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint32(stream_transaction_conflict_retries);
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint32(stream_transaction_retry_interval);
-
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(kafka_bootstrap_servers);
-
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(pulsar_service_url);
-
-// Query flags.
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_double(query_execution_timeout_sec);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(query_modules_directory);
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(query_callable_mappings_path);
-namespace memgraph::flags {
-auto ParseQueryModulesDirectory() -> std::vector<std::filesystem::path>;
-}  // namespace memgraph::flags
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_uint64(replication_replica_check_frequency_sec);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_bool(replication_restore_state_on_startup);
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(license_key);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(organization_name);
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DECLARE_string(auth_user_or_role_name_regex);

src/flags/isolation_level.cpp

@@ -1,54 +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 "flags/isolation_level.hpp"
-
-#include "utils/enum.hpp"
-#include "utils/flag_validation.hpp"
-
-#include "gflags/gflags.h"
-
-#include <array>
-#include <string_view>
-
-inline constexpr std::array isolation_level_mappings{
-    std::pair{std::string_view{"SNAPSHOT_ISOLATION"}, memgraph::storage::IsolationLevel::SNAPSHOT_ISOLATION},
-    std::pair{std::string_view{"READ_COMMITTED"}, memgraph::storage::IsolationLevel::READ_COMMITTED},
-    std::pair{std::string_view{"READ_UNCOMMITTED"}, memgraph::storage::IsolationLevel::READ_UNCOMMITTED}};
-
-const std::string isolation_level_help_string =
-    fmt::format("Default isolation level used for the transactions. Allowed values: {}",
-                memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings));
-
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_string(isolation_level, "SNAPSHOT_ISOLATION", isolation_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, isolation_level_mappings); result.HasError()) {
-    switch (result.GetError()) {
-      case memgraph::utils::ValidationError::EmptyValue: {
-        std::cout << "Isolation level cannot be empty." << std::endl;
-        break;
-      }
-      case memgraph::utils::ValidationError::InvalidValue: {
-        std::cout << "Invalid value for isolation level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings) << std::endl;
-        break;
-      }
-    }
-    return false;
-  }
-  return true;
-});
-
-memgraph::storage::IsolationLevel memgraph::flags::ParseIsolationLevel() {
-  const auto isolation_level =
-      memgraph::utils::StringToEnum<memgraph::storage::IsolationLevel>(FLAGS_isolation_level, isolation_level_mappings);
-  MG_ASSERT(isolation_level, "Invalid isolation level");
-  return *isolation_level;
-}

src/flags/isolation_level.hpp

@@ -1,19 +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 "storage/v2/isolation_level.hpp"
-
-namespace memgraph::flags {
-
-memgraph::storage::IsolationLevel ParseIsolationLevel();
-
-}  // namespace memgraph::flags

src/flags/log_level.cpp

@@ -1,101 +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 "flags/log_level.hpp"
-
-#include "utils/enum.hpp"
-#include "utils/flag_validation.hpp"
-#include "utils/logging.hpp"
-
-#include "gflags/gflags.h"
-#include "spdlog/common.h"
-#include "spdlog/sinks/daily_file_sink.h"
-
-#include <array>
-#include <string_view>
-#include <utility>
-
-using namespace std::string_view_literals;
-
-// Logging flags
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_HIDDEN_bool(also_log_to_stderr, false, "Log messages go to stderr in addition to logfiles");
-DEFINE_string(log_file, "", "Path to where the log should be stored.");
-
-inline constexpr std::array log_level_mappings{
-    std::pair{"TRACE"sv, spdlog::level::trace}, std::pair{"DEBUG"sv, spdlog::level::debug},
-    std::pair{"INFO"sv, spdlog::level::info},   std::pair{"WARNING"sv, spdlog::level::warn},
-    std::pair{"ERROR"sv, spdlog::level::err},   std::pair{"CRITICAL"sv, spdlog::level::critical}};
-
-const std::string log_level_help_string = fmt::format("Minimum log level. Allowed values: {}",
-                                                      memgraph::utils::GetAllowedEnumValuesString(log_level_mappings));
-
-DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
-    const auto error = result.GetError();
-    switch (error) {
-      case memgraph::utils::ValidationError::EmptyValue: {
-        std::cout << "Log level cannot be empty." << std::endl;
-        break;
-      }
-      case memgraph::utils::ValidationError::InvalidValue: {
-        std::cout << "Invalid value for log level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(log_level_mappings) << std::endl;
-        break;
-      }
-    }
-    return false;
-  }
-
-  return true;
-});
-
-spdlog::level::level_enum ParseLogLevel() {
-  const auto log_level = memgraph::utils::StringToEnum<spdlog::level::level_enum>(FLAGS_log_level, log_level_mappings);
-  MG_ASSERT(log_level, "Invalid log level");
-  return *log_level;
-}
-
-// 5 weeks * 7 days
-inline constexpr auto log_retention_count = 35;
-void CreateLoggerFromSink(const auto &sinks, const auto log_level) {
-  auto logger = std::make_shared<spdlog::logger>("memgraph_log", sinks.begin(), sinks.end());
-  logger->set_level(log_level);
-  logger->flush_on(spdlog::level::trace);
-  spdlog::set_default_logger(std::move(logger));
-}
-
-void memgraph::flags::InitializeLogger() {
-  std::vector<spdlog::sink_ptr> sinks;
-
-  if (FLAGS_also_log_to_stderr) {
-    sinks.emplace_back(std::make_shared<spdlog::sinks::stderr_color_sink_mt>());
-  }
-
-  if (!FLAGS_log_file.empty()) {
-    // get local time
-    time_t current_time{0};
-    struct tm *local_time{nullptr};
-
-    time(&current_time);
-    local_time = localtime(&current_time);
-
-    sinks.emplace_back(std::make_shared<spdlog::sinks::daily_file_sink_mt>(
-        FLAGS_log_file, local_time->tm_hour, local_time->tm_min, false, log_retention_count));
-  }
-  CreateLoggerFromSink(sinks, ParseLogLevel());
-}
-
-void memgraph::flags::AddLoggerSink(spdlog::sink_ptr new_sink) {
-  auto default_logger = spdlog::default_logger();
-  auto sinks = default_logger->sinks();
-  sinks.push_back(new_sink);
-  CreateLoggerFromSink(sinks, default_logger->level());
-}

src/flags/log_level.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
-
-#include <spdlog/sinks/sink.h>
-
-namespace memgraph::flags {
-void InitializeLogger();
-void AddLoggerSink(spdlog::sink_ptr new_sink);
-}  // namespace memgraph::flags

src/flags/memory_limit.cpp

@@ -1,41 +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 "flags/memory_limit.hpp"
-
-#include "utils/logging.hpp"
-#include "utils/sysinfo/memory.hpp"
-
-#include "gflags/gflags.h"
-
-// NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(
-    memory_limit, 0,
-    "Total memory limit in MiB. Set to 0 to use the default values which are 100\% of the phyisical memory if the swap "
-    "is enabled and 90\% of the physical memory otherwise.");
-
-int64_t memgraph::flags::GetMemoryLimit() {
-  if (FLAGS_memory_limit == 0) {
-    auto maybe_total_memory = memgraph::utils::sysinfo::TotalMemory();
-    MG_ASSERT(maybe_total_memory, "Failed to fetch the total physical memory");
-    const auto maybe_swap_memory = memgraph::utils::sysinfo::SwapTotalMemory();
-    MG_ASSERT(maybe_swap_memory, "Failed to fetch the total swap memory");
-
-    if (*maybe_swap_memory == 0) {
-      // take only 90% of the total memory
-      *maybe_total_memory *= 9;
-      *maybe_total_memory /= 10;
-    }
-    return *maybe_total_memory * 1024;
-  }
-
-  // We parse the memory as MiB every time
-  return FLAGS_memory_limit * 1024 * 1024;
-}

src/flags/memory_limit.hpp

@@ -1,17 +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 <cstdint>
-
-namespace memgraph::flags {
-int64_t GetMemoryLimit();
-}  // namespace memgraph::flags

src/glue/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(mg-glue STATIC )
-target_sources(mg-glue PRIVATE auth.cpp auth_checker.cpp auth_handler.cpp communication.cpp SessionHL.cpp ServerT.cpp MonitoringServerT.cpp)
-target_link_libraries(mg-glue mg-query mg-auth mg-audit)
-target_precompile_headers(mg-glue INTERFACE auth_checker.hpp auth_handler.hpp)
+set(mg_glue_sources auth.cpp auth_checker.cpp auth_handler.cpp communication.cpp)
+
+add_library(mg-glue STATIC ${mg_glue_sources})
+target_link_libraries(mg-glue mg-query mg-auth)

src/glue/MonitoringServerT.cpp

@@ -1,14 +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 "glue/MonitoringServerT.hpp"
-
-template class memgraph::communication::http::Server<
-    memgraph::http::MetricsRequestHandler<memgraph::dbms::SessionContext>, memgraph::dbms::SessionContext>;

src/glue/MonitoringServerT.hpp

@@ -1,25 +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 "communication/http/server.hpp"
-#include "dbms/session_context.hpp"
-#include "http_handlers/metrics.hpp"
-
-extern template class memgraph::communication::http::Server<
-    memgraph::http::MetricsRequestHandler<memgraph::dbms::SessionContext>, memgraph::dbms::SessionContext>;
-
-namespace memgraph::glue {
-
-using MonitoringServerT =
-    memgraph::communication::http::Server<memgraph::http::MetricsRequestHandler<memgraph::dbms::SessionContext>,
-                                          memgraph::dbms::SessionContext>;
-}  // namespace memgraph::glue

src/glue/ServerT.cpp

@@ -1,17 +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 "glue/ServerT.hpp"
-
-#ifdef MG_ENTERPRISE
-template class memgraph::communication::v2::Server<memgraph::glue::SessionHL, memgraph::dbms::SessionContextHandler>;
-#else
-template class memgraph::communication::v2::Server<memgraph::glue::SessionHL, memgraph::dbms::SessionContext>;
-#endif

src/glue/ServerT.hpp

@@ -1,35 +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 "communication/v2/server.hpp"
-#include "glue/SessionHL.hpp"
-
-#ifdef MG_ENTERPRISE
-#include "dbms/session_context_handler.hpp"
-#else
-#include "dbms/session_context.hpp"
-#endif
-
-#ifdef MG_ENTERPRISE
-extern template class memgraph::communication::v2::Server<memgraph::glue::SessionHL,
-                                                          memgraph::dbms::SessionContextHandler>;
-#else
-extern template class memgraph::communication::v2::Server<memgraph::glue::SessionHL, memgraph::dbms::SessionContext>;
-#endif
-
-namespace memgraph::glue {
-#ifdef MG_ENTERPRISE
-using ServerT = memgraph::communication::v2::Server<memgraph::glue::SessionHL, memgraph::dbms::SessionContextHandler>;
-#else
-using ServerT = memgraph::communication::v2::Server<memgraph::glue::SessionHL, memgraph::dbms::SessionContext>;
-#endif
-}  // namespace memgraph::glue

src/glue/SessionHL.cpp

@@ -1,386 +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 "glue/SessionHL.hpp"
-
-#include "audit/log.hpp"
-#include "glue/auth_checker.hpp"
-#include "glue/communication.hpp"
-#include "license/license.hpp"
-#include "query/discard_value_stream.hpp"
-
-#include "gflags/gflags.h"
-
-namespace memgraph::metrics {
-extern const Event ActiveBoltSessions;
-}  // namespace memgraph::metrics
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(bolt_server_name_for_init, "",
-              "Server name which the database should send to the client in the "
-              "Bolt INIT message.");
-
-auto ToQueryExtras(const memgraph::communication::bolt::Value &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 TypedValueResultStreamBase {
- public:
-  explicit TypedValueResultStreamBase(memgraph::query::InterpreterContext *interpreterContext);
-
-  std::vector<memgraph::communication::bolt::Value> DecodeValues(
-      const std::vector<memgraph::query::TypedValue> &values) const;
-
- private:
-  // NOTE: Needed only for ToBoltValue conversions
-  memgraph::query::InterpreterContext *interpreter_context_;
-};
-
-/// Wrapper around TEncoder which converts TypedValue to Value
-/// before forwarding the calls to original TEncoder.
-template <typename TEncoder>
-class TypedValueResultStream : public TypedValueResultStreamBase {
- public:
-  TypedValueResultStream(TEncoder *encoder, memgraph::query::InterpreterContext *ic)
-      : TypedValueResultStreamBase{ic}, encoder_(encoder) {}
-
-  void Result(const std::vector<memgraph::query::TypedValue> &values) { encoder_->MessageRecord(DecodeValues(values)); }
-
- private:
-  TEncoder *encoder_;
-};
-
-std::vector<memgraph::communication::bolt::Value> TypedValueResultStreamBase::DecodeValues(
-    const std::vector<memgraph::query::TypedValue> &values) const {
-  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);
-    if (maybe_value.HasError()) {
-      switch (maybe_value.GetError()) {
-        case memgraph::storage::Error::DELETED_OBJECT:
-          throw memgraph::communication::bolt::ClientError("Returning a deleted object as a result.");
-        case memgraph::storage::Error::NONEXISTENT_OBJECT:
-          throw memgraph::communication::bolt::ClientError("Returning a nonexistent object as a result.");
-        case memgraph::storage::Error::VERTEX_HAS_EDGES:
-        case memgraph::storage::Error::SERIALIZATION_ERROR:
-        case memgraph::storage::Error::PROPERTIES_DISABLED:
-          throw memgraph::communication::bolt::ClientError("Unexpected storage error when streaming results.");
-      }
-    }
-    decoded_values.emplace_back(std::move(*maybe_value));
-  }
-  return decoded_values;
-}
-TypedValueResultStreamBase::TypedValueResultStreamBase(memgraph::query::InterpreterContext *interpreterContext)
-    : interpreter_context_(interpreterContext) {}
-
-namespace memgraph::glue {
-
-#ifdef MG_ENTERPRISE
-
-void SessionHL::UpdateAndDefunct(const std::string &db_name) {
-  UpdateAndDefunct(ContextWrapper(sc_handler_.Get(db_name)));
-}
-void SessionHL::UpdateAndDefunct(ContextWrapper &&cntxt) {
-  defunct_.emplace(std::move(current_));
-  Update(std::forward<ContextWrapper>(cntxt));
-  defunct_->Defunct();
-}
-void SessionHL::Update(const std::string &db_name) {
-  ContextWrapper tmp(sc_handler_.Get(db_name));
-  Update(std::move(tmp));
-}
-void SessionHL::Update(ContextWrapper &&cntxt) {
-  current_ = std::move(cntxt);
-  interpreter_ = current_.interp();
-  interpreter_->in_explicit_db_ = in_explicit_db_;
-  interpreter_context_ = current_.interpreter_context();
-}
-void SessionHL::MultiDatabaseAuth(const std::string &db) {
-  if (user_ && !AuthChecker::IsUserAuthorized(*user_, {}, db)) {
-    throw memgraph::communication::bolt::ClientError(
-        "You are not authorized on the database \"{}\"! Please contact your database administrator.", db);
-  }
-}
-std::string SessionHL::GetDefaultDB() {
-  if (user_.has_value()) {
-    return user_->db_access().GetDefault();
-  }
-  return memgraph::dbms::kDefaultDB;
-}
-
-bool SessionHL::OnDelete(const std::string &db_name) {
-  MG_ASSERT(current_.interpreter_context()->db->id() != db_name && (!defunct_ || defunct_->defunct()),
-            "Trying to delete a database while still in use.");
-  return true;
-}
-memgraph::dbms::SetForResult SessionHL::OnChange(const std::string &db_name) {
-  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;
-}
-
-#endif
-std::string SessionHL::GetDatabaseName() const { return interpreter_context_->db->id(); }
-
-std::optional<std::string> SessionHL::GetServerNameForInit() {
-  if (FLAGS_bolt_server_name_for_init.empty()) return std::nullopt;
-  return FLAGS_bolt_server_name_for_init;
-}
-bool SessionHL::Authenticate(const std::string &username, const std::string &password) {
-  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();
-}
-void SessionHL::Abort() { interpreter_->Abort(); }
-
-std::map<std::string, memgraph::communication::bolt::Value> SessionHL::Discard(std::optional<int> n,
-                                                                               std::optional<int> qid) {
-  try {
-    memgraph::query::DiscardValueResultStream stream;
-    return DecodeSummary(interpreter_->Pull(&stream, n, qid));
-  } catch (const memgraph::query::QueryException &e) {
-    // Wrap QueryException into ClientError, because we want to allow the
-    // client to fix their query.
-    throw memgraph::communication::bolt::ClientError(e.what());
-  }
-}
-std::map<std::string, memgraph::communication::bolt::Value> SessionHL::Pull(SessionHL::TEncoder *encoder,
-                                                                            std::optional<int> n,
-                                                                            std::optional<int> qid) {
-  try {
-    TypedValueResultStream<TEncoder> stream(encoder, interpreter_context_);
-    return DecodeSummary(interpreter_->Pull(&stream, n, qid));
-  } catch (const memgraph::query::QueryException &e) {
-    // Wrap QueryException into ClientError, because we want to allow the
-    // client to fix their query.
-    throw memgraph::communication::bolt::ClientError(e.what());
-  }
-}
-std::pair<std::vector<std::string>, std::optional<int>> SessionHL::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) {
-  std::map<std::string, memgraph::storage::PropertyValue> params_pv;
-  for (const auto &[key, bolt_param] : params) {
-    params_pv.emplace(key, ToPropertyValue(bolt_param));
-  }
-  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());
-  }
-#endif
-  try {
-    auto result = interpreter_->Prepare(query, params_pv, username, ToQueryExtras(extra), UUID());
-    const std::string db_name = result.db ? *result.db : "";
-    if (user_ && !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.");
-      }
-      throw memgraph::communication::bolt::ClientError(
-          "You are not authorized to execute this query on database \"{}\"! Please contact your database "
-          "administrator.",
-          db_name);
-    }
-    return {std::move(result.headers), result.qid};
-
-  } catch (const memgraph::query::QueryException &e) {
-    // Wrap QueryException into ClientError, because we want to allow the
-    // client to fix their query.
-    throw memgraph::communication::bolt::ClientError(e.what());
-  } catch (const memgraph::query::ReplicationException &e) {
-    throw memgraph::communication::bolt::ClientError(e.what());
-  }
-}
-void SessionHL::RollbackTransaction() { interpreter_->RollbackTransaction(); }
-void SessionHL::CommitTransaction() { interpreter_->CommitTransaction(); }
-void SessionHL::BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &extra) {
-  interpreter_->BeginTransaction(ToQueryExtras(extra));
-}
-void SessionHL::Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) {
-#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;
-  }
-
-  // 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
-}
-SessionHL::~SessionHL() { memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveBoltSessions); }
-SessionHL::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)  // NOLINT
-    : 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()),
-#endif
-      endpoint_(endpoint),
-      run_id_(current_.run_id()) {
-  memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveBoltSessions);
-}
-
-/// ContextWrapper
-ContextWrapper::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::~ContextWrapper() { Defunct(); }
-void ContextWrapper::Defunct() {
-  if (!defunct_) {
-    session_context.interpreter_context->interpreters.WithLock(
-        [this](auto &interpreters) { interpreters.erase(interpreter.get()); });
-    defunct_ = true;
-  }
-}
-ContextWrapper::ContextWrapper(ContextWrapper &&in) noexcept
-    : session_context(std::move(in.session_context)), interpreter(std::move(in.interpreter)), defunct_(in.defunct_) {
-  in.defunct_ = true;
-}
-ContextWrapper &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 *ContextWrapper::interpreter_context() {
-  return session_context.interpreter_context.get();
-}
-memgraph::query::Interpreter *ContextWrapper::interp() { return interpreter.get(); }
-memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *ContextWrapper::auth()
-    const {
-  return session_context.auth;
-}
-std::string ContextWrapper::run_id() const { return session_context.run_id; }
-bool ContextWrapper::defunct() const { return defunct_; }
-#ifdef MG_ENTERPRISE
-memgraph::audit::Log *ContextWrapper::audit_log() const { return session_context.audit_log; }
-#endif
-
-std::map<std::string, memgraph::communication::bolt::Value> SessionHL::DecodeSummary(
-    const std::map<std::string, memgraph::query::TypedValue> &summary) {
-  std::map<std::string, memgraph::communication::bolt::Value> decoded_summary;
-  for (const auto &kv : summary) {
-    auto maybe_value = ToBoltValue(kv.second, *interpreter_context_->db, memgraph::storage::View::NEW);
-    if (maybe_value.HasError()) {
-      switch (maybe_value.GetError()) {
-        case memgraph::storage::Error::DELETED_OBJECT:
-        case memgraph::storage::Error::SERIALIZATION_ERROR:
-        case memgraph::storage::Error::VERTEX_HAS_EDGES:
-        case memgraph::storage::Error::PROPERTIES_DISABLED:
-        case memgraph::storage::Error::NONEXISTENT_OBJECT:
-          throw memgraph::communication::bolt::ClientError("Unexpected storage error when streaming summary.");
-      }
-    }
-    decoded_summary.emplace(kv.first, std::move(*maybe_value));
-  }
-  // Add this memgraph instance run_id, received from telemetry
-  // This is sent with every query, instead of only on bolt init inside
-  // communication/bolt/v1/states/init.hpp because neo4jdriver does not
-  // read the init message.
-  if (auto run_id = run_id_; run_id) {
-    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;
-}
-}  // namespace memgraph::glue

src/glue/SessionHL.hpp

@@ -1,161 +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 "communication/v2/server.hpp"
-#include "communication/v2/session.hpp"
-#include "dbms/session_context.hpp"
-
-#ifdef MG_ENTERPRISE
-#include "dbms/session_context_handler.hpp"
-#else
-#include "dbms/session_context.hpp"
-#endif
-
-namespace memgraph::glue {
-
-struct ContextWrapper {
-  explicit ContextWrapper(memgraph::dbms::SessionContext sc);
-  ~ContextWrapper();
-
-  ContextWrapper(const ContextWrapper &) = delete;
-  ContextWrapper &operator=(const ContextWrapper &) = delete;
-
-  ContextWrapper(ContextWrapper &&in) noexcept;
-  ContextWrapper &operator=(ContextWrapper &&in) noexcept;
-
-  void Defunct();
-  memgraph::query::InterpreterContext *interpreter_context();
-  memgraph::query::Interpreter *interp();
-  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth() const;
-  std::string run_id() const;
-  bool defunct() const;
-#ifdef MG_ENTERPRISE
-  memgraph::audit::Log *audit_log() const;
-#endif
-
- private:
-  memgraph::dbms::SessionContext session_context;
-  std::unique_ptr<memgraph::query::Interpreter> interpreter;
-  bool defunct_;
-};
-
-class SessionHL final : public memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
-                                                                      memgraph::communication::v2::OutputStream> {
- public:
-  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);
-
-  ~SessionHL() override;
-
-  SessionHL(const SessionHL &) = delete;
-  SessionHL &operator=(const SessionHL &) = delete;
-  SessionHL(SessionHL &&) = delete;
-  SessionHL &operator=(SessionHL &&) = delete;
-
-  void Configure(const std::map<std::string, memgraph::communication::bolt::Value> &run_time_info) override;
-
-  using TEncoder = memgraph::communication::bolt::Encoder<
-      memgraph::communication::bolt::ChunkedEncoderBuffer<memgraph::communication::v2::OutputStream>>;
-
-  void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &extra) override;
-
-  void CommitTransaction() override;
-
-  void RollbackTransaction() override;
-
-  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;
-
-  std::map<std::string, memgraph::communication::bolt::Value> Pull(TEncoder *encoder, std::optional<int> n,
-                                                                   std::optional<int> qid) override;
-
-  std::map<std::string, memgraph::communication::bolt::Value> Discard(std::optional<int> n,
-                                                                      std::optional<int> qid) override;
-
-  void Abort() override;
-
-  // 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;
-
-#ifdef MG_ENTERPRISE
-  memgraph::dbms::SetForResult OnChange(const std::string &db_name) override;
-
-  bool OnDelete(const std::string &db_name) override;
-#endif
-  std::optional<std::string> GetServerNameForInit() override;
-
-  std::string GetDatabaseName() const override;
-
- private:
-  std::map<std::string, memgraph::communication::bolt::Value> DecodeSummary(
-      const std::map<std::string, memgraph::query::TypedValue> &summary);
-
-#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);
-
-  void UpdateAndDefunct(ContextWrapper &&cntxt);
-
-  void Update(const std::string &db_name);
-
-  void Update(ContextWrapper &&cntxt);
-
-  /**
-   * @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);
-
-  /**
-   * @brief Get the user's default database
-   *
-   * @return std::string
-   */
-  std::string GetDefaultDB();
-#endif
-
-#ifdef MG_ENTERPRISE
-  memgraph::dbms::SessionContextHandler &sc_handler_;
-#endif
-  ContextWrapper current_;
-  std::optional<ContextWrapper> defunct_;
-
-  memgraph::query::InterpreterContext *interpreter_context_;
-  memgraph::query::Interpreter *interpreter_;
-  memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
-  std::optional<memgraph::auth::User> user_;
-#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_;
-};
-
-}  // namespace memgraph::glue

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 {