Run on docker release version.

.github/workflows/daily_benchmark.yaml

@@ -67,11 +67,7 @@ jobs:
       - name: Run mgbench
         run: |
           cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_pokec.json pokec/medium/*/*
-
-          ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_supernode.json supernode
-
-          ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_high_write_set_property.json high_write_set_property
+          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
 
       - name: Upload mgbench results
         run: |
@@ -80,19 +76,7 @@ jobs:
           source ve3/bin/activate
           pip install -r requirements.txt
           ./main.py --benchmark-name "mgbench" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_pokec.json" \
-                    --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
-
-          ./main.py --benchmark-name "supernode" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_supernode.json" \
-                    --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
-
-          ./main.py --benchmark-name "high_write_set_property" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_high_write_set_property.json" \
+                    --benchmark-results-path "../../tests/mgbench/benchmark_result.json" \
                     --github-run-id "${{ github.run_id }}" \
                     --github-run-number "${{ github.run_number }}" \
                     --head-branch-name "${{ env.BRANCH_NAME }}"

.github/workflows/diff.yaml

@@ -101,7 +101,7 @@ jobs:
             echo ${file}
             if [[ ${file} == *.py ]]; then
               python3 -m black --check --diff ${file}
-              python3 -m isort --profile black --check-only --diff ${file}
+              python3 -m isort --check-only --diff ${file}
             fi
           done
 
@@ -229,11 +229,6 @@ jobs:
           # branches and tags. (default: 1)
           fetch-depth: 0
 
-      - name: Check e2e service dependencies
-        run: |
-          cd tests/e2e
-          ./dependency_check.sh
-
       - name: Build release binaries
         run: |
           # Activate toolchain.
@@ -271,22 +266,21 @@ jobs:
 
       - name: Run e2e tests
         run: |
+          # TODO(gitbuda): Setup mgclient and pymgclient properly.
           cd tests
-          ./setup.sh /opt/toolchain-v4/activate
-          source ve3/bin/activate_e2e
+          ./setup.sh
+          source ve3/bin/activate
           cd e2e
-          ./run.sh
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
 
       - name: Run stress test (plain)
         run: |
           cd tests/stress
-          source ve3/bin/activate
           ./continuous_integration
 
       - name: Run stress test (SSL)
         run: |
           cd tests/stress
-          source ve3/bin/activate
           ./continuous_integration --use-ssl
 
       - name: Run durability test
@@ -299,6 +293,7 @@ jobs:
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
+
           cd build
 
           # create mgconsole
@@ -345,8 +340,10 @@ jobs:
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
+
           # Initialize dependencies.
           ./init
+
           # Build only memgraph release binarie.
           cd build
           cmake -DCMAKE_BUILD_TYPE=release ..
@@ -355,7 +352,7 @@ jobs:
       - name: Run Jepsen tests
         run: |
           cd tests/jepsen
-          ./run.sh test-all-individually --binary ../../build/memgraph --ignore-run-stdout-logs --ignore-run-stderr-logs
+          ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
         uses: actions/upload-artifact@v3

.github/workflows/package_all.yaml

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

.github/workflows/performance_benchmarks.yaml

@@ -1,77 +0,0 @@
-name: Run performance benchmarks manually
-
-on:
-  workflow_dispatch:
-
-jobs:
-  performance_benchmarks:
-    name: "Performance benchmarks"
-    runs-on: [self-hosted, Linux, X64, Diff, Gen7]
-    env:
-      THREADS: 24
-      MEMGRAPH_ENTERPRISE_LICENSE: ${{ secrets.MEMGRAPH_ENTERPRISE_LICENSE }}
-      MEMGRAPH_ORGANIZATION_NAME: ${{ secrets.MEMGRAPH_ORGANIZATION_NAME }}
-
-    steps:
-      - name: Set up repository
-        uses: actions/checkout@v3
-        with:
-          # Number of commits to fetch. `0` indicates all history for all
-          # branches and tags. (default: 1)
-          fetch-depth: 0
-
-      - name: Build release binaries
-        run: |
-          # Activate toolchain.
-          source /opt/toolchain-v4/activate
-
-          # Initialize dependencies.
-          ./init
-
-          # Build only memgraph release binaries.
-          cd build
-          cmake -DCMAKE_BUILD_TYPE=Release ..
-          make -j$THREADS
-
-      - name: Get branch name (merge)
-        if: github.event_name != 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
-
-      - name: Get branch name (pull request)
-        if: github.event_name == 'pull_request'
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
-
-      - name: Run benchmarks
-        run: |
-          cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
-
-          ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_supernode.json supernode
-
-          ./benchmark.py vendor-native --num-workers-for-benchmark 1 --export-results benchmark_high_write_set_property.json high_write_set_property
-
-      - name: Upload benchmark results
-        run: |
-          cd tools/bench-graph-client
-          virtualenv -p python3 ve3
-          source ve3/bin/activate
-          pip install -r requirements.txt
-          ./main.py --benchmark-name "mgbench" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_result.json" \
-                    --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
-
-          ./main.py --benchmark-name "supernode" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_supernode.json" \
-                    --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"
-
-          ./main.py --benchmark-name "high_write_set_property" \
-                    --benchmark-results-path "../../tests/mgbench/benchmark_high_write_set_property.json" \
-                    --github-run-id "${{ github.run_id }}" \
-                    --github-run-number "${{ github.run_number }}" \
-                    --head-branch-name "${{ env.BRANCH_NAME }}"

.github/workflows/release_centos8.yaml

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

.github/workflows/release_debian10.yaml

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

.github/workflows/release_ubuntu2004.yaml

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

.github/workflows/upload_to_s3.yaml

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

.gitignore

@@ -16,7 +16,8 @@
 .ycm_extra_conf.pyc
 .temp/
 Testing/
-/build*/
+build
+build/
 release/examples/build
 cmake-build-*
 cmake/DownloadProject/
@@ -58,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

@@ -15,21 +15,7 @@ repos:
     hooks:
       - id: isort
         name: isort (python)
-        args: ["--profile", "black"]
   - repo: https://github.com/pre-commit/mirrors-clang-format
     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

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

README.md

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

config/flags.yaml

@@ -99,10 +99,6 @@ modifications:
     value: "SNAPSHOT_ISOLATION"
     override: true
 
-  - name: "storage_mode"
-    value: "IN_MEMORY_TRANSACTIONAL"
-    override: true
-
   - name: "allow_load_csv"
     value: "true"
     override: false
@@ -111,10 +107,6 @@ modifications:
     value: "false"
     override: true
 
-  - name: "query_callable_mappings_path"
-    value: "/etc/memgraph/apoc_compatibility_mappings.json"
-    override: true
-
 undocumented:
   - "flag_file"
   - "also_log_to_stderr"

config/generate.py

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

config/mappings.json

@@ -1,27 +0,0 @@
-{
-    "dbms.components": "mgps.components",
-    "apoc.util.validate": "mgps.validate",
-    "db.schema.nodeTypeProperties":"schema.node_type_properties",
-    "db.schema.relTypeProperties":"schema.rel_type_properties",
-    "apoc.coll.contains": "collections.contains",
-    "apoc.coll.partition": "collections.partition",
-    "apoc.coll.toSet": "collections.to_set",
-    "apoc.coll.unionAll": "collections.unionAll",
-    "apoc.coll.removeAll": "collections.remove_all",
-    "apoc.coll.union": "collections.union",
-    "apoc.coll.sum": "collections.sum",
-    "apoc.coll.pairs": "collections.pairs",
-    "apoc.map.fromLists": "map.from_lists",
-    "apoc.map.removeKeys": "map.remove_keys",
-    "apoc.map.merge": "map.merge",
-    "apoc.create.nodes": "create.nodes",
-    "apoc.create.removeProperties": "create.remove_properties",
-    "apoc.create.node": "create.node",
-    "apoc.create.removeLabel": "create.remove_label",
-    "apoc.refactor.invert": "refactor.invert",
-    "apoc.refactor.cloneNode": "refactor.clone_node",
-    "apoc.refactor.cloneSubgraph": "refactor.clone_subgraph",
-    "apoc.refactor.cloneSubgraphFromPath": "refactor.clone_subgraph_from_path",
-    "apoc.label.exists": "label.exists"
-
-}

docs/csv-import-tool/README.md

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

environment/README.md

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

environment/os/.gitignore

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

environment/os/amzn-2.sh

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

environment/os/centos-7.sh

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

environment/os/centos-9.sh

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

environment/os/debian-10.sh

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

environment/os/debian-11-arm.sh

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

environment/os/debian-11.sh

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

environment/os/fedora-36.sh

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

environment/os/run.sh

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

environment/os/template.sh

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

environment/os/ubuntu-18.04.sh

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

environment/os/ubuntu-20.04.sh

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

environment/os/ubuntu-22.04-arm.sh

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

environment/os/ubuntu-22.04.sh

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

environment/util.sh

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

import/mglogs2cypherl.sh

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

import/n2mg_cypherl.sh

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

include/_mgp.hpp

@@ -135,13 +135,6 @@ inline int64_t value_get_int(mgp_value *val) { return MgInvoke<int64_t>(mgp_valu
 
 inline double value_get_double(mgp_value *val) { return MgInvoke<double>(mgp_value_get_double, val); }
 
-inline double value_get_numeric(mgp_value *val) {
-  if (MgInvoke<int>(mgp_value_is_int, val)) {
-    return static_cast<double>(value_get_int(val));
-  }
-  return value_get_double(val);
-}
-
 inline const char *value_get_string(mgp_value *val) { return MgInvoke<const char *>(mgp_value_get_string, val); }
 
 inline mgp_list *value_get_list(mgp_value *val) { return MgInvoke<mgp_list *>(mgp_value_get_list, val); }
@@ -178,8 +171,6 @@ inline bool value_is_int(mgp_value *val) { return MgInvoke<int>(mgp_value_is_int
 
 inline bool value_is_double(mgp_value *val) { return MgInvoke<int>(mgp_value_is_double, val); }
 
-inline bool value_is_numeric(mgp_value *val) { return value_is_int(val) || value_is_double(val); }
-
 inline bool value_is_string(mgp_value *val) { return MgInvoke<int>(mgp_value_is_string, val); }
 
 inline bool value_is_list(mgp_value *val) { return MgInvoke<int>(mgp_value_is_list, val); }
@@ -255,16 +246,6 @@ inline mgp_edge *graph_create_edge(mgp_graph *graph, mgp_vertex *from, mgp_verte
   return MgInvoke<mgp_edge *>(mgp_graph_create_edge, graph, from, to, type, memory);
 }
 
-inline mgp_edge *graph_edge_set_from(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_vertex *new_from,
-                                     mgp_memory *memory) {
-  return MgInvoke<mgp_edge *>(mgp_graph_edge_set_from, graph, e, new_from, memory);
-}
-
-inline mgp_edge *graph_edge_set_to(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_vertex *new_to,
-                                   mgp_memory *memory) {
-  return MgInvoke<mgp_edge *>(mgp_graph_edge_set_to, graph, e, new_to, memory);
-}
-
 inline void graph_delete_edge(mgp_graph *graph, mgp_edge *edge) { MgInvokeVoid(mgp_graph_delete_edge, graph, edge); }
 
 inline mgp_vertex *graph_get_vertex_by_id(mgp_graph *g, mgp_vertex_id id, mgp_memory *memory) {
@@ -345,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); }
@@ -377,10 +352,6 @@ inline mgp_map_item *map_items_iterator_next(mgp_map_items_iterator *it) {
 
 inline mgp_vertex_id vertex_get_id(mgp_vertex *v) { return MgInvoke<mgp_vertex_id>(mgp_vertex_get_id, v); }
 
-inline size_t vertex_get_in_degree(mgp_vertex *v) { return MgInvoke<size_t>(mgp_vertex_get_in_degree, v); }
-
-inline size_t vertex_get_out_degree(mgp_vertex *v) { return MgInvoke<size_t>(mgp_vertex_get_out_degree, v); }
-
 inline mgp_vertex *vertex_copy(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_vertex *>(mgp_vertex_copy, v, memory);
 }
@@ -403,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);
 }
@@ -415,10 +382,6 @@ inline void vertex_set_property(mgp_vertex *v, const char *property_name, mgp_va
   MgInvokeVoid(mgp_vertex_set_property, v, property_name, property_value);
 }
 
-inline void vertex_set_properties(mgp_vertex *v, struct mgp_map *properties) {
-  MgInvokeVoid(mgp_vertex_set_properties, v, properties);
-}
-
 inline mgp_properties_iterator *vertex_iter_properties(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_vertex_iter_properties, v, memory);
 }
@@ -455,10 +418,6 @@ inline void edge_set_property(mgp_edge *e, const char *property_name, mgp_value
   MgInvokeVoid(mgp_edge_set_property, e, property_name, property_value);
 }
 
-inline void edge_set_properties(mgp_edge *e, struct mgp_map *properties) {
-  MgInvokeVoid(mgp_edge_set_properties, e, properties);
-}
-
 inline mgp_properties_iterator *edge_iter_properties(mgp_edge *e, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_edge_iter_properties, e, memory);
 }
@@ -477,8 +436,6 @@ inline void path_destroy(mgp_path *path) { mgp_path_destroy(path); }
 
 inline void path_expand(mgp_path *path, mgp_edge *edge) { MgInvokeVoid(mgp_path_expand, path, edge); }
 
-inline void path_pop(mgp_path *path) { MgInvokeVoid(mgp_path_pop, path); }
-
 inline size_t path_size(mgp_path *path) { return MgInvoke<size_t>(mgp_path_size, path); }
 
 inline mgp_vertex *path_vertex_at(mgp_path *path, size_t index) {
@@ -720,16 +677,6 @@ inline mgp_proc *module_add_write_procedure(mgp_module *module, const char *name
   return MgInvoke<mgp_proc *>(mgp_module_add_write_procedure, module, name, cb);
 }
 
-inline mgp_proc *module_add_batch_read_procedure(mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                 mgp_proc_initializer initializer, mgp_proc_cleanup cleanup) {
-  return MgInvoke<mgp_proc *>(mgp_module_add_batch_read_procedure, module, name, cb, initializer, cleanup);
-}
-
-inline mgp_proc *module_add_batch_write_procedure(mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                  mgp_proc_initializer initializer, mgp_proc_cleanup cleanup) {
-  return MgInvoke<mgp_proc *>(mgp_module_add_batch_write_procedure, module, name, cb, initializer, cleanup);
-}
-
 inline void proc_add_arg(mgp_proc *proc, const char *name, mgp_type *type) {
   MgInvokeVoid(mgp_proc_add_arg, proc, name, type);
 }
@@ -746,7 +693,7 @@ inline void proc_add_deprecated_result(mgp_proc *proc, const char *name, mgp_typ
   MgInvokeVoid(mgp_proc_add_deprecated_result, proc, name, type);
 }
 
-inline int must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
+inline bool must_abort(mgp_graph *graph) { return mgp_must_abort(graph); }
 
 // mgp_result
 

include/_mgp_mock.py

@@ -333,13 +333,6 @@ class Path:
         self._vertices.append(edge.end_id)
         self._edges.append((edge.start_id, edge.end_id, edge.id))
 
-    def pop(self):
-        if not self._edges:
-            raise IndexError("Path contains no relationships.")
-
-        self._vertices.pop()
-        self._edges.pop()
-
     def vertex_at(self, index: int) -> Vertex:
         return Vertex(self._vertices[index], self._graph)
 

include/mg_exceptions.hpp

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

include/mg_procedure.h

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -462,18 +462,6 @@ void mgp_map_destroy(struct mgp_map *map);
 /// Return mgp_error::MGP_ERROR_KEY_ALREADY_EXISTS if a previous mapping already exists.
 enum mgp_error mgp_map_insert(struct mgp_map *map, const char *key, struct mgp_value *value);
 
-/// Insert a mapping from a NULL terminated character string to a value.
-/// If a mapping with the same key already exists, it is replaced.
-/// In case of update, both the string and the value are copied into the map.
-/// Therefore, the map does not take ownership of the original key nor value, so
-/// you still need to free their memory explicitly.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE is returned if unable to allocate for insertion.
-enum mgp_error mgp_map_update(struct mgp_map *map, const char *key, struct mgp_value *value);
-
-// Erase a mapping by key.
-// If the key doesn't exist in the map nothing happens
-enum mgp_error mgp_map_erase(struct mgp_map *map, const char *key);
-
 /// Get the number of items stored in mgp_map.
 /// Current implementation always returns without errors.
 enum mgp_error mgp_map_size(struct mgp_map *map, size_t *result);
@@ -543,10 +531,6 @@ void mgp_path_destroy(struct mgp_path *path);
 /// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for path extension.
 enum mgp_error mgp_path_expand(struct mgp_path *path, struct mgp_edge *edge);
 
-/// Remove the last node and the last relationship from the path.
-/// Return mgp_error::MGP_ERROR_OUT_OF_RANGE if the path contains no relationships.
-enum mgp_error mgp_path_pop(struct mgp_path *path);
-
 /// Get the number of edges in a mgp_path.
 /// Current implementation always returns without errors.
 enum mgp_error mgp_path_size(struct mgp_path *path, size_t *result);
@@ -651,12 +635,6 @@ struct mgp_vertex_id {
 /// Get the ID of given vertex.
 enum mgp_error mgp_vertex_get_id(struct mgp_vertex *v, struct mgp_vertex_id *result);
 
-/// Get the in degree of given vertex.
-enum mgp_error mgp_vertex_get_in_degree(struct mgp_vertex *v, size_t *result);
-
-/// Get the out degree of given vertex.
-enum mgp_error mgp_vertex_get_out_degree(struct mgp_vertex *v, size_t *result);
-
 /// Result is non-zero if the vertex can be modified.
 /// The mutability of the vertex is the same as the graph which it is part of. If a vertex is immutable, then edges
 /// cannot be created or deleted, properties and labels cannot be set or removed and all of the returned edges will be
@@ -674,15 +652,6 @@ enum mgp_error mgp_vertex_underlying_graph_is_mutable(struct mgp_vertex *v, int
 enum mgp_error mgp_vertex_set_property(struct mgp_vertex *v, const char *property_name,
                                        struct mgp_value *property_value);
 
-/// Set the value of properties on a vertex.
-/// When the value is `null`, then the property is removed from the vertex.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for storing the property.
-/// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `v` is immutable.
-/// Return mgp_error::MGP_ERROR_DELETED_OBJECT if `v` has been deleted.
-/// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `v` has been modified by another transaction.
-/// Return mgp_error::MGP_ERROR_VALUE_CONVERSION if `property_value` is vertex, edge or path.
-enum mgp_error mgp_vertex_set_properties(struct mgp_vertex *v, struct mgp_map *properties);
-
 /// Add the label to the vertex.
 /// If the vertex already has the label, this function does nothing.
 /// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for storing the label.
@@ -833,15 +802,6 @@ enum mgp_error mgp_edge_get_property(struct mgp_edge *e, const char *property_na
 /// Return mgp_error::MGP_ERROR_VALUE_CONVERSION if `property_value` is vertex, edge or path.
 enum mgp_error mgp_edge_set_property(struct mgp_edge *e, const char *property_name, struct mgp_value *property_value);
 
-/// Set the value of properties on a vertex.
-/// When the value is `null`, then the property is removed from the vertex.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for storing the property.
-/// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `v` is immutable.
-/// Return mgp_error::MGP_ERROR_DELETED_OBJECT if `v` has been deleted.
-/// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `v` has been modified by another transaction.
-/// Return mgp_error::MGP_ERROR_VALUE_CONVERSION if `property_value` is vertex, edge or path.
-enum mgp_error mgp_edge_set_properties(struct mgp_edge *e, struct mgp_map *properties);
-
 /// Start iterating over properties stored in the given edge.
 /// The properties of the edge are copied when the iterator is created, therefore later changes won't affect them.
 /// Resulting mgp_properties_iterator needs to be deallocated with
@@ -892,22 +852,6 @@ enum mgp_error mgp_graph_detach_delete_vertex(struct mgp_graph *graph, struct mg
 enum mgp_error mgp_graph_create_edge(struct mgp_graph *graph, struct mgp_vertex *from, struct mgp_vertex *to,
                                      struct mgp_edge_type type, struct mgp_memory *memory, struct mgp_edge **result);
 
-/// Change edge from vertex
-/// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `graph` is immutable.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate a mgp_edge.
-/// Return mgp_error::MGP_ERROR_DELETED_OBJECT if `from` or `to` has been deleted.
-/// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `from` or `to` has been modified by another transaction.
-enum mgp_error mgp_graph_edge_set_from(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_vertex *new_from,
-                                       struct mgp_memory *memory, struct mgp_edge **result);
-
-/// Change edge to vertex
-/// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `graph` is immutable.
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate a mgp_edge.
-/// Return mgp_error::MGP_ERROR_DELETED_OBJECT if `from` or `to` has been deleted.
-/// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `from` or `to` has been modified by another transaction.
-enum mgp_error mgp_graph_edge_set_to(struct mgp_graph *graph, struct mgp_edge *e, struct mgp_vertex *new_to,
-                                     struct mgp_memory *memory, struct mgp_edge **result);
-
 /// Delete an edge from the graph.
 /// Return mgp_error::MGP_ERROR_IMMUTABLE_OBJECT if `graph` is immutable.
 /// Return mgp_error::MGP_ERROR_SERIALIZATION_ERROR if `edge`, its source or destination vertex has been modified by
@@ -1374,13 +1318,6 @@ MGP_ENUM_CLASS mgp_log_level{
 /// to allocate global resources.
 typedef void (*mgp_proc_cb)(struct mgp_list *, struct mgp_graph *, struct mgp_result *, struct mgp_memory *);
 
-/// Cleanup for a query module read procedure. Can't be invoked through OpenCypher. Cleans batched stream.
-typedef void (*mgp_proc_cleanup)();
-
-/// Initializer for a query module batched read procedure. Can't be invoked through OpenCypher. Initializes batched
-/// stream.
-typedef void (*mgp_proc_initializer)(struct mgp_list *, struct mgp_graph *, struct mgp_memory *);
-
 /// Register a read-only procedure to a module.
 ///
 /// The `name` must be a sequence of digits, underscores, lowercase and
@@ -1405,30 +1342,6 @@ enum mgp_error mgp_module_add_read_procedure(struct mgp_module *module, const ch
 enum mgp_error mgp_module_add_write_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
                                               struct mgp_proc **result);
 
-/// Register a readable batched procedure to a module.
-///
-/// The `name` must be a valid identifier, following the same rules as the
-/// procedure`name` in mgp_module_add_read_procedure.
-///
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for mgp_proc.
-/// Return mgp_error::MGP_ERROR_INVALID_ARGUMENT if `name` is not a valid procedure name.
-/// RETURN mgp_error::MGP_ERROR_LOGIC_ERROR if a procedure with the same name was already registered.
-enum mgp_error mgp_module_add_batch_read_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                   mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                                                   struct mgp_proc **result);
-
-/// Register a writeable batched procedure to a module.
-///
-/// The `name` must be a valid identifier, following the same rules as the
-/// procedure`name` in mgp_module_add_read_procedure.
-///
-/// Return mgp_error::MGP_ERROR_UNABLE_TO_ALLOCATE if unable to allocate memory for mgp_proc.
-/// Return mgp_error::MGP_ERROR_INVALID_ARGUMENT if `name` is not a valid procedure name.
-/// RETURN mgp_error::MGP_ERROR_LOGIC_ERROR if a procedure with the same name was already registered.
-enum mgp_error mgp_module_add_batch_write_procedure(struct mgp_module *module, const char *name, mgp_proc_cb cb,
-                                                    mgp_proc_initializer initializer, mgp_proc_cleanup cleanup,
-                                                    struct mgp_proc **result);
-
 /// Add a required argument to a procedure.
 ///
 /// The order of adding arguments will correspond to the order the procedure
@@ -1504,10 +1417,7 @@ enum mgp_error mgp_log(enum mgp_log_level log_level, const char *output);
 /// @{
 
 /// Return non-zero if the currently executing procedure should abort as soon as
-/// possible. If non-zero the reasons are:
-/// (1) The transaction was requested to be terminated
-/// (2) The server is gracefully shutting down
-/// (3) The transaction has hit its timeout threshold
+/// possible.
 ///
 /// Procedures which perform heavyweight processing run the risk of running too
 /// long and going over the query execution time limit. To prevent this, such

include/mgp.py

@@ -479,12 +479,6 @@ class Properties:
         except KeyError:
             return False
 
-    def set_properties(self, properties: dict) -> None:
-        if not self._vertex_or_edge.is_valid():
-            raise InvalidContextError()
-
-        self._vertex_or_edge.set_properties(properties)
-
 
 class EdgeType:
     """Type of an Edge."""
@@ -983,24 +977,6 @@ class Path:
         self._vertices = None
         self._edges = None
 
-    def pop(self):
-        """
-        Remove the last node and the last relationship from the path.
-
-        Raises:
-            InvalidContextError: If using an invalid `Path` instance
-            OutOfRangeError: If the path contains no relationships.
-
-        Examples:
-            ```path.pop()```
-        """
-        if not self.is_valid():
-            raise InvalidContextError()
-        self._path.pop()
-        # Invalidate our cached tuples
-        self._vertices = None
-        self._edges = None
-
     @property
     def vertices(self) -> typing.Tuple[Vertex, ...]:
         """
@@ -1041,10 +1017,6 @@ class Path:
             self._edges = tuple(Edge(self._path.edge_at(i)) for i in range(num_edges))
         return self._edges
 
-    @property
-    def length(self) -> int:
-        return self._path.size()
-
 
 class Record:
     """Represents a record of resulting field values."""
@@ -1430,13 +1402,6 @@ class UnsupportedTypingError(Exception):
         super().__init__("Unsupported typing annotation '{}'".format(type_))
 
 
-class UnequalTypesError(Exception):
-    """Signals a typing annotation is not equal between types"""
-
-    def __init__(self, type1_: typing.Any, type2_: typing.Any):
-        super().__init__(f"Unequal typing annotation '{type1_}' and '{type2_}'")
-
-
 def _typing_to_cypher_type(type_):
     """Convert typing annotation to a _mgp.CypherType instance."""
     simple_types = {
@@ -1549,72 +1514,6 @@ def _typing_to_cypher_type(type_):
         return parse_typing(str(type_))
 
 
-def _is_typing_same(type1_, type2_):
-    """Convert typing annotation to a _mgp.CypherType instance."""
-    simple_types = {
-        typing.Any: 1,
-        object: 2,
-        list: 3,
-        Any: 4,
-        bool: 5,
-        str: 6,
-        int: 7,
-        float: 8,
-        Number: 9,
-        Map: 10,
-        Vertex: 11,
-        Edge: 12,
-        Path: 13,
-        Date: 14,
-        LocalTime: 15,
-        LocalDateTime: 16,
-        Duration: 17,
-    }
-    try:
-        return simple_types[type1_] == simple_types[type2_]
-    except KeyError:
-        pass
-
-    if sys.version_info < (3, 8):
-        # skip type checks
-        return True
-
-    complex_type1 = typing.get_origin(type1_)
-    type_args1 = typing.get_args(type2_)
-
-    complex_type2 = typing.get_origin(type1_)
-    type_args2 = typing.get_args(type2_)
-
-    if complex_type2 != complex_type1:
-        raise UnequalTypesError(type1_, type2_)
-
-    if complex_type1 == typing.Union:
-        contains_none_arg1 = type(None) in type_args1
-        contains_none_arg2 = type(None) in type_args2
-
-        if contains_none_arg1 != contains_none_arg2:
-            raise UnequalTypesError(type1_, type2_)
-
-        if contains_none_arg1:
-            types1 = tuple(t for t in type_args1 if t is not type(None))  # noqa E721
-            types2 = tuple(t for t in type_args2 if t is not type(None))  # noqa E721
-            if len(types1) != len(types2):
-                raise UnequalTypesError(types1, types2)
-            if len(types1) == 1:
-                (type_arg1,) = types1
-                (type_arg2,) = types2
-            else:
-                type_arg1 = typing.Union.__getitem__(types1)
-                type_arg2 = typing.Union.__getitem__(types2)
-            return _is_typing_same(type_arg1, type_arg2)
-    elif complex_type1 == list:
-        (type_arg1,) = type_args1
-        (type_arg2,) = type_args2
-        return _is_typing_same(type_arg1, type_arg2)
-    # skip type checks
-    return True
-
-
 # Procedure registration
 
 
@@ -1774,92 +1673,6 @@ def write_proc(func: typing.Callable[..., Record]):
     return _register_proc(func, True)
 
 
-def _register_batch_proc(
-    func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable, is_write: bool
-):
-    raise_if_does_not_meet_requirements(func)
-    register_func = _mgp.Module.add_batch_write_procedure if is_write else _mgp.Module.add_batch_read_procedure
-    func_sig = inspect.signature(func)
-    func_params = tuple(func_sig.parameters.values())
-
-    initializer_sig = inspect.signature(initializer)
-    initializer_params = tuple(initializer_sig.parameters.values())
-
-    assert (
-        func_params and initializer_params or not func_params and not initializer_params
-    ), "Both function params and initializer params must exist or not exist"
-
-    assert len(func_params) == len(initializer_params), "Number of params must be same"
-
-    assert initializer_sig.return_annotation is initializer_sig.empty, "Initializer can't return anything"
-
-    if func_params and func_params[0].annotation is ProcCtx:
-        assert (
-            initializer_params and initializer_params[0].annotation is ProcCtx
-        ), "Initializer must have mgp.ProcCtx as first parameter"
-
-        @wraps(func)
-        def wrapper_func(graph, args):
-            return func(ProcCtx(graph), *args)
-
-        @wraps(initializer)
-        def wrapper_initializer(graph, args):
-            return initializer(ProcCtx(graph), *args)
-
-        func_params = func_params[1:]
-        initializer_params = initializer_params[1:]
-        mgp_proc = register_func(_mgp._MODULE, wrapper_func, wrapper_initializer, cleanup)
-    else:
-
-        @wraps(func)
-        def wrapper_func(graph, args):
-            return func(*args)
-
-        @wraps(initializer)
-        def wrapper_initializer(graph, args):
-            return initializer(*args)
-
-        mgp_proc = register_func(_mgp._MODULE, wrapper_func, wrapper_initializer, cleanup)
-
-    for func_param, initializer_param in zip(func_params, initializer_params):
-        func_param_name = func_param.name
-        func_param_type_ = func_param.annotation
-        if func_param_type_ is func_param.empty:
-            func_param_type_ = object
-        initializer_param_type_ = initializer_param.annotation
-        if initializer_param.annotation is initializer_param.empty:
-            initializer_param_type_ = object
-
-        assert _is_typing_same(
-            func_param_type_, initializer_param_type_
-        ), "Types of initializer and function must be same"
-
-        func_cypher_type = _typing_to_cypher_type(func_param_type_)
-        if func_param.default is func_param.empty:
-            mgp_proc.add_arg(func_param_name, func_cypher_type)
-        else:
-            mgp_proc.add_opt_arg(func_param_name, func_cypher_type, func_param.default)
-    if func_sig.return_annotation is not func_sig.empty:
-        record = func_sig.return_annotation
-        if not isinstance(record, Record):
-            raise TypeError("Expected '{}' to return 'mgp.Record', got '{}'".format(func.__name__, type(record)))
-        for name, type_ in record.fields.items():
-            if isinstance(type_, Deprecated):
-                cypher_type = _typing_to_cypher_type(type_.field_type)
-                mgp_proc.add_deprecated_result(name, cypher_type)
-            else:
-                mgp_proc.add_result(name, _typing_to_cypher_type(type_))
-    return func
-
-
-def add_batch_write_proc(func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable):
-    return _register_batch_proc(func, initializer, cleanup, True)
-
-
-def add_batch_read_proc(func: typing.Callable[..., Record], initializer: typing.Callable, cleanup: typing.Callable):
-    return _register_batch_proc(func, initializer, cleanup, False)
-
-
 class InvalidMessageError(Exception):
     """
     Signals using a message instance outside of the registered transformation.

include/mgp_mock.py

@@ -929,25 +929,6 @@ class Path:
         self._vertices = None
         self._edges = None
 
-    def pop(self):
-        """
-        Remove the last node and the last relationship from the path.
-
-        Raises:
-            InvalidContextError: If using an invalid `Path` instance
-            OutOfRangeError: If the path contains no relationships.
-
-        Examples:
-            ```path.pop()```
-        """
-        if not self.is_valid():
-            raise InvalidContextError()
-        self._path.pop()
-
-        # Invalidate cached tuples
-        self._vertices = None
-        self._edges = None
-
     @property
     def vertices(self) -> typing.Tuple[Vertex, ...]:
         """

init

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

libs/CMakeLists.txt

@@ -12,7 +12,6 @@ find_package(Boost 1.78 REQUIRED)
 find_package(BZip2 1.0.6 REQUIRED)
 find_package(Threads REQUIRED)
 set(GFLAGS_NOTHREADS OFF)
-# NOTE: config/generate.py depends on the gflags help XML format.
 find_package(gflags REQUIRED)
 find_package(fmt 8.0.1)
 find_package(Jemalloc REQUIRED)
@@ -29,7 +28,6 @@ function(import_header_library name include_dir)
   set(${_upper_name}_INCLUDE_DIR ${include_dir} CACHE FILEPATH
       "Path to ${name} include directory" FORCE)
   mark_as_advanced(${_upper_name}_INCLUDE_DIR)
-  add_library(lib::${name} ALIAS ${name})
 endfunction(import_header_library)
 
 function(import_library name type location include_dir)
@@ -258,10 +256,3 @@ import_external_library(librdtsc STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/librdtsc/include
   CMAKE_ARGS ${MG_LIBRDTSC_CMAKE_ARGS}
   BUILD_COMMAND $(MAKE) rdtsc)
-
-# setup ctre
-import_header_library(ctre ${CMAKE_CURRENT_SOURCE_DIR})
-
-# 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.
@@ -122,8 +122,6 @@ declare -A primary_urls=(
   ["protobuf"]="http://$local_cache_host/git/protobuf.git"
   ["pulsar"]="http://$local_cache_host/git/pulsar.git"
   ["librdtsc"]="http://$local_cache_host/git/librdtsc.git"
-  ["ctre"]="http://$local_cache_host/file/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
-  ["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 +139,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"
@@ -149,8 +147,6 @@ declare -A secondary_urls=(
   ["protobuf"]="https://github.com/protocolbuffers/protobuf.git"
   ["pulsar"]="https://github.com/apache/pulsar.git"
   ["librdtsc"]="https://github.com/gabrieleara/librdtsc.git"
-  ["ctre"]="https://raw.githubusercontent.com/hanickadot/compile-time-regular-expressions/v3.7.2/single-header/ctre.hpp"
-  ["absl"]="https://github.com/abseil/abseil-cpp.git"
 )
 
 # antlr
@@ -212,7 +208,7 @@ pymgclient_tag="4f85c179e56302d46a1e3e2cf43509db65f062b3" # (2021-01-15)
 repo_clone_try_double "${primary_urls[pymgclient]}" "${secondary_urls[pymgclient]}" "pymgclient" "$pymgclient_tag"
 
 # mgconsole
-mgconsole_tag="v1.4.0" # (2023-05-21)
+mgconsole_tag="v1.3.0" # (2022-11-20)
 repo_clone_try_double "${primary_urls[mgconsole]}" "${secondary_urls[mgconsole]}" "mgconsole" "$mgconsole_tag" true
 
 spdlog_tag="v1.9.2" # (2021-08-12)
@@ -242,13 +238,3 @@ repo_clone_try_double "${primary_urls[librdtsc]}" "${secondary_urls[librdtsc]}"
 pushd librdtsc
 git apply ../librdtsc.patch
 popd
-
-#ctre
-mkdir -p ctre
-cd ctre
-file_get_try_double "${primary_urls[ctre]}" "${secondary_urls[ctre]}"
-cd ..
-
-# 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-13-09
+CHANGE DATE:            2027-18-05
 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")
@@ -48,9 +48,9 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
 
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0), libstdc++6")
 
-# Setting architecture extension for rpm packages
+# Setting arhitecture extension for rpm packages
 set(MG_ARCH_EXTENSION_RPM "noarch")
 
 if(${MG_ARCH} STREQUAL "x86_64")
@@ -69,12 +69,6 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 set(CPACK_RPM_PACKAGE_REQUIRES_PRE "shadow-utils")
 set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_SOURCE_DIR}/rpm/memgraph.spec.in")
 set(CPACK_RPM_PACKAGE_LICENSE "Memgraph License")
-# CPACK deduces dependency to libstdc++ which:
-#   * can't be easily installed on Centos 7 (the one from the toolchain,
-#     only required to avoid printing issue within query modules)
-#   * it causes issues with glibcxx 2.4
-#     `if(DISTRO STREQUAL "Amazon Linux" AND DISTRO_VERSION STREQUAL "2")`
-set(CPACK_RPM_PACKAGE_AUTOREQ " no")
 
 # Description formatting is important, no line must be greater than 80 characters.
 set(CPACK_RPM_PACKAGE_DESCRIPTION "Contains Memgraph, the graph database.
@@ -83,7 +77,13 @@ the next generation of applications driver by real-time connected data.")
 
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, logrotate")
+set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc++ >= 3.4.29, logrotate")
+
+# If amzn-2
+if(DISTRO STREQUAL "Amazon Linux" AND DISTRO_VERSION STREQUAL "2")
+    # It causes issues with glibcxx 2.4
+    set(CPACK_RPM_PACKAGE_AUTOREQ " no")
+endif()
 
 # All variables must be set before including.
 include(CPack)

release/debian/conffiles

@@ -1,4 +1,3 @@
 /etc/memgraph/memgraph.conf
-/etc/memgraph/apoc_compatibility_mappings.json
 /etc/memgraph/auth_module/ldap.example.yaml
 /etc/logrotate.d/memgraph

release/docker/package_docker

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

release/package/amzn-2/Dockerfile

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

release/package/centos-7/Dockerfile

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

release/package/centos-9/Dockerfile

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

release/package/debian-10/Dockerfile

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

release/package/debian-11-arm/Dockerfile

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

release/package/debian-11/Dockerfile

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

release/package/fedora-36/Dockerfile

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

release/package/run.sh

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

release/package/ubuntu-18.04/Dockerfile

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

release/package/ubuntu-20.04/Dockerfile

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

release/package/ubuntu-22.04-arm/Dockerfile

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

release/package/ubuntu-22.04/Dockerfile

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

release/rpm/memgraph.spec.in

@@ -132,7 +132,6 @@ echo "Don't forget to switch to the 'memgraph' user to use Memgraph" || exit 1
 # Override CPACK_RPM_ABSOLUTE_INSTALL_FILES with our %config(noreplace), cpack
 # uses plain %config.
 %config(noreplace) "/etc/memgraph/memgraph.conf"
-%config(noreplace) "/etc/memgraph/apoc_compatibility_mappings.json"
 %config(noreplace) "/etc/memgraph/auth_module/ldap.example.yaml"
 %config(noreplace) "/etc/logrotate.d/memgraph"
 

src/CMakeLists.txt

@@ -1,7 +1,6 @@
 # CMake configuration for the main memgraph library and executable
 
 # add memgraph sub libraries, ordered by dependency
-add_subdirectory(csv)
 add_subdirectory(utils)
 add_subdirectory(requests)
 add_subdirectory(io)
@@ -17,9 +16,10 @@ add_subdirectory(slk)
 add_subdirectory(rpc)
 add_subdirectory(license)
 add_subdirectory(auth)
-add_subdirectory(audit)
-add_subdirectory(dbms)
-add_subdirectory(flags)
+
+if(MG_ENTERPRISE)
+        add_subdirectory(audit)
+endif()
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
 
@@ -35,11 +35,18 @@ set(mg_single_node_v2_sources
         memgraph.cpp
 )
 
+set(mg_single_node_v2_libs stdc++fs Threads::Threads
+        mg-telemetry mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-glue)
+
+if(MG_ENTERPRISE)
+        # These are enterprise subsystems
+        set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)
+endif()
+
 # memgraph main executable
 add_executable(memgraph ${mg_single_node_v2_sources})
 target_include_directories(memgraph PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_link_libraries(memgraph stdc++fs Threads::Threads
-        mg-telemetry mg-communication mg-memory mg-utils mg-license mg-settings mg-glue mg-flags)
+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
@@ -72,7 +79,7 @@ if(lower_build_type STREQUAL "release")
                 COMMENT "Stripping symbols and sections from memgraph")
 endif()
 
-# Generate the configuration file under the build directory.
+# Generate the configuration file.
 add_custom_command(TARGET memgraph POST_BUILD
         COMMAND ${CMAKE_SOURCE_DIR}/config/generate.py
         ${CMAKE_BINARY_DIR}/memgraph
@@ -81,11 +88,6 @@ add_custom_command(TARGET memgraph POST_BUILD
         ${CMAKE_SOURCE_DIR}/config/flags.yaml
         BYPRODUCTS ${CMAKE_BINARY_DIR}/config/memgraph.conf
         COMMENT "Generating memgraph configuration file")
-# Copy the mappings file to the build directory.
-add_custom_command(TARGET memgraph POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${CMAKE_SOURCE_DIR}/config/mappings.json
-        ${CMAKE_BINARY_DIR}/config/apoc_compatibility_mappings.json)
 
 # Everything here is under "memgraph" install component.
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "memgraph")
@@ -121,9 +123,6 @@ install(FILES ${CMAKE_SOURCE_DIR}/include/mgp.hpp
 # Install the config file (must use absolute path).
 install(FILES ${CMAKE_BINARY_DIR}/config/memgraph.conf
         DESTINATION /etc/memgraph RENAME memgraph.conf)
-# Install the mappings file (must use absolute path).
-install(FILES ${CMAKE_BINARY_DIR}/config/apoc_compatibility_mappings.json
-        DESTINATION /etc/memgraph RENAME apoc_compatibility_mappings.json)
 
 # Install logrotate configuration (must use absolute path).
 install(FILES ${CMAKE_SOURCE_DIR}/release/logrotate.conf

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 {
 
@@ -58,22 +52,10 @@ 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 {
    */
   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 {
    */
   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 {
   /** 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.
@@ -159,7 +140,6 @@ class Session {
           break;
         case State::Idle:
         case State::Result:
-          at_least_one_run_ = true;
           state_ = StateExecutingRun(*this, state_);
           break;
         case State::Error:
@@ -181,13 +161,8 @@ class Session {
     }
   }
 
-  void HandleError() {
-    if (!at_least_one_run_) {
-      spdlog::info("Sudden connection loss. Make sure the client supports Memgraph.");
-    }
-  }
-
-  // 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_;
 
@@ -199,7 +174,6 @@ class Session {
 
   bool handshake_done_{false};
   State state_{State::Handshake};
-  bool at_least_one_run_{false};
 
   struct Version {
     uint8_t major;
@@ -208,9 +182,6 @@ class Session {
 
   Version version_;
 
-  virtual std::string GetDatabaseName() const = 0;
-  std::string UUID() const { return session_uuid_; }
-
  private:
   void ClientFailureInvalidData() {
     // Set the state to Close.
@@ -226,8 +197,6 @@ class Session {
     // 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"
 
@@ -174,7 +173,7 @@ State SendSuccessMessage(TSession &session) {
   // we send a hardcoded value for now.
   std::map<std::string, Value> metadata{{"connection_id", "bolt-1"}};
   if (auto server_name = session.GetServerNameForInit(); server_name) {
-    metadata.insert({"server", std::move(*server_name)});
+    metadata.insert({"server", *server_name});
   }
   bool success_sent = session.encoder_.MessageSuccess(metadata);
   if (!success_sent) {
@@ -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/client.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
@@ -15,10 +15,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-// Centos 7 OpenSSL includes libkrb5 which has brings in macros TRUE and FALSE. undef to prevent issues.
-#undef TRUE
-#undef FALSE
-
 #include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/init.hpp"

src/communication/context.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
@@ -17,10 +17,6 @@
 #include <openssl/ssl.h>
 #include <boost/asio/ssl/context.hpp>
 
-// Centos 7 OpenSSL includes libkrb5 which has brings in macros TRUE and FALSE. undef to prevent issues.
-#undef TRUE
-#undef FALSE
-
 namespace memgraph::communication {
 
 /**

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
@@ -22,10 +22,6 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-// Centos 7 OpenSSL includes libkrb5 which has brings in macros TRUE and FALSE. undef to prevent issues.
-#undef TRUE
-#undef FALSE
-
 #include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/exceptions.hpp"
@@ -73,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,13 +106,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
     return std::shared_ptr<WebsocketSession>(new WebsocketSession(std::forward<Args>(args)...));
   }
 
-  ~WebsocketSession() = default;
-
-  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) {
@@ -162,21 +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->ic,       endpoint, input_buffer_.read_end(), &output_stream_, session_context->auth,
-#ifdef MG_ENTERPRISE
-                 session_context->audit_log
-#endif
-        },
-        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} {
-  }
+        service_name_{service_name} {}
 
   void OnAccept(boost::beast::error_code ec) {
     if (ec) {
@@ -259,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_;
@@ -271,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>
@@ -283,12 +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)...));
   }
 
-  ~Session() = default;
-
   Session(const Session &) = delete;
   Session(Session &&) = delete;
   Session &operator=(const Session &) = delete;
   Session &operator=(Session &&) = delete;
+  ~Session() = default;
 
   bool Start() {
     if (execution_active_) {
@@ -353,18 +334,13 @@ 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->ic,       endpoint, input_buffer_.read_end(), &output_stream_, session_context->auth,
-#ifdef MG_ENTERPRISE
-                 session_context->audit_log
-#endif
-        },
-        session_context_{session_context},
+        session_(data, endpoint, input_buffer_.read_end(), &output_stream_),
+        data_{data},
         endpoint_{endpoint},
         remote_endpoint_{GetRemoteEndpoint()},
         service_name_{service_name},
@@ -406,8 +382,6 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
 
   void OnRead(const boost::system::error_code &ec, const size_t bytes_transferred) {
     if (ec) {
-      // TODO Check if client disconnected
-      session_.HandleError();
       return OnError(ec);
     }
     input_buffer_.write_end()->Written(bytes_transferred);
@@ -422,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;
@@ -562,7 +535,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   communication::Buffer input_buffer_;
   OutputStream output_stream_;
   TSession session_;
-  TSessionContext *session_context_;
+  TSessionData *data_;
   tcp::endpoint endpoint_;
   tcp::endpoint remote_endpoint_;
   std::string_view service_name_;

src/csv/CMakeLists.txt

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

src/csv/fuzz/CMakeLists.txt

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

src/csv/fuzz/fuzz_reader.cpp

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

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

@@ -1,3 +0,0 @@
-
-add_library(mg-dbms STATIC database.cpp)
-target_link_libraries(mg-dbms mg-utils mg-storage-v2 mg-query)

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

@@ -1,37 +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 "dbms/database.hpp"
-#include "flags/storage_mode.hpp"
-#include "storage/v2/disk/storage.hpp"
-#include "storage/v2/inmemory/storage.hpp"
-#include "storage/v2/storage_mode.hpp"
-
-template struct memgraph::utils::Gatekeeper<memgraph::dbms::Database>;
-
-namespace memgraph::dbms {
-
-Database::Database(const storage::Config &config)
-    : trigger_store_(config.durability.storage_directory / "triggers"),
-      streams_{config.durability.storage_directory / "streams"} {
-  if (config.storage_mode == memgraph::storage::StorageMode::ON_DISK_TRANSACTIONAL || config.force_on_disk ||
-      utils::DirExists(config.disk.main_storage_directory)) {
-    storage_ = std::make_unique<storage::DiskStorage>(config);
-  } else {
-    storage_ = std::make_unique<storage::InMemoryStorage>(config, config.storage_mode);
-  }
-}
-
-void Database::SwitchToOnDisk() {
-  storage_ = std::make_unique<memgraph::storage::DiskStorage>(std::move(storage_->config_));
-}
-
-}  // namespace memgraph::dbms

src/dbms/database.hpp

@@ -1,148 +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 <filesystem>
-#include <iterator>
-#include <memory>
-#include <optional>
-#include <string_view>
-#include <unordered_map>
-
-#include "query/cypher_query_interpreter.hpp"
-#include "query/stream/streams.hpp"
-#include "query/trigger.hpp"
-#include "storage/v2/storage.hpp"
-#include "utils/gatekeeper.hpp"
-
-namespace memgraph::dbms {
-
-/**
- * @brief Class containing everything associated with a single Database
- *
- */
-class Database {
- public:
-  /**
-   * @brief Construct a new Database object
-   *
-   * @param config storage configuration
-   */
-  explicit Database(const storage::Config &config);
-
-  /**
-   * @brief Returns the raw storage pointer.
-   * @note Ideally everybody would be using an accessor
-   * TODO: Remove
-   *
-   * @return storage::Storage*
-   */
-  storage::Storage *storage() { return storage_.get(); }
-
-  /**
-   * @brief Storage's Accessor
-   *
-   * @param override_isolation_level
-   * @return std::unique_ptr<storage::Storage::Accessor>
-   */
-  std::unique_ptr<storage::Storage::Accessor> Access(
-      std::optional<storage::IsolationLevel> override_isolation_level = {}) {
-    return storage_->Access(override_isolation_level);
-  }
-
-  /**
-   * @brief Unique storage identified (name)
-   *
-   * @return const std::string&
-   */
-  const std::string &id() const { return storage_->id(); }
-
-  /**
-   * @brief Returns the storage configuration
-   *
-   * @return const storage::Config&
-   */
-  const storage::Config &config() const { return storage_->config_; }
-
-  /**
-   * @brief Get the storage mode
-   *
-   * @return storage::StorageMode
-   */
-  storage::StorageMode GetStorageMode() const { return storage_->GetStorageMode(); }
-
-  /**
-   * @brief Get the storage info
-   *
-   * @return storage::StorageInfo
-   */
-  storage::StorageInfo GetInfo() const { return storage_->GetInfo(); }
-
-  /**
-   * @brief Switch storage to OnDisk
-   *
-   */
-  void SwitchToOnDisk();
-
-  /**
-   * @brief Returns the raw TriggerStore pointer
-   *
-   * @return query::TriggerStore*
-   */
-  query::TriggerStore *trigger_store() { return &trigger_store_; }
-
-  /**
-   * @brief Returns the raw Streams pointer
-   *
-   * @return query::stream::Streams*
-   */
-  query::stream::Streams *streams() { return &streams_; }
-
-  /**
-   * @brief Returns the raw ThreadPool pointer (used for after commit triggers)
-   *
-   * @return utils::ThreadPool*
-   */
-  utils::ThreadPool *thread_pool() { return &after_commit_trigger_pool_; }
-
-  /**
-   * @brief Add task to the after commit trigger thread pool
-   *
-   * @param new_task
-   */
-  void AddTask(std::function<void()> new_task) { after_commit_trigger_pool_.AddTask(std::move(new_task)); }
-
-  /**
-   * @brief Returns the PlanCache vector raw pointer
-   *
-   * @return utils::SkipList<query::PlanCacheEntry>*
-   */
-  utils::SkipList<query::PlanCacheEntry> *plan_cache() { return &plan_cache_; }
-
- private:
-  std::unique_ptr<storage::Storage> storage_;       //!< Underlying storage
-  query::TriggerStore trigger_store_;               //!< Triggers associated with the storage
-  utils::ThreadPool after_commit_trigger_pool_{1};  //!< Thread pool for executing after commit triggers
-  query::stream::Streams streams_;                  //!< Streams associated with the storage
-
-  // TODO: Move to a better place
-  utils::SkipList<query::PlanCacheEntry> plan_cache_;  //!< Plan cache associated with the storage
-};
-
-}  // namespace memgraph::dbms
-
-extern template struct memgraph::utils::Gatekeeper<memgraph::dbms::Database>;
-
-namespace memgraph::dbms {
-using DatabaseAccess = memgraph::utils::Gatekeeper<memgraph::dbms::Database>::Accessor;
-}  // namespace memgraph::dbms

src/dbms/database_handler.hpp

@@ -1,97 +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 <algorithm>
-#include <filesystem>
-#include <iterator>
-#include <memory>
-#include <optional>
-#include <string_view>
-#include <unordered_map>
-
-#include "dbms/database.hpp"
-
-#include "handler.hpp"
-
-namespace memgraph::dbms {
-
-/* NOTE
- * The Database object is shared. All the higher-level function calls should be protected.
- * Storage function calls should already be protected; add protection where needed.
- *
- * Current implementation uses a handler of Database objects. It owns them and gives
- * Gatekeeper::Accessor to it. These guarantee that the object won't be
- * destroyed unless no one is using it.
- */
-
-/**Config
- * @brief Multi-database storage handler
- *
- */
-class DatabaseHandler : public Handler<Database> {
- public:
-  using HandlerT = Handler<Database>;
-
-  /**
-   * @brief Generate new storage associated with the passed name.
-   *
-   * @param name Name associating the new interpreter context
-   * @param config Storage configuration
-   * @return HandlerT::NewResult
-   */
-  HandlerT::NewResult New(std::string_view name, storage::Config config) {
-    // Control that no one is using the same data directory
-    if (std::any_of(begin(), end(), [&](auto &elem) {
-          auto db_acc = elem.second.access();
-          MG_ASSERT(db_acc.has_value(), "Gatekeeper in invalid state");
-          return db_acc->get()->config().durability.storage_directory == config.durability.storage_directory;
-        })) {
-      spdlog::info("Tried to generate new storage using a claimed directory.");
-      return NewError::EXISTS;
-    }
-    config.name = name;  // Set storage id via config
-    return HandlerT::New(std::piecewise_construct, name, config);
-  }
-
-  /**
-   * @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(cbegin(), cend()));
-    std::for_each(cbegin(), cend(), [&](const auto &elem) { res.push_back(elem.first); });
-    return res;
-  }
-
-  /**
-   * @brief Get the associated storage's configuration
-   *
-   * @param name
-   * @return std::optional<storage::Config>
-   */
-  std::optional<storage::Config> GetConfig(std::string_view name) {
-    auto db = Get(name);
-    if (db) {
-      return (*db)->config();
-    }
-    return std::nullopt;
-  }
-};
-
-}  // namespace memgraph::dbms
-
-#endif

src/dbms/dbms_handler.hpp

@@ -1,390 +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 "auth/auth.hpp"
-#include "constants.hpp"
-#include "dbms/database_handler.hpp"
-#include "global.hpp"
-#include "query/config.hpp"
-#include "query/interpreter_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"
-
-namespace memgraph::dbms {
-
-#ifdef MG_ENTERPRISE
-
-using DeleteResult = utils::BasicResult<DeleteError>;
-
-/**
- * @brief Multi-database session contexts handler.
- */
-class DbmsHandler {
- public:
-  using LockT = utils::RWLock;
-  using NewResultT = utils::BasicResult<NewError, DatabaseAccess>;
-
-  struct Statistics {
-    uint64_t num_vertex;     //!< Sum of vertexes in every database
-    uint64_t num_edges;      //!< Sum of edges in every database
-    uint64_t num_databases;  //! number of isolated databases
-  };
-
-  /**
-   * @brief Initialize the handler.
-   *
-   * @param configs storage and interpreter configurations
-   * @param auth pointer to the global authenticator
-   * @param recovery_on_startup restore databases (and its content) and authentication data
-   * @param delete_on_drop when dropping delete any associated directories on disk
-   */
-  DbmsHandler(storage::Config config, auto *auth, bool recovery_on_startup, bool delete_on_drop)
-      : lock_{utils::RWLock::Priority::READ}, default_config_{std::move(config)}, delete_on_drop_(delete_on_drop) {
-    // TODO: Decouple storage config from dbms config
-    // TODO: Save individual db configs inside the kvstore and restore from there
-    storage::UpdatePaths(*default_config_, default_config_->durability.storage_directory / "databases");
-    const auto &db_dir = default_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);
-      }
-    }
-  }
-
-  /**
-   * @brief Create a new Database 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 DatabaseAccess
-   * @throw UnknownDatabaseException if database not found
-   */
-  DatabaseAccess Get(std::string_view name) {
-    std::shared_lock<LockT> rd(lock_);
-    return Get_(name);
-  }
-
-  /**
-   * @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;
-    }
-
-    const auto storage_path = StorageDir_(db_name);
-    if (!storage_path) return DeleteError::NON_EXISTENT;
-
-    // Check if db exists
-    try {
-      // Low level handlers
-      if (!db_handler_.Delete(db_name)) {
-        return DeleteError::USING;
-      }
-    } catch (utils::BasicException &) {
-      return DeleteError::NON_EXISTENT;
-    }
-
-    // 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 Return all active databases.
-   *
-   * @return std::vector<std::string>
-   */
-  std::vector<std::string> All() const {
-    std::shared_lock<LockT> rd(lock_);
-    return db_handler_.All();
-  }
-
-  /**
-   * @brief Return the number of vertex across all databases.
-   *
-   * @return uint64_t
-   */
-  Statistics Info() {
-    // TODO: Handle overflow?
-    uint64_t nv = 0;
-    uint64_t ne = 0;
-    std::shared_lock<LockT> rd(lock_);
-    const uint64_t ndb = std::distance(db_handler_.cbegin(), db_handler_.cend());
-    for (auto &[_, db_gk] : db_handler_) {
-      auto db_acc_opt = db_gk.access();
-      if (!db_acc_opt) continue;
-      auto &db_acc = *db_acc_opt;
-      const auto &info = db_acc->GetInfo();
-      nv += info.vertex_count;
-      ne += info.edge_count;
-    }
-    return {nv, ne, ndb};
-  }
-
-  /**
-   * @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
-   *
-   * @param ic global InterpreterContext
-   */
-  void RestoreTriggers(query::InterpreterContext *ic) {
-    std::lock_guard<LockT> wr(lock_);
-    for (auto &[_, db_gk] : db_handler_) {
-      auto db_acc_opt = db_gk.access();
-      if (!db_acc_opt) continue;
-      auto &db_acc = *db_acc_opt;
-      spdlog::debug("Restoring trigger for database \"{}\"", db_acc->id());
-      auto storage_accessor = db_acc->Access();
-      auto dba = memgraph::query::DbAccessor{storage_accessor.get()};
-      db_acc->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.
-   *
-   * @param ic global InterpreterContext
-   */
-  void RestoreStreams(query::InterpreterContext *ic) {
-    std::lock_guard<LockT> wr(lock_);
-    for (auto &[_, db_gk] : db_handler_) {
-      auto db_acc = db_gk.access();
-      if (!db_acc) continue;
-      auto *db = db_acc->get();
-      spdlog::debug("Restoring streams for database \"{}\"", db->id());
-      db->streams()->RestoreStreams(*db_acc, ic);
-    }
-  }
-
- private:
-  /**
-   * @brief return the storage directory of the associated database
-   *
-   * @param name Database name
-   * @return std::optional<std::filesystem::path>
-   */
-  std::optional<std::filesystem::path> StorageDir_(const std::string &name) {
-    const auto conf = db_handler_.GetConfig(name);
-    if (conf) {
-      return conf->durability.storage_directory;
-    }
-    spdlog::debug("Failed to find storage dir for database \"{}\"", name);
-    return {};
-  }
-
-  /**
-   * @brief Create a new Database 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 Database 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_config_) {
-      auto config_copy = *default_config_;
-      storage::UpdatePaths(config_copy, default_config_->durability.storage_directory / storage_subdir);
-      return New_(name, config_copy);
-    }
-    spdlog::info("Trying to generate session context without any configurations.");
-    return NewError::NO_CONFIGS;
-  }
-
-  /**
-   * @brief Create a new Database associated with the "name" database
-   *
-   * @param name name of the database
-   * @param storage_config storage configuration
-   * @return NewResultT context on success, error on failure
-   */
-  NewResultT New_(const std::string &name, storage::Config &storage_config) {
-    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_db = db_handler_.New(name, storage_config);
-    if (new_db.HasValue()) {
-      // Success
-      if (durability_) durability_->Put(name, "ok");  // TODO: Serialize the configuration?
-      return new_db.GetValue();
-    }
-    return new_db.GetError();
-  }
-
-  /**
-   * @brief Create a new Database 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 = db_handler_.GetConfig(kDefaultDB);
-      MG_ASSERT(conf, "No configuration for the default database.");
-      const auto &tmp_conf = conf->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 DatabaseAccess for the database associated with the "name"
-   *
-   * @param name
-   * @return DatabaseAccess
-   * @throw UnknownDatabaseException if trying to get unknown database
-   */
-  DatabaseAccess Get_(std::string_view name) {
-    auto db = db_handler_.Get(name);
-    if (db) {
-      return *db;
-    }
-    throw UnknownDatabaseException("Tried to retrieve an unknown database \"{}\".", name);
-  }
-
-  // Should storage objects ever be deleted?
-  mutable LockT lock_;                             //!< protective lock
-  DatabaseHandler db_handler_;                     //!< multi-tenancy storage handler
-  std::optional<storage::Config> default_config_;  //!< Storage configuration used when creating new databases
-  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
-};
-#endif
-
-}  // namespace memgraph::dbms