Reduce requirement for py tools because of Ubuntu18.04 and CentOS7

.clang-format

@@ -1,7 +1,6 @@
 ---
-BasedOnStyle: Google
----
 Language:     Cpp
+BasedOnStyle: Google
 Standard:     "c++20"
 UseTab:       Never
 DerivePointerAlignment: false

.github/pull_request_template.md

@@ -1,14 +1,11 @@
 [master < Epic] PR
 - [ ] Check, and update documentation if necessary
+- [ ] Update [changelog](https://docs.memgraph.com/memgraph/changelog)
 - [ ] Write E2E tests
 - [ ] Compare the [benchmarking results](https://bench-graph.memgraph.com/) between the master branch and the Epic branch
 - [ ] Provide the full content or a guide for the final git message
 
 [master < Task] PR
 - [ ] Check, and update documentation if necessary
+- [ ] Update [changelog](https://docs.memgraph.com/memgraph/changelog)
 - [ ] Provide the full content or a guide for the final git message
-
-
-To keep docs changelog up to date, one more thing to do:
-- [ ] Write a release note here, including added/changed clauses
-- [ ] Tag someone from docs team in the comments

.github/workflows/daily_benchmark.yaml

@@ -3,7 +3,7 @@ name: Daily Benchmark
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   release_benchmarks:
@@ -67,7 +67,7 @@ jobs:
       - name: Run mgbench
         run: |
           cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
+          ./benchmark.py --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
 
       - name: Upload mgbench results
         run: |

.github/workflows/diff.yaml

@@ -14,7 +14,7 @@ on:
       - "**/*.md"
       - ".clang-format"
       - "CODEOWNERS"
-      - "licenses/*"
+      - licenses/**
 
 jobs:
   community_build:
@@ -437,7 +437,7 @@ jobs:
       - name: Run mgbench
         run: |
           cd tests/mgbench
-          ./benchmark.py vendor-native --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
+          ./benchmark.py --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
 
       - name: Upload mgbench results
         run: |

.github/workflows/package_all.yaml

@@ -2,12 +2,7 @@ name: Package All
 
 # TODO(gitbuda): Cleanup docker container if GHA job was canceled.
 
-on:
-  workflow_dispatch:
-    inputs:
-      memgraph_version:
-        description: "Memgraph version to upload as. If empty upload is skipped. Format: 'vX.Y.Z'"
-        required: false
+on: workflow_dispatch
 
 jobs:
   centos-7:
@@ -111,7 +106,7 @@ jobs:
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
-          name: ubuntu-18.04
+          name: ubuntu-1804
           path: build/output/ubuntu-18.04/memgraph*.deb
 
   ubuntu-2004:
@@ -128,7 +123,7 @@ jobs:
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
-          name: ubuntu-20.04
+          name: ubuntu-2004
           path: build/output/ubuntu-20.04/memgraph*.deb
 
   ubuntu-2204:
@@ -145,7 +140,7 @@ jobs:
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
-          name: ubuntu-22.04
+          name: ubuntu-2204
           path: build/output/ubuntu-22.04/memgraph*.deb
 
   debian-11-platform:
@@ -165,40 +160,6 @@ jobs:
           name: debian-11-platform
           path: build/output/debian-11/memgraph*.deb
 
-  fedora-36:
-    runs-on: [self-hosted, DockerMgBuild, X64]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package fedora-36
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: fedora-36
-          path: build/output/fedora-36/memgraph*.rpm
-
-  amzn-2:
-    runs-on: [self-hosted, DockerMgBuild, X64]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package amzn-2
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: amzn-2
-          path: build/output/amzn-2/memgraph*.rpm
-
   debian-11-arm:
     runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
     timeout-minutes: 60
@@ -213,44 +174,5 @@ jobs:
       - name: "Upload package"
         uses: actions/upload-artifact@v3
         with:
-          name: debian-11-aarch64
+          name: debian-11-arm
           path: build/output/debian-11-arm/memgraph*.deb
-
-  ubuntu-2204-arm:
-    runs-on: [self-hosted, DockerMgBuild, ARM64, strange]
-    timeout-minutes: 60
-    steps:
-      - name: "Set up repository"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # Required because of release/get_version.py
-      - name: "Build package"
-        run: |
-          ./release/package/run.sh package ubuntu-22.04-arm
-      - name: "Upload package"
-        uses: actions/upload-artifact@v3
-        with:
-          name: ubuntu-22.04-aarch64
-          path: build/output/ubuntu-22.04-arm/memgraph*.deb
-
-  upload-to-s3:
-    # only run upload if we specified version. Allows for runs without upload
-    if: "${{ github.event.inputs.memgraph_version != '' }}"
-    needs: [centos-7, centos-9, debian-10, debian-11, docker, ubuntu-1804, ubuntu-2004, ubuntu-2204, debian-11-platform, fedora-36, amzn-2, debian-11-arm, ubuntu-2204-arm]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v3
-        with:
-          # name: # if name input parameter is not provided, all artifacts are downloaded
-                  # and put in directories named after each one.
-          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/${{ github.event.inputs.memgraph_version }}/"

.github/workflows/release_centos8.yaml

@@ -3,7 +3,7 @@ name: Release CentOS 8
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:

.github/workflows/release_debian10.yaml

@@ -3,7 +3,7 @@ name: Release Debian 10
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:

.github/workflows/release_docker.yaml

@@ -31,8 +31,8 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download memgraph binary
         run: |

.github/workflows/release_mgbench_client.yaml

@@ -1,63 +0,0 @@
-name: "Mgbench Bolt Client Publish Docker Image"
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Mgbench bolt client version to publish on Dockerhub."
-        required: true
-      force_release:
-        type: boolean
-        required: false
-        default: false
-
-jobs:
-  mgbench_docker_publish:
-    runs-on: ubuntu-latest
-    env:
-      DOCKER_ORGANIZATION_NAME: memgraph
-      DOCKER_REPOSITORY_NAME: mgbench-client
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Check if specified version is already pushed
-        run: |
-          EXISTS=$(docker manifest inspect $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:${{ github.event.inputs.version }} > /dev/null; echo $?)
-          echo $EXISTS
-          if [[ ${EXISTS} -eq 0 ]]; then
-              echo 'The specified version has been already released to DockerHub.'
-              if [[ ${{ github.event.inputs.force_release }} = true ]]; then
-                echo 'Forcing the release!'
-              else
-                echo 'Stopping the release!'
-                exit 1
-              fi
-          else
-              echo 'All good the specified version has not been release to DockerHub.'
-          fi
-
-      - name: Build & push docker images
-        run: |
-          cd tests/mgbench
-          docker buildx build \
-          --build-arg TOOLCHAIN_VERSION=toolchain-v4 \
-          --platform linux/amd64,linux/arm64 \
-          --tag $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:${{ github.event.inputs.version }} \
-          --tag $DOCKER_ORGANIZATION_NAME/$DOCKER_REPOSITORY_NAME:latest \
-          --file Dockerfile.mgbench_client \
-          --push .

.github/workflows/release_ubuntu2004.yaml

@@ -3,7 +3,7 @@ name: Release Ubuntu 20.04
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 22 * * *"
+    - cron: "0 1 * * *"
 
 jobs:
   community_build:

.gitignore

@@ -34,6 +34,9 @@ TAGS
 *.fas
 *.fasl
 
+# LCP generated C++ files
+*.lcp.cpp
+
 src/database/distributed/serialization.hpp
 src/database/single_node_ha/serialization.hpp
 src/distributed/bfs_rpc_messages.hpp
@@ -47,11 +50,15 @@ src/distributed/pull_produce_rpc_messages.hpp
 src/distributed/storage_gc_rpc_messages.hpp
 src/distributed/token_sharing_rpc_messages.hpp
 src/distributed/updates_rpc_messages.hpp
+src/query/frontend/ast/ast.hpp
+src/query/distributed/frontend/ast/ast_serialization.hpp
 src/durability/distributed/state_delta.hpp
 src/durability/single_node/state_delta.hpp
 src/durability/single_node_ha/state_delta.hpp
+src/query/frontend/semantic/symbol.hpp
 src/query/distributed/frontend/semantic/symbol_serialization.hpp
 src/query/distributed/plan/ops.hpp
+src/query/plan/operator.hpp
 src/raft/log_entry.hpp
 src/raft/raft_rpc_messages.hpp
 src/raft/snapshot_metadata.hpp

.pre-commit-config.yaml

@@ -1,17 +1,16 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v2.3.0
     hooks:
       - id: check-yaml
-        args: [--allow-multiple-documents]
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 22.10.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.10.1
     hooks:
       - id: isort
         name: isort (python)

CMakeLists.txt

@@ -231,17 +231,7 @@ endif()
 message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
 # -----------------------------------------------------------------------------
 
-add_definitions( -DCMAKE_BUILD_TYPE_NAME="${CMAKE_BUILD_TYPE}")
-
-if (NOT MG_ARCH)
-    set(MG_ARCH_DESCR "Host architecture to build Memgraph on. Supported values are x86_64, ARM64.")
-    if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "aarch64")
-        set(MG_ARCH "ARM64" CACHE STRING ${MG_ARCH_DESCR})
-    else()
-        set(MG_ARCH "x86_64" CACHE STRING ${MG_ARCH_DESCR})
-    endif()
-endif()
-message(STATUS "MG_ARCH: ${MG_ARCH}")
+set(MG_ARCH "x86_64" CACHE STRING "Host architecture to build Memgraph on. Supported values are x86_64 (default), ARM64.")
 
 # setup external dependencies -------------------------------------------------
 

README.md

@@ -4,6 +4,10 @@
 
 ---
 
+<p align="center">
+Build modern, graph-based applications on top of your streaming data in minutes.
+</p>
+
 <p align="center">
   <a href="https://github.com/memgraph/memgraph/blob/master/licenses/APL.txt">
     <img src="https://img.shields.io/badge/license-APL-green" alt="license" title="license"/>
@@ -18,7 +22,7 @@
 
 <p align="center">
   <a href="https://github.com/memgraph/memgraph">
-     <img src="https://img.shields.io/github/actions/workflow/status/memgraph/memgraph/release_debian10.yaml?branch=master&label=build%20and%20test&logo=github"/>
+    <img src="https://img.shields.io/github/workflow/status/memgraph/memgraph/Release%20Ubuntu%2020.04/master" alt="build" title="build"/>
   </a>
   <a href="https://memgraph.com/docs/" alt="Documentation">
     <img src="https://img.shields.io/badge/documentation-Memgraph-orange" />
@@ -52,17 +56,6 @@ to ensure that you’re getting the [best possible
 performance](http://memgraph.com/benchgraph) consistently and without surprises.
 It’s also ACID-compliant and highly available.
 
-## :zap: Features
-
-- Run Python, Rust, and C/C++ code natively, check out the
-  [MAGE](https://github.com/memgraph/mage) graph algorithm library
-- Native support for machine learning
-- Streaming support
-- Replication
-- Authentication and authorization
-- ACID compliance
-
-
 ## :video_game: Memgraph Playground
 
 You don't need to install anything to try out Memgraph. Check out 
@@ -85,49 +78,28 @@ your browser.
 ### macOS
 
 [![macOS](https://img.shields.io/badge/macOS-Docker-000000?style=for-the-badge&logo=macos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-on-macos-docker)
-[![macOS](https://img.shields.io/badge/lima-AACF41?style=for-the-badge&logo=macos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-on-ubuntu)
 
 ### Linux
 
 [![Linux](https://img.shields.io/badge/Linux-Docker-FCC624?style=for-the-badge&logo=linux&logoColor=black)](https://memgraph.com/docs/memgraph/install-memgraph-on-linux-docker)
 [![Debian](https://img.shields.io/badge/Debian-D70A53?style=for-the-badge&logo=debian&logoColor=white)](https://memgraph.com/docs/memgraph/install-memgraph-on-debian)
 [![Ubuntu](https://img.shields.io/badge/Ubuntu-E95420?style=for-the-badge&logo=ubuntu&logoColor=white)](https://memgraph.com/docs/memgraph/install-memgraph-on-ubuntu)
-[![Cent OS](https://img.shields.io/badge/cent%20os-002260?style=for-the-badge&logo=centos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
-[![Fedora](https://img.shields.io/badge/fedora-0B57A4?style=for-the-badge&logo=fedora&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
-[![RedHat](https://img.shields.io/badge/redhat-EE0000?style=for-the-badge&logo=redhat&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
+[![Cent
+OS](https://img.shields.io/badge/cent%20os-002260?style=for-the-badge&logo=centos&logoColor=F0F0F0)](https://memgraph.com/docs/memgraph/install-memgraph-from-rpm)
 
 You can find the binaries and Docker images on the [Download
 Hub](https://memgraph.com/download) and the installation instructions in the
 [official documentation](https://memgraph.com/docs/memgraph/installation).
 
+## :zap: Features
 
-## :cloud: Memgraph Cloud
-
-Check out [Memgraph Cloud](https://memgraph.com/docs/memgraph-cloud) - a cloud service fully managed on AWS and available in 6 geographic regions around the world. Memgraph Cloud allows you to create projects with Enterprise instances of MemgraphDB from your browser.
-
-<p align="left">
-  <a href="https://memgraph.com/docs/memgraph-cloud">
-    <img width="450px" alt="Memgraph Cloud" src="https://public-assets.memgraph.com/memgraph-gifs%2Fcloud.gif">
-  </a>
-</p>
-
-## :link: Connect to Memgraph
-
-[Connect to the database](https://memgraph.com/docs/memgraph/connect-to-memgraph) using Memgraph Lab, mgconsole, various drivers (Python, C/C++ and others) and WebSocket. 
-
-### :microscope: Memgraph Lab
-
-Visualize graphs and play with queries to understand your data. [Memgraph Lab](https://memgraph.com/docs/memgraph-lab) is a user interface that helps you explore and manipulate the data stored in Memgraph. Visualize graphs, execute ad hoc queries, and optimize their performance.
-
-<p align="left">
-  <a href="https://memgraph.com/docs/memgraph-lab">
-    <img width="450px" alt="Memgraph Cloud" src="https://public-assets.memgraph.com/memgraph-gifs%2Flab.gif">
-  </a>
-</p>
-
-## :file_folder: Import data
-
-[Import data](https://memgraph.com/docs/memgraph/import-data) into Memgraph using Kafka, RedPanda or Pulsar streams, CSV and JSON files, or Cypher commands.
+- Run Python, Rust, and C/C++ code natively, check out the
+  [MAGE](https://github.com/memgraph/mage) graph algorithm library
+- Native support for machine learning
+- Streaming support
+- Replication
+- Authentication and authorization
+- ACID compliance
 
 ## :bookmark_tabs: Documentation
 
@@ -171,17 +143,17 @@ Memgraph Community is available under the [BSL
 license](./licenses/BSL.txt).</br> Memgraph Enterprise is available under the
 [MEL license](./licenses/MEL.txt).
 
-## :busts_in_silhouette: Community
+## 🙋 Community
 
 - :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/)
+- :open_file_folder: [**Memgraph GitHub**](https://github.com/memgraph)
 - :bird: [**Twitter**](https://twitter.com/memgraphdb)
 - :movie_camera:
   [**YouTube**](https://www.youtube.com/channel/UCZ3HOJvHGxtQ_JHxOselBYg)
 
 <p align="center">
   <a href="#">
-    <img src="https://img.shields.io/badge/⬆️ back_to_top_⬆️-white" alt="Back to top" title="Back to top"/>
+    <img src="https://img.shields.io/badge/⬆️back_to_top_⬆️-white" alt="Back to top" title="Back to top"/>
   </a>
 </p>

config/flags.yaml

@@ -103,10 +103,6 @@ modifications:
     value: "true"
     override: false
 
-  - name: "storage_parallel_index_recovery"
-    value: "false"
-    override: true
-
 undocumented:
   - "flag_file"
   - "also_log_to_stderr"

environment/os/amzn-2.sh

@@ -1,156 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-check_operating_system "amzn-2"
-check_architecture "x86_64"
-
-TOOLCHAIN_BUILD_DEPS=(
-    gcc gcc-c++ make # generic build tools
-    wget # used for archive download
-    gnupg2 # used for archive signature verification
-    tar gzip bzip2 xz unzip # used for archive unpacking
-    zlib-devel # zlib library used for all builds
-    expat-devel xz-devel python3-devel texinfo
-    curl libcurl-devel # for cmake
-    readline-devel # for cmake and llvm
-    libffi-devel libxml2-devel # for llvm
-    libedit-devel pcre-devel automake bison # for swig
-    file
-    openssl-devel
-    gmp-devel
-    gperf
-    diffutils
-    patch
-    libipt libipt-devel # intel
-    perl # for openssl
-)
-
-TOOLCHAIN_RUN_DEPS=(
-    make # generic build tools
-    tar gzip bzip2 xz # used for archive unpacking
-    zlib # zlib library used for all builds
-    expat xz-libs python3 # for gdb
-    readline # for cmake and llvm
-    libffi libxml2 # for llvm
-    openssl-devel
-)
-
-MEMGRAPH_BUILD_DEPS=(
-    git # source code control
-    make # build system
-    wget # for downloading libs
-    libuuid-devel java-11-openjdk # required by antlr
-    readline-devel # for memgraph console
-    python3-devel # for query modules
-    openssl-devel
-    libseccomp-devel
-    python3 python3-pip nmap-ncat # for tests
-    #
-    # IMPORTANT: python3-yaml does NOT exist on CentOS
-    # Install it using `pip3 install PyYAML`
-    #
-    PyYAML # Package name here does not correspond to the yum package!
-    libcurl-devel # mg-requests
-    rpm-build rpmlint # for RPM package building
-    doxygen graphviz # source documentation generators
-    which nodejs golang zip unzip java-11-openjdk-devel # for driver tests
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    local missing=""
-    # 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" == "PyYAML" ]; then
-            if ! python3 -c "import yaml" >/dev/null 2>/dev/null; then
-                missing="$pkg $missing"
-            fi
-            continue
-        fi
-        if ! yum list installed "$pkg" >/dev/null 2>/dev/null; then
-            missing="$pkg $missing"
-        fi
-    done
-    if [ "$missing" != "" ]; then
-        echo "MISSING PACKAGES: $missing"
-        exit 1
-    fi
-    LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
-}
-
-install() {
-    cd "$DIR"
-    if [ "$EUID" -ne 0 ]; then
-        echo "Please run as root."
-        exit 1
-    fi
-    # If GitHub Actions runner is installed, append LANG to the environment.
-    # Python related tests don't work without the LANG export.
-    if [ -d "/home/gh/actions-runner" ]; then
-        echo "LANG=en_US.utf8" >> /home/gh/actions-runner/.env
-    else
-        echo "NOTE: export LANG=en_US.utf8"
-    fi
-    yum update -y
-    for pkg in $1; do
-        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
-            fi
-            continue
-        fi
-        if [ "$pkg" == libipt-devel ]; then
-            if ! yum list installed libipt-devel >/dev/null 2>/dev/null; then
-                yum install -y http://repo.okay.com.mx/centos/8/x86_64/release/libipt-devel-1.6.1-8.el8.x86_64.rpm
-            fi
-            continue
-        fi
-        if [ "$pkg" == nodejs ]; then
-            curl -sL https://rpm.nodesource.com/setup_16.x | bash -
-            if ! yum list installed nodejs >/dev/null 2>/dev/null; then
-                yum install -y nodejs
-            fi
-            continue
-        fi
-        if [ "$pkg" == PyYAML ]; then
-            if [ -z ${SUDO_USER+x} ]; then # Running as root (e.g. Docker).
-                pip3 install --user PyYAML
-            else # Running using sudo.
-                sudo -H -u "$SUDO_USER" bash -c "pip3 install --user PyYAML"
-            fi
-            continue
-        fi
-        if [ "$pkg" == nodejs ]; then
-            curl -sL https://rpm.nodesource.com/setup_16.x | bash -
-            if ! yum list installed nodejs >/dev/null 2>/dev/null; then
-                yum install -y nodejs
-            fi
-            continue
-        fi
-        if [ "$pkg" == java-11-openjdk ]; then
-            amazon-linux-extras install -y java-openjdk11
-            continue
-        fi
-        if [ "$pkg" == java-11-openjdk-devel ]; then
-            amazon-linux-extras install -y java-openjdk11
-            yum install -y java-11-openjdk-devel
-            continue
-        fi
-        yum install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/os/fedora-36.sh

@@ -26,7 +26,6 @@ TOOLCHAIN_BUILD_DEPS=(
     diffutils
     libipt libipt-devel # intel
     patch
-    perl # for openssl
 )
 
 TOOLCHAIN_RUN_DEPS=(
@@ -37,6 +36,7 @@ TOOLCHAIN_RUN_DEPS=(
     readline # for cmake and llvm
     libffi libxml2 # for llvm
     openssl-devel
+    perl # for openssl
 )
 
 MEMGRAPH_BUILD_DEPS=(
@@ -64,10 +64,6 @@ list() {
 
 check() {
     local missing=""
-    # 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 ! dnf list installed "$pkg" >/dev/null 2>/dev/null; then
             missing="$pkg $missing"
@@ -77,7 +73,6 @@ check() {
         echo "MISSING PACKAGES: $missing"
         exit 1
     fi
-    LD_LIBRARY_PATH=${OLD_LD_LIBRARY_PATH}
 }
 
 install() {

environment/os/ubuntu-22.04-arm.sh

@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$DIR/../util.sh"
-
-check_operating_system "ubuntu-22.04"
-check_architecture "arm64" "aarch64"
-
-TOOLCHAIN_BUILD_DEPS=(
-    coreutils gcc g++ build-essential make # generic build tools
-    wget # used for archive download
-    gnupg # used for archive signature verification
-    tar gzip bzip2 xz-utils unzip # used for archive unpacking
-    zlib1g-dev # zlib library used for all builds
-    libexpat1-dev libbabeltrace-dev liblzma-dev python3-dev texinfo # for gdb
-    libcurl4-openssl-dev # for cmake
-    libreadline-dev # for cmake and llvm
-    libffi-dev libxml2-dev # for llvm
-    curl # snappy
-    file
-    git # for thrift
-    libgmp-dev # for gdb
-    gperf # for proxygen
-    libssl-dev
-    libedit-dev libpcre3-dev automake bison # for swig
-)
-
-TOOLCHAIN_RUN_DEPS=(
-    make # generic build tools
-    tar gzip bzip2 xz-utils # used for archive unpacking
-    zlib1g # zlib library used for all builds
-    libexpat1 libbabeltrace1 liblzma5 python3 # for gdb
-    libcurl4 # for cmake
-    libreadline8 # for cmake and llvm
-    libffi7 libxml2 # for llvm
-    libssl-dev # for libevent
-)
-
-MEMGRAPH_BUILD_DEPS=(
-    git # source code control
-    make pkg-config # build system
-    curl wget # for downloading libs
-    uuid-dev default-jre-headless # required by antlr
-    libreadline-dev # for memgraph console
-    libpython3-dev python3-dev # for query modules
-    libssl-dev
-    libseccomp-dev
-    netcat # tests are using nc to wait for memgraph
-    python3 python3-virtualenv python3-pip # for qa, macro_benchmark and stress tests
-    python3-yaml # for the configuration generator
-    libcurl4-openssl-dev # mg-requests
-    sbcl # for custom Lisp C++ preprocessing
-    doxygen graphviz # source documentation generators
-    mono-runtime mono-mcs zip unzip default-jdk-headless # for driver tests
-    dotnet-sdk-6.0 golang nodejs npm
-    autoconf # for jemalloc code generation
-    libtool  # for protobuf code generation
-)
-
-list() {
-    echo "$1"
-}
-
-check() {
-    check_all_dpkg "$1"
-}
-
-install() {
-    cd "$DIR"
-    apt update
-    # If GitHub Actions runner is installed, append LANG to the environment.
-    # Python related tests doesn't work the LANG export.
-    if [ -d "/home/gh/actions-runner" ]; then
-        echo "LANG=en_US.utf8" >> /home/gh/actions-runner/.env
-    else
-        echo "NOTE: export LANG=en_US.utf8"
-    fi
-    apt install -y wget
-    for pkg in $1; do
-        if [ "$pkg" == dotnet-sdk-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
-                dpkg -i packages-microsoft-prod.deb
-                apt-get update
-                apt-get install -y apt-transport-https dotnet-sdk-6.0
-            fi
-            continue
-        fi
-        apt install -y "$pkg"
-    done
-}
-
-deps=$2"[*]"
-"$1" "${!deps}"

environment/toolchain/v4.sh

@@ -51,19 +51,11 @@ CPPCHECK_VERSION=2.6
 LLVM_VERSION=13.0.0
 SWIG_VERSION=4.0.2 # used only for LLVM compilation
 
-# Set the right env script
-ENV_SCRIPT="$DIR/../os/$DISTRO.sh"
-if [[ "$for_arm" = true ]]; then
-    ENV_SCRIPT="$DIR/../os/$DISTRO-arm.sh"
-fi
-
-# Check for the toolchain build dependencies.
-echo "ALL BUILD PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_BUILD_DEPS)"
-${ENV_SCRIPT} check TOOLCHAIN_BUILD_DEPS
-
-# Check for the toolchain run dependencies.
-echo "ALL RUN PACKAGES: $(${ENV_SCRIPT} list TOOLCHAIN_RUN_DEPS)"
-${ENV_SCRIPT} check TOOLCHAIN_RUN_DEPS
+# Check for the dependencies.
+echo "ALL BUILD PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_BUILD_DEPS)"
+$DIR/../os/$DISTRO.sh check TOOLCHAIN_BUILD_DEPS
+echo "ALL RUN PACKAGES: $($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)"
+$DIR/../os/$DISTRO.sh check TOOLCHAIN_RUN_DEPS
 
 # check installation directory
 NAME=toolchain-v$TOOLCHAIN_VERSION
@@ -387,62 +379,6 @@ if [ ! -f $PREFIX/bin/gdb ]; then
                 --without-babeltrace \
                 --enable-tui \
                 --with-python=python3
-    elif [[ "${DISTRO}" == fedora* ]]; then
-        # Remove readline, gdb does not compile
-        env \
-            CC=gcc \
-            CXX=g++ \
-            CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CPPFLAGS="-Wdate-time -D_FORTIFY_SOURCE=2 -fPIC" \
-            LDFLAGS="-Wl,-z,relro" \
-            PYTHON="" \
-            ../configure \
-                --build=x86_64-linux-gnu \
-                --host=x86_64-linux-gnu \
-                --prefix=$PREFIX \
-                --disable-maintainer-mode \
-                --disable-dependency-tracking \
-                --disable-silent-rules \
-                --disable-gdbtk \
-                --disable-shared \
-                --without-guile \
-                --with-system-gdbinit=$PREFIX/etc/gdb/gdbinit \
-                --with-expat \
-                --with-system-zlib \
-                --with-lzma \
-                --with-babeltrace \
-                --with-intel-pt \
-                --enable-tui \
-                --with-python=python3
-    elif [[ "${DISTRO}" == "amzn-2" ]]; then
-        # Remove readline, gdb does not compile
-        env \
-            CC=gcc \
-            CXX=g++ \
-            CFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CXXFLAGS="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security" \
-            CPPFLAGS="-Wdate-time -D_FORTIFY_SOURCE=2 -fPIC" \
-            LDFLAGS="-Wl,-z,relro" \
-            PYTHON="" \
-            ../configure \
-                --build=x86_64-linux-gnu \
-                --host=x86_64-linux-gnu \
-                --prefix=$PREFIX \
-                --disable-maintainer-mode \
-                --disable-dependency-tracking \
-                --disable-silent-rules \
-                --disable-gdbtk \
-                --disable-shared \
-                --without-guile \
-                --with-system-gdbinit=$PREFIX/etc/gdb/gdbinit \
-                --with-expat \
-                --with-system-zlib \
-                --with-lzma \
-                --with-babeltrace \
-                --with-intel-pt \
-                --enable-tui \
-                --with-python=python3
     else
         # https://buildd.debian.org/status/fetch.php?pkg=gdb&arch=amd64&ver=8.2.1-2&stamp=1550831554&raw=0
         env \
@@ -658,7 +594,7 @@ In order to be able to run all of these tools you should install the following
 packages:
 
 \`\`\`
-$($DIR/../os/$ENV_SCRIPT.sh list TOOLCHAIN_RUN_DEPS)
+$($DIR/../os/$DISTRO.sh list TOOLCHAIN_RUN_DEPS)
 \`\`\`
 
 ## Usage
@@ -715,7 +651,6 @@ export PS1="($NAME) \$PS1"
 export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib64
 export CXXFLAGS=-isystem\ $PREFIX/include\ \$CXXFLAGS
 export CFLAGS=-isystem\ $PREFIX/include\ \$CFLAGS
-export VENV=$PREFIX
 
 # disable root
 function su () {
@@ -767,7 +702,7 @@ PROXYGEN_SHA256=5360a8ccdfb2f5a6c7b3eed331ec7ab0e2c792d579c6fff499c85c516c11fe14
 SNAPPY_SHA256=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7
 SNAPPY_VERSION=1.1.9
 XZ_VERSION=5.2.5 # for LZMA
-ZLIB_VERSION=1.2.13
+ZLIB_VERSION=1.2.12
 ZSTD_VERSION=1.5.0
 WANGLE_SHA256=1002e9c32b6f4837f6a760016e3b3e22f3509880ef3eaad191c80dc92655f23f
 
@@ -1171,121 +1106,119 @@ if [ ! -f $PREFIX/include/libaio.h ]; then
     popd
 fi
 
-if [[ "${DISTRO}" != "amzn-2" ]]; then
-    log_tool_name "folly $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/folly ]; then
-        if [ -d folly-$FBLIBS_VERSION ]; then
-            rm -rf folly-$FBLIBS_VERSION
-        fi
-        mkdir folly-$FBLIBS_VERSION
-        tar -xzf ../archives/folly-$FBLIBS_VERSION.tar.gz -C folly-$FBLIBS_VERSION
-        pushd folly-$FBLIBS_VERSION
-        patch -p1 < ../../folly.patch
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -DBOOST_LINK_STATIC=ON \
-            -DBUILD_TESTS=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DCXX_STD="c++20"
-        make -j$CPUS install
-        popd && popd
+log_tool_name "folly $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/folly ]; then
+    if [ -d folly-$FBLIBS_VERSION ]; then
+        rm -rf folly-$FBLIBS_VERSION
     fi
+    mkdir folly-$FBLIBS_VERSION
+    tar -xzf ../archives/folly-$FBLIBS_VERSION.tar.gz -C folly-$FBLIBS_VERSION
+    pushd folly-$FBLIBS_VERSION
+    patch -p1 < ../../folly.patch
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -DBOOST_LINK_STATIC=ON \
+        -DBUILD_TESTS=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DCXX_STD="c++20"
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "fizz $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/fizz ]; then
-        if [ -d fizz-$FBLIBS_VERSION ]; then
-            rm -rf fizz-$FBLIBS_VERSION
-        fi
-        mkdir fizz-$FBLIBS_VERSION
-        tar -xzf ../archives/fizz-$FBLIBS_VERSION.tar.gz -C fizz-$FBLIBS_VERSION
-        pushd fizz-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake ../fizz $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "fizz $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/fizz ]; then
+    if [ -d fizz-$FBLIBS_VERSION ]; then
+        rm -rf fizz-$FBLIBS_VERSION
     fi
+    mkdir fizz-$FBLIBS_VERSION
+    tar -xzf ../archives/fizz-$FBLIBS_VERSION.tar.gz -C fizz-$FBLIBS_VERSION
+    pushd fizz-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake ../fizz $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_EXAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "wangle FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/wangle ]; then
-        if [ -d wangle-$FBLIBS_VERSION ]; then
-            rm -rf wangle-$FBLIBS_VERSION
-        fi
-        mkdir wangle-$FBLIBS_VERSION
-        tar -xzf ../archives/wangle-$FBLIBS_VERSION.tar.gz -C wangle-$FBLIBS_VERSION
-        pushd wangle-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake ../wangle $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_EXAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "wangle FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/wangle ]; then
+    if [ -d wangle-$FBLIBS_VERSION ]; then
+        rm -rf wangle-$FBLIBS_VERSION
     fi
+    mkdir wangle-$FBLIBS_VERSION
+    tar -xzf ../archives/wangle-$FBLIBS_VERSION.tar.gz -C wangle-$FBLIBS_VERSION
+    pushd wangle-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake ../wangle $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_EXAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "proxygen $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/proxygen ]; then
-        if [ -d proxygen-$FBLIBS_VERSION ]; then
-            rm -rf proxygen-$FBLIBS_VERSION
-        fi
-        mkdir proxygen-$FBLIBS_VERSION
-        tar -xzf ../archives/proxygen-$FBLIBS_VERSION.tar.gz -C proxygen-$FBLIBS_VERSION
-        pushd proxygen-$FBLIBS_VERSION
-        patch -p1 < ../../proxygen.patch
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -DBUILD_TESTS=OFF \
-            -DBUILD_SAMPLES=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DBUILD_QUIC=OFF
-        make -j$CPUS install
-        popd && popd
+log_tool_name "proxygen $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/proxygen ]; then
+    if [ -d proxygen-$FBLIBS_VERSION ]; then
+        rm -rf proxygen-$FBLIBS_VERSION
     fi
+    mkdir proxygen-$FBLIBS_VERSION
+    tar -xzf ../archives/proxygen-$FBLIBS_VERSION.tar.gz -C proxygen-$FBLIBS_VERSION
+    pushd proxygen-$FBLIBS_VERSION
+    patch -p1 < ../../proxygen.patch
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -DBUILD_TESTS=OFF \
+        -DBUILD_SAMPLES=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DBUILD_QUIC=OFF
+    make -j$CPUS install
+    popd && popd
+fi
 
-    log_tool_name "flex $FBLIBS_VERSION"
-    if [ ! -f $PREFIX/include/FlexLexer.h ]; then
-        if [ -d flex-$FLEX_VERSION ]; then
-            rm -rf flex-$FLEX_VERSION
-        fi
-        tar -xzf ../archives/flex-$FLEX_VERSION.tar.gz
-        pushd flex-$FLEX_VERSION
-        ./configure $COMMON_CONFIGURE_FLAGS
-        make -j$CPUS install
-        popd
+log_tool_name "flex $FBLIBS_VERSION"
+if [ ! -f $PREFIX/include/FlexLexer.h ]; then
+    if [ -d flex-$FLEX_VERSION ]; then
+        rm -rf flex-$FLEX_VERSION
     fi
+    tar -xzf ../archives/flex-$FLEX_VERSION.tar.gz
+    pushd flex-$FLEX_VERSION
+    ./configure $COMMON_CONFIGURE_FLAGS
+    make -j$CPUS install
+    popd
+fi
 
-    log_tool_name "fbthrift $FBLIBS_VERSION"
-    if [ ! -d $PREFIX/include/thrift ]; then
-        if [ -d fbthrift-$FBLIBS_VERSION ]; then
-            rm -rf fbthrift-$FBLIBS_VERSION
-        fi
-        git clone --depth 1 --branch v$FBLIBS_VERSION https://github.com/facebook/fbthrift.git fbthrift-$FBLIBS_VERSION
-        pushd fbthrift-$FBLIBS_VERSION
-        # build is used by facebook builder
-        mkdir _build
-        pushd _build
-        if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
-            CMAKE_CXX_FLAGS="-fsized-deallocation"
-        else
-            CMAKE_CXX_FLAGS="-fsized-deallocation -stdlib=libc++"
-        fi
-        cmake .. $COMMON_CMAKE_FLAGS \
-            -Denable_tests=OFF \
-            -DGFLAGS_NOTHREADS=OFF \
-            -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS"
-        make -j$CPUS install
-        popd
+log_tool_name "fbthrift $FBLIBS_VERSION"
+if [ ! -d $PREFIX/include/thrift ]; then
+    if [ -d fbthrift-$FBLIBS_VERSION ]; then
+        rm -rf fbthrift-$FBLIBS_VERSION
     fi
+    git clone --depth 1 --branch v$FBLIBS_VERSION https://github.com/facebook/fbthrift.git fbthrift-$FBLIBS_VERSION
+    pushd fbthrift-$FBLIBS_VERSION
+    # build is used by facebook builder
+    mkdir _build
+    pushd _build
+    if [ "$TOOLCHAIN_STDCXX" = "libstdc++" ]; then
+        CMAKE_CXX_FLAGS="-fsized-deallocation"
+    else
+        CMAKE_CXX_FLAGS="-fsized-deallocation -stdlib=libc++"
+    fi
+    cmake .. $COMMON_CMAKE_FLAGS \
+        -Denable_tests=OFF \
+        -DGFLAGS_NOTHREADS=OFF \
+        -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS"
+    make -j$CPUS install
+    popd
 fi
 
 popd
@@ -1293,7 +1226,7 @@ popd
 # create toolchain archive
 if [ ! -f $NAME-binaries-$DISTRO.tar.gz ]; then
     DISTRO_FULL_NAME=${DISTRO}
-    if [[ "${DISTRO}" == centos* ]] || [[ "${DISTRO}" == fedora* ]]; then
+    if [[ "${DISTRO}" == centos* ]]; then
         if [[ "$for_arm" = "true" ]]; then
             DISTRO_FULL_NAME="$DISTRO_FULL_NAME-aarch64"
         else

environment/util.sh

@@ -19,16 +19,13 @@ function architecture() {
 }
 
 check_architecture() {
-    local ARCH=$(architecture)
     for arch in "$@"; do
-        if [ "${ARCH}" = "$arch" ]; then
+        if [ "$(architecture)" = "$arch" ]; then
             echo "The right architecture!"
             return 0
         fi
     done
     echo "Not the right architecture!"
-    echo "Expected: $@"
-    echo "Actual: ${ARCH}"
     exit 1
 }
 

include/_mgp.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
@@ -378,10 +378,6 @@ inline mgp_value *vertex_get_property(mgp_vertex *v, const char *property_name,
   return MgInvoke<mgp_value *>(mgp_vertex_get_property, v, property_name, memory);
 }
 
-inline void vertex_set_property(mgp_vertex *v, const char *property_name, mgp_value *property_value) {
-  MgInvokeVoid(mgp_vertex_set_property, v, property_name, property_value);
-}
-
 inline mgp_properties_iterator *vertex_iter_properties(mgp_vertex *v, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_vertex_iter_properties, v, memory);
 }
@@ -414,10 +410,6 @@ inline mgp_value *edge_get_property(mgp_edge *e, const char *property_name, mgp_
   return MgInvoke<mgp_value *>(mgp_edge_get_property, e, property_name, memory);
 }
 
-inline void edge_set_property(mgp_edge *e, const char *property_name, mgp_value *property_value) {
-  MgInvokeVoid(mgp_edge_set_property, e, property_name, property_value);
-}
-
 inline mgp_properties_iterator *edge_iter_properties(mgp_edge *e, mgp_memory *memory) {
   return MgInvoke<mgp_properties_iterator *>(mgp_edge_iter_properties, e, memory);
 }

include/_mgp_mock.py

@@ -1,343 +0,0 @@
-import typing
-from enum import Enum
-
-import networkx as nx
-
-NX_LABEL_ATTR = "labels"
-NX_TYPE_ATTR = "type"
-
-SOURCE_TYPE_KAFKA = "SOURCE_TYPE_KAFKA"
-SOURCE_TYPE_PULSAR = "SOURCE_TYPE_PULSAR"
-
-"""
-This module provides helpers for the mock Python API, much like _mgp.py does for mgp.py.
-"""
-
-
-class InvalidArgumentError(Exception):
-    """
-    Signals that some of the arguments have invalid values.
-    """
-
-    pass
-
-
-class ImmutableObjectError(Exception):
-    pass
-
-
-class LogicErrorError(Exception):
-    pass
-
-
-class DeletedObjectError(Exception):
-    pass
-
-
-class EdgeConstants(Enum):
-    I_START = 0
-    I_END = 1
-    I_KEY = 2
-
-
-class Graph:
-    """Wrapper around a NetworkX MultiDiGraph instance."""
-
-    __slots__ = ("nx", "_highest_vertex_id", "_highest_edge_id", "_valid")
-
-    def __init__(self, graph: nx.MultiDiGraph) -> None:
-        if not isinstance(graph, nx.MultiDiGraph):
-            raise TypeError(f"Expected 'networkx.classes.multidigraph.MultiDiGraph', got '{type(graph)}'")
-
-        self.nx = graph
-        self._highest_vertex_id = None
-        self._highest_edge_id = None
-        self._valid = True
-
-    @property
-    def vertex_ids(self):
-        return self.nx.nodes
-
-    def vertex_is_isolate(self, vertex_id: int) -> bool:
-        return nx.is_isolate(self.nx, vertex_id)
-
-    @property
-    def vertices(self):
-        return (Vertex(node_id, self) for node_id in self.nx.nodes)
-
-    def has_node(self, node_id):
-        return self.nx.has_node(node_id)
-
-    @property
-    def edges(self):
-        return self.nx.edges
-
-    def is_valid(self) -> bool:
-        return self._valid
-
-    def get_vertex_by_id(self, vertex_id: int) -> "Vertex":
-        return Vertex(vertex_id, self)
-
-    def invalidate(self):
-        self._valid = False
-
-    def is_immutable(self) -> bool:
-        return nx.is_frozen(self.nx)
-
-    def make_immutable(self):
-        self.nx = nx.freeze(self.nx)
-
-    def _new_vertex_id(self):
-        if self._highest_vertex_id is None:
-            self._highest_vertex_id = max(vertex_id for vertex_id in self.nx.nodes)
-
-        return self._highest_vertex_id + 1
-
-    def _new_edge_id(self):
-        if self._highest_edge_id is None:
-            self._highest_edge_id = max(edge[EdgeConstants.I_KEY.value] for edge in self.nx.edges(keys=True))
-
-        return self._highest_edge_id + 1
-
-    def create_vertex(self) -> "Vertex":
-        vertex_id = self._new_vertex_id()
-
-        self.nx.add_node(vertex_id)
-        self._highest_vertex_id = vertex_id
-
-        return Vertex(vertex_id, self)
-
-    def create_edge(self, from_vertex: "Vertex", to_vertex: "Vertex", edge_type: str) -> "Edge":
-        if from_vertex.is_deleted() or to_vertex.is_deleted():
-            raise DeletedObjectError("Accessing deleted object.")
-
-        edge_id = self._new_edge_id()
-
-        from_id = from_vertex.id
-        to_id = to_vertex.id
-
-        self.nx.add_edge(from_id, to_id, key=edge_id, type=edge_type)
-        self._highest_edge_id = edge_id
-
-        return Edge((from_id, to_id, edge_id), self)
-
-    def delete_vertex(self, vertex_id: int):
-        self.nx.remove_node(vertex_id)
-
-    def delete_edge(self, from_vertex_id: int, to_vertex_id: int, edge_id: int):
-        self.nx.remove_edge(from_vertex_id, to_vertex_id, edge_id)
-
-    @property
-    def highest_vertex_id(self) -> int:
-        if self._highest_vertex_id is None:
-            self._highest_vertex_id = max(vertex_id for vertex_id in self.nx.nodes) + 1
-
-        return self._highest_vertex_id
-
-    @property
-    def highest_edge_id(self) -> int:
-        if self._highest_edge_id is None:
-            self._highest_edge_id = max(edge[EdgeConstants.I_KEY.value] for edge in self.nx.edges(keys=True))
-
-        return self._highest_edge_id + 1
-
-
-class Vertex:
-    """Represents a graph vertex."""
-
-    __slots__ = ("_id", "_graph")
-
-    def __init__(self, id: int, graph: Graph) -> None:
-        if not isinstance(id, int):
-            raise TypeError(f"Expected 'int', got '{type(id)}'")
-
-        if not isinstance(graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(graph)}'")
-
-        if not graph.nx.has_node(id):
-            raise IndexError(f"Unable to find vertex with ID {id}.")
-
-        self._id = id
-        self._graph = graph
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def is_deleted(self) -> bool:
-        return not self._graph.nx.has_node(self._id) and self._id <= self._graph.highest_vertex_id
-
-    @property
-    def underlying_graph(self) -> Graph:
-        return self._graph
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    @property
-    def labels(self) -> typing.List[int]:
-        return self._graph.nx.nodes[self._id][NX_LABEL_ATTR].split(":")
-
-    def add_label(self, label: str) -> None:
-        if nx.is_frozen(self._graph.nx):
-            raise ImmutableObjectError("Cannot modify immutable object.")
-
-        self._graph.nx.nodes[self._id][NX_LABEL_ATTR] += f":{label}"
-
-    def remove_label(self, label: str) -> None:
-        if nx.is_frozen(self._graph.nx):
-            raise ImmutableObjectError("Cannot modify immutable object.")
-
-        labels = self._graph.nx.nodes[self._id][NX_LABEL_ATTR]
-        if labels.startswith(f"{label}:"):
-            labels = "\n" + labels  # pseudo-string starter
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f"\n{label}:", "")
-        elif labels.endswith(f":{label}"):
-            labels += "\n"  # pseudo-string terminator
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f":{label}\n", "")
-        else:
-            self._graph.nx.nodes[self._id][NX_LABEL_ATTR] = labels.replace(f":{label}:", ":")
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def properties(self):
-        return (
-            (key, value)
-            for key, value in self._graph.nx.nodes[self._id].items()
-            if key not in (NX_LABEL_ATTR, NX_TYPE_ATTR)
-        )
-
-    def get_property(self, property_name: str):
-        return self._graph.nx.nodes[self._id][property_name]
-
-    def set_property(self, property_name: str, value: object):
-        self._graph.nx.nodes[self._id][property_name] = value
-
-    @property
-    def in_edges(self) -> typing.Iterable["Edge"]:
-        return [Edge(edge, self._graph) for edge in self._graph.nx.in_edges(self._id, keys=True)]
-
-    @property
-    def out_edges(self) -> typing.Iterable["Edge"]:
-        return [Edge(edge, self._graph) for edge in self._graph.nx.out_edges(self._id, keys=True)]
-
-
-class Edge:
-    """Represents a graph edge."""
-
-    __slots__ = ("_edge", "_graph")
-
-    def __init__(self, edge: typing.Tuple[int, int, int], graph: Graph) -> None:
-        if not isinstance(edge, typing.Tuple):
-            raise TypeError(f"Expected 'Tuple', got '{type(edge)}'")
-
-        if not isinstance(graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(graph)}'")
-
-        if not graph.nx.has_edge(*edge):
-            raise IndexError(f"Unable to find edge with ID {edge[EdgeConstants.I_KEY.value]}.")
-
-        self._edge = edge
-        self._graph = graph
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def is_deleted(self) -> bool:
-        return (
-            not self._graph.nx.has_edge(*self._edge)
-            and self._edge[EdgeConstants.I_KEY.value] <= self._graph.highest_edge_id
-        )
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    @property
-    def id(self) -> int:
-        return self._edge[EdgeConstants.I_KEY.value]
-
-    @property
-    def edge(self) -> typing.Tuple[int, int, int]:
-        return self._edge
-
-    @property
-    def start_id(self) -> int:
-        return self._edge[EdgeConstants.I_START.value]
-
-    @property
-    def end_id(self) -> int:
-        return self._edge[EdgeConstants.I_END.value]
-
-    def get_type_name(self):
-        return self._graph.nx.get_edge_data(*self._edge)[NX_TYPE_ATTR]
-
-    def from_vertex(self) -> Vertex:
-        return Vertex(self.start_id, self._graph)
-
-    def to_vertex(self) -> Vertex:
-        return Vertex(self.end_id, self._graph)
-
-    @property
-    def properties(self):
-        return (
-            (key, value)
-            for key, value in self._graph.nx.edges[self._edge].items()
-            if key not in (NX_LABEL_ATTR, NX_TYPE_ATTR)
-        )
-
-    def get_property(self, property_name: str):
-        return self._graph.nx.edges[self._edge][property_name]
-
-    def set_property(self, property_name: str, value: object):
-        self._graph.nx.edges[self._edge][property_name] = value
-
-
-class Path:
-    """Represents a path comprised of `Vertex` and `Edge` instances."""
-
-    __slots__ = ("_vertices", "_edges", "_graph")
-    __create_key = object()
-
-    def __init__(self, create_key, vertex_id: int, graph: Graph) -> None:
-        assert create_key == Path.__create_key, "Path objects must be created using Path.make_with_start"
-
-        self._vertices = [vertex_id]
-        self._edges = []
-        self._graph = graph
-
-    @classmethod
-    def make_with_start(cls, vertex: Vertex) -> "Path":
-        if not isinstance(vertex, Vertex):
-            raise TypeError(f"Expected 'Vertex', got '{type(vertex)}'")
-
-        if not isinstance(vertex.underlying_graph, Graph):
-            raise TypeError(f"Expected '_mgp_mock.Graph', got '{type(vertex.underlying_graph)}'")
-
-        if not vertex.underlying_graph.nx.has_node(vertex._id):
-            raise IndexError(f"Unable to find vertex with ID {vertex._id}.")
-
-        return Path(cls.__create_key, vertex._id, vertex.underlying_graph)
-
-    def is_valid(self) -> bool:
-        return self._graph.is_valid()
-
-    def underlying_graph_is_mutable(self) -> bool:
-        return not nx.is_frozen(self._graph.nx)
-
-    def expand(self, edge: Edge):
-        if edge.start_id != self._vertices[-1]:
-            raise LogicErrorError("Logic error.")
-
-        self._vertices.append(edge.end_id)
-        self._edges.append((edge.start_id, edge.end_id, edge.id))
-
-    def vertex_at(self, index: int) -> Vertex:
-        return Vertex(self._vertices[index], self._graph)
-
-    def edge_at(self, index: int) -> Edge:
-        return Edge(self._edges[index], self._graph)
-
-    def size(self) -> int:
-        return len(self._edges)

include/mgp.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
@@ -55,15 +55,6 @@ class NotEnoughMemoryException : public std::exception {
   const char *what() const throw() { return "Not enough memory!"; }
 };
 
-class MustAbortException : public std::exception {
- public:
-  explicit MustAbortException(const std::string &message) : message_(message) {}
-  const char *what() const noexcept override { return message_.c_str(); }
-
- private:
-  std::string message_;
-};
-
 // Forward declarations
 class Nodes;
 using GraphNodes = Nodes;
@@ -75,12 +66,9 @@ struct MapItem;
 class Duration;
 class Value;
 
-struct StealType {};
-inline constexpr StealType steal{};
-
 inline mgp_memory *memory{nullptr};
 
-/* #region Graph (Id, Graph, Nodes, GraphRelationships, Relationships & Labels) */
+/* #region Graph (Id, Graph, Nodes, GraphRelationships, Relationships, Properties & Labels) */
 
 /// Wrapper for int64_t IDs to prevent dangerous implicit conversions.
 class Id {
@@ -150,10 +138,6 @@ class Graph {
   /// @brief Deletes a relationship from the graph.
   void DeleteRelationship(const Relationship &relationship);
 
-  bool MustAbort() const;
-
-  void CheckMustAbort() const;
-
  private:
   mgp_graph *graph_;
 };
@@ -175,7 +159,7 @@ class Nodes {
 
     explicit Iterator(mgp_vertices_iterator *nodes_iterator);
 
-    Iterator(const Iterator &other) noexcept;
+    Iterator(const Iterator &other);
     Iterator &operator=(const Iterator &other) = delete;
 
     ~Iterator();
@@ -223,7 +207,7 @@ class GraphRelationships {
 
     explicit Iterator(mgp_vertices_iterator *nodes_iterator);
 
-    Iterator(const Iterator &other) noexcept;
+    Iterator(const Iterator &other);
     Iterator &operator=(const Iterator &other) = delete;
 
     ~Iterator();
@@ -269,7 +253,7 @@ class Relationships {
 
     explicit Iterator(mgp_edges_iterator *relationships_iterator);
 
-    Iterator(const Iterator &other) noexcept;
+    Iterator(const Iterator &other);
     Iterator &operator=(const Iterator &other) = delete;
 
     ~Iterator();
@@ -297,12 +281,46 @@ class Relationships {
   mgp_edges_iterator *relationships_iterator_ = nullptr;
 };
 
+/// @brief View of node properties.
+class Properties {
+ public:
+  explicit Properties(mgp_properties_iterator *properties_iterator);
+
+  /// @brief Returns the size of the properties map.
+  size_t Size() const;
+  /// @brief Returns whether the properties map is empty.
+  bool Empty() const;
+
+  /// @brief Returns the value associated with the given `key`. If there’s no such value, the behavior is undefined.
+  /// @note Each key-value pair needs to be checked, ensuing O(n) time complexity.
+  Value operator[](const std::string_view key) const;
+
+  std::map<std::string_view, Value>::const_iterator begin() const;
+  std::map<std::string_view, Value>::const_iterator end() const;
+
+  std::map<std::string_view, Value>::const_iterator cbegin() const;
+  std::map<std::string_view, Value>::const_iterator cend() const;
+
+  /// @brief Returns the key-value iterator for the given `key`. If there’s no such pair, returns the end of the
+  /// iterator.
+  /// @note Each key-value pair needs to be checked, ensuing O(n) time complexity.
+  std::map<std::string_view, Value>::const_iterator find(const std::string_view key) const;
+
+  /// @exception std::runtime_error Map contains value(s) of unknown type.
+  bool operator==(const Properties &other) const;
+  /// @exception std::runtime_error Map contains value(s) of unknown type.
+  bool operator!=(const Properties &other) const;
+
+ private:
+  std::map<const std::string_view, Value> property_map_;
+};
+
 /// @brief View of node labels.
 class Labels {
  public:
   explicit Labels(mgp_vertex *node_ptr);
 
-  Labels(const Labels &other) noexcept;
+  Labels(const Labels &other);
   Labels(Labels &&other) noexcept;
 
   Labels &operator=(const Labels &other) noexcept;
@@ -345,7 +363,6 @@ class Labels {
  private:
   mgp_vertex *node_ptr_;
 };
-
 /* #endregion */
 
 /* #region Types */
@@ -380,7 +397,7 @@ class List {
   /// @brief Creates a List from the given initializer_list.
   explicit List(const std::initializer_list<Value> list);
 
-  List(const List &other) noexcept;
+  List(const List &other);
   List(List &&other) noexcept;
 
   List &operator=(const List &other) noexcept;
@@ -472,7 +489,7 @@ class Map {
   /// @brief Creates a Map from the given initializer_list (map items correspond to initializer list pairs).
   Map(const std::initializer_list<std::pair<std::string_view, Value>> items);
 
-  Map(const Map &other) noexcept;
+  Map(const Map &other);
   Map(Map &&other) noexcept;
 
   Map &operator=(const Map &other) noexcept;
@@ -502,7 +519,7 @@ class Map {
 
     explicit Iterator(mgp_map_items_iterator *map_items_iterator);
 
-    Iterator(const Iterator &other) noexcept;
+    Iterator(const Iterator &other);
     Iterator &operator=(const Iterator &other) = delete;
 
     ~Iterator();
@@ -561,7 +578,7 @@ class Node {
   /// @brief Creates a Node from the copy of the given @ref mgp_vertex.
   explicit Node(const mgp_vertex *const_ptr);
 
-  Node(const Node &other) noexcept;
+  Node(const Node &other);
   Node(Node &&other) noexcept;
 
   Node &operator=(const Node &other) noexcept;
@@ -573,19 +590,16 @@ class Node {
   mgp::Id Id() const;
 
   /// @brief Returns an iterable & indexable structure of the node’s labels.
-  mgp::Labels Labels() const;
+  class Labels Labels() const;
 
   /// @brief Returns whether the node has the given `label`.
   bool HasLabel(std::string_view label) const;
 
-  /// @brief Returns an std::map of the node’s properties.
-  std::map<std::string, Value> Properties() const;
+  /// @brief Returns an iterable & indexable structure of the node’s properties.
+  class Properties Properties() const;
 
-  /// @brief Sets the chosen property to the given value.
-  void SetProperty(std::string property, Value value);
-
-  /// @brief Retrieves the value of the chosen property.
-  Value GetProperty(const std::string &property) const;
+  /// @brief Returns the value of the node’s `property_name` property.
+  Value operator[](const std::string_view property_name) const;
 
   /// @brief Returns an iterable structure of the node’s inbound relationships.
   Relationships InRelationships() const;
@@ -621,7 +635,7 @@ class Relationship {
   /// @brief Creates a Relationship from the copy of the given @ref mgp_edge.
   explicit Relationship(const mgp_edge *const_ptr);
 
-  Relationship(const Relationship &other) noexcept;
+  Relationship(const Relationship &other);
   Relationship(Relationship &&other) noexcept;
 
   Relationship &operator=(const Relationship &other) noexcept;
@@ -635,14 +649,11 @@ class Relationship {
   /// @brief Returns the relationship’s type.
   std::string_view Type() const;
 
-  /// @brief Returns an std::map of the relationship’s properties.
-  std::map<std::string, Value> Properties() const;
+  /// @brief Returns an iterable & indexable structure of the relationship’s properties.
+  class Properties Properties() const;
 
-  /// @brief Sets the chosen property to the given value.
-  void SetProperty(std::string property, Value value);
-
-  /// @brief Retrieves the value of the chosen property.
-  Value GetProperty(const std::string &property) const;
+  /// @brief Returns the value of the relationship’s `property_name` property.
+  Value operator[](const std::string_view property_name) const;
 
   /// @brief Returns the relationship’s source node.
   Node From() const;
@@ -677,7 +688,7 @@ class Path {
   /// @brief Creates a Path starting with the given `start_node`.
   explicit Path(const Node &start_node);
 
-  Path(const Path &other) noexcept;
+  Path(const Path &other);
   Path(Path &&other) noexcept;
 
   Path &operator=(const Path &other) noexcept;
@@ -733,7 +744,7 @@ class Date {
   /// @brief Creates a Date object with the given `year`, `month`, and `day` properties.
   Date(int year, int month, int day);
 
-  Date(const Date &other) noexcept;
+  Date(const Date &other);
   Date(Date &&other) noexcept;
 
   Date &operator=(const Date &other) noexcept;
@@ -788,7 +799,7 @@ class LocalTime {
   /// properties.
   LocalTime(int hour, int minute, int second, int millisecond, int microsecond);
 
-  LocalTime(const LocalTime &other) noexcept;
+  LocalTime(const LocalTime &other);
   LocalTime(LocalTime &&other) noexcept;
 
   LocalTime &operator=(const LocalTime &other) noexcept;
@@ -847,7 +858,7 @@ class LocalDateTime {
   /// `millisecond`, and `microsecond` properties.
   LocalDateTime(int year, int month, int day, int hour, int minute, int second, int millisecond, int microsecond);
 
-  LocalDateTime(const LocalDateTime &other) noexcept;
+  LocalDateTime(const LocalDateTime &other);
   LocalDateTime(LocalDateTime &&other) noexcept;
 
   LocalDateTime &operator=(const LocalDateTime &other) noexcept;
@@ -918,7 +929,7 @@ class Duration {
   /// `microsecond` properties.
   Duration(double day, double hour, double minute, double second, double millisecond, double microsecond);
 
-  Duration(const Duration &other) noexcept;
+  Duration(const Duration &other);
   Duration(Duration &&other) noexcept;
 
   Duration &operator=(const Duration &other) noexcept;
@@ -975,8 +986,6 @@ class Value {
 
   explicit Value(mgp_value *ptr);
 
-  explicit Value(StealType /*steal*/, mgp_value *ptr);
-
   // Null constructor:
   explicit Value();
 
@@ -1047,7 +1056,7 @@ class Value {
   /// @note The behavior of accessing `duration` after performing this operation is undefined.
   explicit Value(Duration &&duration);
 
-  Value(const Value &other) noexcept;
+  Value(const Value &other);
   Value(Value &&other) noexcept;
 
   Value &operator=(const Value &other) noexcept;
@@ -1585,14 +1594,6 @@ inline Id::Id(int64_t id) : id_(id) {}
 
 inline Graph::Graph(mgp_graph *graph) : graph_(graph) {}
 
-inline bool Graph::MustAbort() const { return must_abort(graph_); }
-
-inline void Graph::CheckMustAbort() const {
-  if (MustAbort()) {
-    throw MustAbortException("Query was asked to abort.");
-  }
-}
-
 inline int64_t Graph::Order() const {
   int64_t i = 0;
   for (const auto _ : Nodes()) {
@@ -1703,7 +1704,7 @@ inline Nodes::Iterator::Iterator(mgp_vertices_iterator *nodes_iterator) : nodes_
   }
 }
 
-inline Nodes::Iterator::Iterator(const Iterator &other) noexcept : Iterator(other.nodes_iterator_) {}
+inline Nodes::Iterator::Iterator(const Iterator &other) : Iterator(other.nodes_iterator_) {}
 
 inline Nodes::Iterator::~Iterator() {
   if (nodes_iterator_ != nullptr) {
@@ -1794,7 +1795,7 @@ inline GraphRelationships::Iterator::Iterator(mgp_vertices_iterator *nodes_itera
   }
 }
 
-inline GraphRelationships::Iterator::Iterator(const Iterator &other) noexcept : Iterator(other.nodes_iterator_) {}
+inline GraphRelationships::Iterator::Iterator(const Iterator &other) : Iterator(other.nodes_iterator_) {}
 
 inline GraphRelationships::Iterator::~Iterator() {
   if (nodes_iterator_ != nullptr) {
@@ -1813,12 +1814,10 @@ inline GraphRelationships::Iterator &GraphRelationships::Iterator::operator++()
   if (out_relationships_iterator_ != nullptr) {
     auto next = mgp::edges_iterator_next(out_relationships_iterator_);
 
-    if (next != nullptr) {
-      return *this;
+    if (next == nullptr) {
+      mgp::edges_iterator_destroy(out_relationships_iterator_);
+      out_relationships_iterator_ = nullptr;
     }
-
-    mgp::edges_iterator_destroy(out_relationships_iterator_);
-    out_relationships_iterator_ = nullptr;
   }
 
   // 2. Move onto the next nodes
@@ -1905,7 +1904,7 @@ inline Relationships::Iterator::Iterator(mgp_edges_iterator *relationships_itera
   }
 }
 
-inline Relationships::Iterator::Iterator(const Iterator &other) noexcept : Iterator(other.relationships_iterator_) {}
+inline Relationships::Iterator::Iterator(const Iterator &other) : Iterator(other.relationships_iterator_) {}
 
 inline Relationships::Iterator::~Iterator() {
   if (relationships_iterator_ != nullptr) {
@@ -1964,11 +1963,40 @@ inline Relationships::Iterator Relationships::cbegin() const { return Iterator(r
 
 inline Relationships::Iterator Relationships::cend() const { return Iterator(nullptr); }
 
+// Properties:
+
+inline Properties::Properties(mgp_properties_iterator *properties_iterator) {
+  for (auto property = mgp::properties_iterator_get(properties_iterator); property;
+       property = mgp::properties_iterator_next(properties_iterator)) {
+    auto value = Value(property->value);
+    property_map_.emplace(property->name, value);
+  }
+  mgp::properties_iterator_destroy(properties_iterator);
+}
+
+inline size_t Properties::Size() const { return property_map_.size(); }
+
+inline bool Properties::Empty() const { return Size() == 0; }
+
+inline Value Properties::operator[](const std::string_view key) const { return property_map_.at(key); }
+
+inline std::map<std::string_view, Value>::const_iterator Properties::begin() const { return property_map_.begin(); }
+
+inline std::map<std::string_view, Value>::const_iterator Properties::end() const { return property_map_.end(); }
+
+inline std::map<std::string_view, Value>::const_iterator Properties::cbegin() const { return property_map_.cbegin(); }
+
+inline std::map<std::string_view, Value>::const_iterator Properties::cend() const { return property_map_.cend(); }
+
+inline bool Properties::operator==(const Properties &other) const { return property_map_ == other.property_map_; }
+
+inline bool Properties::operator!=(const Properties &other) const { return !(*this == other); }
+
 // Labels:
 
 inline Labels::Labels(mgp_vertex *node_ptr) : node_ptr_(mgp::vertex_copy(node_ptr, memory)) {}
 
-inline Labels::Labels(const Labels &other) noexcept : Labels(other.node_ptr_) {}
+inline Labels::Labels(const Labels &other) : Labels(other.node_ptr_) {}
 
 inline Labels::Labels(Labels &&other) noexcept : node_ptr_(other.node_ptr_) { other.node_ptr_ = nullptr; }
 
@@ -2058,7 +2086,7 @@ inline List::List(const std::initializer_list<Value> values) : ptr_(mgp::list_ma
   }
 }
 
-inline List::List(const List &other) noexcept : List(other.ptr_) {}
+inline List::List(const List &other) : List(other.ptr_) {}
 
 inline List::List(List &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2166,7 +2194,7 @@ inline Map::Map(const std::initializer_list<std::pair<std::string_view, Value>>
   }
 }
 
-inline Map::Map(const Map &other) noexcept : Map(other.ptr_) {}
+inline Map::Map(const Map &other) : Map(other.ptr_) {}
 
 inline Map::Map(Map &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2211,7 +2239,7 @@ inline Map::Iterator::Iterator(mgp_map_items_iterator *map_items_iterator) : map
   }
 }
 
-inline Map::Iterator::Iterator(const Iterator &other) noexcept : Iterator(other.map_items_iterator_) {}
+inline Map::Iterator::Iterator(const Iterator &other) : Iterator(other.map_items_iterator_) {}
 
 inline Map::Iterator::~Iterator() {
   if (map_items_iterator_ != nullptr) {
@@ -2278,6 +2306,10 @@ inline void Map::Insert(std::string_view key, Value &&value) {
   value.ptr_ = nullptr;
 }
 
+inline std::map<std::string_view, Value>::const_iterator Properties::find(const std::string_view key) const {
+  return property_map_.find(key);
+}
+
 inline bool Map::operator==(const Map &other) const { return util::MapsEqual(ptr_, other.ptr_); }
 
 inline bool Map::operator!=(const Map &other) const { return !(*this == other); }
@@ -2292,7 +2324,7 @@ inline Node::Node(mgp_vertex *ptr) : ptr_(mgp::vertex_copy(ptr, memory)) {}
 
 inline Node::Node(const mgp_vertex *const_ptr) : ptr_(mgp::vertex_copy(const_cast<mgp_vertex *>(const_ptr), memory)) {}
 
-inline Node::Node(const Node &other) noexcept : Node(other.ptr_) {}
+inline Node::Node(const Node &other) : Node(other.ptr_) {}
 
 inline Node::Node(Node &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2323,7 +2355,7 @@ inline Node::~Node() {
 
 inline mgp::Id Node::Id() const { return Id::FromInt(mgp::vertex_get_id(ptr_).as_int); }
 
-inline mgp::Labels Node::Labels() const { return mgp::Labels(ptr_); }
+inline class Labels Node::Labels() const { return mgp::Labels(ptr_); }
 
 inline bool Node::HasLabel(std::string_view label) const {
   for (const auto node_label : Labels()) {
@@ -2334,6 +2366,10 @@ inline bool Node::HasLabel(std::string_view label) const {
   return false;
 }
 
+inline class Properties Node::Properties() const { return mgp::Properties(mgp::vertex_iter_properties(ptr_, memory)); }
+
+inline Value Node::operator[](const std::string_view property_name) const { return Properties()[property_name]; }
+
 inline Relationships Node::InRelationships() const {
   auto relationship_iterator = mgp::vertex_iter_in_edges(ptr_, memory);
   if (relationship_iterator == nullptr) {
@@ -2354,26 +2390,6 @@ inline void Node::AddLabel(const std::string_view label) {
   mgp::vertex_add_label(this->ptr_, mgp_label{.name = label.data()});
 }
 
-inline std::map<std::string, Value> Node::Properties() const {
-  mgp_properties_iterator *properties_iterator = mgp::vertex_iter_properties(ptr_, memory);
-  std::map<std::string, Value> property_map;
-  for (auto *property = mgp::properties_iterator_get(properties_iterator); property;
-       property = mgp::properties_iterator_next(properties_iterator)) {
-    property_map.emplace(std::string(property->name), Value(property->value));
-  }
-  mgp::properties_iterator_destroy(properties_iterator);
-  return property_map;
-}
-
-inline void Node::SetProperty(std::string property, Value value) {
-  mgp::vertex_set_property(ptr_, property.data(), value.ptr());
-}
-
-inline Value Node::GetProperty(const std::string &property) const {
-  mgp_value *vertex_prop = mgp::vertex_get_property(ptr_, property.data(), memory);
-  return Value(steal, vertex_prop);
-}
-
 inline bool Node::operator<(const Node &other) const { return Id() < other.Id(); }
 
 inline bool Node::operator==(const Node &other) const { return util::NodesEqual(ptr_, other.ptr_); }
@@ -2387,7 +2403,7 @@ inline Relationship::Relationship(mgp_edge *ptr) : ptr_(mgp::edge_copy(ptr, memo
 inline Relationship::Relationship(const mgp_edge *const_ptr)
     : ptr_(mgp::edge_copy(const_cast<mgp_edge *>(const_ptr), memory)) {}
 
-inline Relationship::Relationship(const Relationship &other) noexcept : Relationship(other.ptr_) {}
+inline Relationship::Relationship(const Relationship &other) : Relationship(other.ptr_) {}
 
 inline Relationship::Relationship(Relationship &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2420,24 +2436,12 @@ inline mgp::Id Relationship::Id() const { return Id::FromInt(mgp::edge_get_id(pt
 
 inline std::string_view Relationship::Type() const { return mgp::edge_get_type(ptr_).name; }
 
-inline std::map<std::string, Value> Relationship::Properties() const {
-  mgp_properties_iterator *properties_iterator = mgp::edge_iter_properties(ptr_, memory);
-  std::map<std::string, Value> property_map;
-  for (mgp_property *property = mgp::properties_iterator_get(properties_iterator); property;
-       property = mgp::properties_iterator_next(properties_iterator)) {
-    property_map.emplace(property->name, Value(property->value));
-  }
-  mgp::properties_iterator_destroy(properties_iterator);
-  return property_map;
+inline class Properties Relationship::Properties() const {
+  return mgp::Properties(mgp::edge_iter_properties(ptr_, memory));
 }
 
-inline void Relationship::SetProperty(std::string property, Value value) {
-  mgp::edge_set_property(ptr_, property.data(), value.ptr());
-}
-
-inline Value Relationship::GetProperty(const std::string &property) const {
-  mgp_value *edge_prop = mgp::edge_get_property(ptr_, property.data(), memory);
-  return Value(steal, edge_prop);
+inline Value Relationship::operator[](const std::string_view property_name) const {
+  return Properties()[property_name];
 }
 
 inline Node Relationship::From() const { return Node(mgp::edge_get_from(ptr_)); }
@@ -2460,7 +2464,7 @@ inline Path::Path(const mgp_path *const_ptr) : ptr_(mgp::path_copy(const_cast<mg
 
 inline Path::Path(const Node &start_node) : ptr_(mgp::path_make_with_start(start_node.ptr_, memory)) {}
 
-inline Path::Path(const Path &other) noexcept : Path(other.ptr_) {}
+inline Path::Path(const Path &other) : Path(other.ptr_) {}
 
 inline Path::Path(Path &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2529,7 +2533,7 @@ inline Date::Date(int year, int month, int day) {
   ptr_ = mgp::date_from_parameters(&params, memory);
 }
 
-inline Date::Date(const Date &other) noexcept : Date(other.ptr_) {}
+inline Date::Date(const Date &other) : Date(other.ptr_) {}
 
 inline Date::Date(Date &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 
@@ -2623,7 +2627,7 @@ inline LocalTime::LocalTime(int hour, int minute, int second, int millisecond, i
   ptr_ = mgp::local_time_from_parameters(&params, memory);
 }
 
-inline LocalTime::LocalTime(const LocalTime &other) noexcept : LocalTime(other.ptr_) {}
+inline LocalTime::LocalTime(const LocalTime &other) : LocalTime(other.ptr_) {}
 
 inline LocalTime::LocalTime(LocalTime &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; };
 
@@ -2728,7 +2732,7 @@ inline LocalDateTime::LocalDateTime(int year, int month, int day, int hour, int
   ptr_ = mgp::local_date_time_from_parameters(&params, memory);
 }
 
-inline LocalDateTime::LocalDateTime(const LocalDateTime &other) noexcept : LocalDateTime(other.ptr_) {}
+inline LocalDateTime::LocalDateTime(const LocalDateTime &other) : LocalDateTime(other.ptr_) {}
 
 inline LocalDateTime::LocalDateTime(LocalDateTime &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; };
 
@@ -2841,7 +2845,7 @@ inline Duration::Duration(double day, double hour, double minute, double second,
   ptr_ = mgp::duration_from_parameters(&params, memory);
 }
 
-inline Duration::Duration(const Duration &other) noexcept : Duration(other.ptr_) {}
+inline Duration::Duration(const Duration &other) : Duration(other.ptr_) {}
 
 inline Duration::Duration(Duration &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; };
 
@@ -2913,7 +2917,6 @@ inline bool Duration::operator<(const Duration &other) const {
 /* #region Value */
 
 inline Value::Value(mgp_value *ptr) : ptr_(mgp::value_copy(ptr, memory)) {}
-inline Value::Value(StealType /*steal*/, mgp_value *ptr) : ptr_{ptr} {}
 
 inline Value::Value() : ptr_(mgp::value_make_null(memory)) {}
 
@@ -2994,7 +2997,7 @@ inline Value::Value(Duration &&duration) {
   duration.ptr_ = nullptr;
 }
 
-inline Value::Value(const Value &other) noexcept : Value(other.ptr_) {}
+inline Value::Value(const Value &other) : Value(other.ptr_) {}
 
 inline Value::Value(Value &&other) noexcept : ptr_(other.ptr_) { other.ptr_ = nullptr; }
 

include/mgp.py

@@ -1283,7 +1283,7 @@ class Graph:
             raise InvalidContextError()
         self._graph.detach_delete_vertex(vertex._vertex)
 
-    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex, edge_type: EdgeType) -> Edge:
+    def create_edge(self, from_vertex: Vertex, to_vertex: Vertex, edge_type: EdgeType) -> None:
         """
         Create an edge.
 
@@ -1292,16 +1292,13 @@ class Graph:
             to_vertex: `Vertex'  to where edge is directed.
             edge_type:  `EdgeType` defines the type of edge.
 
-        Returns:
-            Created `Edge`.
-
         Raises:
             ImmutableObjectError: If `graph` is immutable.
             UnableToAllocateError: If unable to allocate an edge.
             DeletedObjectError: If `from_vertex` or `to_vertex` has been deleted.
             SerializationError: If `from_vertex` or `to_vertex` has been modified by another transaction.
         Examples:
-            ```edge = graph.create_edge(from_vertex, vertex, edge_type)```
+            ```graph.create_edge(from_vertex, vertex, edge_type)```
         """
         if not self.is_valid():
             raise InvalidContextError()

init

@@ -14,6 +14,7 @@ function print_help () {
     echo "Optional arguments:"
     echo -e "  -h\tdisplay this help and exit"
     echo -e "  --without-libs-setup\tskip the step for setting up libs"
+    echo -e "  --wsl-quicklisp-proxy \"host:port\"\tquicklist HTTP proxy (this flag + HTTP proxy are required on WSL)"
 }
 
 function setup_virtualenv () {
@@ -34,6 +35,7 @@ function setup_virtualenv () {
     popd > /dev/null
 }
 
+wsl_quicklisp_proxy=""
 setup_libs=true
 if [[ $# -eq 1 && "$1" == "-h" ]]; then
     print_help
@@ -41,6 +43,16 @@ if [[ $# -eq 1 && "$1" == "-h" ]]; then
 else
     while(($#)); do
         case "$1" in
+          --wsl-quicklisp-proxy)
+              shift
+              if [[ $# -eq 0 ]]; then
+                  echo "Missing proxy URL"
+                  print_help
+                  exit 1
+              fi
+              wsl_quicklisp_proxy=":proxy \"http://$1/\""
+              shift
+          ;;
           --without-libs-setup)
               shift
               setup_libs=false
@@ -67,17 +79,42 @@ echo "All packages are in-place..."
 # create a default build directory
 mkdir -p ./build
 
+# quicklisp package manager for Common Lisp
+quicklisp_install_dir="$HOME/quicklisp"
+if [[ -v QUICKLISP_HOME ]]; then
+  quicklisp_install_dir="${QUICKLISP_HOME}"
+fi
+
+if [[ ! -f "${quicklisp_install_dir}/setup.lisp" ]]; then
+  wget -nv https://beta.quicklisp.org/quicklisp.lisp -O quicklisp.lisp || exit 1
+  echo \
+  "
+  (load \"${DIR}/quicklisp.lisp\")
+  (quicklisp-quickstart:install $wsl_quicklisp_proxy :path \"${quicklisp_install_dir}\")
+  " | sbcl --script || exit 1
+  rm -rf quicklisp.lisp || exit 1
+fi
+ln -Tfs "$DIR/src/lisp" "${quicklisp_install_dir}/local-projects/lcp"
+# Install LCP dependencies
+# TODO: We should at some point cache or have a mirror of packages we use.
+# TODO: move the installation of LCP's dependencies into ./setup.sh
+echo \
+  "
+  (load \"${quicklisp_install_dir}/setup.lisp\")
+  (ql:quickload '(:lcp :lcp/test) :silent t)
+  " | sbcl --script
+
 if [[ "$setup_libs" == "true" ]]; then
-  # Setup libs (download).
-  cd libs
-  ./cleanup.sh
-  ./setup.sh
-  cd ..
+    # Setup libs (download).
+    cd libs
+    ./cleanup.sh
+    ./setup.sh
+    cd ..
 fi
 
 # Fix for centos 7 during release
-if [ "${DISTRO}" = "centos-7" ] || [ "${DISTRO}" = "debian-11" ] || [ "${DISTRO}" = "amzn-2" ]; then
-  python3 -m pip uninstall -y virtualenv
+if [ "${ARCHITECTURE}" = "centos-7" ]; then
+  python3 -m pip uninstall virtualenv
   python3 -m pip install virtualenv
 fi
 
@@ -106,18 +143,15 @@ for hook in $(find $DIR/.githooks -type f -printf "%f\n"); do
   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
-# packages.
-if [ "${DISTRO}" != "centos-7" ] && [ "$DISTRO" != "debian-10" ] && [ "${DISTRO}" != "ubuntu-18.04" ] && [ "${DISTRO}" != "amzn-2" ]; then
-  python3 -m pip install pre-commit
-  python3 -m pre_commit install
-  # Install py format tools for usage during the development.
-  echo "Install black formatter"
-  python3 -m pip install black==23.1.*
-  echo "Install isort"
-  python3 -m pip install isort==5.12.*
-fi
+# Install precommit hook
+python3 -m pip install pre-commit
+python3 -m pre_commit install
+
+# Install py format tools
+echo "Install black formatter"
+python3 -m pip install black==22.*
+echo "Install isort"
+python3 -m pip install isort==5.*
 
 # Link `include/mgp.py` with `release/mgp/mgp.py`
 ln -v -f include/mgp.py release/mgp/mgp.py

libs/.gitignore

@@ -6,4 +6,3 @@
 !__main.cpp
 !pulsar.patch
 !antlr4.10.1.patch
-!rocksdb8.1.1.patch

libs/rocksdb8.1.1.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 598c728..816c705 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1242,7 +1242,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
-
-   if(ROCKSDB_BUILD_SHARED)
-     install(
--      TARGETS ${ROCKSDB_SHARED_LIB}
-+      TARGETS ${ROCKSDB_SHARED_LIB} OPTIONAL
-       EXPORT RocksDBTargets
-       COMPONENT runtime
-       ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

libs/setup.sh

@@ -117,7 +117,7 @@ declare -A primary_urls=(
   ["mgconsole"]="http://$local_cache_host/git/mgconsole.git"
   ["spdlog"]="http://$local_cache_host/git/spdlog"
   ["nlohmann"]="http://$local_cache_host/file/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
-  ["neo4j"]="http://$local_cache_host/file/neo4j-community-5.6.0-unix.tar.gz"
+  ["neo4j"]="http://$local_cache_host/file/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="http://$local_cache_host/git/librdkafka.git"
   ["protobuf"]="http://$local_cache_host/git/protobuf.git"
   ["pulsar"]="http://$local_cache_host/git/pulsar.git"
@@ -142,7 +142,7 @@ declare -A secondary_urls=(
   ["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"
+  ["neo4j"]="https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="https://github.com/edenhill/librdkafka.git"
   ["protobuf"]="https://github.com/protocolbuffers/protobuf.git"
   ["pulsar"]="https://github.com/apache/pulsar.git"
@@ -180,9 +180,9 @@ repo_clone_try_double "${primary_urls[libbcrypt]}" "${secondary_urls[libbcrypt]}
 
 # neo4j
 file_get_try_double "${primary_urls[neo4j]}" "${secondary_urls[neo4j]}"
-tar -xzf neo4j-community-5.6.0-unix.tar.gz
-mv neo4j-community-5.6.0 neo4j
-rm neo4j-community-5.6.0-unix.tar.gz
+tar -xzf neo4j-community-3.2.3-unix.tar.gz
+mv neo4j-community-3.2.3 neo4j
+rm neo4j-community-3.2.3-unix.tar.gz
 
 # nlohmann json
 # We wget header instead of cloning repo since repo is huge (lots of test data).
@@ -192,10 +192,10 @@ cd json
 file_get_try_double "${primary_urls[nlohmann]}" "${secondary_urls[nlohmann]}"
 cd ..
 
-rocksdb_tag="v8.1.1" # (2023-04-21)
+rocksdb_tag="v6.14.6" # (2020-10-14)
 repo_clone_try_double "${primary_urls[rocksdb]}" "${secondary_urls[rocksdb]}" "rocksdb" "$rocksdb_tag" true
 pushd rocksdb
-git apply ../rocksdb8.1.1.patch
+git apply ../rocksdb.patch
 popd
 
 # mgclient

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

licenses/third-party/ldbc/LICENSE

@@ -1,202 +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.

release/CMakeLists.txt

@@ -1,10 +1,6 @@
 # Install systemd service (must use absolute path).
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/memgraph.service
-    DESTINATION /lib/systemd/system)
-
-# Set parameters to recognize the host distro
-cmake_host_system_information(RESULT DISTRO QUERY DISTRIB_NAME)
-cmake_host_system_information(RESULT DISTRO_VERSION QUERY DISTRIB_VERSION)
+        DESTINATION /lib/systemd/system)
 
 # ---- Setup CPack --------
 
@@ -16,11 +12,10 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
 
 # Setting arhitecture extension for deb packages
 set(MG_ARCH_EXTENSION_DEB "all")
-
-if(${MG_ARCH} STREQUAL "x86_64")
+if (${MG_ARCH} STREQUAL "x86_64")
     set(MG_ARCH_EXTENSION_DEB "amd64")
-elseif(${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_DEB "arm64")
+elseif (${MG_ARCH} STREQUAL "ARM64")
+    set(MG_ARCH_EXTENSION_DEB  "arm64")
 endif()
 
 # DEB specific
@@ -39,24 +34,21 @@ set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;"
     "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-
 # Description formatting is important, summary must be followed with a newline and 1 space.
 set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
  Contains Memgraph, the graph database. It aims to deliver developers the
  speed, simplicity and scale required to build the next generation of
  applications driver by real-time connected data.")
-
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "openssl (>= 1.1.0), python3 (>= 3.5.0), libstdc++6")
 
 # Setting arhitecture extension for rpm packages
 set(MG_ARCH_EXTENSION_RPM "noarch")
-
-if(${MG_ARCH} STREQUAL "x86_64")
+if (${MG_ARCH} STREQUAL "x86_64")
     set(MG_ARCH_EXTENSION_RPM "x86_64")
-elseif(${MG_ARCH} STREQUAL "ARM64")
-    set(MG_ARCH_EXTENSION_RPM "aarch64")
+elseif (${MG_ARCH} STREQUAL "ARM64")
+    set(MG_ARCH_EXTENSION_RPM  "aarch64")
 endif()
 
 # RPM specific
@@ -64,26 +56,18 @@ set(CPACK_RPM_PACKAGE_URL https://memgraph.com)
 set(CPACK_RPM_PACKAGE_VERSION "${MEMGRAPH_VERSION_RPM}")
 set(CPACK_RPM_FILE_NAME "memgraph-${MEMGRAPH_VERSION_RPM}-1.${MG_ARCH_EXTENSION_RPM}.rpm")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
-    /var /var/lib /var/log /etc/logrotate.d
-    /lib /lib/systemd /lib/systemd/system /lib/systemd/system/memgraph.service)
+  /var /var/lib /var/log /etc/logrotate.d
+  /lib /lib/systemd /lib/systemd/system /lib/systemd/system/memgraph.service)
 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")
-
 # Description formatting is important, no line must be greater than 80 characters.
 set(CPACK_RPM_PACKAGE_DESCRIPTION "Contains Memgraph, the graph database.
 It aims to deliver developers the speed, simplicity and scale required to build
 the next generation of applications driver by real-time connected data.")
-
 # Add `openssl` package to dependencies list. Used to generate SSL certificates.
 # We also depend on `python3` because we embed it in Memgraph.
-set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc++ >= 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()
+set(CPACK_RPM_PACKAGE_REQUIRES "openssl >= 1.0.0, curl >= 7.29.0, python3 >= 3.5.0, libstdc >= 6, logrotate")
 
 # All variables must be set before including.
 include(CPack)

release/mgp/.gitignore

@@ -1,4 +1,3 @@
 .venv
 dist
 mgp.py
-poetry.lock

release/mgp/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "mgp"
-version = "1.1.1"
+version = "1.1.0"
 description = "Memgraph's module for developing MAGE modules. Used only for type hinting!"
 authors = [
     "katarinasupe <katarina.supe@memgraph.io>",

release/package/amzn-2/Dockerfile

@@ -1,14 +0,0 @@
-FROM amazonlinux:2
-
-ARG TOOLCHAIN_VERSION
-
-RUN yum -y update \
-    && yum install -y wget git tar
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-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
-
-ENTRYPOINT ["sleep", "infinity"]

release/package/arm-builders.yml

@@ -1,11 +0,0 @@
-version: "3"
-
-services:
-  debian-11-arm:
-    build:
-      context: debian-11-arm
-    container_name: "mgbuild_debian-11-arm"
-  ubuntu-2204-arm:
-    build:
-      context: ubuntu-22.04-arm
-    container_name: "mgbuild_ubuntu-22.04-arm"

release/package/docker-compose.yml

@@ -28,11 +28,3 @@ services:
     build:
       context: ubuntu-22.04
     container_name: "mgbuild_ubuntu-22.04"
-  mgbuild_fedora-36:
-    build:
-      context: fedora-36
-    container_name: "mgbuild_fedora-36"
-  mgbuild_amzn-2:
-    build:
-      context: amzn-2
-    container_name: "mgbuild_amzn-2"

release/package/fedora-36/Dockerfile

@@ -1,15 +0,0 @@
-FROM fedora:36
-
-ARG TOOLCHAIN_VERSION
-
-# Stops tzdata interactive configuration.
-RUN yum -y update \
-    && yum install -y wget git
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-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
-
-ENTRYPOINT ["sleep", "infinity"]

release/package/run.sh

@@ -3,14 +3,7 @@
 set -Eeuo pipefail
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SUPPORTED_OS=(
-    centos-7 centos-9
-    debian-10 debian-11 debian-11-arm
-    ubuntu-18.04 ubuntu-20.04 ubuntu-22.04 ubuntu-22.04-arm
-    fedora-36
-    amzn-2
-)
-
+SUPPORTED_OS=(centos-7 centos-9 debian-10 debian-11 ubuntu-18.04 ubuntu-20.04 ubuntu-22.04 debian-11-arm)
 PROJECT_ROOT="$SCRIPT_DIR/../.."
 TOOLCHAIN_VERSION="toolchain-v4"
 ACTIVATE_TOOLCHAIN="source /opt/${TOOLCHAIN_VERSION}/activate"
@@ -30,9 +23,9 @@ make_package () {
     echo "Building Memgraph for $os on $build_container..."
 
     package_command=""
-    if [[ "$os" =~ ^"centos".* ]] || [[ "$os" =~ ^"fedora".* ]] || [[ "$os" =~ ^"amzn".* ]]; then
+    if [[ "$os" =~ ^"centos".* ]]; then
         docker exec "$build_container" bash -c "yum -y update"
-        package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint --file='../../release/rpm/rpmlintrc' memgraph*.rpm "
+        package_command=" cpack -G RPM --config ../CPackConfig.cmake && rpmlint memgraph*.rpm "
     fi
     if [[ "$os" =~ ^"debian".* ]]; then
         docker exec "$build_container" bash -c "apt update"
@@ -83,7 +76,7 @@ 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 ./*"
-    if [[ "$os" =~ "-arm" ]]; then
+    if [[ "$os" == "debian-11-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
         docker exec "$build_container" bash -c "cd $container_build_dir && $ACTIVATE_TOOLCHAIN && cmake -DCMAKE_BUILD_TYPE=release $telemetry_id_override_flag .."

release/package/ubuntu-22.04-arm/Dockerfile

@@ -1,17 +0,0 @@
-FROM ubuntu:22.04
-
-ARG TOOLCHAIN_VERSION
-
-# Stops tzdata interactive configuration.
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt update && apt install -y \
-    ca-certificates wget git
-# Do NOT be smart here and clean the cache because the container is used in the
-# stateful context.
-
-RUN wget -q https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/${TOOLCHAIN_VERSION}/${TOOLCHAIN_VERSION}-binaries-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
-
-ENTRYPOINT ["sleep", "infinity"]

release/rpm/memgraph.spec.in

@@ -30,7 +30,7 @@ BuildRequires: systemd
 # This is needed to prevent Python compilation errors when building the RPM
 # package
 # https://github.com/scylladb/scylla/issues/2235
-%if 0%{?rhel} && 0%{?rhel} < 8
+%if 0%{?rhel} < 8
 %global __os_install_post    \
     /usr/lib/rpm/redhat/brp-compress \
     %{!?__debug_package:\
@@ -40,9 +40,7 @@ BuildRequires: systemd
     /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} \
     %{!?__jar_repack:/usr/lib/rpm/redhat/brp-java-repack-jars} \
 %{nil}
-%endif
-
-%if 0%{?fedora} && 0%{?fedora} < 35
+%else
 %global __os_install_post    \
     /usr/lib/rpm/brp-compress \
     %{!?__debug_package:\

release/rpm/rpmlintrc

@@ -1,4 +0,0 @@
-# from https://github.com/google/earthenterprise/blob/master/earth_enterprise/rpmlintrc
-
-# We are not packaging log dir
-addFilter("E: logrotate-log-dir-not-packaged")

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 # CMake configuration for the main memgraph library and executable
 
 # add memgraph sub libraries, ordered by dependency
+add_subdirectory(lisp)
 add_subdirectory(utils)
 add_subdirectory(requests)
 add_subdirectory(io)
@@ -105,10 +106,6 @@ install(PROGRAMS $<TARGET_FILE:memgraph>
 # Install Python source for supporting our embedded Python.
 install(FILES ${CMAKE_SOURCE_DIR}/include/mgp.py
         DESTINATION lib/memgraph/python_support)
-install(FILES ${CMAKE_SOURCE_DIR}/include/mgp_mock.py
-        DESTINATION lib/memgraph/python_support)
-install(FILES ${CMAKE_SOURCE_DIR}/include/_mgp_mock.py
-        DESTINATION lib/memgraph/python_support)
 
 # Install the includes file for writing custom procedures in C and C++>
 install(FILES ${CMAKE_SOURCE_DIR}/include/mg_procedure.h

src/auth/CMakeLists.txt

@@ -16,10 +16,6 @@ target_link_libraries(mg-auth mg-utils mg-kvstore mg-license )
 target_link_libraries(mg-auth ${Seccomp_LIBRARIES})
 target_include_directories(mg-auth SYSTEM PRIVATE ${Seccomp_INCLUDE_DIRS})
 
-find_package(OpenSSL REQUIRED)
-target_link_libraries(mg-auth ${OPENSSL_LIBRARIES})
-target_include_directories(mg-auth SYSTEM PUBLIC ${OPENSSL_INCLUDE_DIR})
-
 # Install reference auth modules and their configuration files.
 install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/reference_modules/example.py
         DESTINATION lib/memgraph/auth_module)

src/auth/crypto.cpp

@@ -1,64 +1,19 @@
-// 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
 // this file except in compliance with the License. You may obtain a copy of the License at https://memgraph.com/legal.
 //
 //
+
 #include "auth/crypto.hpp"
 
-#include <iomanip>
-#include <sstream>
-
-#include <gflags/gflags.h>
 #include <libbcrypt/bcrypt.h>
-#include <openssl/evp.h>
-#include <openssl/opensslv.h>
-#include <openssl/sha.h>
 
 #include "auth/exceptions.hpp"
-#include "utils/enum.hpp"
-#include "utils/flag_validation.hpp"
-
-namespace {
-using namespace std::literals;
-inline constexpr std::array password_encryption_mappings{
-    std::pair{"bcrypt"sv, memgraph::auth::PasswordEncryptionAlgorithm::BCRYPT},
-    std::pair{"sha256"sv, memgraph::auth::PasswordEncryptionAlgorithm::SHA256},
-    std::pair{"sha256-multiple"sv, memgraph::auth::PasswordEncryptionAlgorithm::SHA256_MULTIPLE}};
-
-inline constexpr uint64_t ONE_SHA_ITERATION = 1;
-inline constexpr uint64_t MULTIPLE_SHA_ITERATIONS = 1024;
-}  // namespace
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables,misc-unused-parameters)
-DEFINE_VALIDATED_string(password_encryption_algorithm, "bcrypt",
-                        "The password encryption algorithm used for authentication.", {
-                          if (const auto result =
-                                  memgraph::utils::IsValidEnumValueString(value, password_encryption_mappings);
-                              result.HasError()) {
-                            const auto error = result.GetError();
-                            switch (error) {
-                              case memgraph::utils::ValidationError::EmptyValue: {
-                                std::cout << "Password encryption algorithm cannot be empty." << std::endl;
-                                break;
-                              }
-                              case memgraph::utils::ValidationError::InvalidValue: {
-                                std::cout << "Invalid value for password encryption algorithm. Allowed values: "
-                                          << memgraph::utils::GetAllowedEnumValuesString(password_encryption_mappings)
-                                          << std::endl;
-                                break;
-                              }
-                            }
-                            return false;
-                          }
-
-                          return true;
-                        });
 
 namespace memgraph::auth {
-namespace BCrypt {
-std::string EncryptPassword(const std::string &password) {
+const std::string EncryptPassword(const std::string &password) {
   char salt[BCRYPT_HASHSIZE];
   char hash[BCRYPT_HASHSIZE];
 
@@ -73,7 +28,7 @@ std::string EncryptPassword(const std::string &password) {
     throw AuthException("Couldn't hash password!");
   }
 
-  return {hash};
+  return std::string(hash);
 }
 
 bool VerifyPassword(const std::string &password, const std::string &hash) {
@@ -83,102 +38,5 @@ bool VerifyPassword(const std::string &password, const std::string &hash) {
   }
   return ret == 0;
 }
-}  // namespace BCrypt
-
-namespace SHA {
-#if OPENSSL_VERSION_MAJOR >= 3
-std::string EncryptPasswordOpenSSL3(const std::string &password, const uint64_t number_of_iterations) {
-  unsigned char hash[SHA256_DIGEST_LENGTH];
-
-  EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-  EVP_MD *md = EVP_MD_fetch(nullptr, "SHA2-256", nullptr);
-
-  EVP_DigestInit_ex(ctx, md, nullptr);
-  for (auto i = 0; i < number_of_iterations; i++) {
-    EVP_DigestUpdate(ctx, password.c_str(), password.size());
-  }
-  EVP_DigestFinal_ex(ctx, hash, nullptr);
-
-  EVP_MD_free(md);
-  EVP_MD_CTX_free(ctx);
-
-  std::stringstream result_stream;
-  for (auto hash_char : hash) {
-    result_stream << std::hex << std::setw(2) << std::setfill('0') << (int)hash_char;
-  }
-
-  return result_stream.str();
-}
-#else
-std::string EncryptPasswordOpenSSL1_1(const std::string &password, const uint64_t number_of_iterations) {
-  unsigned char hash[SHA256_DIGEST_LENGTH];
-
-  SHA256_CTX sha256;
-  SHA256_Init(&sha256);
-  for (auto i = 0; i < number_of_iterations; i++) {
-    SHA256_Update(&sha256, password.c_str(), password.size());
-  }
-  SHA256_Final(hash, &sha256);
-
-  std::stringstream ss;
-  for (auto hash_char : hash) {
-    ss << std::hex << std::setw(2) << std::setfill('0') << (int)hash_char;
-  }
-
-  return ss.str();
-}
-#endif
-
-std::string EncryptPassword(const std::string &password, const uint64_t number_of_iterations) {
-#if OPENSSL_VERSION_MAJOR >= 3
-  return EncryptPasswordOpenSSL3(password, number_of_iterations);
-#else
-  return EncryptPasswordOpenSSL1_1(password, number_of_iterations);
-#endif
-}
-
-bool VerifyPassword(const std::string &password, const std::string &hash, const uint64_t number_of_iterations) {
-  auto password_hash = EncryptPassword(password, number_of_iterations);
-  return password_hash == hash;
-}
-}  // namespace SHA
-
-bool VerifyPassword(const std::string &password, const std::string &hash) {
-  const auto password_encryption_algorithm = utils::StringToEnum<PasswordEncryptionAlgorithm>(
-      FLAGS_password_encryption_algorithm, password_encryption_mappings);
-
-  if (!password_encryption_algorithm.has_value()) {
-    throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-  }
-
-  switch (password_encryption_algorithm.value()) {
-    case PasswordEncryptionAlgorithm::BCRYPT:
-      return BCrypt::VerifyPassword(password, hash);
-    case PasswordEncryptionAlgorithm::SHA256:
-      return SHA::VerifyPassword(password, hash, ONE_SHA_ITERATION);
-    case PasswordEncryptionAlgorithm::SHA256_MULTIPLE:
-      return SHA::VerifyPassword(password, hash, MULTIPLE_SHA_ITERATIONS);
-  }
-
-  throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-}
-
-std::string EncryptPassword(const std::string &password) {
-  const auto password_encryption_algorithm = utils::StringToEnum<PasswordEncryptionAlgorithm>(
-      FLAGS_password_encryption_algorithm, password_encryption_mappings);
-
-  if (!password_encryption_algorithm.has_value()) {
-    throw AuthException("Invalid password encryption flag '{}'!", FLAGS_password_encryption_algorithm);
-  }
-
-  switch (password_encryption_algorithm.value()) {
-    case PasswordEncryptionAlgorithm::BCRYPT:
-      return BCrypt::EncryptPassword(password);
-    case PasswordEncryptionAlgorithm::SHA256:
-      return SHA::EncryptPassword(password, ONE_SHA_ITERATION);
-    case PasswordEncryptionAlgorithm::SHA256_MULTIPLE:
-      return SHA::EncryptPassword(password, MULTIPLE_SHA_ITERATIONS);
-  }
-}
 
 }  // namespace memgraph::auth

src/auth/crypto.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
@@ -11,11 +11,10 @@
 #include <string>
 
 namespace memgraph::auth {
-enum class PasswordEncryptionAlgorithm : uint8_t { BCRYPT, SHA256, SHA256_MULTIPLE };
-
 /// @throw AuthException if unable to encrypt the password.
-std::string EncryptPassword(const std::string &password);
+const std::string EncryptPassword(const std::string &password);
 
 /// @throw AuthException if unable to verify the password.
 bool VerifyPassword(const std::string &password, const std::string &hash);
+
 }  // namespace memgraph::auth

src/auth/models.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
@@ -16,7 +16,6 @@
 #include "auth/crypto.hpp"
 #include "auth/exceptions.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 #include "utils/cast.hpp"
 #include "utils/logging.hpp"
 #include "utils/settings.hpp"
@@ -35,19 +34,13 @@ 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};
-
+const std::vector<Permission> kPermissionsAll = {
+    Permission::MATCH,      Permission::CREATE,    Permission::MERGE,       Permission::DELETE,
+    Permission::SET,        Permission::REMOVE,    Permission::INDEX,       Permission::STATS,
+    Permission::CONSTRAINT, Permission::DUMP,      Permission::AUTH,        Permission::REPLICATION,
+    Permission::DURABILITY, Permission::READ_FILE, Permission::FREE_MEMORY, Permission::TRIGGER,
+    Permission::CONFIG,     Permission::STREAM,    Permission::MODULE_READ, Permission::MODULE_WRITE,
+    Permission::WEBSOCKET};
 }  // namespace
 
 std::string PermissionToString(Permission permission) {
@@ -94,10 +87,6 @@ std::string PermissionToString(Permission permission) {
       return "MODULE_WRITE";
     case Permission::WEBSOCKET:
       return "WEBSOCKET";
-    case Permission::TRANSACTION_MANAGEMENT:
-      return "TRANSACTION_MANAGEMENT";
-    case Permission::STORAGE_MODE:
-      return "STORAGE_MODE";
   }
 }
 
@@ -275,7 +264,7 @@ PermissionLevel FineGrainedAccessPermissions::Has(const std::string &permission,
 
 void FineGrainedAccessPermissions::Grant(const std::string &permission,
                                          const FineGrainedPermission fine_grained_permission) {
-  if (permission == query::kAsterisk) {
+  if (permission == kAsterisk) {
     global_permission_ = CalculateGrant(fine_grained_permission);
   } else {
     permissions_[permission] = CalculateGrant(fine_grained_permission);
@@ -283,7 +272,7 @@ void FineGrainedAccessPermissions::Grant(const std::string &permission,
 }
 
 void FineGrainedAccessPermissions::Revoke(const std::string &permission) {
-  if (permission == query::kAsterisk) {
+  if (permission == kAsterisk) {
     permissions_.clear();
     global_permission_ = std::nullopt;
   } else {

src/auth/models.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
@@ -15,6 +15,7 @@
 #include <json/json.hpp>
 
 namespace memgraph::auth {
+const std::string kAsterisk = "*";
 // These permissions must have values that are applicable for usage in a
 // bitmask.
 // clang-format off
@@ -39,9 +40,7 @@ enum class Permission : uint64_t {
   STREAM       = 1U << 17U,
   MODULE_READ  = 1U << 18U,
   MODULE_WRITE = 1U << 19U,
-  WEBSOCKET    = 1U << 20U,
-  TRANSACTION_MANAGEMENT = 1U << 21U,
-  STORAGE_MODE    = 1U << 22U
+  WEBSOCKET    = 1U << 20U
 };
 // clang-format on
 

src/communication/bolt/client.cpp

@@ -146,10 +146,9 @@ QueryData Client::Execute(const std::string &query, const std::map<std::string,
     throw ServerMalformedDataException();
   }
 
-  auto &header = fields.ValueMap();
-
   QueryData ret{{}, std::move(records), std::move(metadata.ValueMap())};
 
+  auto &header = fields.ValueMap();
   if (header.find("fields") == header.end()) {
     throw ServerMalformedDataException();
   }
@@ -165,10 +164,6 @@ QueryData Client::Execute(const std::string &query, const std::map<std::string,
     ret.fields.emplace_back(std::move(field_item.ValueString()));
   }
 
-  if (header.contains("qid")) {
-    ret.metadata["qid"] = header["qid"];
-  }
-
   return ret;
 }
 

src/communication/bolt/v1/codes.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
@@ -20,8 +20,6 @@ inline constexpr uint8_t kPreamble[4] = {0x60, 0x60, 0xB0, 0x17};
 enum class Signature : uint8_t {
   Noop = 0x00,
   Init = 0x01,
-  LogOn = 0x6A,
-  LogOff = 0x6B,
   AckFailure = 0x0E,  // only v1
   Reset = 0x0F,
   Goodbye = 0x02,

src/communication/bolt/v1/constants.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
@@ -28,7 +28,7 @@ inline constexpr size_t kChunkWholeSize = kChunkHeaderSize + kChunkMaxDataSize;
  */
 inline constexpr size_t kHandshakeSize = 20;
 
-inline constexpr uint16_t kSupportedVersions[] = {0x0100, 0x0400, 0x0401, 0x0403, 0x0502};
+inline constexpr uint16_t kSupportedVersions[] = {0x0100, 0x0400, 0x0401, 0x0403};
 
 inline constexpr int kPullAll = -1;
 inline constexpr int kPullLast = -1;

src/communication/bolt/v1/decoder/decoder.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
@@ -33,14 +33,7 @@ namespace memgraph::communication::bolt {
 template <typename Buffer>
 class Decoder {
  public:
-  explicit Decoder(Buffer &buffer) : buffer_(buffer), major_v_(0) {}
-
-  /**
-   * Lets the user update the version.
-   * This is all single thread for now. TODO: Update if ever multithreaded.
-   * @param major_v the major version of the Bolt protocol used.
-   */
-  void UpdateVersion(int major_v) { major_v_ = major_v; }
+  explicit Decoder(Buffer &buffer) : buffer_(buffer) {}
 
   /**
    * Reads a Value from the available data in the buffer.
@@ -215,10 +208,6 @@ class Decoder {
 
  protected:
   Buffer &buffer_;
-  int major_v_;  //!< Major version of the underlying Bolt protocol
-                 // TODO: when refactoring
-  // Ideally the major_v would be a compile time constant. If the higher level (Bolt driver) ends up being separate
-  // classes, this could be just a template and each version of the driver would use the appropriate decoder.
 
  private:
   bool ReadNull(const Marker &marker, Value *data) {
@@ -381,7 +370,11 @@ class Decoder {
       }
       ret.emplace(std::move(dv_key.ValueString()), std::move(dv_val));
     }
-    return ret.size() == size;
+    if (ret.size() != size) {
+      return false;
+    }
+
+    return true;
   }
 
   bool ReadVertex(Value *data) {
@@ -414,14 +407,6 @@ class Decoder {
     }
     vertex.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      vertex.element_id = std::move(dv.ValueString());
-    }
-
     return true;
   }
 
@@ -460,23 +445,6 @@ class Decoder {
     }
     edge.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.element_id = std::move(dv.ValueString());
-      // from_element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.from_element_id = std::move(dv.ValueString());
-      // to_element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.to_element_id = std::move(dv.ValueString());
-    }
     return true;
   }
 
@@ -503,14 +471,6 @@ class Decoder {
     }
     edge.properties = std::move(dv.ValueMap());
 
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      if (!ReadValue(&dv, Value::Type::String)) {
-        return false;
-      }
-      edge.element_id = std::move(dv.ValueString());
-    }
-
     return true;
   }
 

src/communication/bolt/v1/encoder/base_encoder.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
@@ -36,14 +36,7 @@ namespace memgraph::communication::bolt {
 template <typename Buffer>
 class BaseEncoder {
  public:
-  explicit BaseEncoder(Buffer &buffer) : buffer_(buffer), major_v_(0) {}
-
-  /**
-   * Lets the user update the version.
-   * This is all single thread for now. TODO: Update if ever multithreaded.
-   * @param major_v the major version of the Bolt protocol used.
-   */
-  void UpdateVersion(int major_v) { major_v_ = major_v; }
+  explicit BaseEncoder(Buffer &buffer) : buffer_(buffer) {}
 
   void WriteRAW(const uint8_t *data, uint64_t len) { buffer_.Write(data, len); }
 
@@ -123,8 +116,7 @@ class BaseEncoder {
   }
 
   void WriteVertex(const Vertex &vertex) {
-    int struct_n = 3 + 1 * int(major_v_ > 4);  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + 3);
     WriteRAW(utils::UnderlyingCast(Signature::Node));
     WriteInt(vertex.id.AsInt());
 
@@ -140,16 +132,10 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(vertex.element_id);
-    }
   }
 
   void WriteEdge(const Edge &edge, bool unbound = false) {
-    int struct_n = (unbound ? 3 + 1 * int(major_v_ > 4) : 5 + 3 * int(major_v_ > 4));  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + (unbound ? 3 : 5));
     WriteRAW(utils::UnderlyingCast(unbound ? Signature::UnboundRelationship : Signature::Relationship));
 
     WriteInt(edge.id.AsInt());
@@ -166,22 +152,10 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(edge.element_id);
-      if (!unbound) {
-        // from_element_id introduced in v5.0
-        WriteString(edge.from_element_id);
-        // to_element_id introduced in v5.0
-        WriteString(edge.to_element_id);
-      }
-    }
   }
 
   void WriteEdge(const UnboundedEdge &edge) {
-    const int struct_n = 3 + 1 * int(major_v_ > 4);  // element_id introduced from v5
-    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + struct_n);
+    WriteRAW(utils::UnderlyingCast(Marker::TinyStruct) + 3);
     WriteRAW(utils::UnderlyingCast(Signature::UnboundRelationship));
 
     WriteInt(edge.id.AsInt());
@@ -194,11 +168,6 @@ class BaseEncoder {
       WriteString(prop.first);
       WriteValue(prop.second);
     }
-
-    if (major_v_ > 4) {
-      // element_id introduced in v5.0
-      WriteString(edge.element_id);
-    }
   }
 
   void WritePath(const Path &path) {
@@ -295,7 +264,6 @@ class BaseEncoder {
 
  protected:
   Buffer &buffer_;
-  int major_v_;  //!< Major version of the underlying Bolt protocol (TODO: Think about reimplementing the versioning)
 
  private:
   template <class T>

src/communication/bolt/v1/encoder/client_encoder.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
@@ -41,8 +41,6 @@ class ClientEncoder : private BaseEncoder<Buffer> {
  public:
   ClientEncoder(Buffer &buffer) : BaseEncoder<Buffer>(buffer) {}
 
-  using BaseEncoder<Buffer>::UpdateVersion;
-
   /**
    * Writes a Init message.
    *

src/communication/bolt/v1/encoder/encoder.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
@@ -34,8 +34,6 @@ class Encoder : private BaseEncoder<Buffer> {
  public:
   Encoder(Buffer &buffer) : BaseEncoder<Buffer>(buffer) {}
 
-  using BaseEncoder<Buffer>::UpdateVersion;
-
   /**
    * Sends a Record message.
    *

src/communication/bolt/v1/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
@@ -63,8 +63,7 @@ class Session {
    * if an explicit transaction was started.
    */
   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> &metadata) = 0;
+      const std::string &query, const std::map<std::string, Value> &params) = 0;
 
   /**
    * Put results of the processed query in the `encoder`.
@@ -86,7 +85,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> &) = 0;
+  virtual void BeginTransaction() = 0;
   virtual void CommitTransaction() = 0;
   virtual void RollbackTransaction() = 0;
 
@@ -121,9 +120,6 @@ class Session {
         return;
       }
       handshake_done_ = true;
-      // Update the decoder's Bolt version (v5 has changed the undelying structure)
-      decoder_.UpdateVersion(version_.major);
-      encoder_.UpdateVersion(version_.major);
     }
 
     ChunkState chunk_state;

src/communication/bolt/v1/states/executing.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,15 +22,10 @@
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/states/handlers.hpp"
 #include "communication/bolt/v1/value.hpp"
-#include "utils/event_counter.hpp"
 #include "utils/likely.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 
-namespace memgraph::metrics {
-extern const Event BoltMessages;
-}  // namespace memgraph::metrics
-
 namespace memgraph::communication::bolt {
 
 template <typename TSession>
@@ -91,37 +86,6 @@ State RunHandlerV4(Signature signature, TSession &session, State state, Marker m
   }
 }
 
-template <typename TSession>
-State RunHandlerV5(Signature signature, TSession &session, State state, Marker marker) {
-  switch (signature) {
-    case Signature::Run:
-      return HandleRunV5<TSession>(session, state, marker);
-    case Signature::Pull:
-      return HandlePullV5<TSession>(session, state, marker);
-    case Signature::Discard:
-      return HandleDiscardV5<TSession>(session, state, marker);
-    case Signature::Reset:
-      return HandleReset<TSession>(session, marker);
-    case Signature::Begin:
-      return HandleBegin<TSession>(session, state, marker);
-    case Signature::Commit:
-      return HandleCommit<TSession>(session, state, marker);
-    case Signature::Goodbye:
-      return HandleGoodbye<TSession>();
-    case Signature::Rollback:
-      return HandleRollback<TSession>(session, state, marker);
-    case Signature::Noop:
-      return HandleNoop<TSession>(state);
-    case Signature::Route:
-      return HandleRoute<TSession>(session, marker);
-    case Signature::LogOff:
-      return HandleLogOff<TSession>();
-    default:
-      spdlog::trace("Unrecognized signature received (0x{:02X})!", utils::UnderlyingCast(signature));
-      return State::Close;
-  }
-}
-
 /**
  * Executor state run function
  * This function executes an initialized Bolt session.
@@ -139,10 +103,8 @@ State StateExecutingRun(TSession &session, State state) {
 
   switch (session.version_.major) {
     case 1:
-      memgraph::metrics::IncrementCounter(memgraph::metrics::BoltMessages);
       return RunHandlerV1(signature, session, state, marker);
     case 4: {
-      memgraph::metrics::IncrementCounter(memgraph::metrics::BoltMessages);
       if (session.version_.minor >= 3) {
         return RunHandlerV4<TSession, 3>(signature, session, state, marker);
       }
@@ -151,8 +113,6 @@ State StateExecutingRun(TSession &session, State state) {
       }
       return RunHandlerV4<TSession>(signature, session, state, marker);
     }
-    case 5:
-      return RunHandlerV5<TSession>(signature, session, state, marker);
     default:
       spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
       return State::Close;

src/communication/bolt/v1/states/handlers.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
@@ -12,7 +12,6 @@
 #pragma once
 
 #include <map>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -23,7 +22,6 @@
 #include "communication/bolt/v1/state.hpp"
 #include "communication/bolt/v1/value.hpp"
 #include "communication/exceptions.hpp"
-#include "storage/v2/property_value.hpp"
 #include "utils/logging.hpp"
 #include "utils/message.hpp"
 
@@ -73,25 +71,42 @@ 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 <typename TSession>
+State HandleRun(TSession &session, const State state, const Value &query, const Value &params) {
+  if (state != State::Idle) {
+    // Client could potentially recover if we move to error state, but there is
+    // no legitimate situation in which well working client would end up in this
+    // situation.
+    spdlog::trace("Unexpected RUN command!");
+    return State::Close;
+  }
+
+  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
+
+  spdlog::debug("[Run] '{}'", query.ValueString());
+
+  try {
+    // Interpret can throw.
+    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap());
+    // Convert std::string to Value
+    std::vector<Value> vec;
+    std::map<std::string, Value> data;
+    vec.reserve(header.size());
+    for (auto &i : header) vec.emplace_back(std::move(i));
+    data.emplace("fields", std::move(vec));
+    // Send the header.
+    if (!session.encoder_.MessageSuccess(data)) {
+      spdlog::trace("Couldn't send query header!");
+      return State::Close;
+    }
+    return State::Result;
+  } catch (const std::exception &e) {
+    return HandleFailure(session, e);
+  }
+}
+
 template <bool is_pull, typename TSession>
 State HandlePullDiscard(TSession &session, std::optional<int> n, std::optional<int> qid) {
   try {
@@ -214,36 +229,7 @@ State HandleRunV1(TSession &session, const State state, const Marker marker) {
     return State::Close;
   }
 
-  if (state != State::Idle) {
-    // Client could potentially recover if we move to error state, but there is
-    // no legitimate situation in which well working client would end up in this
-    // situation.
-    spdlog::trace("Unexpected RUN command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  spdlog::debug("[Run] '{}'", query.ValueString());
-
-  try {
-    // Interpret can throw.
-    const auto [header, qid] = session.Interpret(query.ValueString(), params.ValueMap(), {});
-    // Convert std::string to Value
-    std::vector<Value> vec;
-    std::map<std::string, Value> data;
-    vec.reserve(header.size());
-    for (auto &i : header) vec.emplace_back(std::move(i));
-    data.emplace("fields", std::move(vec));
-    // Send the header.
-    if (!session.encoder_.MessageSuccess(data)) {
-      spdlog::trace("Couldn't send query header!");
-      return State::Close;
-    }
-    return State::Result;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
+  return details::HandleRun(session, state, query, params);
 }
 
 template <typename TSession>
@@ -269,50 +255,9 @@ State HandleRunV4(TSession &session, const State state, const Marker marker) {
   // Even though this part seems unnecessary it is needed to move the buffer
   if (!session.decoder_.ReadValue(&extra, Value::Type::Map)) {
     spdlog::trace("Couldn't read extra field!");
-    return State::Close;
   }
 
-  if (state != State::Idle) {
-    // Client could potentially recover if we move to error state, but there is
-    // no legitimate situation in which well working client would end up in this
-    // situation.
-    spdlog::trace("Unexpected RUN command!");
-    return State::Close;
-  }
-
-  DMG_ASSERT(!session.encoder_buffer_.HasData(), "There should be no data to write in this state");
-
-  spdlog::debug("[Run] '{}'", query.ValueString());
-
-  try {
-    // Interpret can throw.
-    const auto [header, qid] =
-        session.Interpret(query.ValueString(), params.ValueMap(), helpers::ConsumeMetadata(extra));
-    // Convert std::string to Value
-    std::vector<Value> vec;
-    std::map<std::string, Value> data;
-    vec.reserve(header.size());
-    for (auto &i : header) vec.emplace_back(std::move(i));
-    data.emplace("fields", std::move(vec));
-    if (qid.has_value()) {
-      data.emplace("qid", Value{*qid});
-    }
-
-    // Send the header.
-    if (!session.encoder_.MessageSuccess(data)) {
-      spdlog::trace("Couldn't send query header!");
-      return State::Close;
-    }
-    return State::Result;
-  } catch (const std::exception &e) {
-    return HandleFailure(session, e);
-  }
-}
-
-template <typename TSession>
-State HandleRunV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandleRunV4<TSession>(session, state, marker);
+  return details::HandleRun(session, state, query, params);
 }
 
 template <typename TSession>
@@ -325,12 +270,6 @@ State HandlePullV4(TSession &session, const State state, const Marker marker) {
   return details::HandlePullDiscardV4<true>(session, state, marker);
 }
 
-template <typename TSession>
-State HandlePullV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandlePullV4<TSession>(session, state, marker);
-}
-
 template <typename TSession>
 State HandleDiscardV1(TSession &session, const State state, const Marker marker) {
   return details::HandlePullDiscardV1<false>(session, state, marker);
@@ -341,12 +280,6 @@ State HandleDiscardV4(TSession &session, const State state, const Marker marker)
   return details::HandlePullDiscardV4<false>(session, state, marker);
 }
 
-template <typename TSession>
-State HandleDiscardV5(TSession &session, const State state, const Marker marker) {
-  // Using V4 on purpose
-  return HandleDiscardV4<TSession>(session, state, marker);
-}
-
 template <typename TSession>
 State HandleReset(TSession &session, const Marker marker) {
   // IMPORTANT: This implementation of the Bolt RESET command isn't fully
@@ -399,7 +332,7 @@ State HandleBegin(TSession &session, const State state, const Marker marker) {
   }
 
   try {
-    session.BeginTransaction(helpers::ConsumeMetadata(extra));
+    session.BeginTransaction();
   } catch (const std::exception &e) {
     return HandleFailure(session, e);
   }
@@ -504,10 +437,4 @@ State HandleRoute(TSession &session, const Marker marker) {
   }
   return State::Error;
 }
-
-template <typename TSession>
-State HandleLogOff() {
-  // Not arguments sent, the user just needs to reauthenticate
-  return State::Init;
-}
 }  // namespace memgraph::communication::bolt

src/communication/bolt/v1/states/init.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
@@ -27,25 +27,17 @@ namespace details {
 template <typename TSession>
 std::optional<State> AuthenticateUser(TSession &session, Value &metadata) {
   // Get authentication data.
-  // From neo4j driver v4.4, fields that have a default value are not sent.
-  // In order to have back-compatibility, the missing fields will be added.
-
   auto &data = metadata.ValueMap();
-  if (data.empty()) {  // Special case auth=None
-    spdlog::warn("The client didn't supply the authentication scheme! Trying with \"none\"...");
-    data["scheme"] = "none";
+  if (!data.count("scheme")) {
+    spdlog::warn("The client didn't supply authentication information!");
+    return State::Close;
   }
-
   std::string username;
   std::string password;
   if (data["scheme"].ValueString() == "basic") {
-    if (!data.count("principal")) {  // Special case principal = ""
-      spdlog::warn("The client didn't supply the principal field! Trying with \"\"...");
-      data["principal"] = "";
-    }
-    if (!data.count("credentials")) {  // Special case credentials = ""
-      spdlog::warn("The client didn't supply the credentials field! Trying with \"\"...");
-      data["credentials"] = "";
+    if (!data.count("principal") || !data.count("credentials")) {
+      spdlog::warn("The client didn't supply authentication information!");
+      return State::Close;
     }
     username = data["principal"].ValueString();
     password = data["credentials"].ValueString();
@@ -114,30 +106,6 @@ std::optional<Value> GetMetadataV4(TSession &session, const Marker marker) {
     return std::nullopt;
   }
 
-  auto &data = metadata.ValueMap();
-  if (!data.count("user_agent")) {
-    spdlog::warn("The client didn't supply the user agent!");
-    return std::nullopt;
-  }
-
-  spdlog::info("Client connected '{}'", data.at("user_agent").ValueString());
-
-  return metadata;
-}
-
-template <typename TSession>
-std::optional<Value> GetInitDataV5(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct1) [[unlikely]] {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-    return std::nullopt;
-  }
-
-  Value metadata;
-  if (!session.decoder_.ReadValue(&metadata, Value::Type::Map)) {
-    spdlog::trace("Couldn't read metadata!");
-    return std::nullopt;
-  }
-
   const auto &data = metadata.ValueMap();
   if (!data.count("user_agent")) {
     spdlog::warn("The client didn't supply the user agent!");
@@ -149,22 +117,6 @@ std::optional<Value> GetInitDataV5(TSession &session, const Marker marker) {
   return metadata;
 }
 
-template <typename TSession>
-std::optional<Value> GetAuthDataV5(TSession &session, const Marker marker) {
-  if (marker != Marker::TinyStruct1) [[unlikely]] {
-    spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-    return std::nullopt;
-  }
-
-  Value metadata;
-  if (!session.decoder_.ReadValue(&metadata, Value::Type::Map)) {
-    spdlog::trace("Couldn't read metadata!");
-    return std::nullopt;
-  }
-
-  return metadata;
-}
-
 template <typename TSession>
 State SendSuccessMessage(TSession &session) {
   // Neo4j's Java driver 4.1.1+ requires connection_id.
@@ -228,57 +180,6 @@ State StateInitRunV4(TSession &session, Marker marker, Signature signature) {
 
   return SendSuccessMessage(session);
 }
-
-template <typename TSession>
-State StateInitRunV5(TSession &session, Marker marker, Signature signature) {
-  if (signature == Signature::Noop) [[unlikely]] {
-    SPDLOG_DEBUG("Received NOOP message");
-    return State::Init;
-  }
-
-  if (signature == Signature::Init) {
-    auto maybeMetadata = GetInitDataV5(session, marker);
-
-    if (!maybeMetadata) {
-      return State::Close;
-    }
-
-    if (SendSuccessMessage(session) == State::Close) {
-      return State::Close;
-    }
-    // Stay in Init
-    return State::Init;
-
-  } else if (signature == Signature::LogOn) {
-    if (marker != Marker::TinyStruct1) [[unlikely]] {
-      spdlog::trace("Expected TinyStruct1 marker, but received 0x{:02X}!", utils::UnderlyingCast(marker));
-      spdlog::trace(
-          "The client sent malformed data, but we are continuing "
-          "because the official Neo4j Java driver sends malformed "
-          "data. D'oh!");
-      return State::Close;
-    }
-
-    auto maybeMetadata = GetAuthDataV5(session, marker);
-    if (!maybeMetadata) {
-      return State::Close;
-    }
-    auto result = AuthenticateUser(session, *maybeMetadata);
-    if (result) {
-      spdlog::trace("Failed to authenticate, closing connection...");
-      return State::Close;
-    }
-
-    if (SendSuccessMessage(session) == State::Close) {
-      return State::Close;
-    }
-    return State::Idle;
-
-  } else [[unlikely]] {
-    spdlog::trace("Expected Init signature, but received 0x{:02X}!", utils::UnderlyingCast(signature));
-    return State::Close;
-  }
-}
 }  // namespace details
 
 /**
@@ -307,9 +208,6 @@ State StateInitRun(TSession &session) {
       }
       return details::StateInitRunV4<TSession>(session, marker, signature);
     }
-    case 5: {
-      return details::StateInitRunV5<TSession>(session, marker, signature);
-    }
   }
   spdlog::trace("Unsupported bolt version:{}.{})!", session.version_.major, session.version_.minor);
   return State::Close;

src/communication/bolt/v1/value.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
@@ -342,9 +342,6 @@ std::ostream &operator<<(std::ostream &os, const Vertex &vertex) {
                          [&](auto &stream, const auto &pair) { stream << pair.first << ": " << pair.second; });
     os << "}";
   }
-  if (!vertex.element_id.empty()) {
-    os << " element_id: " << vertex.element_id;
-  }
   return os << ")";
 }
 

src/communication/bolt/v1/value.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
@@ -57,7 +57,6 @@ struct Vertex {
   Id id;
   std::vector<std::string> labels;
   std::map<std::string, Value> properties;
-  std::string element_id;
 };
 
 /**
@@ -70,9 +69,6 @@ struct Edge {
   Id to;
   std::string type;
   std::map<std::string, Value> properties;
-  std::string element_id;
-  std::string from_element_id;
-  std::string to_element_id;
 };
 
 /**
@@ -83,7 +79,6 @@ struct UnboundedEdge {
   Id id;
   std::string type;
   std::map<std::string, Value> properties;
-  std::string element_id;
 };
 
 /**

src/communication/http/listener.hpp

@@ -1,108 +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 <list>
-#include <memory>
-
-#include <spdlog/spdlog.h>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/beast/core.hpp>
-
-#include "communication/context.hpp"
-#include "communication/http/session.hpp"
-#include "utils/spin_lock.hpp"
-#include "utils/synchronized.hpp"
-
-namespace memgraph::communication::http {
-
-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, TSessionData>;
-  using std::enable_shared_from_this<Listener<TRequestHandler, TSessionData>>::shared_from_this;
-
- public:
-  Listener(const Listener &) = delete;
-  Listener(Listener &&) = delete;
-  Listener &operator=(const Listener &) = delete;
-  Listener &operator=(Listener &&) = delete;
-  ~Listener() {}
-
-  template <typename... Args>
-  static std::shared_ptr<Listener> Create(Args &&...args) {
-    return std::shared_ptr<Listener>{new Listener(std::forward<Args>(args)...)};
-  }
-
-  // Start accepting incoming connections
-  void Run() { DoAccept(); }
-  tcp::endpoint GetEndpoint() const { return acceptor_.local_endpoint(); }
-
- private:
-  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
-    acceptor_.open(endpoint.protocol(), ec);
-    if (ec) {
-      LogError(ec, "open");
-      return;
-    }
-
-    // Allow address reuse
-    acceptor_.set_option(boost::asio::socket_base::reuse_address(true), ec);
-    if (ec) {
-      LogError(ec, "set_option");
-      return;
-    }
-
-    // Bind to the server address
-    acceptor_.bind(endpoint, ec);
-    if (ec) {
-      LogError(ec, "bind");
-      return;
-    }
-
-    acceptor_.listen(boost::asio::socket_base::max_listen_connections, ec);
-    if (ec) {
-      LogError(ec, "listen");
-      return;
-    }
-
-    spdlog::info("HTTP server is listening on {}:{}", endpoint.address(), endpoint.port());
-  }
-
-  void DoAccept() {
-    acceptor_.async_accept(ioc_, [shared_this = shared_from_this()](auto ec, auto socket) {
-      shared_this->OnAccept(ec, std::move(socket));
-    });
-  }
-
-  void OnAccept(boost::beast::error_code ec, tcp::socket socket) {
-    if (ec) {
-      return LogError(ec, "accept");
-    }
-
-    SessionHandler::Create(std::move(socket), data_, *context_)->Run();
-
-    DoAccept();
-  }
-
-  boost::asio::io_context &ioc_;
-  TSessionData *data_;
-  ServerContext *context_;
-  tcp::acceptor acceptor_;
-};
-}  // namespace memgraph::communication::http

src/communication/http/server.hpp

@@ -1,65 +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 <thread>
-
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/tcp.hpp>
-
-#include "communication/http/listener.hpp"
-#include "io/network/endpoint.hpp"
-
-namespace memgraph::communication::http {
-
-template <class TRequestHandler, typename TSessionData>
-class Server final {
-  using tcp = boost::asio::ip::tcp;
-
- public:
-  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;
-  Server &operator=(const Server &) = delete;
-  Server &operator=(Server &&) = delete;
-
-  ~Server() {
-    MG_ASSERT(!background_thread_ || (ioc_.stopped() && !background_thread_->joinable()),
-              "Server wasn't shutdown properly");
-  }
-
-  void Start() {
-    MG_ASSERT(!background_thread_, "The server was already started!");
-    listener_->Run();
-    background_thread_.emplace([this] { ioc_.run(); });
-  }
-
-  void Shutdown() { ioc_.stop(); }
-
-  void AwaitShutdown() {
-    if (background_thread_ && background_thread_->joinable()) {
-      background_thread_->join();
-    }
-  }
-  bool IsRunning() const { return background_thread_ && !ioc_.stopped(); }
-  tcp::endpoint GetEndpoint() const { return listener_->GetEndpoint(); }
-
- private:
-  boost::asio::io_context ioc_;
-
-  std::shared_ptr<Listener<TRequestHandler, TSessionData>> listener_;
-  std::optional<std::thread> background_thread_;
-};
-}  // namespace memgraph::communication::http

src/communication/http/session.hpp

@@ -1,193 +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 <deque>
-#include <functional>
-#include <memory>
-#include <optional>
-#include <string>
-#include <variant>
-
-#include <spdlog/spdlog.h>
-#include <boost/asio/bind_executor.hpp>
-#include <boost/asio/dispatch.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/strand.hpp>
-#include <boost/beast/core/buffers_to_string.hpp>
-#include <boost/beast/core/stream_traits.hpp>
-#include <boost/beast/core/tcp_stream.hpp>
-#include <boost/beast/http.hpp>
-#include <boost/beast/ssl.hpp>
-#include <boost/beast/version.hpp>
-#include <json/json.hpp>
-
-#include "communication/context.hpp"
-#include "utils/logging.hpp"
-#include "utils/variant_helpers.hpp"
-
-namespace memgraph::communication::http {
-
-inline constexpr uint16_t kSSLExpirySeconds = 30;
-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 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, TSessionData>>::shared_from_this;
-
- public:
-  template <typename... Args>
-  static std::shared_ptr<Session> Create(Args &&...args) {
-    return std::shared_ptr<Session>{new Session{std::forward<Args>(args)...}};
-  }
-
-  void Run() {
-    if (auto *ssl = std::get_if<SSLSocket>(&stream_); ssl != nullptr) {
-      try {
-        boost::beast::get_lowest_layer(*ssl).expires_after(std::chrono::seconds(kSSLExpirySeconds));
-        ssl->handshake(boost::asio::ssl::stream_base::server);
-      } catch (const boost::system::system_error &e) {
-        spdlog::warn("Failed on SSL handshake: {}", e.what());
-        return;
-      }
-    }
-
-    // run on the strand
-    boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoRead(); });
-  }
-
- private:
-  using PlainSocket = boost::beast::tcp_stream;
-  using SSLSocket = boost::beast::ssl_stream<boost::beast::tcp_stream>;
-
-  explicit Session(tcp::socket &&socket, TSessionData *data, ServerContext &context)
-      : stream_(CreateSocket(std::move(socket), context)),
-        handler_(data),
-        strand_{boost::asio::make_strand(GetExecutor())} {}
-
-  std::variant<PlainSocket, SSLSocket> CreateSocket(tcp::socket &&socket, ServerContext &context) {
-    if (context.use_ssl()) {
-      ssl_context_.emplace(context.context_clone());
-      return Session::SSLSocket{std::move(socket), *ssl_context_};
-    }
-
-    return Session::PlainSocket{std::move(socket)};
-  }
-
-  void OnWrite(boost::beast::error_code ec, size_t bytes_transferred) {
-    boost::ignore_unused(bytes_transferred);
-
-    if (ec) {
-      close_ = true;
-      return LogError(ec, "write");
-    }
-
-    if (close_) {
-      DoClose();
-      return;
-    }
-
-    res_ = nullptr;
-
-    DoRead();
-  }
-
-  void DoRead() {
-    req_ = {};
-
-    ExecuteForStream([this](auto &&stream) {
-      boost::beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(kSSLExpirySeconds));
-
-      boost::beast::http::async_read(
-          stream, buffer_, req_,
-          boost::asio::bind_executor(strand_, std::bind_front(&Session::OnRead, shared_from_this())));
-    });
-  }
-
-  void OnRead(boost::beast::error_code ec, size_t bytes_transferred) {
-    boost::ignore_unused(bytes_transferred);
-
-    if (ec == boost::beast::http::error::end_of_stream) {
-      DoClose();
-      return;
-    }
-
-    if (ec) {
-      return LogError(ec, "read");
-    }
-
-    auto async_write = [this](boost::beast::http::response<boost::beast::http::string_body> msg) {
-      ExecuteForStream([this, &msg](auto &&stream) {
-        // The lifetime of the message has to extend
-        // for the duration of the async operation so
-        // we use a shared_ptr to manage it.
-        auto sp = std::make_shared<boost::beast::http::response<boost::beast::http::string_body>>(std::move(msg));
-
-        // Store a type-erased version of the shared
-        // pointer in the class to keep it alive.
-        res_ = sp;
-        // Write the response
-        boost::beast::http::async_write(
-            stream, *sp, boost::asio::bind_executor(strand_, std::bind_front(&Session::OnWrite, shared_from_this())));
-      });
-    };
-
-    // handle request
-    handler_.HandleRequest(std::move(req_), async_write);
-  }
-
-  void DoClose() {
-    std::visit(utils::Overloaded{[this](SSLSocket &stream) {
-                                   boost::beast::get_lowest_layer(stream).expires_after(std::chrono::seconds(30));
-
-                                   // Perform the SSL shutdown
-                                   stream.async_shutdown(
-                                       boost::beast::bind_front_handler(&Session::OnClose, shared_from_this()));
-                                 },
-                                 [](PlainSocket &stream) {
-                                   boost::beast::error_code ec;
-                                   stream.socket().shutdown(tcp::socket::shutdown_send, ec);
-                                 }},
-               stream_);
-  }
-  void OnClose(boost::beast::error_code ec) {
-    if (ec) {
-      LogError(ec, "close");
-    }
-
-    // At this point the connection is closed gracefully
-  }
-
-  auto GetExecutor() {
-    return std::visit(utils::Overloaded{[](auto &&stream) { return stream.get_executor(); }}, stream_);
-  }
-
-  template <typename F>
-  decltype(auto) ExecuteForStream(F &&fn) {
-    return std::visit(utils::Overloaded{std::forward<F>(fn)}, stream_);
-  }
-
-  std::optional<std::reference_wrapper<boost::asio::ssl::context>> ssl_context_;
-  std::variant<PlainSocket, SSLSocket> stream_;
-  boost::beast::flat_buffer buffer_;
-
-  TRequestHandler handler_;
-  boost::beast::http::request<boost::beast::http::string_body> req_;
-  std::shared_ptr<void> res_;
-
-  boost::asio::strand<boost::beast::tcp_stream::executor_type> strand_;
-  bool close_{false};
-};
-}  // namespace memgraph::communication::http

src/communication/v2/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
@@ -30,7 +30,6 @@
 #include "communication/context.hpp"
 #include "communication/v2/pool.hpp"
 #include "communication/v2/session.hpp"
-#include "utils/message.hpp"
 #include "utils/spin_lock.hpp"
 #include "utils/synchronized.hpp"
 

src/communication/v2/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
@@ -41,21 +41,11 @@
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/system/detail/error_code.hpp>
 
-#include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/exceptions.hpp"
-#include "utils/event_counter.hpp"
 #include "utils/logging.hpp"
-#include "utils/on_scope_exit.hpp"
 #include "utils/variant_helpers.hpp"
 
-namespace memgraph::metrics {
-extern const Event ActiveSessions;
-extern const Event ActiveTCPSessions;
-extern const Event ActiveSSLSessions;
-extern const Event ActiveWebSocketSessions;
-}  // namespace memgraph::metrics
-
 namespace memgraph::communication::v2 {
 
 /**
@@ -109,8 +99,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
   // Start the asynchronous accept operation
   template <class Body, class Allocator>
   void DoAccept(boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>> req) {
-    memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveWebSocketSessions);
-
     execution_active_ = true;
     // Set suggested timeout settings for the websocket
     ws_.set_option(boost::beast::websocket::stream_base::timeout::suggested(boost::beast::role_type::server));
@@ -225,10 +213,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
     if (!IsConnected()) {
       return;
     }
-
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSessions);
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveWebSocketSessions);
-
     if (ec) {
       return OnError(ec, "close");
     }
@@ -275,19 +259,12 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     if (execution_active_) {
       return false;
     }
-
-    memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveSessions);
-
     execution_active_ = true;
     timeout_timer_.async_wait(boost::asio::bind_executor(strand_, std::bind(&Session::OnTimeout, shared_from_this())));
 
     if (std::holds_alternative<SSLSocket>(socket_)) {
-      utils::OnScopeExit increment_counter(
-          [] { memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveSSLSessions); });
       boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoHandshake(); });
     } else {
-      utils::OnScopeExit increment_counter(
-          [] { memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveTCPSessions); });
       boost::asio::dispatch(strand_, [shared_this = shared_from_this()] { shared_this->DoRead(); });
     }
     return true;
@@ -473,14 +450,6 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   }
 
   void OnClose(const boost::system::error_code &ec) {
-    if (ssl_context_.has_value()) {
-      memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSSLSessions);
-    } else {
-      memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveTCPSessions);
-    }
-
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveSessions);
-
     if (ec) {
       return OnError(ec);
     }
@@ -496,7 +465,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     if (timeout_timer_.expiry() <= boost::asio::steady_timer::clock_type::now()) {
       // The deadline has passed. Stop the session. The other actors will
       // terminate as soon as possible.
-      spdlog::info("Shutting down session after {} seconds of inactivity", timeout_seconds_.count());
+      spdlog::info("Shutting down session after {} of inactivity", timeout_seconds_);
       DoShutdown();
     } else {
       // Put the actor back to sleep.

src/glue/auth.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
@@ -58,10 +58,6 @@ auth::Permission PrivilegeToPermission(query::AuthQuery::Privilege privilege) {
       return auth::Permission::MODULE_WRITE;
     case query::AuthQuery::Privilege::WEBSOCKET:
       return auth::Permission::WEBSOCKET;
-    case query::AuthQuery::Privilege::STORAGE_MODE:
-      return auth::Permission::STORAGE_MODE;
-    case query::AuthQuery::Privilege::TRANSACTION_MANAGEMENT:
-      return auth::Permission::TRANSACTION_MANAGEMENT;
   }
 }
 

src/glue/auth_checker.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
@@ -15,7 +15,6 @@
 #include "auth/models.hpp"
 #include "glue/auth.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 #include "query/frontend/ast/ast.hpp"
 #include "utils/synchronized.hpp"
 
@@ -39,7 +38,7 @@ bool IsUserAuthorizedGloballyLabels(const memgraph::auth::User &user,
   if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     return true;
   }
-  return user.GetFineGrainedAccessLabelPermissions().Has(memgraph::query::kAsterisk, fine_grained_permission) ==
+  return user.GetFineGrainedAccessLabelPermissions().Has(memgraph::auth::kAsterisk, fine_grained_permission) ==
          memgraph::auth::PermissionLevel::GRANT;
 }
 
@@ -48,7 +47,7 @@ bool IsUserAuthorizedGloballyEdges(const memgraph::auth::User &user,
   if (!memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
     return true;
   }
-  return user.GetFineGrainedAccessEdgeTypePermissions().Has(memgraph::query::kAsterisk, fine_grained_permission) ==
+  return user.GetFineGrainedAccessEdgeTypePermissions().Has(memgraph::auth::kAsterisk, fine_grained_permission) ==
          memgraph::auth::PermissionLevel::GRANT;
 }
 
@@ -85,7 +84,6 @@ bool AuthChecker::IsUserAuthorized(const std::optional<std::string> &username,
 
   return maybe_user.has_value() && IsUserAuthorized(*maybe_user, privileges);
 }
-
 #ifdef MG_ENTERPRISE
 std::unique_ptr<memgraph::query::FineGrainedAuthChecker> AuthChecker::GetFineGrainedAuthChecker(
     const std::string &username, const memgraph::query::DbAccessor *dba) const {

src/glue/auth_checker.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
@@ -26,11 +26,9 @@ class AuthChecker : public query::AuthChecker {
 
   bool IsUserAuthorized(const std::optional<std::string> &username,
                         const std::vector<query::AuthQuery::Privilege> &privileges) const override;
-
 #ifdef MG_ENTERPRISE
   std::unique_ptr<memgraph::query::FineGrainedAuthChecker> GetFineGrainedAuthChecker(
       const std::string &username, const memgraph::query::DbAccessor *dba) const override;
-
 #endif
   [[nodiscard]] static bool IsUserAuthorized(const memgraph::auth::User &user,
                                              const std::vector<memgraph::query::AuthQuery::Privilege> &privileges);

src/glue/auth_handler.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,7 +18,6 @@
 #include "auth/models.hpp"
 #include "glue/auth.hpp"
 #include "license/license.hpp"
-#include "query/constants.hpp"
 
 namespace {
 
@@ -254,18 +253,19 @@ bool AuthQueryHandler::CreateUser(const std::string &username, const std::option
 
     if (first_user) {
       spdlog::info("{} is first created user. Granting all privileges.", username);
-      GrantPrivilege(
-          username, memgraph::query::kPrivilegesAll
+      GrantPrivilege(username, memgraph::query::kPrivilegesAll
 #ifdef MG_ENTERPRISE
-          ,
-          {{{memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {memgraph::query::kAsterisk}}}},
-          {
-            {
-              {
-                memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, { memgraph::query::kAsterisk }
-              }
-            }
-          }
+                     ,
+                     {{{memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {memgraph::auth::kAsterisk}}}},
+                     {
+                       {
+                         {
+                           memgraph::query::AuthQuery::FineGrainedPrivilege::CREATE_DELETE, {
+                             memgraph::auth::kAsterisk
+                           }
+                         }
+                       }
+                     }
 #endif
       );
     }

src/glue/communication.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
@@ -150,9 +150,7 @@ storage::Result<communication::bolt::Vertex> ToBoltVertex(const storage::VertexA
   for (const auto &prop : *maybe_properties) {
     properties[db.PropertyToName(prop.first)] = ToBoltValue(prop.second);
   }
-  // Introduced in Bolt v5 (for now just send the ID)
-  const auto element_id = std::to_string(id.AsInt());
-  return communication::bolt::Vertex{id, labels, properties, element_id};
+  return communication::bolt::Vertex{id, labels, properties};
 }
 
 storage::Result<communication::bolt::Edge> ToBoltEdge(const storage::EdgeAccessor &edge, const storage::Storage &db,
@@ -167,11 +165,7 @@ storage::Result<communication::bolt::Edge> ToBoltEdge(const storage::EdgeAccesso
   for (const auto &prop : *maybe_properties) {
     properties[db.PropertyToName(prop.first)] = ToBoltValue(prop.second);
   }
-  // Introduced in Bolt v5 (for now just send the ID)
-  const auto element_id = std::to_string(id.AsInt());
-  const auto from_element_id = std::to_string(from.AsInt());
-  const auto to_element_id = std::to_string(to.AsInt());
-  return communication::bolt::Edge{id, from, to, type, properties, element_id, from_element_id, to_element_id};
+  return communication::bolt::Edge{id, from, to, type, properties};
 }
 
 storage::Result<communication::bolt::Path> ToBoltPath(const query::Path &path, const storage::Storage &db,

src/http_handlers/CMakeLists.txt

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

src/http_handlers/metrics.hpp

@@ -1,211 +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 <atomic>
-#include <tuple>
-#include <vector>
-
-#include <spdlog/spdlog.h>
-#include <boost/beast/http.hpp>
-#include <boost/beast/version.hpp>
-#include <json/json.hpp>
-
-#include <utils/event_counter.hpp>
-#include <utils/event_gauge.hpp>
-#include "storage/v2/storage.hpp"
-#include "utils/event_gauge.hpp"
-#include "utils/event_histogram.hpp"
-
-namespace memgraph::http {
-
-struct MetricsResponse {
-  uint64_t vertex_count;
-  uint64_t edge_count;
-  double average_degree;
-  uint64_t memory_usage;
-  uint64_t disk_usage;
-
-  // Storage of all the counter values throughout the system
-  // e.g. number of active transactions
-  std::vector<std::tuple<std::string, std::string, uint64_t>> event_counters{};
-
-  // Storage of all the current values throughout the system
-  std::vector<std::tuple<std::string, std::string, uint64_t>> event_gauges{};
-
-  // Storage of all the percentile values across the histograms in the system
-  // e.g. query latency percentiles, snapshot recovery duration percentiles, etc.
-  std::vector<std::tuple<std::string, std::string, uint64_t>> event_histograms{};
-};
-
-template <typename TSessionData>
-class MetricsService {
- public:
-  explicit MetricsService(TSessionData *data) : db_(data->db) {}
-
-  nlohmann::json GetMetricsJSON() {
-    auto response = GetMetrics();
-    return AsJson(response);
-  }
-
- private:
-  const storage::Storage *db_;
-
-  MetricsResponse GetMetrics() {
-    auto info = db_->GetInfo();
-
-    return MetricsResponse{.vertex_count = info.vertex_count,
-                           .edge_count = info.edge_count,
-                           .average_degree = info.average_degree,
-                           .memory_usage = info.memory_usage,
-                           .disk_usage = info.disk_usage,
-                           .event_counters = GetEventCounters(),
-                           .event_gauges = GetEventGauges(),
-                           .event_histograms = GetEventHistograms()};
-  }
-
-  nlohmann::json AsJson(MetricsResponse response) {
-    auto metrics_response = nlohmann::json();
-    const auto *general_type = "General";
-
-    metrics_response[general_type]["vertex_count"] = response.vertex_count;
-    metrics_response[general_type]["edge_count"] = response.edge_count;
-    metrics_response[general_type]["average_degree"] = response.average_degree;
-    metrics_response[general_type]["memory_usage"] = response.memory_usage;
-    metrics_response[general_type]["disk_usage"] = response.disk_usage;
-
-    for (const auto &[name, type, value] : response.event_counters) {
-      metrics_response[type][name] = value;
-    }
-
-    for (const auto &[name, type, value] : response.event_gauges) {
-      metrics_response[type][name] = value;
-    }
-
-    for (const auto &[name, type, value] : response.event_histograms) {
-      metrics_response[type][name] = value;
-    }
-
-    return metrics_response;
-  }
-
-  auto GetEventCounters() {
-    // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-    std::vector<std::tuple<std::string, std::string, uint64_t>> event_counters{};
-
-    for (auto i = 0; i < memgraph::metrics::CounterEnd(); i++) {
-      event_counters.emplace_back(memgraph::metrics::GetCounterName(i), memgraph::metrics::GetCounterType(i),
-                                  memgraph::metrics::global_counters[i].load(std::memory_order_acquire));
-    }
-
-    return event_counters;
-  }
-
-  auto GetEventGauges() {
-    // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-    std::vector<std::tuple<std::string, std::string, uint64_t>> event_gauges{};
-
-    for (auto i = 0; i < memgraph::metrics::GaugeEnd(); i++) {
-      event_gauges.emplace_back(memgraph::metrics::GetGaugeName(i), memgraph::metrics::GetGaugeType(i),
-                                memgraph::metrics::global_gauges[i].load(std::memory_order_acquire));
-    }
-
-    return event_gauges;
-  }
-
-  auto GetEventHistograms() {
-    // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-    std::vector<std::tuple<std::string, std::string, uint64_t>> event_histograms{};
-
-    for (auto i = 0; i < memgraph::metrics::HistogramEnd(); i++) {
-      const auto *name = memgraph::metrics::GetHistogramName(i);
-      auto &histogram = memgraph::metrics::global_histograms[i];
-
-      for (auto &[percentile, value] : histogram.YieldPercentiles()) {
-        auto metric_name = std::string(name) + "_" + std::to_string(percentile) + "p";
-
-        event_histograms.emplace_back(metric_name, memgraph::metrics::GetHistogramType(i), value);
-      }
-    }
-
-    return event_histograms;
-  }
-};
-
-template <typename TSessionData>
-class MetricsRequestHandler final {
- public:
-  explicit MetricsRequestHandler(TSessionData *data) : service_(data) {
-    spdlog::info("Basic request handler started!");
-  }
-
-  MetricsRequestHandler(const MetricsRequestHandler &) = delete;
-  MetricsRequestHandler(MetricsRequestHandler &&) = delete;
-  MetricsRequestHandler &operator=(const MetricsRequestHandler &) = delete;
-  MetricsRequestHandler &operator=(MetricsRequestHandler &&) = delete;
-  ~MetricsRequestHandler() = default;
-
-  template <class Body, class Allocator>
-  // NOLINTNEXTLINE(misc-unused-parameters)
-  void HandleRequest(boost::beast::http::request<Body, boost::beast::http::basic_fields<Allocator>> &&req,
-                     std::function<void(boost::beast::http::response<boost::beast::http::string_body>)> &&send) {
-    auto response_json = nlohmann::json();
-    // Returns a bad request response
-    auto const bad_request = [&req, &response_json](const auto why) {
-      response_json["error"] = std::string(why);
-
-      // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-      boost::beast::http::response<boost::beast::http::string_body> res{boost::beast::http::status::bad_request,
-                                                                        req.version()};
-      res.set(boost::beast::http::field::server, BOOST_BEAST_VERSION_STRING);
-      res.set(boost::beast::http::field::content_type, "application/json");
-      res.keep_alive(req.keep_alive());
-      res.body() = response_json.dump();
-      res.prepare_payload();
-      return res;
-    };
-
-    // Make sure we can handle the method
-    if (req.method() != boost::beast::http::verb::get) {
-      return send(bad_request("Unknown HTTP-method"));
-    }
-
-    // Request path must be absolute and not contain "..".
-    if (req.target().empty() || req.target()[0] != '/' || req.target().find("..") != boost::beast::string_view::npos) {
-      return send(bad_request("Illegal request-target"));
-    }
-
-    // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-    boost::beast::http::string_body::value_type body;
-
-    auto service_response = service_.GetMetricsJSON();
-    body.append(service_response.dump());
-
-    // Cache the size since we need it after the move
-    const auto size = body.size();
-
-    // Respond to GET request
-    // NOLINTNEXTLINE(cppcoreguidelines-init-variables)
-    boost::beast::http::response<boost::beast::http::string_body> res{
-        std::piecewise_construct, std::make_tuple(std::move(body)),
-        std::make_tuple(boost::beast::http::status::ok, req.version())};
-    res.set(boost::beast::http::field::server, BOOST_BEAST_VERSION_STRING);
-    res.set(boost::beast::http::field::content_type, "application/json");
-    res.content_length(size);
-    res.keep_alive(req.keep_alive());
-    return send(std::move(res));
-  }
-
- private:
-  MetricsService<TSessionData> service_;
-};
-}  // namespace memgraph::http

src/memgraph.cpp

@@ -1,4 +1,4 @@
-// Copyright 2023 Memgraph Ltd.
+// Copyright 2022 Memgraph Ltd.
 //
 // Use of this software is governed by the Business Source License
 // included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
@@ -36,13 +36,11 @@
 
 #include "auth/models.hpp"
 #include "communication/bolt/v1/constants.hpp"
-#include "communication/http/server.hpp"
 #include "communication/websocket/auth.hpp"
 #include "communication/websocket/server.hpp"
 #include "glue/auth_checker.hpp"
 #include "glue/auth_handler.hpp"
 #include "helpers.hpp"
-#include "http_handlers/metrics.hpp"
 #include "license/license.hpp"
 #include "license/license_sender.hpp"
 #include "py/py.hpp"
@@ -59,7 +57,6 @@
 #include "storage/v2/storage.hpp"
 #include "storage/v2/view.hpp"
 #include "telemetry/telemetry.hpp"
-#include "utils/enum.hpp"
 #include "utils/event_counter.hpp"
 #include "utils/file.hpp"
 #include "utils/flag_validation.hpp"
@@ -106,6 +103,42 @@ constexpr const char *kMgUser = "MEMGRAPH_USER";
 constexpr const char *kMgPassword = "MEMGRAPH_PASSWORD";
 constexpr const char *kMgPassfile = "MEMGRAPH_PASSFILE";
 
+namespace {
+std::string GetAllowedEnumValuesString(const auto &mappings) {
+  std::vector<std::string> allowed_values;
+  allowed_values.reserve(mappings.size());
+  std::transform(mappings.begin(), mappings.end(), std::back_inserter(allowed_values),
+                 [](const auto &mapping) { return std::string(mapping.first); });
+  return memgraph::utils::Join(allowed_values, ", ");
+}
+
+enum class ValidationError : uint8_t { EmptyValue, InvalidValue };
+
+memgraph::utils::BasicResult<ValidationError> IsValidEnumValueString(const auto &value, const auto &mappings) {
+  if (value.empty()) {
+    return ValidationError::EmptyValue;
+  }
+
+  if (std::find_if(mappings.begin(), mappings.end(), [&](const auto &mapping) { return mapping.first == value; }) ==
+      mappings.cend()) {
+    return ValidationError::InvalidValue;
+  }
+
+  return {};
+}
+
+template <typename Enum>
+std::optional<Enum> StringToEnum(const auto &value, const auto &mappings) {
+  const auto mapping_iter =
+      std::find_if(mappings.begin(), mappings.end(), [&](const auto &mapping) { return mapping.first == value; });
+  if (mapping_iter == mappings.cend()) {
+    return std::nullopt;
+  }
+
+  return mapping_iter->second;
+}
+}  // namespace
+
 // Short help flag.
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_HIDDEN_bool(h, false, "Print usage and exit.");
@@ -115,9 +148,6 @@ DEFINE_string(bolt_address, "0.0.0.0", "IP address on which the Bolt server shou
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_string(monitoring_address, "0.0.0.0",
               "IP address on which the websocket server for Memgraph monitoring should listen.");
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_string(metrics_address, "0.0.0.0",
-              "IP address on which the Memgraph server for exposing metrics should listen.");
 DEFINE_VALIDATED_int32(bolt_port, 7687, "Port on which the Bolt server should listen.",
                        FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
@@ -125,9 +155,6 @@ DEFINE_VALIDATED_int32(monitoring_port, 7444,
                        "Port on which the websocket server for Memgraph monitoring should listen.",
                        FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_VALIDATED_int32(metrics_port, 9091, "Port on which the Memgraph server for exposing metrics should listen.",
-                       FLAG_IN_RANGE(0, std::numeric_limits<uint16_t>::max()));
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_VALIDATED_int32(bolt_num_workers, std::max(std::thread::hardware_concurrency(), 1U),
                        "Number of workers used by the Bolt server. By default, this will be the "
                        "number of processing units available on the machine.",
@@ -200,20 +227,6 @@ DEFINE_VALIDATED_uint64(storage_wal_file_flush_every_n_tx,
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(storage_snapshot_on_exit, false, "Controls whether the storage creates another snapshot on exit.");
 
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_items_per_batch, memgraph::storage::Config::Durability().items_per_batch,
-              "The number of edges and vertices stored in a batch in a snapshot file.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_bool(storage_parallel_index_recovery, false,
-            "Controls whether the index creation can be done in a multithreaded fashion.");
-
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-DEFINE_uint64(storage_recovery_thread_count,
-              std::max(static_cast<uint64_t>(std::thread::hardware_concurrency()),
-                       memgraph::storage::Config::Durability().recovery_thread_count),
-              "The number of threads used to recover persisted data from disk.");
-
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_bool(telemetry_enabled, false,
             "Set to true to enable telemetry. We collect information about the "
@@ -277,21 +290,21 @@ inline constexpr std::array isolation_level_mappings{
 
 const std::string isolation_level_help_string =
     fmt::format("Default isolation level used for the transactions. Allowed values: {}",
-                memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings));
+                GetAllowedEnumValuesString(isolation_level_mappings));
 }  // namespace
 
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_VALIDATED_string(isolation_level, "SNAPSHOT_ISOLATION", isolation_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, isolation_level_mappings); result.HasError()) {
+  if (const auto result = IsValidEnumValueString(value, isolation_level_mappings); result.HasError()) {
     const auto error = result.GetError();
     switch (error) {
-      case memgraph::utils::ValidationError::EmptyValue: {
+      case ValidationError::EmptyValue: {
         std::cout << "Isolation level cannot be empty." << std::endl;
         break;
       }
-      case memgraph::utils::ValidationError::InvalidValue: {
+      case ValidationError::InvalidValue: {
         std::cout << "Invalid value for isolation level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(isolation_level_mappings) << std::endl;
+                  << GetAllowedEnumValuesString(isolation_level_mappings) << std::endl;
         break;
       }
     }
@@ -304,7 +317,7 @@ DEFINE_VALIDATED_string(isolation_level, "SNAPSHOT_ISOLATION", isolation_level_h
 namespace {
 memgraph::storage::IsolationLevel ParseIsolationLevel() {
   const auto isolation_level =
-      memgraph::utils::StringToEnum<memgraph::storage::IsolationLevel>(FLAGS_isolation_level, isolation_level_mappings);
+      StringToEnum<memgraph::storage::IsolationLevel>(FLAGS_isolation_level, isolation_level_mappings);
   MG_ASSERT(isolation_level, "Invalid isolation level");
   return *isolation_level;
 }
@@ -364,21 +377,21 @@ inline constexpr std::array log_level_mappings{
     std::pair{"INFO"sv, spdlog::level::info},   std::pair{"WARNING"sv, spdlog::level::warn},
     std::pair{"ERROR"sv, spdlog::level::err},   std::pair{"CRITICAL"sv, spdlog::level::critical}};
 
-const std::string log_level_help_string = fmt::format("Minimum log level. Allowed values: {}",
-                                                      memgraph::utils::GetAllowedEnumValuesString(log_level_mappings));
+const std::string log_level_help_string =
+    fmt::format("Minimum log level. Allowed values: {}", GetAllowedEnumValuesString(log_level_mappings));
 }  // namespace
 
 DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(), {
-  if (const auto result = memgraph::utils::IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
+  if (const auto result = IsValidEnumValueString(value, log_level_mappings); result.HasError()) {
     const auto error = result.GetError();
     switch (error) {
-      case memgraph::utils::ValidationError::EmptyValue: {
+      case ValidationError::EmptyValue: {
         std::cout << "Log level cannot be empty." << std::endl;
         break;
       }
-      case memgraph::utils::ValidationError::InvalidValue: {
-        std::cout << "Invalid value for log level. Allowed values: "
-                  << memgraph::utils::GetAllowedEnumValuesString(log_level_mappings) << std::endl;
+      case ValidationError::InvalidValue: {
+        std::cout << "Invalid value for log level. Allowed values: " << GetAllowedEnumValuesString(log_level_mappings)
+                  << std::endl;
         break;
       }
     }
@@ -390,7 +403,7 @@ DEFINE_VALIDATED_string(log_level, "WARNING", log_level_help_string.c_str(), {
 
 namespace {
 spdlog::level::level_enum ParseLogLevel() {
-  const auto log_level = memgraph::utils::StringToEnum<spdlog::level::level_enum>(FLAGS_log_level, log_level_mappings);
+  const auto log_level = StringToEnum<spdlog::level::level_enum>(FLAGS_log_level, log_level_mappings);
   MG_ASSERT(log_level, "Invalid log level");
   return *log_level;
 }
@@ -500,10 +513,6 @@ void InitFromCypherlFile(memgraph::query::InterpreterContext &ctx, std::string c
   }
 }
 
-namespace memgraph::metrics {
-extern const Event ActiveBoltSessions;
-}  // namespace memgraph::metrics
-
 class BoltSession final : public memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                                         memgraph::communication::v2::OutputStream> {
  public:
@@ -513,7 +522,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
       : memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                memgraph::communication::v2::OutputStream>(input_stream, output_stream),
         db_(data->db),
-        interpreter_context_(data->interpreter_context),
         interpreter_(data->interpreter_context),
         auth_(data->auth),
 #if MG_ENTERPRISE
@@ -521,41 +529,21 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
 #endif
         endpoint_(endpoint),
         run_id_(data->run_id) {
-    memgraph::metrics::IncrementCounter(memgraph::metrics::ActiveBoltSessions);
-    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.insert(&interpreter_); });
-  }
-
-  ~BoltSession() override {
-    memgraph::metrics::DecrementCounter(memgraph::metrics::ActiveBoltSessions);
-    interpreter_context_->interpreters.WithLock([this](auto &interpreters) { interpreters.erase(&interpreter_); });
   }
 
   using memgraph::communication::bolt::Session<memgraph::communication::v2::InputStream,
                                                memgraph::communication::v2::OutputStream>::TEncoder;
 
-  void BeginTransaction(const std::map<std::string, memgraph::communication::bolt::Value> &metadata) override {
-    std::map<std::string, memgraph::storage::PropertyValue> metadata_pv;
-    for (const auto &[key, bolt_value] : metadata) {
-      metadata_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_value));
-    }
-    interpreter_.BeginTransaction(metadata_pv);
-  }
+  void BeginTransaction() override { interpreter_.BeginTransaction(); }
 
   void CommitTransaction() override { interpreter_.CommitTransaction(); }
 
   void RollbackTransaction() override { interpreter_.RollbackTransaction(); }
 
   std::pair<std::vector<std::string>, std::optional<int>> Interpret(
-      const std::string &query, const std::map<std::string, memgraph::communication::bolt::Value> &params,
-      const std::map<std::string, memgraph::communication::bolt::Value> &metadata) override {
+      const std::string &query, const std::map<std::string, memgraph::communication::bolt::Value> &params) override {
     std::map<std::string, memgraph::storage::PropertyValue> params_pv;
-    std::map<std::string, memgraph::storage::PropertyValue> metadata_pv;
-    for (const auto &[key, bolt_param] : params) {
-      params_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_param));
-    }
-    for (const auto &[key, bolt_md] : metadata) {
-      metadata_pv.emplace(key, memgraph::glue::ToPropertyValue(bolt_md));
-    }
+    for (const auto &kv : params) params_pv.emplace(kv.first, memgraph::glue::ToPropertyValue(kv.second));
     const std::string *username{nullptr};
     if (user_) {
       username = &user_->username();
@@ -567,7 +555,7 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
     }
 #endif
     try {
-      auto result = interpreter_.Prepare(query, params_pv, username, metadata_pv);
+      auto result = interpreter_.Prepare(query, params_pv, username);
       if (user_ && !memgraph::glue::AuthChecker::IsUserAuthorized(*user_, result.privileges)) {
         interpreter_.Abort();
         throw memgraph::communication::bolt::ClientError(
@@ -686,7 +674,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
 
   // NOTE: Needed only for ToBoltValue conversions
   const memgraph::storage::Storage *db_;
-  memgraph::query::InterpreterContext *interpreter_context_;
   memgraph::query::Interpreter interpreter_;
   memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
   std::optional<memgraph::auth::User> user_;
@@ -699,8 +686,6 @@ class BoltSession final : public memgraph::communication::bolt::Session<memgraph
 };
 
 using ServerT = memgraph::communication::v2::Server<BoltSession, SessionData>;
-using MonitoringServerT =
-    memgraph::communication::http::Server<memgraph::http::MetricsRequestHandler<SessionData>, SessionData>;
 using memgraph::communication::ServerContext;
 
 // Needed to correctly handle memgraph destruction from a signal handler.
@@ -895,10 +880,7 @@ int main(int argc, char **argv) {
                      .wal_file_size_kibibytes = FLAGS_storage_wal_file_size_kib,
                      .wal_file_flush_every_n_tx = FLAGS_storage_wal_file_flush_every_n_tx,
                      .snapshot_on_exit = FLAGS_storage_snapshot_on_exit,
-                     .restore_replicas_on_startup = true,
-                     .items_per_batch = FLAGS_storage_items_per_batch,
-                     .recovery_thread_count = FLAGS_storage_recovery_thread_count,
-                     .allow_parallel_index_creation = FLAGS_storage_parallel_index_recovery},
+                     .restore_replicas_on_startup = true},
       .transaction = {.isolation_level = ParseIsolationLevel()}};
   if (FLAGS_storage_snapshot_interval_sec == 0) {
     if (FLAGS_storage_wal_enabled) {
@@ -1010,9 +992,8 @@ int main(int argc, char **argv) {
     });
     telemetry->AddCollector("event_counters", []() -> nlohmann::json {
       nlohmann::json ret;
-      for (size_t i = 0; i < memgraph::metrics::CounterEnd(); ++i) {
-        ret[memgraph::metrics::GetCounterName(i)] =
-            memgraph::metrics::global_counters[i].load(std::memory_order_relaxed);
+      for (size_t i = 0; i < EventCounter::End(); ++i) {
+        ret[EventCounter::GetName(i)] = EventCounter::global_counters[i].load(std::memory_order_relaxed);
       }
       return ret;
     });
@@ -1028,43 +1009,6 @@ int main(int argc, char **argv) {
       {FLAGS_monitoring_address, static_cast<uint16_t>(FLAGS_monitoring_port)}, &context, websocket_auth};
   AddLoggerSink(websocket_server.GetLoggingSink());
 
-  MonitoringServerT metrics_server{
-      {FLAGS_metrics_address, static_cast<uint16_t>(FLAGS_metrics_port)}, &session_data, &context};
-
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    // Handler for regular termination signals
-    auto shutdown = [&metrics_server, &websocket_server, &server, &interpreter_context] {
-      // Server needs to be shutdown first and then the database. This prevents
-      // a race condition when a transaction is accepted during server shutdown.
-      server.Shutdown();
-      // After the server is notified to stop accepting and processing
-      // connections we tell the execution engine to stop processing all pending
-      // queries.
-      memgraph::query::Shutdown(&interpreter_context);
-
-      websocket_server.Shutdown();
-      metrics_server.Shutdown();
-    };
-
-    InitSignalHandlers(shutdown);
-  } else {
-    // Handler for regular termination signals
-    auto shutdown = [&websocket_server, &server, &interpreter_context] {
-      // Server needs to be shutdown first and then the database. This prevents
-      // a race condition when a transaction is accepted during server shutdown.
-      server.Shutdown();
-      // After the server is notified to stop accepting and processing
-      // connections we tell the execution engine to stop processing all pending
-      // queries.
-      memgraph::query::Shutdown(&interpreter_context);
-
-      websocket_server.Shutdown();
-    };
-
-    InitSignalHandlers(shutdown);
-  }
-#else
   // Handler for regular termination signals
   auto shutdown = [&websocket_server, &server, &interpreter_context] {
     // Server needs to be shutdown first and then the database. This prevents
@@ -1074,22 +1018,14 @@ int main(int argc, char **argv) {
     // connections we tell the execution engine to stop processing all pending
     // queries.
     memgraph::query::Shutdown(&interpreter_context);
-
     websocket_server.Shutdown();
   };
 
   InitSignalHandlers(shutdown);
-#endif
 
   MG_ASSERT(server.Start(), "Couldn't start the Bolt server!");
   websocket_server.Start();
 
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    metrics_server.Start();
-  }
-#endif
-
   if (!FLAGS_init_data_file.empty()) {
     spdlog::info("Running init data file.");
 #ifdef MG_ENTERPRISE
@@ -1103,11 +1039,6 @@ int main(int argc, char **argv) {
 
   server.AwaitShutdown();
   websocket_server.AwaitShutdown();
-#ifdef MG_ENTERPRISE
-  if (memgraph::license::global_license_checker.IsEnterpriseValidFast()) {
-    metrics_server.AwaitShutdown();
-  }
-#endif
 
   memgraph::query::procedure::gModuleRegistry.UnloadAllModules();
 

src/query/CMakeLists.txt

@@ -1,7 +1,13 @@
+define_add_lcp(add_lcp_query lcp_query_cpp_files generated_lcp_query_files)
+
+add_lcp_query(frontend/ast/ast.lcp)
+add_lcp_query(frontend/semantic/symbol.lcp)
+add_lcp_query(plan/operator.lcp)
+
+add_custom_target(generate_lcp_query DEPENDS ${generated_lcp_query_files})
+
 set(mg_query_sources
-    frontend/ast/ast.cpp
-    frontend/semantic/symbol.cpp
-    plan/operator_type_info.cpp
+    ${lcp_query_cpp_files}
     common.cpp
     cypher_query_interpreter.cpp
     dump.cpp
@@ -40,6 +46,7 @@ set(mg_query_sources
 find_package(Boost REQUIRED)
 
 add_library(mg-query STATIC ${mg_query_sources})
+add_dependencies(mg-query generate_lcp_query)
 target_include_directories(mg-query PUBLIC ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(mg-query dl cppitertools Boost::headers)
 target_link_libraries(mg-query mg-integrations-pulsar mg-integrations-kafka mg-storage-v2 mg-license mg-utils mg-kvstore mg-memory)

src/query/auth_checker.hpp

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

src/query/common.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
@@ -107,37 +107,5 @@ storage::PropertyValue PropsSetChecked(T *record, const storage::PropertyId &key
   }
 }
 
-template <typename T>
-concept AccessorWithInitProperties = requires(T accessor,
-                                              const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-  { accessor.InitProperties(properties) } -> std::same_as<storage::Result<bool>>;
-};
-
-/// Set property `values` mapped with given `key` on a `record`.
-///
-/// @throw QueryRuntimeException if value cannot be set as a property value
-template <AccessorWithInitProperties T>
-bool MultiPropsInitChecked(T *record, std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-  try {
-    auto maybe_values = record->InitProperties(properties);
-    if (maybe_values.HasError()) {
-      switch (maybe_values.GetError()) {
-        case storage::Error::SERIALIZATION_ERROR:
-          throw TransactionSerializationException();
-        case storage::Error::DELETED_OBJECT:
-          throw QueryRuntimeException("Trying to set properties on a deleted object.");
-        case storage::Error::PROPERTIES_DISABLED:
-          throw QueryRuntimeException("Can't set property because properties on edges are disabled.");
-        case storage::Error::VERTEX_HAS_EDGES:
-        case storage::Error::NONEXISTENT_OBJECT:
-          throw QueryRuntimeException("Unexpected error when setting a property.");
-      }
-    }
-    return std::move(*maybe_values);
-  } catch (const TypedValueException &) {
-    throw QueryRuntimeException("Cannot set properties.");
-  }
-}
-
 int64_t QueryTimestamp();
 }  // namespace memgraph::query

src/query/constants.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
@@ -16,6 +16,4 @@
 namespace memgraph::query {
 inline constexpr uint16_t kDefaultReplicationPort = 10000;
 inline constexpr auto *kDefaultReplicationServerIp = "0.0.0.0";
-inline const std::string kAsterisk = "*";
-inline constexpr uint16_t kDeleteStatisticsNumResults = 6;
 }  // namespace memgraph::query

src/query/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
@@ -22,19 +22,8 @@
 #include "query/trigger.hpp"
 #include "utils/async_timer.hpp"
 
-#include "query/frame_change.hpp"
-
 namespace memgraph::query {
 
-enum class TransactionStatus {
-  IDLE,
-  ACTIVE,
-  VERIFYING,
-  TERMINATED,
-  STARTED_COMMITTING,
-  STARTED_ROLLBACK,
-};
-
 struct EvaluationContext {
   /// Memory for allocations during evaluation of a *single* Pull call.
   ///
@@ -77,14 +66,12 @@ struct ExecutionContext {
   SymbolTable symbol_table;
   EvaluationContext evaluation_context;
   std::atomic<bool> *is_shutting_down{nullptr};
-  std::atomic<TransactionStatus> *transaction_status{nullptr};
   bool is_profile_query{false};
   std::chrono::duration<double> profile_execution_time;
   plan::ProfilingStats stats;
   plan::ProfilingStats *stats_root{nullptr};
   ExecutionStats execution_stats;
   TriggerContextCollector *trigger_context_collector{nullptr};
-  FrameChangeCollector *frame_change_collector{nullptr};
   utils::AsyncTimer timer;
 #ifdef MG_ENTERPRISE
   std::unique_ptr<FineGrainedAuthChecker> auth_checker{nullptr};
@@ -95,9 +82,7 @@ static_assert(std::is_move_assignable_v<ExecutionContext>, "ExecutionContext mus
 static_assert(std::is_move_constructible_v<ExecutionContext>, "ExecutionContext must be move constructible!");
 
 inline bool MustAbort(const ExecutionContext &context) noexcept {
-  return (context.transaction_status != nullptr &&
-          context.transaction_status->load(std::memory_order_acquire) == TransactionStatus::TERMINATED) ||
-         (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) ||
+  return (context.is_shutting_down != nullptr && context.is_shutting_down->load(std::memory_order_acquire)) ||
          context.timer.IsExpired();
 }
 

src/query/db_accessor.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
@@ -71,10 +71,6 @@ class EdgeAccessor final {
     return impl_.SetProperty(key, value);
   }
 
-  storage::Result<bool> InitProperties(const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-    return impl_.InitProperties(properties);
-  }
-
   storage::Result<storage::PropertyValue> RemoveProperty(storage::PropertyId key) {
     return SetProperty(key, storage::PropertyValue());
   }
@@ -129,10 +125,6 @@ class VertexAccessor final {
     return impl_.SetProperty(key, value);
   }
 
-  storage::Result<bool> InitProperties(const std::map<storage::PropertyId, storage::PropertyValue> &properties) {
-    return impl_.InitProperties(properties);
-  }
-
   storage::Result<storage::PropertyValue> RemoveProperty(storage::PropertyId key) {
     return SetProperty(key, storage::PropertyValue());
   }
@@ -430,25 +422,6 @@ class DbAccessor final {
     return accessor_->LabelPropertyIndexExists(label, prop);
   }
 
-  std::optional<storage::IndexStats> GetIndexStats(const storage::LabelId &label,
-                                                   const storage::PropertyId &property) const {
-    return accessor_->GetIndexStats(label, property);
-  }
-
-  std::vector<std::pair<storage::LabelId, storage::PropertyId>> ClearIndexStats() {
-    return accessor_->ClearIndexStats();
-  }
-
-  std::vector<std::pair<storage::LabelId, storage::PropertyId>> DeleteIndexStatsForLabels(
-      const std::span<std::string> labels) {
-    return accessor_->DeleteIndexStatsForLabels(labels);
-  }
-
-  void SetIndexStats(const storage::LabelId &label, const storage::PropertyId &property,
-                     const storage::IndexStats &stats) {
-    accessor_->SetIndexStats(label, property, stats);
-  }
-
   int64_t VerticesCount() const { return accessor_->ApproximateVertexCount(); }
 
   int64_t VerticesCount(storage::LabelId label) const { return accessor_->ApproximateVertexCount(label); }

src/query/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
@@ -120,8 +120,9 @@ class HintedAbortError : public utils::BasicException {
   using utils::BasicException::BasicException;
   HintedAbortError()
       : utils::BasicException(
-            "Transaction was asked to abort either because it was executing longer than time specified or another user "
-            "asked it to abort.") {}
+            "Transaction was asked to abort, most likely because it was "
+            "executing longer than time specified by "
+            "--query-execution-timeout-sec flag.") {}
 };
 
 class ExplicitTransactionUsageException : public QueryRuntimeException {
@@ -211,21 +212,6 @@ class IsolationLevelModificationInMulticommandTxException : public QueryExceptio
       : QueryException("Isolation level cannot be modified in multicommand transactions.") {}
 };
 
-class IsolationLevelModificationInAnalyticsException : public QueryException {
- public:
-  IsolationLevelModificationInAnalyticsException()
-      : QueryException(
-            "Isolation level cannot be modified when storage mode is set to IN_MEMORY_ANALYTICAL."
-            "IN_MEMORY_ANALYTICAL mode doesn't provide any isolation guarantees, "
-            "you can think about it as an equivalent to READ_UNCOMMITED.") {}
-};
-
-class StorageModeModificationInMulticommandTxException : public QueryException {
- public:
-  StorageModeModificationInMulticommandTxException()
-      : QueryException("Storage mode cannot be modified in multicommand transactions.") {}
-};
-
 class CreateSnapshotInMulticommandTxException final : public QueryException {
  public:
   CreateSnapshotInMulticommandTxException()
@@ -244,12 +230,6 @@ class VersionInfoInMulticommandTxException : public QueryException {
       : QueryException("Version info query not allowed in multicommand transactions.") {}
 };
 
-class AnalyzeGraphInMulticommandTxException : public QueryException {
- public:
-  AnalyzeGraphInMulticommandTxException()
-      : QueryException("Analyze graph query not allowed in multicommand transactions.") {}
-};
-
 class ReplicationException : public utils::BasicException {
  public:
   using utils::BasicException::BasicException;
@@ -257,11 +237,4 @@ class ReplicationException : public utils::BasicException {
       : utils::BasicException("Replication Exception: {} Check the status of the replicas using 'SHOW REPLICA' query.",
                               message) {}
 };
-
-class TransactionQueueInMulticommandTxException : public QueryException {
- public:
-  TransactionQueueInMulticommandTxException()
-      : QueryException("Transaction queue queries not allowed in multicommand transactions.") {}
-};
-
 }  // namespace memgraph::query

src/query/frame_change.hpp

@@ -1,122 +0,0 @@
-// Copyright 2023 Memgraph Ltd.
-//
-// Use of this software is governed by the Business Source License
-// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
-// License, and you may not use this file except in compliance with the Business Source License.
-//
-// As of the Change Date specified in that file, in accordance with
-// the Business Source License, use of this software will be governed
-// by the Apache License, Version 2.0, included in the file
-// licenses/APL.txt.
-#include "query/typed_value.hpp"
-#include "utils/memory.hpp"
-#include "utils/pmr/unordered_map.hpp"
-#include "utils/pmr/vector.hpp"
-namespace memgraph::query {
-
-// Key is hash output, value is vector of unique elements
-using CachedType = utils::pmr::unordered_map<size_t, std::vector<TypedValue>>;
-
-struct CachedValue {
-  // Cached value, this can be probably templateized
-  CachedType cache_;
-
-  explicit CachedValue(utils::MemoryResource *mem) : cache_(mem) {}
-
-  CachedValue(CachedType &&cache, memgraph::utils::MemoryResource *memory) : cache_(std::move(cache), memory) {}
-
-  CachedValue(const CachedValue &other, memgraph::utils::MemoryResource *memory) : cache_(other.cache_, memory) {}
-
-  CachedValue(CachedValue &&other, memgraph::utils::MemoryResource *memory) : cache_(std::move(other.cache_), memory) {}
-
-  CachedValue(CachedValue &&other) noexcept = delete;
-
-  /// Copy construction without memgraph::utils::MemoryResource is not allowed.
-  CachedValue(const CachedValue &) = delete;
-
-  CachedValue &operator=(const CachedValue &) = delete;
-  CachedValue &operator=(CachedValue &&) = delete;
-
-  ~CachedValue() = default;
-
-  memgraph::utils::MemoryResource *GetMemoryResource() const noexcept {
-    return cache_.get_allocator().GetMemoryResource();
-  }
-
-  // Func to check if cache_ contains value
-  bool CacheValue(const TypedValue &value) {
-    if (!value.IsList()) {
-      return false;
-    }
-    const auto &list = value.ValueList();
-    TypedValue::Hash hash{};
-    for (const TypedValue &element : list) {
-      const auto key = hash(element);
-      auto &vector_values = cache_[key];
-      if (!IsValueInVec(vector_values, element)) {
-        vector_values.push_back(element);
-      }
-    }
-    return true;
-  }
-  // Func to cache_value inside cache_
-  bool ContainsValue(const TypedValue &value) const {
-    TypedValue::Hash hash{};
-    const auto key = hash(value);
-    if (cache_.contains(key)) {
-      return IsValueInVec(cache_.at(key), value);
-    }
-    return false;
-  }
-
- private:
-  bool IsValueInVec(const std::vector<TypedValue> &vec_values, const TypedValue &value) const {
-    return std::any_of(vec_values.begin(), vec_values.end(), [&value](auto &vec_value) {
-      const auto is_value_equal = vec_value == value;
-      if (is_value_equal.IsNull()) return false;
-      return is_value_equal.ValueBool();
-    });
-  }
-};
-
-// Class tracks keys for which user can cache values which help with faster search or faster retrieval
-// in the future.
-class FrameChangeCollector {
- public:
-  explicit FrameChangeCollector(utils::MemoryResource *mem) : tracked_values_(mem){};
-
-  // Add tracking key to cache later value
-  CachedValue &AddTrackingKey(const std::string &key) {
-    const auto &[it, _] = tracked_values_.emplace(key, tracked_values_.get_allocator().GetMemoryResource());
-    return it->second;
-  }
-
-  // Is key tracked
-  bool IsKeyTracked(const std::string &key) const { return tracked_values_.contains(key); }
-
-  // Is value for given key cached
-  bool IsKeyValueCached(const std::string &key) const {
-    return tracked_values_.contains(key) && !tracked_values_.at(key).cache_.empty();
-  }
-
-  // Reset value for tracking key
-  bool ResetTrackingValue(const std::string &key) {
-    if (tracked_values_.contains(key)) {
-      tracked_values_.erase(key);
-      AddTrackingKey(key);
-    }
-
-    return true;
-  }
-
-  // Get value cached for tracking key, throws if key is not in tracked
-  CachedValue &GetCachedValue(const std::string &key) { return tracked_values_.at(key); }
-
-  // Checks for keys tracked
-  bool IsTrackingValues() const { return !tracked_values_.empty(); }
-
- private:
-  // Key is output of utils::GetFrameChangeId, value is utils::pmr::unordered_map
-  memgraph::utils::pmr::unordered_map<std::string, CachedValue> tracked_values_;
-};
-}  // namespace memgraph::query

src/query/frontend/ast/ast.cpp

@@ -1,282 +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 "query/frontend/ast/ast.hpp"
-#include "query/frontend/ast/ast_visitor.hpp"
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-constexpr utils::TypeInfo query::LabelIx::kType{utils::TypeId::AST_LABELIX, "LabelIx", nullptr};
-
-constexpr utils::TypeInfo query::PropertyIx::kType{utils::TypeId::AST_PROPERTYIX, "PropertyIx", nullptr};
-
-constexpr utils::TypeInfo query::EdgeTypeIx::kType{utils::TypeId::AST_EDGETYPEIX, "EdgeTypeIx", nullptr};
-
-constexpr utils::TypeInfo query::Tree::kType{utils::TypeId::AST_TREE, "Tree", nullptr};
-
-constexpr utils::TypeInfo query::Expression::kType{utils::TypeId::AST_EXPRESSION, "Expression", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Where::kType{utils::TypeId::AST_WHERE, "Where", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::BinaryOperator::kType{utils::TypeId::AST_BINARY_OPERATOR, "BinaryOperator",
-                                                       &query::Expression::kType};
-
-constexpr utils::TypeInfo query::UnaryOperator::kType{utils::TypeId::AST_UNARY_OPERATOR, "UnaryOperator",
-                                                      &query::Expression::kType};
-
-constexpr utils::TypeInfo query::OrOperator::kType{utils::TypeId::AST_OR_OPERATOR, "OrOperator",
-                                                   &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::XorOperator::kType{utils::TypeId::AST_XOR_OPERATOR, "XorOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::AndOperator::kType{utils::TypeId::AST_AND_OPERATOR, "AndOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::AdditionOperator::kType{utils::TypeId::AST_ADDITION_OPERATOR, "AdditionOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::SubtractionOperator::kType{utils::TypeId::AST_SUBTRACTION_OPERATOR,
-                                                            "SubtractionOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::MultiplicationOperator::kType{utils::TypeId::AST_MULTIPLICATION_OPERATOR,
-                                                               "MultiplicationOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::DivisionOperator::kType{utils::TypeId::AST_DIVISION_OPERATOR, "DivisionOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::ModOperator::kType{utils::TypeId::AST_MOD_OPERATOR, "ModOperator",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::NotEqualOperator::kType{utils::TypeId::AST_NOT_EQUAL_OPERATOR, "NotEqualOperator",
-                                                         &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::EqualOperator::kType{utils::TypeId::AST_EQUAL_OPERATOR, "EqualOperator",
-                                                      &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::LessOperator::kType{utils::TypeId::AST_LESS_OPERATOR, "LessOperator",
-                                                     &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::GreaterOperator::kType{utils::TypeId::AST_GREATER_OPERATOR, "GreaterOperator",
-                                                        &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::LessEqualOperator::kType{utils::TypeId::AST_LESS_EQUAL_OPERATOR, "LessEqualOperator",
-                                                          &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::GreaterEqualOperator::kType{utils::TypeId::AST_GREATER_EQUAL_OPERATOR,
-                                                             "GreaterEqualOperator", &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::InListOperator::kType{utils::TypeId::AST_IN_LIST_OPERATOR, "InListOperator",
-                                                       &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::SubscriptOperator::kType{utils::TypeId::AST_SUBSCRIPT_OPERATOR, "SubscriptOperator",
-                                                          &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::NotOperator::kType{utils::TypeId::AST_NOT_OPERATOR, "NotOperator",
-                                                    &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::UnaryPlusOperator::kType{utils::TypeId::AST_UNARY_PLUS_OPERATOR, "UnaryPlusOperator",
-                                                          &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::UnaryMinusOperator::kType{utils::TypeId::AST_UNARY_MINUS_OPERATOR,
-                                                           "UnaryMinusOperator", &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::IsNullOperator::kType{utils::TypeId::AST_IS_NULL_OPERATOR, "IsNullOperator",
-                                                       &query::UnaryOperator::kType};
-
-constexpr utils::TypeInfo query::Aggregation::kType{utils::TypeId::AST_AGGREGATION, "Aggregation",
-                                                    &query::BinaryOperator::kType};
-
-constexpr utils::TypeInfo query::ListSlicingOperator::kType{utils::TypeId::AST_LIST_SLICING_OPERATOR,
-                                                            "ListSlicingOperator", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::IfOperator::kType{utils::TypeId::AST_IF_OPERATOR, "IfOperator",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::BaseLiteral::kType{utils::TypeId::AST_BASE_LITERAL, "BaseLiteral",
-                                                    &query::Expression::kType};
-
-constexpr utils::TypeInfo query::PrimitiveLiteral::kType{utils::TypeId::AST_PRIMITIVE_LITERAL, "PrimitiveLiteral",
-                                                         &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::ListLiteral::kType{utils::TypeId::AST_LIST_LITERAL, "ListLiteral",
-                                                    &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::MapLiteral::kType{utils::TypeId::AST_MAP_LITERAL, "MapLiteral",
-                                                   &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::MapProjectionLiteral::kType{utils::TypeId::AST_MAP_PROJECTION_LITERAL,
-                                                             "MapProjectionLiteral", &query::BaseLiteral::kType};
-
-constexpr utils::TypeInfo query::Identifier::kType{utils::TypeId::AST_IDENTIFIER, "Identifier",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::PropertyLookup::kType{utils::TypeId::AST_PROPERTY_LOOKUP, "PropertyLookup",
-                                                       &query::Expression::kType};
-
-constexpr utils::TypeInfo query::AllPropertiesLookup::kType{utils::TypeId::AST_ALL_PROPERTIES_LOOKUP,
-                                                            "AllPropertiesLookup", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::LabelsTest::kType{utils::TypeId::AST_LABELS_TEST, "LabelsTest",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Function::kType{utils::TypeId::AST_FUNCTION, "Function", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Reduce::kType{utils::TypeId::AST_REDUCE, "Reduce", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Coalesce::kType{utils::TypeId::AST_COALESCE, "Coalesce", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Extract::kType{utils::TypeId::AST_EXTRACT, "Extract", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::All::kType{utils::TypeId::AST_ALL, "All", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Single::kType{utils::TypeId::AST_SINGLE, "Single", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::Any::kType{utils::TypeId::AST_ANY, "Any", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::None::kType{utils::TypeId::AST_NONE, "None", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::ParameterLookup::kType{utils::TypeId::AST_PARAMETER_LOOKUP, "ParameterLookup",
-                                                        &query::Expression::kType};
-
-constexpr utils::TypeInfo query::RegexMatch::kType{utils::TypeId::AST_REGEX_MATCH, "RegexMatch",
-                                                   &query::Expression::kType};
-
-constexpr utils::TypeInfo query::NamedExpression::kType{utils::TypeId::AST_NAMED_EXPRESSION, "NamedExpression",
-                                                        &query::Tree::kType};
-
-constexpr utils::TypeInfo query::PatternAtom::kType{utils::TypeId::AST_PATTERN_ATOM, "PatternAtom",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::NodeAtom::kType{utils::TypeId::AST_NODE_ATOM, "NodeAtom", &query::PatternAtom::kType};
-
-constexpr utils::TypeInfo query::EdgeAtom::Lambda::kType{utils::TypeId::AST_EDGE_ATOM_LAMBDA, "Lambda", nullptr};
-
-constexpr utils::TypeInfo query::EdgeAtom::kType{utils::TypeId::AST_EDGE_ATOM, "EdgeAtom", &query::PatternAtom::kType};
-
-constexpr utils::TypeInfo query::Pattern::kType{utils::TypeId::AST_PATTERN, "Pattern", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Clause::kType{utils::TypeId::AST_CLAUSE, "Clause", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::SingleQuery::kType{utils::TypeId::AST_SINGLE_QUERY, "SingleQuery",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::CypherUnion::kType{utils::TypeId::AST_CYPHER_UNION, "CypherUnion",
-                                                    &query::Tree::kType};
-
-constexpr utils::TypeInfo query::Query::kType{utils::TypeId::AST_QUERY, "Query", &query::Tree::kType};
-
-constexpr utils::TypeInfo query::CypherQuery::kType{utils::TypeId::AST_CYPHER_QUERY, "CypherQuery",
-                                                    &query::Query::kType};
-
-constexpr utils::TypeInfo query::ExplainQuery::kType{utils::TypeId::AST_EXPLAIN_QUERY, "ExplainQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::ProfileQuery::kType{utils::TypeId::AST_PROFILE_QUERY, "ProfileQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::IndexQuery::kType{utils::TypeId::AST_INDEX_QUERY, "IndexQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Create::kType{utils::TypeId::AST_CREATE, "Create", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::CallProcedure::kType{utils::TypeId::AST_CALL_PROCEDURE, "CallProcedure",
-                                                      &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Match::kType{utils::TypeId::AST_MATCH, "Match", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SortItem::kType{utils::TypeId::AST_SORT_ITEM, "SortItem", nullptr};
-
-constexpr utils::TypeInfo query::ReturnBody::kType{utils::TypeId::AST_RETURN_BODY, "ReturnBody", nullptr};
-
-constexpr utils::TypeInfo query::Return::kType{utils::TypeId::AST_RETURN, "Return", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::With::kType{utils::TypeId::AST_WITH, "With", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Delete::kType{utils::TypeId::AST_DELETE, "Delete", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetProperty::kType{utils::TypeId::AST_SET_PROPERTY, "SetProperty",
-                                                    &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetProperties::kType{utils::TypeId::AST_SET_PROPERTIES, "SetProperties",
-                                                      &query::Clause::kType};
-
-constexpr utils::TypeInfo query::SetLabels::kType{utils::TypeId::AST_SET_LABELS, "SetLabels", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::RemoveProperty::kType{utils::TypeId::AST_REMOVE_PROPERTY, "RemoveProperty",
-                                                       &query::Clause::kType};
-
-constexpr utils::TypeInfo query::RemoveLabels::kType{utils::TypeId::AST_REMOVE_LABELS, "RemoveLabels",
-                                                     &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Merge::kType{utils::TypeId::AST_MERGE, "Merge", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::Unwind::kType{utils::TypeId::AST_UNWIND, "Unwind", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::AuthQuery::kType{utils::TypeId::AST_AUTH_QUERY, "AuthQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::InfoQuery::kType{utils::TypeId::AST_INFO_QUERY, "InfoQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Constraint::kType{utils::TypeId::AST_CONSTRAINT, "Constraint", nullptr};
-
-constexpr utils::TypeInfo query::ConstraintQuery::kType{utils::TypeId::AST_CONSTRAINT_QUERY, "ConstraintQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::DumpQuery::kType{utils::TypeId::AST_DUMP_QUERY, "DumpQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::ReplicationQuery::kType{utils::TypeId::AST_REPLICATION_QUERY, "ReplicationQuery",
-                                                         &query::Query::kType};
-
-constexpr utils::TypeInfo query::LockPathQuery::kType{utils::TypeId::AST_LOCK_PATH_QUERY, "LockPathQuery",
-                                                      &query::Query::kType};
-
-constexpr utils::TypeInfo query::LoadCsv::kType{utils::TypeId::AST_LOAD_CSV, "LoadCsv", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::FreeMemoryQuery::kType{utils::TypeId::AST_FREE_MEMORY_QUERY, "FreeMemoryQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::TriggerQuery::kType{utils::TypeId::AST_TRIGGER_QUERY, "TriggerQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::IsolationLevelQuery::kType{utils::TypeId::AST_ISOLATION_LEVEL_QUERY,
-                                                            "IsolationLevelQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::StorageModeQuery::kType{utils::TypeId::AST_STORAGE_MODE_QUERY, "StorageModeQuery",
-                                                         &query::Query::kType};
-
-constexpr utils::TypeInfo query::CreateSnapshotQuery::kType{utils::TypeId::AST_CREATE_SNAPSHOT_QUERY,
-                                                            "CreateSnapshotQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::StreamQuery::kType{utils::TypeId::AST_STREAM_QUERY, "StreamQuery",
-                                                    &query::Query::kType};
-
-constexpr utils::TypeInfo query::SettingQuery::kType{utils::TypeId::AST_SETTING_QUERY, "SettingQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::VersionQuery::kType{utils::TypeId::AST_VERSION_QUERY, "VersionQuery",
-                                                     &query::Query::kType};
-
-constexpr utils::TypeInfo query::Foreach::kType{utils::TypeId::AST_FOREACH, "Foreach", &query::Clause::kType};
-
-constexpr utils::TypeInfo query::ShowConfigQuery::kType{utils::TypeId::AST_SHOW_CONFIG_QUERY, "ShowConfigQuery",
-                                                        &query::Query::kType};
-
-constexpr utils::TypeInfo query::AnalyzeGraphQuery::kType{utils::TypeId::AST_ANALYZE_GRAPH_QUERY, "AnalyzeGraphQuery",
-                                                          &query::Query::kType};
-
-constexpr utils::TypeInfo query::TransactionQueueQuery::kType{utils::TypeId::AST_TRANSACTION_QUEUE_QUERY,
-                                                              "TransactionQueueQuery", &query::Query::kType};
-
-constexpr utils::TypeInfo query::Exists::kType{utils::TypeId::AST_EXISTS, "Exists", &query::Expression::kType};
-
-constexpr utils::TypeInfo query::CallSubquery::kType{utils::TypeId::AST_CALL_SUBQUERY, "CallSubquery",
-                                                     &query::Clause::kType};
-}  // namespace memgraph

src/query/frontend/ast/ast.lcp

@@ -301,7 +301,6 @@ cpp<#
 
 (lcp:define-class expression (tree "::utils::Visitable<HierarchicalTreeVisitor>"
                                    "::utils::Visitable<ExpressionVisitor<TypedValue>>"
-                                   "::utils::Visitable<ExpressionVisitor<TypedValue*>>"
                                    "::utils::Visitable<ExpressionVisitor<void>>")
   ()
   (:abstractp t)
@@ -309,7 +308,6 @@ cpp<#
     #>cpp
     using utils::Visitable<HierarchicalTreeVisitor>::Accept;
     using utils::Visitable<ExpressionVisitor<TypedValue>>::Accept;
-    using utils::Visitable<ExpressionVisitor<TypedValue*>>::Accept;
     using utils::Visitable<ExpressionVisitor<void>>::Accept;
 
     Expression() = default;
@@ -409,7 +407,6 @@ cpp<#
                           (:public
                             #>cpp
                             DEFVISITABLE(ExpressionVisitor<TypedValue>);
-                            DEFVISITABLE(ExpressionVisitor<TypedValue*>);
                             DEFVISITABLE(ExpressionVisitor<void>);
                             bool Accept(HierarchicalTreeVisitor &visitor) override {
                               if (visitor.PreVisit(*this)) {
@@ -441,7 +438,6 @@ cpp<#
                           (:public
                             #>cpp
                             DEFVISITABLE(ExpressionVisitor<TypedValue>);
-                            DEFVISITABLE(ExpressionVisitor<TypedValue*>);
                             DEFVISITABLE(ExpressionVisitor<void>);
                             bool Accept(HierarchicalTreeVisitor &visitor) override {
                               if (visitor.PreVisit(*this)) {
@@ -489,7 +485,6 @@ cpp<#
     }
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -543,7 +538,6 @@ cpp<#
     ListSlicingOperator() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -587,7 +581,6 @@ cpp<#
     IfOperator() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -635,7 +628,6 @@ cpp<#
     PrimitiveLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
     cpp<#)
@@ -664,7 +656,6 @@ cpp<#
     ListLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -697,7 +688,6 @@ cpp<#
     MapLiteral() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -730,7 +720,6 @@ cpp<#
     Identifier() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
 
@@ -768,7 +757,6 @@ cpp<#
     PropertyLookup() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -809,7 +797,6 @@ cpp<#
     LabelsTest() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -850,7 +837,6 @@ cpp<#
     Function() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -906,7 +892,6 @@ cpp<#
     Reduce() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -945,7 +930,6 @@ cpp<#
    Coalesce() = default;
 
    DEFVISITABLE(ExpressionVisitor<TypedValue>);
-   DEFVISITABLE(ExpressionVisitor<TypedValue*>);
    DEFVISITABLE(ExpressionVisitor<void>);
    bool Accept(HierarchicalTreeVisitor &visitor) override {
      if (visitor.PreVisit(*this)) {
@@ -985,7 +969,6 @@ cpp<#
     Extract() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1022,7 +1005,6 @@ cpp<#
     All() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1064,7 +1046,6 @@ cpp<#
     Single() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1106,7 +1087,6 @@ cpp<#
     Any() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1148,7 +1128,6 @@ cpp<#
     None() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1180,7 +1159,6 @@ cpp<#
     ParameterLookup() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     DEFVISITABLE(HierarchicalTreeVisitor);
     cpp<#)
@@ -1208,7 +1186,6 @@ cpp<#
     RegexMatch() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1228,7 +1205,6 @@ cpp<#
 
 (lcp:define-class named-expression (tree "::utils::Visitable<HierarchicalTreeVisitor>"
                                          "::utils::Visitable<ExpressionVisitor<TypedValue>>"
-                                         "::utils::Visitable<ExpressionVisitor<TypedValue*>>"
                                          "::utils::Visitable<ExpressionVisitor<void>>")
   ((name "std::string" :scope :public)
    (expression "Expression *" :initval "nullptr" :scope :public
@@ -1237,9 +1213,7 @@ cpp<#
    (token-position :int32_t :initval -1 :scope :public
                    :documentation "This field contains token position of first token in named expression used to create name_. If NamedExpression object is not created from query or it is aliased leave this value at -1.")
    (symbol-pos :int32_t :initval -1 :scope :public
-               :documentation "Symbol table position of the symbol this NamedExpression is mapped to.")
-   (is-aliased :bool :initval "false" :scope :public
-               :documentation "True if the variable is aliased"))
+               :documentation "Symbol table position of the symbol this NamedExpression is mapped to."))
   (:public
     #>cpp
     using utils::Visitable<ExpressionVisitor<TypedValue>>::Accept;
@@ -1249,7 +1223,6 @@ cpp<#
     NamedExpression() = default;
 
     DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
     DEFVISITABLE(ExpressionVisitor<void>);
     bool Accept(HierarchicalTreeVisitor &visitor) override {
       if (visitor.PreVisit(*this)) {
@@ -1622,7 +1595,7 @@ cpp<#
   (:clone :ignore-other-base-classes t)
   (:type-info :ignore-other-base-classes t))
 
-(lcp:define-class cypher-query (query "::utils::Visitable<HierarchicalTreeVisitor>")
+(lcp:define-class cypher-query (query)
   ((single-query "SingleQuery *" :initval "nullptr" :scope :public
                  :slk-save #'slk-save-ast-pointer
                  :slk-load (slk-load-ast-pointer "SingleQuery")
@@ -1641,25 +1614,13 @@ cpp<#
     CypherQuery() = default;
 
     DEFVISITABLE(QueryVisitor<void>);
-
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        single_query_->Accept(visitor);
-        for (auto *cypher_union : cypher_unions_) {
-          cypher_union->Accept(visitor);
-        }
-      }
-
-      return visitor.PostVisit(*this);
-    }
     cpp<#)
   (:private
     #>cpp
     friend class AstStorage;
     cpp<#)
-  (:serialize (:slk :ignore-other-base-classes t))
-  (:clone :ignore-other-base-classes t)
-  (:type-info :ignore-other-base-classes t))
+  (:serialize (:slk))
+  (:clone))
 
 (lcp:define-class explain-query (query)
   ((cypher-query "CypherQuery *" :initval "nullptr" :scope :public
@@ -2298,7 +2259,7 @@ cpp<#
     (lcp:define-enum privilege
         (create delete match merge set remove index stats auth constraint
          dump replication durability read_file free_memory trigger config stream module_read module_write
-         websocket transaction_management)
+         websocket)
       (:serialize))
     (lcp:define-enum fine-grained-privilege
         (nothing read update create_delete)
@@ -2347,7 +2308,7 @@ const std::vector<AuthQuery::Privilege> kPrivilegesAll = {
     AuthQuery::Privilege::FREE_MEMORY, AuthQuery::Privilege::TRIGGER,
     AuthQuery::Privilege::CONFIG,      AuthQuery::Privilege::STREAM,
     AuthQuery::Privilege::MODULE_READ, AuthQuery::Privilege::MODULE_WRITE,
-    AuthQuery::Privilege::WEBSOCKET,   AuthQuery::Privilege::TRANSACTION_MANAGEMENT};
+    AuthQuery::Privilege::WEBSOCKET};
 cpp<#
 
 (lcp:define-class info-query (query)
@@ -2417,26 +2378,6 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class analyze-graph-query (query)
-  ((action "Action" :scope :public)
-  (labels "std::vector<std::string>" :scope :public))
-
-  (:public
-    (lcp:define-enum action
-        (analyze delete)
-      (:serialize))
-    #>cpp
-    AnalyzeGraphQuery() = default;
-
-    DEFVISITABLE(QueryVisitor<void>);
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:define-class replication-query (query)
   ((action "Action" :scope :public)
    (role "ReplicationRole" :scope :public)
@@ -2695,26 +2636,6 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class transaction-queue-query (query)
-  ((action "Action" :scope :public)
-  (transaction_id_list "std::vector<Expression*>" :scope :public))
-
-  (:public
-    (lcp:define-enum action
-        (show-transactions terminate-transactions)
-      (:serialize))
-    #>cpp
-    TransactionQueueQuery() = default;
-
-    DEFVISITABLE(QueryVisitor<void>);
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:define-class version-query (query) ()
   (:public
     #>cpp
@@ -2765,64 +2686,5 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
-(lcp:define-class exists (expression)
-  ((pattern "Pattern *" :initval "nullptr" :scope :public
-             :slk-save #'slk-save-ast-pointer
-             :slk-load (slk-load-ast-pointer "Pattern"))
-   (symbol-pos :int32_t :initval -1 :scope :public
-               :documentation "Symbol table position of the symbol this Aggregation is mapped to."))
-
-  (:public
-    #>cpp
-    Exists() = default;
-
-    DEFVISITABLE(ExpressionVisitor<TypedValue>);
-    DEFVISITABLE(ExpressionVisitor<TypedValue*>);
-    DEFVISITABLE(ExpressionVisitor<void>);
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        pattern_->Accept(visitor);
-      }
-      return visitor.PostVisit(*this);
-    }
-    Exists *MapTo(const Symbol &symbol) {
-      symbol_pos_ = symbol.position();
-      return this;
-    }
-    cpp<#)
-  (:protected
-    #>cpp
-    Exists(Pattern * pattern) : pattern_(pattern) {}
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
-(lcp:define-class call-subquery (clause)
-  ((cypher-query "CypherQuery *" :scope :public
-          :slk-save #'slk-save-ast-pointer
-          :slk-load (slk-load-ast-pointer "CypherQuery")))
-  (:public
-    #>cpp
-    CallSubquery() = default;
-
-    bool Accept(HierarchicalTreeVisitor &visitor) override {
-      if (visitor.PreVisit(*this)) {
-        cypher_query_->Accept(visitor);
-      }
-      return visitor.PostVisit(*this);
-    }
-
-    cpp<#)
-  (:private
-    #>cpp
-    friend class AstStorage;
-    cpp<#)
-  (:serialize (:slk))
-  (:clone))
-
 (lcp:pop-namespace) ;; namespace query
 (lcp:pop-namespace) ;; namespace memgraph

src/query/frontend/ast/ast_visitor.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,7 +22,6 @@ class CypherUnion;
 class NamedExpression;
 class Identifier;
 class PropertyLookup;
-class AllPropertiesLookup;
 class LabelsTest;
 class Aggregation;
 class Function;
@@ -45,7 +44,6 @@ class EdgeAtom;
 class PrimitiveLiteral;
 class ListLiteral;
 class MapLiteral;
-class MapProjectionLiteral;
 class OrOperator;
 class XorOperator;
 class AndOperator;
@@ -91,27 +89,21 @@ class LoadCsv;
 class FreeMemoryQuery;
 class TriggerQuery;
 class IsolationLevelQuery;
-class StorageModeQuery;
 class CreateSnapshotQuery;
 class StreamQuery;
 class SettingQuery;
 class VersionQuery;
 class Foreach;
 class ShowConfigQuery;
-class CallSubquery;
-class AnalyzeGraphQuery;
-class TransactionQueueQuery;
-class Exists;
 
 using TreeCompositeVisitor = utils::CompositeVisitor<
     SingleQuery, CypherUnion, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator, AdditionOperator,
     SubtractionOperator, MultiplicationOperator, DivisionOperator, ModOperator, NotEqualOperator, EqualOperator,
     LessOperator, GreaterOperator, LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
     ListSlicingOperator, IfOperator, UnaryPlusOperator, UnaryMinusOperator, IsNullOperator, ListLiteral, MapLiteral,
-    MapProjectionLiteral, PropertyLookup, AllPropertiesLookup, LabelsTest, Aggregation, Function, Reduce, Coalesce,
-    Extract, All, Single, Any, None, CallProcedure, Create, Match, Return, With, Pattern, NodeAtom, EdgeAtom, Delete,
-    Where, SetProperty, SetProperties, SetLabels, RemoveProperty, RemoveLabels, Merge, Unwind, RegexMatch, LoadCsv,
-    Foreach, Exists, CallSubquery, CypherQuery>;
+    PropertyLookup, LabelsTest, Aggregation, Function, Reduce, Coalesce, Extract, All, Single, Any, None, CallProcedure,
+    Create, Match, Return, With, Pattern, NodeAtom, EdgeAtom, Delete, Where, SetProperty, SetProperties, SetLabels,
+    RemoveProperty, RemoveLabels, Merge, Unwind, RegexMatch, LoadCsv, Foreach>;
 
 using TreeLeafVisitor = utils::LeafVisitor<Identifier, PrimitiveLiteral, ParameterLookup>;
 
@@ -125,20 +117,18 @@ class HierarchicalTreeVisitor : public TreeCompositeVisitor, public TreeLeafVisi
 
 template <class TResult>
 class ExpressionVisitor
-    : public utils::Visitor<TResult, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator,
-                            AdditionOperator, SubtractionOperator, MultiplicationOperator, DivisionOperator,
-                            ModOperator, NotEqualOperator, EqualOperator, LessOperator, GreaterOperator,
-                            LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
-                            ListSlicingOperator, IfOperator, UnaryPlusOperator, UnaryMinusOperator, IsNullOperator,
-                            ListLiteral, MapLiteral, MapProjectionLiteral, PropertyLookup, AllPropertiesLookup,
-                            LabelsTest, Aggregation, Function, Reduce, Coalesce, Extract, All, Single, Any, None,
-                            ParameterLookup, Identifier, PrimitiveLiteral, RegexMatch, Exists> {};
+    : public utils::Visitor<
+          TResult, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator, AdditionOperator,
+          SubtractionOperator, MultiplicationOperator, DivisionOperator, ModOperator, NotEqualOperator, EqualOperator,
+          LessOperator, GreaterOperator, LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
+          ListSlicingOperator, IfOperator, UnaryPlusOperator, UnaryMinusOperator, IsNullOperator, ListLiteral,
+          MapLiteral, PropertyLookup, LabelsTest, Aggregation, Function, Reduce, Coalesce, Extract, All, Single, Any,
+          None, ParameterLookup, Identifier, PrimitiveLiteral, RegexMatch> {};
 
 template <class TResult>
-class QueryVisitor
-    : public utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery, InfoQuery,
-                            ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery, FreeMemoryQuery, TriggerQuery,
-                            IsolationLevelQuery, CreateSnapshotQuery, StreamQuery, SettingQuery, VersionQuery,
-                            ShowConfigQuery, TransactionQueueQuery, StorageModeQuery, AnalyzeGraphQuery> {};
+class QueryVisitor : public utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery,
+                                           InfoQuery, ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery,
+                                           FreeMemoryQuery, TriggerQuery, IsolationLevelQuery, CreateSnapshotQuery,
+                                           StreamQuery, SettingQuery, VersionQuery, ShowConfigQuery> {};
 
 }  // namespace memgraph::query

src/query/frontend/ast/cypher_main_visitor.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
@@ -11,10 +11,8 @@
 
 #include "query/frontend/ast/cypher_main_visitor.hpp"
 #include <support/Any.h>
-#include <tree/ParseTreeVisitor.h>
 
 #include <algorithm>
-#include <any>
 #include <climits>
 #include <codecvt>
 #include <cstring>
@@ -124,9 +122,6 @@ antlrcpp::Any CypherMainVisitor::visitInfoQuery(MemgraphCypher::InfoQueryContext
   } else if (ctx->constraintInfo()) {
     info_query->info_type_ = InfoQuery::InfoType::CONSTRAINT;
     return info_query;
-  } else if (ctx->buildInfo()) {
-    info_query->info_type_ = InfoQuery::InfoType::BUILD;
-    return info_query;
   } else {
     throw utils::NotYetImplemented("Info query: '{}'", ctx->getText());
   }
@@ -244,23 +239,6 @@ antlrcpp::Any CypherMainVisitor::visitDumpQuery(MemgraphCypher::DumpQueryContext
   return dump_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitAnalyzeGraphQuery(MemgraphCypher::AnalyzeGraphQueryContext *ctx) {
-  auto *analyze_graph_query = storage_->Create<AnalyzeGraphQuery>();
-  if (ctx->listOfColonSymbolicNames()) {
-    analyze_graph_query->labels_ =
-        std::any_cast<std::vector<std::string>>(ctx->listOfColonSymbolicNames()->accept(this));
-  } else {
-    analyze_graph_query->labels_.emplace_back("*");
-  }
-  if (ctx->DELETE()) {
-    analyze_graph_query->action_ = AnalyzeGraphQuery::Action::DELETE;
-  } else {
-    analyze_graph_query->action_ = AnalyzeGraphQuery::Action::ANALYZE;
-  }
-  query_ = analyze_graph_query;
-  return analyze_graph_query;
-}
-
 antlrcpp::Any CypherMainVisitor::visitReplicationQuery(MemgraphCypher::ReplicationQueryContext *ctx) {
   MG_ASSERT(ctx->children.size() == 1, "ReplicationQuery should have exactly one child!");
   auto *replication_query = std::any_cast<ReplicationQuery *>(ctx->children[0]->accept(this));
@@ -328,9 +306,7 @@ antlrcpp::Any CypherMainVisitor::visitShowReplicas(MemgraphCypher::ShowReplicasC
 
 antlrcpp::Any CypherMainVisitor::visitLockPathQuery(MemgraphCypher::LockPathQueryContext *ctx) {
   auto *lock_query = storage_->Create<LockPathQuery>();
-  if (ctx->STATUS()) {
-    lock_query->action_ = LockPathQuery::Action::STATUS;
-  } else if (ctx->LOCK()) {
+  if (ctx->LOCK()) {
     lock_query->action_ = LockPathQuery::Action::LOCK_PATH;
   } else if (ctx->UNLOCK()) {
     lock_query->action_ = LockPathQuery::Action::UNLOCK_PATH;
@@ -492,20 +468,6 @@ antlrcpp::Any CypherMainVisitor::visitIsolationLevelQuery(MemgraphCypher::Isolat
   return isolation_level_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitStorageModeQuery(MemgraphCypher::StorageModeQueryContext *ctx) {
-  auto *storage_mode_query = storage_->Create<StorageModeQuery>();
-
-  storage_mode_query->storage_mode_ = std::invoke([mode = ctx->storageMode()]() {
-    if (mode->IN_MEMORY_ANALYTICAL()) {
-      return StorageModeQuery::StorageMode::IN_MEMORY_ANALYTICAL;
-    }
-    return StorageModeQuery::StorageMode::IN_MEMORY_TRANSACTIONAL;
-  });
-
-  query_ = storage_mode_query;
-  return storage_mode_query;
-}
-
 antlrcpp::Any CypherMainVisitor::visitCreateSnapshotQuery(MemgraphCypher::CreateSnapshotQueryContext *ctx) {
   query_ = storage_->Create<CreateSnapshotQuery>();
   return query_;
@@ -669,7 +631,6 @@ void GetTopicNames(auto &destination, MemgraphCypher::TopicNamesContext *topic_n
     destination = std::any_cast<Expression *>(topic_names_ctx->accept(&visitor));
   }
 }
-
 }  // namespace
 
 antlrcpp::Any CypherMainVisitor::visitKafkaCreateStreamConfig(MemgraphCypher::KafkaCreateStreamConfigContext *ctx) {
@@ -922,34 +883,6 @@ antlrcpp::Any CypherMainVisitor::visitShowSettings(MemgraphCypher::ShowSettingsC
   return setting_query;
 }
 
-antlrcpp::Any CypherMainVisitor::visitTransactionQueueQuery(MemgraphCypher::TransactionQueueQueryContext *ctx) {
-  MG_ASSERT(ctx->children.size() == 1, "TransactionQueueQuery should have exactly one child!");
-  auto *transaction_queue_query = std::any_cast<TransactionQueueQuery *>(ctx->children[0]->accept(this));
-  query_ = transaction_queue_query;
-  return transaction_queue_query;
-}
-
-antlrcpp::Any CypherMainVisitor::visitShowTransactions(MemgraphCypher::ShowTransactionsContext * /*ctx*/) {
-  auto *transaction_shower = storage_->Create<TransactionQueueQuery>();
-  transaction_shower->action_ = TransactionQueueQuery::Action::SHOW_TRANSACTIONS;
-  return transaction_shower;
-}
-
-antlrcpp::Any CypherMainVisitor::visitTerminateTransactions(MemgraphCypher::TerminateTransactionsContext *ctx) {
-  auto *terminator = storage_->Create<TransactionQueueQuery>();
-  terminator->action_ = TransactionQueueQuery::Action::TERMINATE_TRANSACTIONS;
-  terminator->transaction_id_list_ = std::any_cast<std::vector<Expression *>>(ctx->transactionIdList()->accept(this));
-  return terminator;
-}
-
-antlrcpp::Any CypherMainVisitor::visitTransactionIdList(MemgraphCypher::TransactionIdListContext *ctx) {
-  std::vector<Expression *> transaction_ids;
-  for (auto *transaction_id : ctx->transactionId()) {
-    transaction_ids.push_back(std::any_cast<Expression *>(transaction_id->accept(this)));
-  }
-  return transaction_ids;
-}
-
 antlrcpp::Any CypherMainVisitor::visitVersionQuery(MemgraphCypher::VersionQueryContext * /*ctx*/) {
   auto *version_query = storage_->Create<VersionQuery>();
   query_ = version_query;
@@ -1008,10 +941,6 @@ antlrcpp::Any CypherMainVisitor::visitSingleQuery(MemgraphCypher::SingleQueryCon
         calls_write_procedure = true;
         has_update = true;
       }
-    } else if (const auto *call_subquery = utils::Downcast<CallSubquery>(clause); call_subquery != nullptr) {
-      if (has_return) {
-        throw SemanticException("CALL can't be put after RETURN clause.");
-      }
     } else if (utils::IsSubtype(clause_type, Unwind::kType)) {
       check_write_procedure("UNWIND");
       if (has_update || has_return) {
@@ -1124,9 +1053,6 @@ antlrcpp::Any CypherMainVisitor::visitClause(MemgraphCypher::ClauseContext *ctx)
   if (ctx->foreach ()) {
     return static_cast<Clause *>(std::any_cast<Foreach *>(ctx->foreach ()->accept(this)));
   }
-  if (ctx->callSubquery()) {
-    return static_cast<Clause *>(std::any_cast<CallSubquery *>(ctx->callSubquery()->accept(this)));
-  }
   // TODO: implement other clauses.
   throw utils::NotYetImplemented("clause '{}'", ctx->getText());
   return 0;
@@ -1484,23 +1410,19 @@ antlrcpp::Any CypherMainVisitor::visitEntityPrivilegeList(MemgraphCypher::Entity
   return result;
 }
 
-antlrcpp::Any CypherMainVisitor::visitListOfColonSymbolicNames(MemgraphCypher::ListOfColonSymbolicNamesContext *ctx) {
-  std::vector<std::string> symbolic_names;
-  for (auto *symbolic_name : ctx->colonSymbolicName()) {
-    symbolic_names.push_back(std::any_cast<std::string>(symbolic_name->symbolicName()->accept(this)));
-  }
-  return symbolic_names;
-}
-
 /**
  * @return std::vector<std::string>
  */
 antlrcpp::Any CypherMainVisitor::visitEntitiesList(MemgraphCypher::EntitiesListContext *ctx) {
   std::vector<std::string> entities;
-  if (ctx->listOfColonSymbolicNames()) {
-    return ctx->listOfColonSymbolicNames()->accept(this);
+  if (ctx->listOfEntities()) {
+    for (auto *entity : ctx->listOfEntities()->entity()) {
+      entities.push_back(std::any_cast<std::string>(entity->symbolicName()->accept(this)));
+    }
+  } else {
+    entities.emplace_back("*");
   }
-  entities.emplace_back("*");
+
   return entities;
 }
 
@@ -1529,8 +1451,6 @@ antlrcpp::Any CypherMainVisitor::visitPrivilege(MemgraphCypher::PrivilegeContext
   if (ctx->MODULE_READ()) return AuthQuery::Privilege::MODULE_READ;
   if (ctx->MODULE_WRITE()) return AuthQuery::Privilege::MODULE_WRITE;
   if (ctx->WEBSOCKET()) return AuthQuery::Privilege::WEBSOCKET;
-  if (ctx->TRANSACTION_MANAGEMENT()) return AuthQuery::Privilege::TRANSACTION_MANAGEMENT;
-  if (ctx->STORAGE_MODE()) return AuthQuery::Privilege::STORAGE_MODE;
   LOG_FATAL("Should not get here - unknown privilege!");
 }
 
@@ -1623,7 +1543,6 @@ antlrcpp::Any CypherMainVisitor::visitReturnItem(MemgraphCypher::ReturnItemConte
   named_expr->expression_ = std::any_cast<Expression *>(ctx->expression()->accept(this));
   MG_ASSERT(named_expr->expression_);
   if (ctx->variable()) {
-    named_expr->is_aliased_ = true;
     named_expr->name_ = std::string(std::any_cast<std::string>(ctx->variable()->accept(this)));
     users_identifiers.insert(named_expr->name_);
   } else {
@@ -1701,38 +1620,6 @@ antlrcpp::Any CypherMainVisitor::visitMapLiteral(MemgraphCypher::MapLiteralConte
   return map;
 }
 
-antlrcpp::Any CypherMainVisitor::visitMapProjectionLiteral(MemgraphCypher::MapProjectionLiteralContext *ctx) {
-  MapProjectionData map_projection_data;
-
-  map_projection_data.map_variable =
-      storage_->Create<Identifier>(std::any_cast<std::string>(ctx->variable()->accept(this)));
-  for (auto *map_el : ctx->mapElement()) {
-    if (map_el->propertyLookup()) {
-      auto key = std::any_cast<PropertyIx>(map_el->propertyLookup()->propertyKeyName()->accept(this));
-      auto property = std::any_cast<PropertyIx>(map_el->propertyLookup()->accept(this));
-      auto *property_lookup = storage_->Create<PropertyLookup>(map_projection_data.map_variable, property);
-      map_projection_data.elements.insert_or_assign(key, property_lookup);
-    }
-    if (map_el->allPropertiesLookup()) {
-      auto key = AddProperty("*");
-      auto *all_properties_lookup = storage_->Create<AllPropertiesLookup>(map_projection_data.map_variable);
-      map_projection_data.elements.insert_or_assign(key, all_properties_lookup);
-    }
-    if (map_el->variable()) {
-      auto key = AddProperty(std::any_cast<std::string>(map_el->variable()->accept(this)));
-      auto *variable = storage_->Create<Identifier>(std::any_cast<std::string>(map_el->variable()->accept(this)));
-      map_projection_data.elements.insert_or_assign(key, variable);
-    }
-    if (map_el->propertyKeyValuePair()) {
-      auto key = std::any_cast<PropertyIx>(map_el->propertyKeyValuePair()->propertyKeyName()->accept(this));
-      auto *value = std::any_cast<Expression *>(map_el->propertyKeyValuePair()->expression()->accept(this));
-      map_projection_data.elements.insert_or_assign(key, value);
-    }
-  }
-
-  return map_projection_data;
-}
-
 antlrcpp::Any CypherMainVisitor::visitListLiteral(MemgraphCypher::ListLiteralContext *ctx) {
   std::vector<Expression *> expressions;
   for (auto *expr_ctx : ctx->expression()) {
@@ -2273,10 +2160,7 @@ antlrcpp::Any CypherMainVisitor::visitAtom(MemgraphCypher::AtomContext *ctx) {
     auto *list = std::any_cast<Expression *>(ctx->extractExpression()->idInColl()->expression()->accept(this));
     auto *expr = std::any_cast<Expression *>(ctx->extractExpression()->expression()->accept(this));
     return static_cast<Expression *>(storage_->Create<Extract>(ident, list, expr));
-  } else if (ctx->existsExpression()) {
-    return std::any_cast<Expression *>(ctx->existsExpression()->accept(this));
   }
-
   // TODO: Implement this. We don't support comprehensions, filtering... at
   // the moment.
   throw utils::NotYetImplemented("atom expression '{}'", ctx->getText());
@@ -2313,10 +2197,6 @@ antlrcpp::Any CypherMainVisitor::visitLiteral(MemgraphCypher::LiteralContext *ct
   } else if (ctx->listLiteral()) {
     return static_cast<Expression *>(
         storage_->Create<ListLiteral>(std::any_cast<std::vector<Expression *>>(ctx->listLiteral()->accept(this))));
-  } else if (ctx->mapProjectionLiteral()) {
-    auto map_projection_data = std::any_cast<MapProjectionData>(ctx->mapProjectionLiteral()->accept(this));
-    return static_cast<Expression *>(storage_->Create<MapProjectionLiteral>(map_projection_data.map_variable,
-                                                                            std::move(map_projection_data.elements)));
   } else {
     return static_cast<Expression *>(storage_->Create<MapLiteral>(
         std::any_cast<std::unordered_map<PropertyIx, Expression *>>(ctx->mapLiteral()->accept(this))));
@@ -2324,17 +2204,6 @@ antlrcpp::Any CypherMainVisitor::visitLiteral(MemgraphCypher::LiteralContext *ct
   return visitChildren(ctx);
 }
 
-antlrcpp::Any CypherMainVisitor::visitExistsExpression(MemgraphCypher::ExistsExpressionContext *ctx) {
-  auto *exists = storage_->Create<Exists>();
-  exists->pattern_ = std::any_cast<Pattern *>(ctx->patternPart()->accept(this));
-
-  if (exists->pattern_->identifier_) {
-    throw SyntaxException("Identifiers are not supported in exists(...).");
-  }
-
-  return static_cast<Expression *>(exists);
-}
-
 antlrcpp::Any CypherMainVisitor::visitParenthesizedExpression(MemgraphCypher::ParenthesizedExpressionContext *ctx) {
   return std::any_cast<Expression *>(ctx->expression()->accept(this));
 }
@@ -2629,20 +2498,6 @@ antlrcpp::Any CypherMainVisitor::visitShowConfigQuery(MemgraphCypher::ShowConfig
   return query_;
 }
 
-antlrcpp::Any CypherMainVisitor::visitCallSubquery(MemgraphCypher::CallSubqueryContext *ctx) {
-  auto *call_subquery = storage_->Create<CallSubquery>();
-
-  MG_ASSERT(ctx->cypherQuery(), "Expected query inside subquery clause");
-
-  if (ctx->cypherQuery()->queryMemoryLimit()) {
-    throw SyntaxException("Memory limit cannot be set on subqueries!");
-  }
-
-  call_subquery->cypher_query_ = std::any_cast<CypherQuery *>(ctx->cypherQuery()->accept(this));
-
-  return call_subquery;
-}
-
 LabelIx CypherMainVisitor::AddLabel(const std::string &name) { return storage_->GetLabelIx(name); }
 
 PropertyIx CypherMainVisitor::AddProperty(const std::string &name) { return storage_->GetPropertyIx(name); }

src/query/frontend/ast/cypher_main_visitor.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,6 +15,8 @@
 #include <unordered_set>
 #include <utility>
 
+#include <antlr4-runtime.h>
+
 #include "query/frontend/ast/ast.hpp"
 #include "query/frontend/opencypher/generated/MemgraphCypherBaseVisitor.h"
 #include "utils/exceptions.hpp"
@@ -181,16 +183,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitDumpQuery(MemgraphCypher::DumpQueryContext *ctx) override;
 
-  /**
-  @return std::vector<std::string>
-  */
-  antlrcpp::Any visitListOfColonSymbolicNames(MemgraphCypher::ListOfColonSymbolicNamesContext *ctx) override;
-
-  /**
-   * @return AnalyzeGraphQuery*
-   */
-  antlrcpp::Any visitAnalyzeGraphQuery(MemgraphCypher::AnalyzeGraphQueryContext *ctx) override;
-
   /**
    * @return ReplicationQuery*
    */
@@ -261,11 +253,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitIsolationLevelQuery(MemgraphCypher::IsolationLevelQueryContext *ctx) override;
 
-  /**
-   * @return StorageModeQuery*
-   */
-  antlrcpp::Any visitStorageModeQuery(MemgraphCypher::StorageModeQueryContext *ctx) override;
-
   /**
    * @return CreateSnapshotQuery*
    */
@@ -371,26 +358,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitShowSettings(MemgraphCypher::ShowSettingsContext *ctx) override;
 
-  /**
-   * @return TransactionQueueQuery*
-   */
-  antlrcpp::Any visitTransactionQueueQuery(MemgraphCypher::TransactionQueueQueryContext *ctx) override;
-
-  /**
-   * @return ShowTransactions*
-   */
-  antlrcpp::Any visitShowTransactions(MemgraphCypher::ShowTransactionsContext *ctx) override;
-
-  /**
-   * @return TerminateTransactions*
-   */
-  antlrcpp::Any visitTerminateTransactions(MemgraphCypher::TerminateTransactionsContext *ctx) override;
-
-  /**
-   * @return TransactionIdList*
-   */
-  antlrcpp::Any visitTransactionIdList(MemgraphCypher::TransactionIdListContext *ctx) override;
-
   /**
    * @return VersionQuery*
    */
@@ -606,11 +573,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitMapLiteral(MemgraphCypher::MapLiteralContext *ctx) override;
 
-  /**
-   * @return MapProjectionData
-   */
-  antlrcpp::Any visitMapProjectionLiteral(MemgraphCypher::MapProjectionLiteralContext *ctx) override;
-
   /**
    * @return vector<Expression*>
    */
@@ -801,11 +763,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitParameter(MemgraphCypher::ParameterContext *ctx) override;
 
-  /**
-   * @return Exists* (Expression)
-   */
-  antlrcpp::Any visitExistsExpression(MemgraphCypher::ExistsExpressionContext *ctx) override;
-
   /**
    * @return Expression*
    */
@@ -930,11 +887,6 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitShowConfigQuery(MemgraphCypher::ShowConfigQueryContext *ctx) override;
 
-  /**
-   * @return CallSubquery*
-   */
-  antlrcpp::Any visitCallSubquery(MemgraphCypher::CallSubqueryContext *ctx) override;
-
  public:
   Query *query() { return query_; }
   const static std::string kAnonPrefix;

src/query/frontend/ast/pretty_print.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
@@ -54,14 +54,12 @@ class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
   void Visit(IfOperator &op) override;
   void Visit(ListLiteral &op) override;
   void Visit(MapLiteral &op) override;
-  void Visit(MapProjectionLiteral &op) override;
   void Visit(LabelsTest &op) override;
   void Visit(Aggregation &op) override;
   void Visit(Function &op) override;
   void Visit(Reduce &op) override;
   void Visit(Coalesce &op) override;
   void Visit(Extract &op) override;
-  void Visit(Exists &op) override;
   void Visit(All &op) override;
   void Visit(Single &op) override;
   void Visit(Any &op) override;
@@ -69,7 +67,6 @@ class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
   void Visit(Identifier &op) override;
   void Visit(PrimitiveLiteral &op) override;
   void Visit(PropertyLookup &op) override;
-  void Visit(AllPropertiesLookup &op) override;
   void Visit(ParameterLookup &op) override;
   void Visit(NamedExpression &op) override;
   void Visit(RegexMatch &op) override;
@@ -91,8 +88,6 @@ void PrintObject(std::ostream *out, Aggregation::Op op);
 
 void PrintObject(std::ostream *out, Expression *expr);
 
-void PrintObject(std::ostream *out, AllPropertiesLookup *apl);
-
 void PrintObject(std::ostream *out, Identifier *expr);
 
 void PrintObject(std::ostream *out, const storage::PropertyValue &value);
@@ -126,15 +121,6 @@ void PrintObject(std::ostream *out, Expression *expr) {
   }
 }
 
-void PrintObject(std::ostream *out, AllPropertiesLookup *apl) {
-  if (apl) {
-    ExpressionPrettyPrinter printer{out};
-    *out << ".*";
-  } else {
-    *out << "<null>";
-  }
-}
-
 void PrintObject(std::ostream *out, Identifier *expr) { PrintObject(out, static_cast<Expression *>(expr)); }
 
 void PrintObject(std::ostream *out, const storage::PropertyValue &value) {
@@ -262,17 +248,6 @@ void ExpressionPrettyPrinter::Visit(MapLiteral &op) {
   PrintObject(out_, map);
 }
 
-void ExpressionPrettyPrinter::Visit(MapProjectionLiteral &op) {
-  std::map<std::string, Expression *> map_projection_elements;
-  for (const auto &kv : op.elements_) {
-    map_projection_elements[kv.first.name] = kv.second;
-  }
-  PrintObject(out_, op.map_variable_);
-  PrintObject(out_, map_projection_elements);
-}
-
-void ExpressionPrettyPrinter::Visit(AllPropertiesLookup &op) { PrintObject(out_, &op); }
-
 void ExpressionPrettyPrinter::Visit(LabelsTest &op) { PrintOperator(out_, "LabelsTest", op.expression_); }
 
 void ExpressionPrettyPrinter::Visit(Aggregation &op) { PrintOperator(out_, "Aggregation", op.op_); }
@@ -289,8 +264,6 @@ void ExpressionPrettyPrinter::Visit(Extract &op) {
   PrintOperator(out_, "Extract", op.identifier_, op.list_, op.expression_);
 }
 
-void ExpressionPrettyPrinter::Visit(Exists & /*op*/) { PrintOperator(out_, "Exists", "expression"); }
-
 void ExpressionPrettyPrinter::Visit(All &op) {
   PrintOperator(out_, "All", op.identifier_, op.list_expression_, op.where_->expression_);
 }

src/query/frontend/opencypher/grammar/Cypher.g4

@@ -46,9 +46,7 @@ indexInfo : INDEX INFO ;
 
 constraintInfo : CONSTRAINT INFO ;
 
-buildInfo : BUILD INFO ;
-
-infoQuery : SHOW ( storageInfo | indexInfo | constraintInfo | buildInfo) ;
+infoQuery : SHOW ( storageInfo | indexInfo | constraintInfo ) ;
 
 explainQuery : EXPLAIN cypherQuery ;
 
@@ -238,7 +236,6 @@ atom : literal
      | ( ANY '(' filterExpression ')' )
      | ( NONE '(' filterExpression ')' )
      | ( SINGLE '(' filterExpression ')' )
-     | ( EXISTS '(' existsExpression ')' )
      | relationshipsPattern
      | parenthesizedExpression
      | functionInvocation
@@ -250,7 +247,6 @@ literal : numberLiteral
         | booleanLiteral
         | CYPHERNULL
         | mapLiteral
-        | mapProjectionLiteral
         | listLiteral
         ;
 
@@ -279,8 +275,6 @@ reduceExpression : accumulator=variable '=' initial=expression ',' idInColl '|'
 
 extractExpression : idInColl '|' expression ;
 
-existsExpression : patternPart ;
-
 idInColl : variable IN expression ;
 
 functionInvocation : functionName '(' ( DISTINCT )? ( expression ( ',' expression )* )? ')' ;
@@ -293,8 +287,6 @@ patternComprehension : '[' ( variable '=' )? relationshipsPattern ( WHERE expres
 
 propertyLookup : '.' ( propertyKeyName ) ;
 
-allPropertiesLookup : '.' '*' ;
-
 caseExpression : ( ( CASE ( caseAlternatives )+ ) | ( CASE test=expression ( caseAlternatives )+ ) ) ( ELSE else_expression=expression )? END ;
 
 caseAlternatives : WHEN when_expression=expression THEN then_expression=expression ;
@@ -307,22 +299,12 @@ numberLiteral : doubleLiteral
 
 mapLiteral : '{' ( propertyKeyName ':' expression ( ',' propertyKeyName ':' expression )* )? '}' ;
 
-mapProjectionLiteral : variable '{' ( mapElement ( ',' mapElement )* )? '}' ;
-
-mapElement : propertyLookup
-           | allPropertiesLookup
-           | variable
-           | propertyKeyValuePair
-           ;
-
 parameter : '$' ( symbolicName | DecimalLiteral ) ;
 
 propertyExpression : atom ( propertyLookup )+ ;
 
 propertyKeyName : symbolicName ;
 
-propertyKeyValuePair : propertyKeyName ':' expression ;
-
 integerLiteral : DecimalLiteral
                | OctalLiteral
                | HexadecimalLiteral

src/query/frontend/opencypher/grammar/MemgraphCypher.g4

@@ -22,7 +22,6 @@ import Cypher ;
 memgraphCypherKeyword : cypherKeyword
                       | AFTER
                       | ALTER
-                      | ANALYZE
                       | ASYNC
                       | AUTH
                       | BAD
@@ -31,7 +30,6 @@ memgraphCypherKeyword : cypherKeyword
                       | BATCH_SIZE
                       | BEFORE
                       | BOOTSTRAP_SERVERS
-                      | BUILD
                       | CHECK
                       | CLEAR
                       | COMMIT
@@ -55,13 +53,10 @@ memgraphCypherKeyword : cypherKeyword
                       | FREE
                       | FROM
                       | GLOBAL
-                      | GRAPH
                       | GRANT
                       | HEADER
                       | IDENTIFIED
                       | ISOLATION
-                      | IN_MEMORY_ANALYTICAL
-                      | IN_MEMORY_TRANSACTIONAL
                       | KAFKA
                       | LABELS
                       | LEVEL
@@ -91,8 +86,6 @@ memgraphCypherKeyword : cypherKeyword
                       | SNAPSHOT
                       | START
                       | STATS
-                      | STATUS
-                      | STORAGE
                       | STREAM
                       | STREAMS
                       | SYNC
@@ -109,8 +102,6 @@ memgraphCypherKeyword : cypherKeyword
                       | USER
                       | USERS
                       | VERSION
-                      | TERMINATE
-                      | TRANSACTIONS
                       ;
 
 symbolicName : UnescapedSymbolicName
@@ -126,19 +117,16 @@ query : cypherQuery
       | constraintQuery
       | authQuery
       | dumpQuery
-      | analyzeGraphQuery
       | replicationQuery
       | lockPathQuery
       | freeMemoryQuery
       | triggerQuery
       | isolationLevelQuery
-      | storageModeQuery
       | createSnapshotQuery
       | streamQuery
       | settingQuery
       | versionQuery
       | showConfigQuery
-      | transactionQueueQuery
       ;
 
 authQuery : createRole
@@ -182,7 +170,6 @@ clause : cypherMatch
        | callProcedure
        | loadCsv
        | foreach
-       | callSubquery
        ;
 
 updateClause : set
@@ -195,8 +182,6 @@ updateClause : set
 
 foreach :  FOREACH '(' variable IN expression '|' updateClause+  ')' ;
 
-callSubquery : CALL '{' cypherQuery '}' ;
-
 streamQuery : checkStream
             | createStream
             | dropStream
@@ -212,14 +197,6 @@ settingQuery : setSetting
              | showSettings
              ;
 
-transactionQueueQuery : showTransactions
-                      | terminateTransactions
-                      ;
-
-showTransactions : SHOW TRANSACTIONS ;
-
-terminateTransactions : TERMINATE TRANSACTIONS transactionIdList;
-
 loadCsv : LOAD CSV FROM csvFile ( WITH | NO ) HEADER
          ( IGNORE BAD ) ?
          ( DELIMITER delimiter ) ?
@@ -282,8 +259,6 @@ privilege : CREATE
           | MODULE_READ
           | MODULE_WRITE
           | WEBSOCKET
-          | TRANSACTION_MANAGEMENT
-          | STORAGE_MODE
           ;
 
 granularPrivilege : NOTHING | READ | UPDATE | CREATE_DELETE ;
@@ -304,11 +279,11 @@ revokePrivilegesList : privilegeOrEntities ( ',' privilegeOrEntities )* ;
 
 privilegesList : privilege ( ',' privilege )* ;
 
-entitiesList : ASTERISK | listOfColonSymbolicNames ;
+entitiesList : ASTERISK | listOfEntities ;
 
-listOfColonSymbolicNames : colonSymbolicName ( ',' colonSymbolicName )* ;
+listOfEntities : entity ( ',' entity )* ;
 
-colonSymbolicName : COLON symbolicName ;
+entity : COLON symbolicName ;
 
 showPrivileges : SHOW PRIVILEGES FOR userOrRole=userOrRoleName ;
 
@@ -318,8 +293,6 @@ showUsersForRole : SHOW USERS FOR role=userOrRoleName ;
 
 dumpQuery: DUMP DATABASE ;
 
-analyzeGraphQuery: ANALYZE GRAPH ( ON LABELS ( listOfColonSymbolicNames | ASTERISK ) ) ? ( DELETE STATISTICS ) ? ;
-
 setReplicationRole  : SET REPLICATION ROLE TO ( MAIN | REPLICA )
                       ( WITH PORT port=literal ) ? ;
 
@@ -336,7 +309,7 @@ dropReplica : DROP REPLICA replicaName ;
 
 showReplicas  : SHOW REPLICAS ;
 
-lockPathQuery : ( LOCK | UNLOCK ) DATA DIRECTORY | DATA DIRECTORY LOCK STATUS;
+lockPathQuery : ( LOCK | UNLOCK ) DATA DIRECTORY ;
 
 freeMemoryQuery : FREE MEMORY ;
 
@@ -361,10 +334,6 @@ isolationLevelScope : GLOBAL | SESSION | NEXT ;
 
 isolationLevelQuery : SET isolationLevelScope TRANSACTION ISOLATION LEVEL isolationLevel ;
 
-storageMode : IN_MEMORY_ANALYTICAL | IN_MEMORY_TRANSACTIONAL ;
-
-storageModeQuery : STORAGE MODE storageMode ;
-
 createSnapshotQuery : CREATE SNAPSHOT ;
 
 streamName : symbolicName ;
@@ -433,7 +402,3 @@ showSettings : SHOW DATABASE SETTINGS ;
 showConfigQuery : SHOW CONFIG ;
 
 versionQuery : SHOW VERSION ;
-
-transactionIdList : transactionId ( ',' transactionId )* ;
-
-transactionId : literal ;

src/query/frontend/opencypher/grammar/MemgraphCypherLexer.g4

@@ -25,109 +25,96 @@ import CypherLexer ;
 
 UNDERSCORE : '_' ;
 
-AFTER                   : A F T E R ;
-ALTER                   : A L T E R ;
-ANALYZE                 : A N A L Y Z E ;
-ASYNC                   : A S Y N C ;
-AUTH                    : A U T H ;
-BAD                     : B A D ;
-BATCH_INTERVAL          : B A T C H UNDERSCORE I N T E R V A L ;
-BATCH_LIMIT             : B A T C H UNDERSCORE L I M I T ;
-BATCH_SIZE              : B A T C H UNDERSCORE S I Z E ;
-BEFORE                  : B E F O R E ;
-BUILD                   : B U I L D ;
-BOOTSTRAP_SERVERS       : B O O T S T R A P UNDERSCORE S E R V E R S ;
-CALL                    : C A L L ;
-CHECK                   : C H E C K ;
-CLEAR                   : C L E A R ;
-COMMIT                  : C O M M I T ;
-COMMITTED               : C O M M I T T E D ;
-CONFIG                  : C O N F I G ;
-CONFIGS                 : C O N F I G S;
-CONSUMER_GROUP          : C O N S U M E R UNDERSCORE G R O U P ;
-CREATE_DELETE           : C R E A T E UNDERSCORE D E L E T E ;
-CREDENTIALS             : C R E D E N T I A L S ;
-CSV                     : C S V ;
-DATA                    : D A T A ;
-DELIMITER               : D E L I M I T E R ;
-DATABASE                : D A T A B A S E ;
-DENY                    : D E N Y ;
-DIRECTORY               : D I R E C T O R Y ;
-DROP                    : D R O P ;
-DUMP                    : D U M P ;
-DURABILITY              : D U R A B I L I T Y ;
-EDGE_TYPES              : E D G E UNDERSCORE T Y P E S ;
-EXECUTE                 : E X E C U T E ;
-FOR                     : F O R ;
-FOREACH                 : F O R E A C H;
-FREE                    : F R E E ;
-FREE_MEMORY             : F R E E UNDERSCORE M E M O R Y ;
-FROM                    : F R O M ;
-GLOBAL                  : G L O B A L ;
-GRANT                   : G R A N T ;
-GRAPH                   : G R A P H ;
-GRANTS                  : G R A N T S ;
-HEADER                  : H E A D E R ;
-IDENTIFIED              : I D E N T I F I E D ;
-IGNORE                  : I G N O R E ;
-ISOLATION               : I S O L A T I O N ;
-IN_MEMORY_ANALYTICAL    : I N UNDERSCORE M E M O R Y UNDERSCORE A N A L Y T I C A L ;
-IN_MEMORY_TRANSACTIONAL : I N UNDERSCORE M E M O R Y UNDERSCORE T R A N S A C T I O N A L ;
-KAFKA                   : K A F K A ;
-LABELS                  : L A B E L S ;
-LEVEL                   : L E V E L ;
-LOAD                    : L O A D ;
-LOCK                    : L O C K ;
-MAIN                    : M A I N ;
-MODE                    : M O D E ;
-MODULE_READ             : M O D U L E UNDERSCORE R E A D ;
-MODULE_WRITE            : M O D U L E UNDERSCORE W R I T E ;
-NEXT                    : N E X T ;
-NO                      : N O ;
-NOTHING                 : N O T H I N G ;
-PASSWORD                : P A S S W O R D ;
-PORT                    : P O R T ;
-PRIVILEGES              : P R I V I L E G E S ;
-PULSAR                  : P U L S A R ;
-READ                    : R E A D ;
-READ_FILE               : R E A D UNDERSCORE F I L E ;
-REGISTER                : R E G I S T E R ;
-REPLICA                 : R E P L I C A ;
-REPLICAS                : R E P L I C A S ;
-REPLICATION             : R E P L I C A T I O N ;
-REVOKE                  : R E V O K E ;
-ROLE                    : R O L E ;
-ROLES                   : R O L E S ;
-QUOTE                   : Q U O T E ;
-SERVICE_URL             : S E R V I C E UNDERSCORE U R L ;
-SESSION                 : S E S S I O N ;
-SETTING                 : S E T T I N G ;
-SETTINGS                : S E T T I N G S ;
-SNAPSHOT                : S N A P S H O T ;
-START                   : S T A R T ;
-STATISTICS              : S T A T I S T I C S ;
-STATS                   : S T A T S ;
-STATUS                  : S T A T U S ;
-STOP                    : S T O P ;
-STORAGE                 : S T O R A G E;
-STORAGE_MODE            : S T O R A G E UNDERSCORE MODE;
-STREAM                  : S T R E A M ;
-STREAMS                 : S T R E A M S ;
-SYNC                    : S Y N C ;
-TERMINATE               : T E R M I N A T E ;
-TIMEOUT                 : T I M E O U T ;
-TO                      : T O ;
-TOPICS                  : T O P I C S;
-TRANSACTION             : T R A N S A C T I O N ;
-TRANSACTION_MANAGEMENT  : T R A N S A C T I O N UNDERSCORE M A N A G E M E N T ;
-TRANSACTIONS            : T R A N S A C T I O N S ;
-TRANSFORM               : T R A N S F O R M ;
-TRIGGER                 : T R I G G E R ;
-TRIGGERS                : T R I G G E R S ;
-UNCOMMITTED             : U N C O M M I T T E D ;
-UNLOCK                  : U N L O C K ;
-UPDATE                  : U P D A T E ;
-USER                    : U S E R ;
-USERS                   : U S E R S ;
-VERSION                 : V E R S I O N ;
-WEBSOCKET               : W E B S O C K E T ;
+AFTER               : A F T E R ;
+ALTER               : A L T E R ;
+ASYNC               : A S Y N C ;
+AUTH                : A U T H ;
+BAD                 : B A D ;
+BATCH_INTERVAL      : B A T C H UNDERSCORE I N T E R V A L ;
+BATCH_LIMIT         : B A T C H UNDERSCORE L I M I T ;
+BATCH_SIZE          : B A T C H UNDERSCORE S I Z E ;
+BEFORE              : B E F O R E ;
+BOOTSTRAP_SERVERS   : B O O T S T R A P UNDERSCORE S E R V E R S ;
+CHECK               : C H E C K ;
+CLEAR               : C L E A R ;
+COMMIT              : C O M M I T ;
+COMMITTED           : C O M M I T T E D ;
+CONFIG              : C O N F I G ;
+CONFIGS             : C O N F I G S;
+CONSUMER_GROUP      : C O N S U M E R UNDERSCORE G R O U P ;
+CREATE_DELETE       : C R E A T E UNDERSCORE D E L E T E ;
+CREDENTIALS         : C R E D E N T I A L S ;
+CSV                 : C S V ;
+DATA                : D A T A ;
+DELIMITER           : D E L I M I T E R ;
+DATABASE            : D A T A B A S E ;
+DENY                : D E N Y ;
+DIRECTORY           : D I R E C T O R Y ;
+DROP                : D R O P ;
+DUMP                : D U M P ;
+DURABILITY          : D U R A B I L I T Y ;
+EXECUTE             : E X E C U T E ;
+FOR                 : F O R ;
+FOREACH             : F O R E A C H;
+FREE                : F R E E ;
+FREE_MEMORY         : F R E E UNDERSCORE M E M O R Y ;
+FROM                : F R O M ;
+GLOBAL              : G L O B A L ;
+GRANT               : G R A N T ;
+GRANTS              : G R A N T S ;
+HEADER              : H E A D E R ;
+IDENTIFIED          : I D E N T I F I E D ;
+IGNORE              : I G N O R E ;
+ISOLATION           : I S O L A T I O N ;
+KAFKA               : K A F K A ;
+LABELS              : L A B E L S ;
+LEVEL               : L E V E L ;
+LOAD                : L O A D ;
+LOCK                : L O C K ;
+MAIN                : M A I N ;
+MODE                : M O D E ;
+MODULE_READ         : M O D U L E UNDERSCORE R E A D ;
+MODULE_WRITE        : M O D U L E UNDERSCORE W R I T E ;
+NEXT                : N E X T ;
+NO                  : N O ;
+NOTHING             : N O T H I N G ;
+PASSWORD            : P A S S W O R D ;
+PORT                : P O R T ;
+PRIVILEGES          : P R I V I L E G E S ;
+PULSAR              : P U L S A R ;
+READ                : R E A D ;
+READ_FILE           : R E A D UNDERSCORE F I L E ;
+REGISTER            : R E G I S T E R ;
+REPLICA             : R E P L I C A ;
+REPLICAS            : R E P L I C A S ;
+REPLICATION         : R E P L I C A T I O N ;
+REVOKE              : R E V O K E ;
+ROLE                : R O L E ;
+ROLES               : R O L E S ;
+QUOTE               : Q U O T E ;
+SERVICE_URL         : S E R V I C E UNDERSCORE U R L ;
+SESSION             : S E S S I O N ;
+SETTING             : S E T T I N G ;
+SETTINGS            : S E T T I N G S ;
+SNAPSHOT            : S N A P S H O T ;
+START               : S T A R T ;
+STATS               : S T A T S ;
+STOP                : S T O P ;
+STREAM              : S T R E A M ;
+STREAMS             : S T R E A M S ;
+SYNC                : S Y N C ;
+TIMEOUT             : T I M E O U T ;
+TO                  : T O ;
+TOPICS              : T O P I C S;
+TRANSACTION         : T R A N S A C T I O N ;
+TRANSFORM           : T R A N S F O R M ;
+TRIGGER             : T R I G G E R ;
+TRIGGERS            : T R I G G E R S ;
+UNCOMMITTED         : U N C O M M I T T E D ;
+UNLOCK              : U N L O C K ;
+UPDATE              : U P D A T E ;
+USER                : U S E R ;
+USERS               : U S E R S ;
+VERSION             : V E R S I O N ;
+WEBSOCKET           : W E B S O C K E T ;
+EDGE_TYPES          : E D G E UNDERSCORE T Y P E S ;

src/query/frontend/semantic/required_privileges.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
@@ -25,15 +25,13 @@ class PrivilegeExtractor : public QueryVisitor<void>, public HierarchicalTreeVis
 
   std::vector<AuthQuery::Privilege> privileges() { return privileges_; }
 
-  void Visit(IndexQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
+  void Visit(IndexQuery &) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
 
-  void Visit(AnalyzeGraphQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::INDEX); }
+  void Visit(AuthQuery &) override { AddPrivilege(AuthQuery::Privilege::AUTH); }
 
-  void Visit(AuthQuery & /*unused*/) override { AddPrivilege(AuthQuery::Privilege::AUTH); }
+  void Visit(ExplainQuery &query) override { query.cypher_query_->Accept(*this); }
 
-  void Visit(ExplainQuery &query) override { query.cypher_query_->Accept(dynamic_cast<QueryVisitor &>(*this)); }
-
-  void Visit(ProfileQuery &query) override { query.cypher_query_->Accept(dynamic_cast<QueryVisitor &>(*this)); }
+  void Visit(ProfileQuery &query) override { query.cypher_query_->Accept(*this); }
 
   void Visit(InfoQuery &info_query) override {
     switch (info_query.info_type_) {
@@ -43,7 +41,6 @@ class PrivilegeExtractor : public QueryVisitor<void>, public HierarchicalTreeVis
         AddPrivilege(AuthQuery::Privilege::INDEX);
         break;
       case InfoQuery::InfoType::STORAGE:
-      case InfoQuery::InfoType::BUILD:
         AddPrivilege(AuthQuery::Privilege::STATS);
         break;
       case InfoQuery::InfoType::CONSTRAINT:
@@ -79,14 +76,10 @@ class PrivilegeExtractor : public QueryVisitor<void>, public HierarchicalTreeVis
 
   void Visit(IsolationLevelQuery &isolation_level_query) override { AddPrivilege(AuthQuery::Privilege::CONFIG); }
 
-  void Visit(StorageModeQuery & /*storage_mode_query*/) override { AddPrivilege(AuthQuery::Privilege::STORAGE_MODE); }
-
   void Visit(CreateSnapshotQuery &create_snapshot_query) override { AddPrivilege(AuthQuery::Privilege::DURABILITY); }
 
   void Visit(SettingQuery & /*setting_query*/) override { AddPrivilege(AuthQuery::Privilege::CONFIG); }
 
-  void Visit(TransactionQueueQuery & /*transaction_queue_query*/) override {}
-
   void Visit(VersionQuery & /*version_query*/) override { AddPrivilege(AuthQuery::Privilege::STATS); }
 
   bool PreVisit(Create & /*unused*/) override {

src/query/frontend/semantic/symbol.cpp

@@ -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.
-
-#include "query/frontend/semantic/symbol.hpp"
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-constexpr utils::TypeInfo query::Symbol::kType{utils::TypeId::SYMBOL, "Symbol", nullptr};
-}  // namespace memgraph

src/query/frontend/semantic/symbol.hpp

@@ -1,75 +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 <string>
-
-#include "utils/typeinfo.hpp"
-
-namespace memgraph {
-
-namespace query {
-
-class Symbol {
- public:
-  static const utils::TypeInfo kType;
-  static const utils::TypeInfo &GetTypeInfo() { return kType; }
-
-  enum class Type { ANY, VERTEX, EDGE, PATH, NUMBER, EDGE_LIST };
-
-  // TODO: Generate enum to string conversion from LCP. Note, that this is
-  // displayed to the end user, so we may want to have a pretty name of each
-  // value.
-  static std::string TypeToString(Type type) {
-    const char *enum_string[] = {"Any", "Vertex", "Edge", "Path", "Number", "EdgeList"};
-    return enum_string[static_cast<int>(type)];
-  }
-
-  Symbol() {}
-  Symbol(const std::string &name, int position, bool user_declared, Type type = Type::ANY, int token_position = -1)
-      : name_(name), position_(position), user_declared_(user_declared), type_(type), token_position_(token_position) {}
-
-  bool operator==(const Symbol &other) const {
-    return position_ == other.position_ && name_ == other.name_ && type_ == other.type_;
-  }
-  bool operator!=(const Symbol &other) const { return !operator==(other); }
-
-  // TODO: Remove these since members are public
-  const auto &name() const { return name_; }
-  int position() const { return position_; }
-  Type type() const { return type_; }
-  bool user_declared() const { return user_declared_; }
-  int token_position() const { return token_position_; }
-
-  std::string name_;
-  int64_t position_;
-  bool user_declared_{true};
-  memgraph::query::Symbol::Type type_{Type::ANY};
-  int64_t token_position_{-1};
-};
-
-}  // namespace query
-}  // namespace memgraph
-namespace std {
-
-template <>
-struct hash<memgraph::query::Symbol> {
-  size_t operator()(const memgraph::query::Symbol &symbol) const {
-    size_t prime = 265443599u;
-    size_t hash = std::hash<int>{}(symbol.position());
-    hash ^= prime * std::hash<std::string>{}(symbol.name());
-    hash ^= prime * std::hash<int>{}(static_cast<int>(symbol.type()));
-    return hash;
-  }
-};
-
-}  // namespace std

src/query/frontend/semantic/symbol_generator.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
@@ -64,9 +64,12 @@ auto SymbolGenerator::CreateSymbol(const std::string &name, bool user_declared,
   return symbol;
 }
 
-auto SymbolGenerator::CreateAnonymousSymbol(Symbol::Type /*type*/) {
-  auto symbol = symbol_table_->CreateAnonymousSymbol();
-  return symbol;
+auto SymbolGenerator::GetOrCreateSymbolLocalScope(const std::string &name, bool user_declared, Symbol::Type type) {
+  auto &scope = scopes_.back();
+  if (auto maybe_symbol = FindSymbolInScope(name, scope, type); maybe_symbol) {
+    return *maybe_symbol;
+  }
+  return CreateSymbol(name, user_declared, type);
 }
 
 auto SymbolGenerator::GetOrCreateSymbol(const std::string &name, bool user_declared, Symbol::Type type) {
@@ -203,7 +206,7 @@ bool SymbolGenerator::PreVisit(CallProcedure &call_proc) {
 
 bool SymbolGenerator::PostVisit(CallProcedure &call_proc) {
   for (auto *ident : call_proc.result_identifiers_) {
-    if (HasSymbol(ident->name_)) {
+    if (HasSymbolLocalScope(ident->name_)) {
       throw RedeclareVariableError(ident->name_);
     }
     ident->MapTo(CreateSymbol(ident->name_, true));
@@ -211,37 +214,10 @@ bool SymbolGenerator::PostVisit(CallProcedure &call_proc) {
   return true;
 }
 
-bool SymbolGenerator::PreVisit(CallSubquery & /*call_sub*/) {
-  scopes_.emplace_back(Scope{.in_call_subquery = true});
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(CallSubquery & /*call_sub*/) {
-  // no need to set the flag to true as we are popping the scope
-  auto subquery_scope = scopes_.back();
-  scopes_.pop_back();
-  auto &main_query_scope = scopes_.back();
-
-  if (!subquery_scope.has_return) {
-    return true;
-  }
-
-  // append symbols returned in from subquery to outer scope
-  for (const auto &[symbol_name, symbol] : subquery_scope.symbols) {
-    if (main_query_scope.symbols.find(symbol_name) != main_query_scope.symbols.end()) {
-      throw SemanticException("Variable in subquery already declared in outer scope!");
-    }
-
-    main_query_scope.symbols[symbol_name] = symbol;
-  }
-
-  return true;
-}
-
 bool SymbolGenerator::PreVisit(LoadCsv &load_csv) { return false; }
 
 bool SymbolGenerator::PostVisit(LoadCsv &load_csv) {
-  if (HasSymbol(load_csv.row_var_->name_)) {
+  if (HasSymbolLocalScope(load_csv.row_var_->name_)) {
     throw RedeclareVariableError(load_csv.row_var_->name_);
   }
   load_csv.row_var_->MapTo(CreateSymbol(load_csv.row_var_->name_, true));
@@ -251,8 +227,6 @@ bool SymbolGenerator::PostVisit(LoadCsv &load_csv) {
 bool SymbolGenerator::PreVisit(Return &ret) {
   auto &scope = scopes_.back();
   scope.in_return = true;
-  scope.has_return = true;
-
   VisitReturnBody(ret.body_);
   scope.in_return = false;
   return false;  // We handled the traversal ourselves.
@@ -291,7 +265,7 @@ bool SymbolGenerator::PostVisit(Merge &) {
 
 bool SymbolGenerator::PostVisit(Unwind &unwind) {
   const auto &name = unwind.named_expression_->name_;
-  if (HasSymbol(name)) {
+  if (HasSymbolLocalScope(name)) {
     throw RedeclareVariableError(name);
   }
   unwind.named_expression_->MapTo(CreateSymbol(name, true));
@@ -308,7 +282,7 @@ bool SymbolGenerator::PostVisit(Match &) {
   // Check variables in property maps after visiting Match, so that they can
   // reference symbols out of bind order.
   for (auto &ident : scope.identifiers_in_match) {
-    if (!HasSymbol(ident->name_) && !ConsumePredefinedIdentifier(ident->name_))
+    if (!HasSymbolLocalScope(ident->name_) && !ConsumePredefinedIdentifier(ident->name_))
       throw UnboundVariableError(ident->name_);
     ident->MapTo(scope.symbols[ident->name_]);
   }
@@ -336,19 +310,11 @@ SymbolGenerator::ReturnType SymbolGenerator::Visit(Identifier &ident) {
   if (scope.in_skip || scope.in_limit) {
     throw SemanticException("Variables are not allowed in {}.", scope.in_skip ? "SKIP" : "LIMIT");
   }
-
-  if (scope.in_exists && (scope.visiting_edge || scope.in_node_atom)) {
-    auto has_symbol = HasSymbol(ident.name_);
-    if (!has_symbol && !ConsumePredefinedIdentifier(ident.name_) && ident.user_declared_) {
-      throw SemanticException("Unbounded variables are not allowed in exists!");
-    }
-  }
-
   Symbol symbol;
   if (scope.in_pattern && !(scope.in_node_atom || scope.visiting_edge)) {
     // If we are in the pattern, and outside of a node or an edge, the
     // identifier is the pattern name.
-    symbol = GetOrCreateSymbol(ident.name_, ident.user_declared_, Symbol::Type::PATH);
+    symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, Symbol::Type::PATH);
   } else if (scope.in_pattern && scope.in_pattern_atom_identifier) {
     //  Patterns used to create nodes and edges cannot redeclare already
     //  established bindings. Declaration only happens in single node
@@ -356,22 +322,21 @@ SymbolGenerator::ReturnType SymbolGenerator::Visit(Identifier &ident) {
     //  `MATCH (n) CREATE (n)` should throw an error that `n` is already
     //  declared. While `MATCH (n) CREATE (n) -[:R]-> (n)` is allowed,
     //  since `n` now references the bound node instead of declaring it.
-    if ((scope.in_create_node || scope.in_create_edge) && HasSymbol(ident.name_)) {
+    if ((scope.in_create_node || scope.in_create_edge) && HasSymbolLocalScope(ident.name_)) {
       throw RedeclareVariableError(ident.name_);
     }
     auto type = Symbol::Type::VERTEX;
     if (scope.visiting_edge) {
       // Edge referencing is not allowed (like in Neo4j):
       // `MATCH (n) - [r] -> (n) - [r] -> (n) RETURN r` is not allowed.
-      if (HasSymbol(ident.name_)) {
+      if (HasSymbolLocalScope(ident.name_)) {
         throw RedeclareVariableError(ident.name_);
       }
       type = scope.visiting_edge->IsVariable() ? Symbol::Type::EDGE_LIST : Symbol::Type::EDGE;
     }
-    symbol = GetOrCreateSymbol(ident.name_, ident.user_declared_, type);
+    symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, type);
   } else if (scope.in_pattern && !scope.in_pattern_atom_identifier && scope.in_match) {
-    if (scope.in_edge_range && scope.visiting_edge && scope.visiting_edge->identifier_ &&
-        scope.visiting_edge->identifier_->name_ == ident.name_) {
+    if (scope.in_edge_range && scope.visiting_edge->identifier_->name_ == ident.name_) {
       // Prevent variable path bounds to reference the identifier which is bound
       // by the variable path itself.
       throw UnboundVariableError(ident.name_);
@@ -473,55 +438,6 @@ bool SymbolGenerator::PreVisit(Extract &extract) {
   return false;
 }
 
-bool SymbolGenerator::PreVisit(Exists &exists) {
-  auto &scope = scopes_.back();
-
-  if (scope.in_set_property) {
-    throw utils::NotYetImplemented("Set property can not be used with exists, but only during matching!");
-  }
-
-  if (scope.in_with) {
-    throw utils::NotYetImplemented("WITH can not be used with exists, but only during matching!");
-  }
-
-  scope.in_exists = true;
-
-  const auto &symbol = CreateAnonymousSymbol();
-  exists.MapTo(symbol);
-
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(Exists & /*exists*/) {
-  auto &scope = scopes_.back();
-  scope.in_exists = false;
-
-  return true;
-}
-
-bool SymbolGenerator::PreVisit(NamedExpression &named_expression) {
-  if (auto &scope = scopes_.back(); scope.in_call_subquery && scope.in_return &&
-                                    !utils::Downcast<Identifier>(named_expression.expression_) &&
-                                    !named_expression.is_aliased_) {
-    throw SemanticException("Expression returned from subquery must be aliased (use AS)!");
-  }
-  return true;
-}
-
-bool SymbolGenerator::PreVisit(SetProperty & /*set_property*/) {
-  auto &scope = scopes_.back();
-  scope.in_set_property = true;
-
-  return true;
-}
-
-bool SymbolGenerator::PostVisit(SetProperty & /*set_property*/) {
-  auto &scope = scopes_.back();
-  scope.in_set_property = false;
-
-  return true;
-}
-
 // Pattern and its subparts.
 
 bool SymbolGenerator::PreVisit(Pattern &pattern) {
@@ -531,7 +447,6 @@ bool SymbolGenerator::PreVisit(Pattern &pattern) {
     MG_ASSERT(utils::IsSubtype(*pattern.atoms_[0], NodeAtom::kType), "Expected a single NodeAtom in Pattern");
     scope.in_create_node = true;
   }
-
   return true;
 }
 
@@ -546,7 +461,7 @@ bool SymbolGenerator::PreVisit(NodeAtom &node_atom) {
   auto &scope = scopes_.back();
   auto check_node_semantic = [&node_atom, &scope, this](const bool props_or_labels) {
     const auto &node_name = node_atom.identifier_->name_;
-    if ((scope.in_create || scope.in_merge) && props_or_labels && HasSymbol(node_name)) {
+    if ((scope.in_create || scope.in_merge) && props_or_labels && HasSymbolLocalScope(node_name)) {
       throw SemanticException("Cannot create node '" + node_name +
                               "' with labels or properties, because it is already declared.");
     }
@@ -640,11 +555,11 @@ bool SymbolGenerator::PreVisit(EdgeAtom &edge_atom) {
   edge_atom.identifier_->Accept(*this);
   scope.in_pattern_atom_identifier = false;
   if (edge_atom.total_weight_) {
-    if (HasSymbol(edge_atom.total_weight_->name_)) {
+    if (HasSymbolLocalScope(edge_atom.total_weight_->name_)) {
       throw RedeclareVariableError(edge_atom.total_weight_->name_);
     }
-    edge_atom.total_weight_->MapTo(GetOrCreateSymbol(edge_atom.total_weight_->name_,
-                                                     edge_atom.total_weight_->user_declared_, Symbol::Type::NUMBER));
+    edge_atom.total_weight_->MapTo(GetOrCreateSymbolLocalScope(
+        edge_atom.total_weight_->name_, edge_atom.total_weight_->user_declared_, Symbol::Type::NUMBER));
   }
   return false;
 }
@@ -687,6 +602,10 @@ bool SymbolGenerator::HasSymbol(const std::string &name) const {
   return std::ranges::any_of(scopes_, [&name](const auto &scope) { return scope.symbols.contains(name); });
 }
 
+bool SymbolGenerator::HasSymbolLocalScope(const std::string &name) const {
+  return scopes_.back().symbols.contains(name);
+}
+
 bool SymbolGenerator::ConsumePredefinedIdentifier(const std::string &name) {
   auto it = predefined_identifiers_.find(name);
 

src/query/frontend/semantic/symbol_generator.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
@@ -50,8 +50,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PostVisit(Create &) override;
   bool PreVisit(CallProcedure &) override;
   bool PostVisit(CallProcedure &) override;
-  bool PreVisit(CallSubquery & /*unused*/) override;
-  bool PostVisit(CallSubquery & /*unused*/) override;
   bool PreVisit(LoadCsv &) override;
   bool PostVisit(LoadCsv &) override;
   bool PreVisit(Return &) override;
@@ -66,8 +64,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PostVisit(Match &) override;
   bool PreVisit(Foreach &) override;
   bool PostVisit(Foreach &) override;
-  bool PreVisit(SetProperty & /*set_property*/) override;
-  bool PostVisit(SetProperty & /*set_property*/) override;
 
   // Expressions
   ReturnType Visit(Identifier &) override;
@@ -83,9 +79,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   bool PreVisit(None &) override;
   bool PreVisit(Reduce &) override;
   bool PreVisit(Extract &) override;
-  bool PreVisit(Exists & /*exists*/) override;
-  bool PostVisit(Exists & /*exists*/) override;
-  bool PreVisit(NamedExpression & /*unused*/) override;
 
   // Pattern and its subparts.
   bool PreVisit(Pattern &) override;
@@ -120,10 +113,6 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
     bool in_where{false};
     bool in_match{false};
     bool in_foreach{false};
-    bool in_exists{false};
-    bool in_set_property{false};
-    bool in_call_subquery{false};
-    bool has_return{false};
     // True when visiting a pattern atom (node or edge) identifier, which can be
     // reused or created in the pattern itself.
     bool in_pattern_atom_identifier{false};
@@ -145,6 +134,7 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   static std::optional<Symbol> FindSymbolInScope(const std::string &name, const Scope &scope, Symbol::Type type);
 
   bool HasSymbol(const std::string &name) const;
+  bool HasSymbolLocalScope(const std::string &name) const;
 
   // @return true if it added a predefined identifier with that name
   bool ConsumePredefinedIdentifier(const std::string &name);
@@ -154,12 +144,10 @@ class SymbolGenerator : public HierarchicalTreeVisitor {
   auto CreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY,
                     int token_position = -1);
 
-  // Returns a freshly generated anonymous symbol.
-  auto CreateAnonymousSymbol(Symbol::Type type = Symbol::Type::ANY);
-
   auto GetOrCreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY);
   // Returns the symbol by name. If the mapping already exists, checks if the
   // types match. Otherwise, returns a new symbol.
+  auto GetOrCreateSymbolLocalScope(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY);
 
   void VisitReturnBody(ReturnBody &body, Where *where = nullptr);
 

src/query/frontend/semantic/symbol_table.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
@@ -51,7 +51,6 @@ class SymbolTable final {
   const Symbol &at(const Identifier &ident) const { return table_.at(ident.symbol_pos_); }
   const Symbol &at(const NamedExpression &nexpr) const { return table_.at(nexpr.symbol_pos_); }
   const Symbol &at(const Aggregation &aggr) const { return table_.at(aggr.symbol_pos_); }
-  const Symbol &at(const Exists &exists) const { return table_.at(exists.symbol_pos_); }
 
   // TODO: Remove these since members are public
   int32_t max_position() const { return static_cast<int32_t>(table_.size()); }

src/query/frontend/stripped_lexer_constants.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
@@ -145,7 +145,6 @@ const trie::Trie kKeywords = {"union",
                               "drop",
                               "show",
                               "stats",
-                              "status",
                               "unique",
                               "explain",
                               "profile",
@@ -209,15 +208,7 @@ const trie::Trie kKeywords = {"union",
                               "websocket",
                               "foreach",
                               "labels",
-                              "edge_types",
-                              "off",
-                              "in_memory_transactional",
-                              "in_memory_analytical",
-                              "data",
-                              "directory",
-                              "lock",
-                              "unlock"
-                              "build"};
+                              "edge_types"};
 
 // Unicode codepoints that are allowed at the start of the unescaped name.
 const std::bitset<kBitsetSize> kUnescapedNameAllowedStarts(

src/query/interpret/eval.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,12 +13,10 @@
 #pragma once
 
 #include <algorithm>
-#include <cstddef>
 #include <limits>
 #include <map>
 #include <optional>
 #include <regex>
-#include <string>
 #include <vector>
 
 #include "query/common.hpp"
@@ -29,92 +27,15 @@
 #include "query/frontend/semantic/symbol_table.hpp"
 #include "query/interpret/frame.hpp"
 #include "query/typed_value.hpp"
-#include "spdlog/spdlog.h"
 #include "utils/exceptions.hpp"
-#include "utils/frame_change_id.hpp"
-#include "utils/logging.hpp"
-#include "utils/pmr/unordered_map.hpp"
 
 namespace memgraph::query {
 
-class ReferenceExpressionEvaluator : public ExpressionVisitor<TypedValue *> {
- public:
-  ReferenceExpressionEvaluator(Frame *frame, const SymbolTable *symbol_table, const EvaluationContext *ctx)
-      : frame_(frame), symbol_table_(symbol_table), ctx_(ctx) {}
-
-  using ExpressionVisitor<TypedValue *>::Visit;
-
-  utils::MemoryResource *GetMemoryResource() const { return ctx_->memory; }
-
-#define UNSUCCESSFUL_VISIT(expr_name) \
-  TypedValue *Visit(expr_name &expr) override { return nullptr; }
-
-  TypedValue *Visit(Identifier &ident) override { return &frame_->at(symbol_table_->at(ident)); }
-
-  UNSUCCESSFUL_VISIT(NamedExpression);
-  UNSUCCESSFUL_VISIT(OrOperator);
-  UNSUCCESSFUL_VISIT(XorOperator);
-  UNSUCCESSFUL_VISIT(AdditionOperator);
-  UNSUCCESSFUL_VISIT(SubtractionOperator);
-  UNSUCCESSFUL_VISIT(MultiplicationOperator);
-  UNSUCCESSFUL_VISIT(DivisionOperator);
-  UNSUCCESSFUL_VISIT(ModOperator);
-  UNSUCCESSFUL_VISIT(NotEqualOperator);
-  UNSUCCESSFUL_VISIT(EqualOperator);
-  UNSUCCESSFUL_VISIT(LessOperator);
-  UNSUCCESSFUL_VISIT(GreaterOperator);
-  UNSUCCESSFUL_VISIT(LessEqualOperator);
-  UNSUCCESSFUL_VISIT(GreaterEqualOperator);
-
-  UNSUCCESSFUL_VISIT(NotOperator);
-  UNSUCCESSFUL_VISIT(UnaryPlusOperator);
-  UNSUCCESSFUL_VISIT(UnaryMinusOperator);
-
-  UNSUCCESSFUL_VISIT(AndOperator);
-  UNSUCCESSFUL_VISIT(IfOperator);
-  UNSUCCESSFUL_VISIT(InListOperator);
-
-  UNSUCCESSFUL_VISIT(SubscriptOperator);
-
-  UNSUCCESSFUL_VISIT(ListSlicingOperator);
-  UNSUCCESSFUL_VISIT(IsNullOperator);
-  UNSUCCESSFUL_VISIT(PropertyLookup);
-  UNSUCCESSFUL_VISIT(AllPropertiesLookup);
-  UNSUCCESSFUL_VISIT(LabelsTest);
-
-  UNSUCCESSFUL_VISIT(PrimitiveLiteral);
-  UNSUCCESSFUL_VISIT(ListLiteral);
-  UNSUCCESSFUL_VISIT(MapLiteral);
-  UNSUCCESSFUL_VISIT(MapProjectionLiteral);
-  UNSUCCESSFUL_VISIT(Aggregation);
-  UNSUCCESSFUL_VISIT(Coalesce);
-  UNSUCCESSFUL_VISIT(Function);
-  UNSUCCESSFUL_VISIT(Reduce);
-  UNSUCCESSFUL_VISIT(Extract);
-  UNSUCCESSFUL_VISIT(All);
-  UNSUCCESSFUL_VISIT(Single);
-  UNSUCCESSFUL_VISIT(Any);
-  UNSUCCESSFUL_VISIT(None);
-  UNSUCCESSFUL_VISIT(ParameterLookup);
-  UNSUCCESSFUL_VISIT(RegexMatch);
-  UNSUCCESSFUL_VISIT(Exists);
-
- private:
-  Frame *frame_;
-  const SymbolTable *symbol_table_;
-  const EvaluationContext *ctx_;
-};
-
 class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
  public:
   ExpressionEvaluator(Frame *frame, const SymbolTable &symbol_table, const EvaluationContext &ctx, DbAccessor *dba,
-                      storage::View view, FrameChangeCollector *frame_change_collector = nullptr)
-      : frame_(frame),
-        symbol_table_(&symbol_table),
-        ctx_(&ctx),
-        dba_(dba),
-        view_(view),
-        frame_change_collector_(frame_change_collector) {}
+                      storage::View view)
+      : frame_(frame), symbol_table_(&symbol_table), ctx_(&ctx), dba_(dba), view_(view) {}
 
   using ExpressionVisitor<TypedValue>::Visit;
 
@@ -203,78 +124,25 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   }
 
   TypedValue Visit(InListOperator &in_list) override {
-    TypedValue *_list_ptr = nullptr;
-    TypedValue _list;
     auto literal = in_list.expression1_->Accept(*this);
-
-    auto get_list_literal = [this, &in_list, &_list, &_list_ptr]() -> void {
-      ReferenceExpressionEvaluator reference_expression_evaluator{frame_, symbol_table_, ctx_};
-      _list_ptr = in_list.expression2_->Accept(reference_expression_evaluator);
-      if (nullptr == _list_ptr) {
-        _list = in_list.expression2_->Accept(*this);
-        _list_ptr = &_list;
-      }
-    };
-
-    auto do_list_literal_checks = [this, &literal, &_list_ptr]() -> std::optional<TypedValue> {
-      MG_ASSERT(_list_ptr, "List literal should have been defined");
-      if (_list_ptr->IsNull()) {
-        return TypedValue(ctx_->memory);
-      }
-      // Exceptions have higher priority than returning nulls when list expression
-      // is not null.
-      if (_list_ptr->type() != TypedValue::Type::List) {
-        throw QueryRuntimeException("IN expected a list, got {}.", _list_ptr->type());
-      }
-      const auto &list = _list_ptr->ValueList();
-
-      // If literal is NULL there is no need to try to compare it with every
-      // element in the list since result of every comparison will be NULL. There
-      // is one special case that we must test explicitly: if list is empty then
-      // result is false since no comparison will be performed.
-      if (list.empty()) return TypedValue(false, ctx_->memory);
-      if (literal.IsNull()) return TypedValue(ctx_->memory);
-      return {};
-    };
-
-    const auto cached_id = memgraph::utils::GetFrameChangeId(in_list);
-
-    const auto do_cache{frame_change_collector_ != nullptr && cached_id &&
-                        frame_change_collector_->IsKeyTracked(*cached_id)};
-    if (do_cache) {
-      if (!frame_change_collector_->IsKeyValueCached(*cached_id)) {
-        // Check only first time if everything is okay, later when we use
-        // cache there is no need to check again as we did check first time
-        get_list_literal();
-        auto preoperational_checks = do_list_literal_checks();
-        if (preoperational_checks) {
-          return std::move(*preoperational_checks);
-        }
-        auto &cached_value = frame_change_collector_->GetCachedValue(*cached_id);
-        cached_value.CacheValue(*_list_ptr);
-        spdlog::trace("Value cached {}", *cached_id);
-      }
-      const auto &cached_value = frame_change_collector_->GetCachedValue(*cached_id);
-
-      if (cached_value.ContainsValue(literal)) {
-        return TypedValue(true, ctx_->memory);
-      }
-      // has null
-      if (cached_value.ContainsValue(TypedValue(ctx_->memory))) {
-        return TypedValue(ctx_->memory);
-      }
-      return TypedValue(false, ctx_->memory);
+    auto _list = in_list.expression2_->Accept(*this);
+    if (_list.IsNull()) {
+      return TypedValue(ctx_->memory);
     }
-    // When caching is not an option, we need to evaluate list literal every time
-    // and do the checks
-    get_list_literal();
-    auto preoperational_checks = do_list_literal_checks();
-    if (preoperational_checks) {
-      return std::move(*preoperational_checks);
+    // Exceptions have higher priority than returning nulls when list expression
+    // is not null.
+    if (_list.type() != TypedValue::Type::List) {
+      throw QueryRuntimeException("IN expected a list, got {}.", _list.type());
     }
-
     const auto &list = _list.ValueList();
-    spdlog::trace("Not using cache on IN LIST operator");
+
+    // If literal is NULL there is no need to try to compare it with every
+    // element in the list since result of every comparison will be NULL. There
+    // is one special case that we must test explicitly: if list is empty then
+    // result is false since no comparison will be performed.
+    if (list.empty()) return TypedValue(false, ctx_->memory);
+    if (literal.IsNull()) return TypedValue(ctx_->memory);
+
     auto has_null = false;
     for (const auto &element : list) {
       auto result = literal == element;
@@ -291,53 +159,50 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   }
 
   TypedValue Visit(SubscriptOperator &list_indexing) override {
-    ReferenceExpressionEvaluator referenceExpressionEvaluator(frame_, symbol_table_, ctx_);
-
-    TypedValue *lhs_ptr = list_indexing.expression1_->Accept(referenceExpressionEvaluator);
-    TypedValue lhs;
-    const auto referenced = nullptr != lhs_ptr;
-    if (!referenced) {
-      lhs = list_indexing.expression1_->Accept(*this);
-      lhs_ptr = &lhs;
-    }
+    auto lhs = list_indexing.expression1_->Accept(*this);
     auto index = list_indexing.expression2_->Accept(*this);
-    if (!lhs_ptr->IsList() && !lhs_ptr->IsMap() && !lhs_ptr->IsVertex() && !lhs_ptr->IsEdge() && !lhs_ptr->IsNull())
+    if (!lhs.IsList() && !lhs.IsMap() && !lhs.IsVertex() && !lhs.IsEdge() && !lhs.IsNull())
       throw QueryRuntimeException(
           "Expected a list, a map, a node or an edge to index with '[]', got "
           "{}.",
-          lhs_ptr->type());
-    if (lhs_ptr->IsNull() || index.IsNull()) return TypedValue(ctx_->memory);
-    if (lhs_ptr->IsList()) {
+          lhs.type());
+    if (lhs.IsNull() || index.IsNull()) return TypedValue(ctx_->memory);
+    if (lhs.IsList()) {
       if (!index.IsInt()) throw QueryRuntimeException("Expected an integer as a list index, got {}.", index.type());
       auto index_int = index.ValueInt();
-      auto &list = lhs_ptr->ValueList();
+      // NOTE: Take non-const reference to list, so that we can move out the
+      // indexed element as the result.
+      auto &list = lhs.ValueList();
       if (index_int < 0) {
         index_int += static_cast<int64_t>(list.size());
       }
       if (index_int >= static_cast<int64_t>(list.size()) || index_int < 0) return TypedValue(ctx_->memory);
-      return referenced ? TypedValue(list[index_int], ctx_->memory)
-                        : TypedValue(std::move(list[index_int]), ctx_->memory);
+      // NOTE: Explicit move is needed, so that we return the move constructed
+      // value and preserve the correct MemoryResource.
+      return std::move(list[index_int]);
     }
 
-    if (lhs_ptr->IsMap()) {
+    if (lhs.IsMap()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a map index, got {}.", index.type());
       // NOTE: Take non-const reference to map, so that we can move out the
       // looked-up element as the result.
-      auto &map = lhs_ptr->ValueMap();
+      auto &map = lhs.ValueMap();
       auto found = map.find(index.ValueString());
       if (found == map.end()) return TypedValue(ctx_->memory);
-      return referenced ? TypedValue(found->second, ctx_->memory) : TypedValue(std::move(found->second), ctx_->memory);
+      // NOTE: Explicit move is needed, so that we return the move constructed
+      // value and preserve the correct MemoryResource.
+      return std::move(found->second);
     }
 
-    if (lhs_ptr->IsVertex()) {
+    if (lhs.IsVertex()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a property name, got {}.", index.type());
-      return {GetProperty(lhs_ptr->ValueVertex(), index.ValueString()), ctx_->memory};
+      return TypedValue(GetProperty(lhs.ValueVertex(), index.ValueString()), ctx_->memory);
     }
 
-    if (lhs_ptr->IsEdge()) {
+    if (lhs.IsEdge()) {
       if (!index.IsString()) throw QueryRuntimeException("Expected a string as a property name, got {}.", index.type());
-      return {GetProperty(lhs_ptr->ValueEdge(), index.ValueString()), ctx_->memory};
-    };
+      return TypedValue(GetProperty(lhs.ValueEdge(), index.ValueString()), ctx_->memory);
+    }
 
     // lhs is Null
     return TypedValue(ctx_->memory);
@@ -393,15 +258,7 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   }
 
   TypedValue Visit(PropertyLookup &property_lookup) override {
-    ReferenceExpressionEvaluator referenceExpressionEvaluator(frame_, symbol_table_, ctx_);
-
-    TypedValue *expression_result_ptr = property_lookup.expression_->Accept(referenceExpressionEvaluator);
-    TypedValue expression_result;
-
-    if (nullptr == expression_result_ptr) {
-      expression_result = property_lookup.expression_->Accept(*this);
-      expression_result_ptr = &expression_result;
-    }
+    auto expression_result = property_lookup.expression_->Accept(*this);
     auto maybe_date = [this](const auto &date, const auto &prop_name) -> std::optional<TypedValue> {
       if (prop_name == "year") {
         return TypedValue(date.year, ctx_->memory);
@@ -475,38 +332,42 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
       }
       return std::nullopt;
     };
-    switch (expression_result_ptr->type()) {
+    switch (expression_result.type()) {
       case TypedValue::Type::Null:
         return TypedValue(ctx_->memory);
       case TypedValue::Type::Vertex:
-        return TypedValue(GetProperty(expression_result_ptr->ValueVertex(), property_lookup.property_), ctx_->memory);
+        return TypedValue(GetProperty(expression_result.ValueVertex(), property_lookup.property_), ctx_->memory);
       case TypedValue::Type::Edge:
-        return TypedValue(GetProperty(expression_result_ptr->ValueEdge(), property_lookup.property_), ctx_->memory);
+        return TypedValue(GetProperty(expression_result.ValueEdge(), property_lookup.property_), ctx_->memory);
       case TypedValue::Type::Map: {
-        auto &map = expression_result_ptr->ValueMap();
+        // NOTE: Take non-const reference to map, so that we can move out the
+        // looked-up element as the result.
+        auto &map = expression_result.ValueMap();
         auto found = map.find(property_lookup.property_.name.c_str());
         if (found == map.end()) return TypedValue(ctx_->memory);
-        return TypedValue(found->second, ctx_->memory);
+        // NOTE: Explicit move is needed, so that we return the move constructed
+        // value and preserve the correct MemoryResource.
+        return std::move(found->second);
       }
       case TypedValue::Type::Duration: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &dur = expression_result_ptr->ValueDuration();
+        const auto &dur = expression_result.ValueDuration();
         if (auto dur_field = maybe_duration(dur, prop_name); dur_field) {
-          return TypedValue(*dur_field, ctx_->memory);
+          return std::move(*dur_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Duration", prop_name);
       }
       case TypedValue::Type::Date: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &date = expression_result_ptr->ValueDate();
+        const auto &date = expression_result.ValueDate();
         if (auto date_field = maybe_date(date, prop_name); date_field) {
-          return TypedValue(*date_field, ctx_->memory);
+          return std::move(*date_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Date", prop_name);
       }
       case TypedValue::Type::LocalTime: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &lt = expression_result_ptr->ValueLocalTime();
+        const auto &lt = expression_result.ValueLocalTime();
         if (auto lt_field = maybe_local_time(lt, prop_name); lt_field) {
           return std::move(*lt_field);
         }
@@ -514,119 +375,25 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
       }
       case TypedValue::Type::LocalDateTime: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &ldt = expression_result_ptr->ValueLocalDateTime();
+        const auto &ldt = expression_result.ValueLocalDateTime();
         if (auto date_field = maybe_date(ldt.date, prop_name); date_field) {
           return std::move(*date_field);
         }
         if (auto lt_field = maybe_local_time(ldt.local_time, prop_name); lt_field) {
-          return TypedValue(*lt_field, ctx_->memory);
+          return std::move(*lt_field);
         }
         throw QueryRuntimeException("Invalid property name {} for LocalDateTime", prop_name);
       }
       case TypedValue::Type::Graph: {
         const auto &prop_name = property_lookup.property_.name;
-        const auto &graph = expression_result_ptr->ValueGraph();
+        const auto &graph = expression_result.ValueGraph();
         if (auto graph_field = maybe_graph(graph, prop_name); graph_field) {
-          return TypedValue(*graph_field, ctx_->memory);
+          return std::move(*graph_field);
         }
         throw QueryRuntimeException("Invalid property name {} for Graph", prop_name);
       }
       default:
-        throw QueryRuntimeException(
-            "Only nodes, edges, maps, temporal types and graphs have properties to be looked up.");
-    }
-  }
-
-  TypedValue Visit(AllPropertiesLookup &all_properties_lookup) override {
-    TypedValue::TMap result(ctx_->memory);
-
-    auto expression_result = all_properties_lookup.expression_->Accept(*this);
-    switch (expression_result.type()) {
-      case TypedValue::Type::Null:
-        return TypedValue(ctx_->memory);
-      case TypedValue::Type::Vertex: {
-        for (const auto properties = *expression_result.ValueVertex().Properties(view_);
-             const auto &[property_id, value] : properties) {
-          result.emplace(dba_->PropertyToName(property_id), value);
-        }
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::Edge: {
-        for (const auto properties = *expression_result.ValueEdge().Properties(view_);
-             const auto &[property_id, value] : properties) {
-          result.emplace(dba_->PropertyToName(property_id), value);
-        }
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::Map: {
-        for (auto &[name, value] : expression_result.ValueMap()) {
-          result.emplace(name, value);
-        }
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::Duration: {
-        const auto &dur = expression_result.ValueDuration();
-        result.emplace("day", TypedValue(dur.Days(), ctx_->memory));
-        result.emplace("hour", TypedValue(dur.SubDaysAsHours(), ctx_->memory));
-        result.emplace("minute", TypedValue(dur.SubDaysAsMinutes(), ctx_->memory));
-        result.emplace("second", TypedValue(dur.SubDaysAsSeconds(), ctx_->memory));
-        result.emplace("millisecond", TypedValue(dur.SubDaysAsMilliseconds(), ctx_->memory));
-        result.emplace("microseconds", TypedValue(dur.SubDaysAsMicroseconds(), ctx_->memory));
-        result.emplace("nanoseconds", TypedValue(dur.SubDaysAsNanoseconds(), ctx_->memory));
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::Date: {
-        const auto &date = expression_result.ValueDate();
-        result.emplace("year", TypedValue(date.year, ctx_->memory));
-        result.emplace("month", TypedValue(date.month, ctx_->memory));
-        result.emplace("day", TypedValue(date.day, ctx_->memory));
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::LocalTime: {
-        const auto &lt = expression_result.ValueLocalTime();
-        result.emplace("hour", TypedValue(lt.hour, ctx_->memory));
-        result.emplace("minute", TypedValue(lt.minute, ctx_->memory));
-        result.emplace("second", TypedValue(lt.second, ctx_->memory));
-        result.emplace("millisecond", TypedValue(lt.millisecond, ctx_->memory));
-        result.emplace("microsecond", TypedValue(lt.microsecond, ctx_->memory));
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::LocalDateTime: {
-        const auto &ldt = expression_result.ValueLocalDateTime();
-        const auto &date = ldt.date;
-        const auto &lt = ldt.local_time;
-        result.emplace("year", TypedValue(date.year, ctx_->memory));
-        result.emplace("month", TypedValue(date.month, ctx_->memory));
-        result.emplace("day", TypedValue(date.day, ctx_->memory));
-        result.emplace("hour", TypedValue(lt.hour, ctx_->memory));
-        result.emplace("minute", TypedValue(lt.minute, ctx_->memory));
-        result.emplace("second", TypedValue(lt.second, ctx_->memory));
-        result.emplace("millisecond", TypedValue(lt.millisecond, ctx_->memory));
-        result.emplace("microsecond", TypedValue(lt.microsecond, ctx_->memory));
-        return TypedValue(result, ctx_->memory);
-      }
-      case TypedValue::Type::Graph: {
-        const auto &graph = expression_result.ValueGraph();
-
-        utils::pmr::vector<TypedValue> vertices(ctx_->memory);
-        vertices.reserve(graph.vertices().size());
-        for (const auto &v : graph.vertices()) {
-          vertices.emplace_back(TypedValue(v, ctx_->memory));
-        }
-        result.emplace("nodes", TypedValue(std::move(vertices), ctx_->memory));
-
-        utils::pmr::vector<TypedValue> edges(ctx_->memory);
-        edges.reserve(graph.edges().size());
-        for (const auto &e : graph.edges()) {
-          edges.emplace_back(TypedValue(e, ctx_->memory));
-        }
-        result.emplace("edges", TypedValue(std::move(edges), ctx_->memory));
-
-        return TypedValue(result, ctx_->memory);
-      }
-      default:
-        throw QueryRuntimeException(
-            "Only nodes, edges, maps, temporal types and graphs have properties to be looked up.");
+        throw QueryRuntimeException("Only nodes, edges, maps and temporal types have properties to be looked-up.");
     }
   }
 
@@ -691,30 +458,6 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
     return TypedValue(result, ctx_->memory);
   }
 
-  TypedValue Visit(MapProjectionLiteral &literal) override {
-    constexpr std::string_view kAllPropertiesSelector{"*"};
-
-    TypedValue::TMap result(ctx_->memory);
-    TypedValue::TMap all_properties_lookup(ctx_->memory);
-    for (const auto &[property_key, property_value] : literal.elements_) {
-      if (property_key.name == kAllPropertiesSelector.data()) {
-        auto maybe_all_properties_lookup = property_value->Accept(*this);
-
-        if (maybe_all_properties_lookup.type() != TypedValue::Type::Map) {
-          throw QueryRuntimeException("Expected a map from AllPropertiesLookup, got {}.",
-                                      maybe_all_properties_lookup.type());
-        }
-        all_properties_lookup = std::move(maybe_all_properties_lookup.ValueMap());
-        continue;
-      }
-
-      result.emplace(property_key.name, property_value->Accept(*this));
-    }
-    if (!all_properties_lookup.empty()) result.merge(all_properties_lookup);
-
-    return TypedValue(result, ctx_->memory);
-  }
-
   TypedValue Visit(Aggregation &aggregation) override {
     return TypedValue(frame_->at(symbol_table_->at(aggregation)), ctx_->memory);
   }
@@ -804,8 +547,6 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
     return TypedValue(result, ctx_->memory);
   }
 
-  TypedValue Visit(Exists &exists) override { return TypedValue{frame_->at(symbol_table_->at(exists)), ctx_->memory}; }
-
   TypedValue Visit(All &all) override {
     auto list_value = all.list_expression_->Accept(*this);
     if (list_value.IsNull()) {
@@ -1036,8 +777,7 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   DbAccessor *dba_;
   // which switching approach should be used when evaluating
   storage::View view_;
-  FrameChangeCollector *frame_change_collector_;
-};  // namespace memgraph::query
+};
 
 /// A helper function for evaluating an expression that's an int.
 ///