Merge branch 'T0982-MG-Implement-EdgeType-filtering' into T0993-MG-lba-execution-triggers

* grammar expanded; (#462)

* T0954 mg expand user and role to hold permissions on labels (#465)

* added FineGrainedAccessPermissions class to model

* expanded user and role with fine grained access permissions

* fixed grammar

* [E129 < T0953-MG] GRANT, DENY, REVOKE added in interpreter and mainVisitor (#464)

* GRANT, DENY, REVOKE added in interpreter and mainVisitor

* Commented labelPermissons

* remove labelsPermission adding

* Removed extra lambda

* [E129<-T0955-MG] Expand ExecutionContext with label related information (#467)

* Added FineGrainedAccessChecker to Context

* fixed failing tests for label based authorization (#480)

* Marked FineGrainedAccessChecker ctor explicit; Introduced change to clang-tidy; (#483)

Co-authored-by: niko4299 <51059248+niko4299@users.noreply.github.com>

.github/pull_request_template.md

@@ -3,7 +3,9 @@
 - [ ] 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

.github/workflows/diff.yaml

@@ -70,6 +70,11 @@ jobs:
           # branches and tags. (default: 1)
           fetch-depth: 0
 
+        # This is also needed if we want do to comparison against other branches
+        # See https://github.community/t/checkout-code-fails-when-it-runs-lerna-run-test-since-master/17920
+      - name: Fetch all history for all tags and branches
+        run: git fetch
+
       - name: Build combined ASAN, UBSAN and coverage binaries
         run: |
           # Activate toolchain.
@@ -110,12 +115,22 @@ jobs:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
 
+      - name: Set base branch
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo "BASE_BRANCH=origin/${{ github.base_ref }}" >> $GITHUB_ENV
+
+      - name: Set base branch # if we manually dispatch or push to master
+        if: ${{ github.event_name != 'pull_request' }}
+        run: |
+          echo "BASE_BRANCH=origin/master" >> $GITHUB_ENV
+
       - name: Run clang-tidy
         run: |
           source /opt/toolchain-v4/activate
 
           # Restrict clang-tidy results only to the modified parts
-          git diff -U0 master... -- src | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -path build | tee ./build/clang_tidy_output.txt
+          git diff -U0 ${{ env.BASE_BRANCH }}... -- src | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -path build  -regex ".+\.cpp" | tee ./build/clang_tidy_output.txt
 
           # Fail if any warning is reported
           ! cat ./build/clang_tidy_output.txt | ./tools/github/clang-tidy/grep_error_lines.sh > /dev/null

.github/workflows/package_all.yaml

@@ -174,5 +174,5 @@ jobs:
       - name: "Upload package"
         uses: actions/upload-artifact@v2
         with:
-          name: debian-11
-          path: build/output/debian-11/memgraph*.deb
+          name: debian-11-arm
+          path: build/output/debian-11-arm/memgraph*.deb

.github/workflows/release_docker.yaml

@@ -4,8 +4,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: "Memgraph binary version to publish on Dockerhub."
+        description: "Memgraph binary version to publish on DockerHub."
         required: true
+      force_release:
+        type: boolean
+        required: false
+        default: false
 
 jobs:
   docker_publish:
@@ -36,6 +40,22 @@ jobs:
           curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.version }}/debian-11/memgraph_${{ github.event.inputs.version }}-1_amd64.deb > memgraph-amd64.deb
           curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.version }}/debian-11-aarch64/memgraph_${{ github.event.inputs.version }}-1_arm64.deb > memgraph-arm64.deb
 
+      - 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 release/docker

.gitignore

@@ -9,7 +9,6 @@
 *.swn
 *.swo
 *.swp
-
 *~
 .DS_Store
 .gdb_history
@@ -27,7 +26,6 @@ src/query/frontend/opencypher/generated/
 tags
 ve/
 ve3/
-.cache/
 perf.data*
 TAGS
 *.apollo_measurements

CODEOWNERS

@@ -1 +0,0 @@
-* @antaljanosbenjamin @kostasrim

config/generate.py

@@ -18,16 +18,14 @@ WIDTH = 80
 
 def wrap_text(s, initial_indent="# "):
     return "\n#\n".join(
-        map(
-            lambda x: textwrap.fill(x, WIDTH, initial_indent=initial_indent, subsequent_indent="# "),
-            s.split("\n"),
-        )
-    )
+        map(lambda x: textwrap.fill(x, WIDTH, initial_indent=initial_indent,
+                                    subsequent_indent="# "), s.split("\n")))
 
 
 def extract_flags(binary_path):
     ret = {}
-    data = subprocess.run([binary_path, "--help-xml"], stdout=subprocess.PIPE).stdout.decode("utf-8")
+    data = subprocess.run([binary_path, "--help-xml"],
+                          stdout=subprocess.PIPE).stdout.decode("utf-8")
     root = ET.fromstring(data)
     for child in root:
         if child.tag == "usage" and child.text.lower().count("warning"):
@@ -48,7 +46,8 @@ def apply_config_to_flags(config, flags):
     for modification in config["modifications"]:
         name = modification["name"]
         if name not in flags:
-            print("WARNING: Flag '" + name + "' missing from binary!", file=sys.stderr)
+            print("WARNING: Flag '" + name + "' missing from binary!",
+                  file=sys.stderr)
             continue
         flags[name]["default"] = modification["value"]
         flags[name]["override"] = modification["override"]
@@ -76,9 +75,8 @@ def extract_sections(flags):
     else:
         sections.append((current_section, current_flags))
     sections.append(("other", other))
-    assert set(sum(map(lambda x: x[1], sections), [])) == set(
-        flags.keys()
-    ), "The section extraction algorithm lost some flags!"
+    assert set(sum(map(lambda x: x[1], sections), [])) == set(flags.keys()), \
+        "The section extraction algorithm lost some flags!"
     return sections
 
 
@@ -91,7 +89,8 @@ def generate_config_file(sections, flags):
             helpstr = flag["meaning"] + " [" + flag["type"] + "]"
             ret += wrap_text(helpstr) + "\n"
             prefix = "# " if not flag["override"] else ""
-            ret += prefix + "--" + flag["name"].replace("_", "-") + "=" + flag["default"] + "\n\n"
+            ret += prefix + "--" + flag["name"].replace("_", "-") + \
+                "=" + flag["default"] + "\n\n"
         ret += "\n"
     ret += wrap_text(config["footer"])
     return ret.strip() + "\n"
@@ -99,16 +98,13 @@ def generate_config_file(sections, flags):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument("memgraph_binary", help="path to Memgraph binary")
-    parser.add_argument(
-        "output_file",
-        help="path where to store the generated Memgraph " "configuration file",
-    )
-    parser.add_argument(
-        "--config-file",
-        default=CONFIG_FILE,
-        help="path to generator configuration file",
-    )
+    parser.add_argument("memgraph_binary",
+                        help="path to Memgraph binary")
+    parser.add_argument("output_file",
+                        help="path where to store the generated Memgraph "
+                        "configuration file")
+    parser.add_argument("--config-file", default=CONFIG_FILE,
+                        help="path to generator configuration file")
 
     args = parser.parse_args()
     flags = extract_flags(args.memgraph_binary)

environment/os/centos-7.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "centos-7"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc gcc-c++ make # generic build tools
     wget # used for archive download

environment/os/centos-9.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "centos-9"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils-common gcc gcc-c++ make # generic build tools
     wget # used for archive download

environment/os/debian-10.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "debian-10"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/debian-11-arm.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "debian-11"
+check_architecture "arm64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/debian-11.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "debian-11"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/template.sh

@@ -5,6 +5,8 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "todo-os-name"
+
 TOOLCHAIN_BUILD_DEPS=(
     pkg
 )

environment/os/ubuntu-18.04.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "ubuntu-18.04"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # archive download

environment/os/ubuntu-20.04.sh

@@ -5,6 +5,9 @@ set -Eeuo pipefail
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source "$DIR/../util.sh"
 
+check_operating_system "ubuntu-20.04"
+check_architecture "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/os/ubuntu-22.04.sh

@@ -5,6 +5,9 @@ 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 "x86_64"
+
 TOOLCHAIN_BUILD_DEPS=(
     coreutils gcc g++ build-essential make # generic build tools
     wget # used for archive download

environment/util.sh

@@ -5,10 +5,28 @@ operating_system() {
     sort | cut -d '=' -f 2- | sed 's/"//g' | paste -s -d '-'
 }
 
+check_operating_system() {
+    if [ "$(operating_system)" != "$1" ]; then
+        echo "Not the right operating system!"
+        exit 1
+    else
+        echo "The right operating system."
+    fi
+}
+
 architecture() {
     uname -m
 }
 
+check_architecture() {
+    if [ "$(architecture)" != "$1" ]; then
+        echo "Not the right architecture!"
+        exit 1
+    else
+        echo "The right architecture."
+    fi
+}
+
 check_all_yum() {
     local missing=""
     for pkg in $1; do

init

@@ -139,3 +139,6 @@ done;
 # Install precommit hook
 python3 -m pip install pre-commit
 python3 -m pre_commit install
+
+# Link `include/mgp.py` with `release/mgp/mgp.py`
+ln -v -f include/mgp.py release/mgp/mgp.py

libs/.gitignore

@@ -5,3 +5,4 @@
 !CMakeLists.txt
 !__main.cpp
 !pulsar.patch
+!antlr4.10.1.patch

libs/CMakeLists.txt

@@ -106,6 +106,7 @@ import_external_library(antlr4 STATIC
              -DWITH_LIBCXX=OFF # because of debian bug
              -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=true
              -DCMAKE_CXX_STANDARD=20
+             -DANTLR_BUILD_CPP_TESTS=OFF
   BUILD_COMMAND $(MAKE) antlr4_static
   INSTALL_COMMAND $(MAKE) install)
 

libs/antlr4.10.1.patch

@@ -0,0 +1,13 @@
+diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
+index baf46cac9..2e7756de8 100644
+--- a/runtime/Cpp/runtime/CMakeLists.txt
++++ b/runtime/Cpp/runtime/CMakeLists.txt
+@@ -134,7 +134,7 @@ set_target_properties(antlr4_static
+                                  ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}
+                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
+
+-install(TARGETS antlr4_shared
++install(TARGETS antlr4_shared OPTIONAL
+         EXPORT antlr4-targets
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

libs/antlr4.patch

@@ -1,43 +0,0 @@
-diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
-index a8503bb..11362cf 100644
---- a/runtime/Cpp/runtime/CMakeLists.txt
-+++ b/runtime/Cpp/runtime/CMakeLists.txt
-@@ -5,8 +5,8 @@ set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
- set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
- ExternalProject_Add(
-   utfcpp
--  GIT_REPOSITORY        "git://github.com/nemtrif/utfcpp"
--  GIT_TAG               "v3.1.1"
-+  GIT_REPOSITORY        "https://github.com/nemtrif/utfcpp"
-+  GIT_TAG               "v3.2.1"
-   SOURCE_DIR            ${UTFCPP_DIR}
-   UPDATE_DISCONNECTED   1
-   CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
-@@ -118,7 +118,7 @@ set_target_properties(antlr4_static
-                                  ARCHIVE_OUTPUT_DIRECTORY ${LIB_OUTPUT_DIR}
-                                  COMPILE_FLAGS "${disabled_compile_warnings} ${extra_static_compile_flags}")
- 
--install(TARGETS antlr4_shared
-+install(TARGETS antlr4_shared OPTIONAL
-         DESTINATION lib
-         EXPORT antlr4-targets)
- install(TARGETS antlr4_static
-diff --git a/runtime/Cpp/runtime/src/support/Any.h b/runtime/Cpp/runtime/src/support/Any.h
-index 468db98..65a473b 100644
---- a/runtime/Cpp/runtime/src/support/Any.h
-+++ b/runtime/Cpp/runtime/src/support/Any.h
-@@ -122,12 +122,12 @@ private:
-     }
- 
-   private:
--    template<int N = 0, typename std::enable_if<N == N && std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
-+    template<int N = 0, typename std::enable_if<N == N && std::is_copy_constructible<T>::value, int>::type = 0>
-     Base* clone() const {
-       return new Derived<T>(value);
-     }
- 
--    template<int N = 0, typename std::enable_if<N == N && !std::is_nothrow_copy_constructible<T>::value, int>::type = 0>
-+    template<int N = 0, typename std::enable_if<N == N && !std::is_copy_constructible<T>::value, int>::type = 0>
-     Base* clone() const {
-       return nullptr;
-     }

libs/setup.sh

@@ -105,7 +105,7 @@ repo_clone_try_double () {
 # Download from primary_urls might fail because the cache is not installed.
 declare -A primary_urls=(
   ["antlr4-code"]="http://$local_cache_host/git/antlr4.git"
-  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.9.2-complete.jar"
+  ["antlr4-generator"]="http://$local_cache_host/file/antlr-4.10.1-complete.jar"
   ["cppitertools"]="http://$local_cache_host/git/cppitertools.git"
   ["rapidcheck"]="http://$local_cache_host/git/rapidcheck.git"
   ["gbenchmark"]="http://$local_cache_host/git/benchmark.git"
@@ -130,7 +130,7 @@ declare -A primary_urls=(
 # should fail.
 declare -A secondary_urls=(
   ["antlr4-code"]="https://github.com/antlr/antlr4.git"
-  ["antlr4-generator"]="http://www.antlr.org/download/antlr-4.9.2-complete.jar"
+  ["antlr4-generator"]="https://www.antlr.org/download/antlr-4.10.1-complete.jar"
   ["cppitertools"]="https://github.com/ryanhaining/cppitertools.git"
   ["rapidcheck"]="https://github.com/emil-e/rapidcheck.git"
   ["gbenchmark"]="https://github.com/google/benchmark.git"
@@ -152,10 +152,10 @@ declare -A secondary_urls=(
 # antlr
 file_get_try_double "${primary_urls[antlr4-generator]}" "${secondary_urls[antlr4-generator]}"
 
-antlr4_tag="4.9.2" # v4.9.2
+antlr4_tag="4.10.1" # v4.10.1
 repo_clone_try_double "${primary_urls[antlr4-code]}" "${secondary_urls[antlr4-code]}" "antlr4" "$antlr4_tag" true
 pushd antlr4
-git apply ../antlr4.patch
+git apply ../antlr4.10.1.patch
 popd
 
 # cppitertools v2.0 2019-12-23
@@ -199,7 +199,7 @@ git apply ../rocksdb.patch
 popd
 
 # mgclient
-mgclient_tag="96e95c6845463cbe88948392be58d26da0d5ffd3" # (2022-02-08)
+mgclient_tag="v1.4.0" # (2022-06-14)
 repo_clone_try_double "${primary_urls[mgclient]}" "${secondary_urls[mgclient]}" "mgclient" "$mgclient_tag"
 sed -i 's/\${CMAKE_INSTALL_LIBDIR}/lib/' mgclient/src/CMakeLists.txt
 

query_modules/example.py

@@ -7,11 +7,13 @@ import copy
 
 
 @mgp.read_proc
-def procedure(
-    context: mgp.ProcCtx,
-    required_arg: mgp.Nullable[mgp.Any],
-    optional_arg: mgp.Nullable[mgp.Any] = None,
-) -> mgp.Record(args=list, vertex_count=int, avg_degree=mgp.Number, props=mgp.Nullable[mgp.Map]):
+def procedure(context: mgp.ProcCtx,
+              required_arg: mgp.Nullable[mgp.Any],
+              optional_arg: mgp.Nullable[mgp.Any] = None
+              ) -> mgp.Record(args=list,
+                              vertex_count=int,
+                              avg_degree=mgp.Number,
+                              props=mgp.Nullable[mgp.Map]):
     """
     This example procedure returns 4 fields.
 
@@ -35,7 +37,7 @@ def procedure(
     if isinstance(required_arg, (mgp.Edge, mgp.Vertex)):
         props = dict(required_arg.properties.items())
     elif isinstance(required_arg, mgp.Path):
-        (start_vertex,) = required_arg.vertices
+        start_vertex, = required_arg.vertices
         props = dict(start_vertex.properties.items())
     # Count the vertices and edges in the database; this may take a while.
     vertex_count = 0
@@ -49,13 +51,15 @@ def procedure(
     # Copy the received arguments to make it equivalent to the C example.
     args_copy = [copy.deepcopy(required_arg), copy.deepcopy(optional_arg)]
     # Multiple rows can be produced by returning an iterable of mgp.Record.
-    return mgp.Record(args=args_copy, vertex_count=vertex_count, avg_degree=avg_degree, props=props)
+    return mgp.Record(args=args_copy, vertex_count=vertex_count,
+                      avg_degree=avg_degree, props=props)
 
 
 @mgp.write_proc
-def write_procedure(
-    context: mgp.ProcCtx, property_name: str, property_value: mgp.Nullable[mgp.Any]
-) -> mgp.Record(created_vertex=mgp.Vertex):
+def write_procedure(context: mgp.ProcCtx,
+                    property_name: str,
+                    property_value: mgp.Nullable[mgp.Any]
+                    ) -> mgp.Record(created_vertex=mgp.Vertex):
     """
     This example procedure creates a new vertex with the specified property
     and connects it to all existing vertex which has the same property with

query_modules/graph_analyzer.py

@@ -4,17 +4,15 @@ from collections import OrderedDict
 from itertools import chain, repeat
 from inspect import cleandoc
 from typing import List, Tuple
-
 try:
     import networkx as nx
 except ImportError as import_error:
-    sys.stderr.write(
-        (
-            "\n"
-            "NOTE: Please install networkx to be able to use graph_analyzer "
-            "module. Using Python:\n" + sys.version + "\n"
-        )
-    )
+    sys.stderr.write((
+        '\n'
+        'NOTE: Please install networkx to be able to use graph_analyzer '
+        'module. Using Python:\n'
+        + sys.version +
+        '\n'))
     raise import_error
 # Imported last because it also depends on networkx.
 from mgp_networkx import MemgraphMultiDiGraph  # noqa E402
@@ -25,14 +23,16 @@ _MAX_LIST_SIZE = 10
 
 @mgp.read_proc
 def help() -> mgp.Record(name=str, value=str):
-    """Shows manual page for graph_analyzer."""
+    '''Shows manual page for graph_analyzer.'''
     records = []
 
     def make_records(name, doc):
-        return (mgp.Record(name=n, value=v) for n, v in zip(chain([name], repeat("")), cleandoc(doc).splitlines()))
+        return (mgp.Record(name=n, value=v) for n, v in
+                zip(chain([name], repeat('')), cleandoc(doc).splitlines()))
 
     for func in (help, analyze, analyze_subgraph):
-        records.extend(make_records("Procedure '{}'".format(func.__name__), func.__doc__))
+        records.extend(make_records("Procedure '{}'".format(func.__name__),
+                                    func.__doc__))
 
     for m, v in _get_analysis_mapping().items():
         records.extend(make_records("Analysis '{}'".format(m), v.__doc__))
@@ -41,8 +41,10 @@ def help() -> mgp.Record(name=str, value=str):
 
 
 @mgp.read_proc
-def analyze(context: mgp.ProcCtx, analyses: mgp.Nullable[List[str]] = None) -> mgp.Record(name=str, value=str):
-    """
+def analyze(context: mgp.ProcCtx,
+            analyses: mgp.Nullable[List[str]] = None
+            ) -> mgp.Record(name=str, value=str):
+    '''
     Shows graph information.
 
     In case of multiple results, only the first 10 will be shown.
@@ -55,20 +57,19 @@ def analyze(context: mgp.ProcCtx, analyses: mgp.Nullable[List[str]] = None) -> m
 
     Example call (with parameter):
         CALL graph_analyzer.analyze(['nodes', 'edges']) YIELD *;
-    """
+    '''
     g = MemgraphMultiDiGraph(ctx=context)
     recs = _analyze_graph(context, g, analyses)
     return [mgp.Record(name=name, value=value) for name, value in recs]
 
 
 @mgp.read_proc
-def analyze_subgraph(
-    context: mgp.ProcCtx,
-    vertices: mgp.List[mgp.Vertex],
-    edges: mgp.List[mgp.Edge],
-    analyses: mgp.Nullable[List[str]] = None,
-) -> mgp.Record(name=str, value=str):
-    """
+def analyze_subgraph(context: mgp.ProcCtx,
+                     vertices: mgp.List[mgp.Vertex],
+                     edges: mgp.List[mgp.Edge],
+                     analyses: mgp.Nullable[List[str]] = None
+                     ) -> mgp.Record(name=str, value=str):
+    '''
     Shows subgraph information.
 
     In case of multiple results, only the first 10 will be shown.
@@ -90,40 +91,36 @@ def analyze_subgraph(
         CALL graph_analyzer.analyze_subgraph(nodes, edges, ['nodes', 'edges'])
         YIELD *
         RETURN name, value;
-    """
+    '''
     vertices, edges = map(set, [vertices, edges])
     g = nx.subgraph_view(
         MemgraphMultiDiGraph(ctx=context),
         lambda n: n in vertices,
-        lambda n1, n2, e: e in edges,
-    )
+        lambda n1, n2, e: e in edges)
     recs = _analyze_graph(context, g, analyses)
     return [mgp.Record(name=name, value=value) for name, value in recs]
 
 
 def _get_analysis_mapping():
-    return OrderedDict(
-        [
-            ("nodes", _number_of_nodes),
-            ("edges", _number_of_edges),
-            ("bridges", _bridges),
-            ("articulation_points", _articulation_points),
-            ("avg_degree", _avg_degree),
-            ("sorted_nodes_degree", _sorted_nodes_degree),
-            ("self_loops", _self_loops),
-            ("is_bipartite", _is_bipartite),
-            ("is_planar", _is_planar),
-            ("is_biconnected: ", _is_biconnected),
-            ("is_weakly_connected", _is_weakly_connected),
-            ("number_of_weakly_components", _weakly_components),
-            ("is_strongly_connected", _is_strongly_connected),
-            ("strongly_components", _strongly_components),
-            ("is_dag", _is_dag),
-            ("is_eulerian", _is_eulerian),
-            ("is_forest", _is_forest),
-            ("is_tree", _is_tree),
-        ]
-    )
+    return OrderedDict([
+                        ('nodes', _number_of_nodes),
+                        ('edges', _number_of_edges),
+                        ('bridges', _bridges),
+                        ('articulation_points', _articulation_points),
+                        ('avg_degree', _avg_degree),
+                        ('sorted_nodes_degree', _sorted_nodes_degree),
+                        ('self_loops', _self_loops),
+                        ('is_bipartite', _is_bipartite),
+                        ('is_planar', _is_planar),
+                        ('is_biconnected: ', _is_biconnected),
+                        ('is_weakly_connected', _is_weakly_connected),
+                        ('number_of_weakly_components', _weakly_components),
+                        ('is_strongly_connected', _is_strongly_connected),
+                        ('strongly_components', _strongly_components),
+                        ('is_dag', _is_dag),
+                        ('is_eulerian', _is_eulerian),
+                        ('is_forest', _is_forest),
+                        ('is_tree', _is_tree)])
 
 
 def _get_analysis_func(name: str):
@@ -135,15 +132,20 @@ def _get_analysis_funcs():
     return _get_analysis_mapping().values()
 
 
-def _analyze_graph(context: mgp.ProcCtx, g: nx.MultiDiGraph, analyses: List[str]) -> List[Tuple[str, str]]:
+def _analyze_graph(context: mgp.ProcCtx,
+                   g: nx.MultiDiGraph,
+                   analyses: List[str]
+                   ) -> List[Tuple[str, str]]:
 
-    functions = _get_analysis_funcs() if analyses is None else [_get_analysis_func(name) for name in analyses]
+    functions = (_get_analysis_funcs() if analyses is None
+                 else [_get_analysis_func(name) for name in analyses])
 
     records = []
     for index, f in enumerate(functions):
         context.check_must_abort()
         if f is None:
-            raise KeyError("Graph analysis is not supported: " + analyses[index])
+            raise KeyError('Graph analysis is not supported: ' +
+                           analyses[index])
         name, value = f(g)
         if isinstance(value, (list, set, tuple)):
             value = list(value)[:_MAX_LIST_SIZE]
@@ -153,120 +155,126 @@ def _analyze_graph(context: mgp.ProcCtx, g: nx.MultiDiGraph, analyses: List[str]
 
 
 def _number_of_nodes(g: nx.MultiDiGraph) -> Tuple[str, int]:
-    """Returns number of nodes."""
-    return "Number of nodes", nx.number_of_nodes(g)
+    '''Returns number of nodes.'''
+    return 'Number of nodes', nx.number_of_nodes(g)
 
 
 def _number_of_edges(g: nx.MultiDiGraph) -> Tuple[str, int]:
-    """Returns number of edges."""
-    return "Number of edges", nx.number_of_edges(g)
+    '''Returns number of edges.'''
+    return 'Number of edges', nx.number_of_edges(g)
 
 
 def _avg_degree(g: nx.MultiDiGraph) -> Tuple[str, float]:
-    """Returns average degree."""
+    '''Returns average degree.'''
     _, number_of_nodes = _number_of_nodes(g)
     _, number_of_edges = _number_of_edges(g)
-    avg_degree = 0 if number_of_nodes == 0 else number_of_edges / number_of_nodes
-    return "Average degree", avg_degree
+    avg_degree = (0 if number_of_nodes == 0
+                  else number_of_edges / number_of_nodes)
+    return 'Average degree', avg_degree
 
 
 def _sorted_nodes_degree(g: nx.MultiDiGraph) -> Tuple[str, List[int]]:
-    """Returns list of sorted nodes degree. [(node_id, degree), ...]"""
+    '''Returns list of sorted nodes degree. [(node_id, degree), ...]'''
     nodes_degree = [(n, g.degree(n)) for n in g.nodes()]
     nodes_degree.sort(key=lambda x: x[1], reverse=True)
-    return "Sorted nodes degree", nodes_degree
+    return 'Sorted nodes degree', nodes_degree
 
 
 def _self_loops(g: nx.MultiDiGraph) -> Tuple[str, int]:
-    """Returns number of self loops."""
-    return "Self loops", sum((1 if e[0] == e[1] else 0 for e in g.edges()))
+    '''Returns number of self loops.'''
+    return 'Self loops', sum((1 if e[0] == e[1] else 0 for e in g.edges()))
 
 
 def _is_bipartite(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is bipartite."""
+    '''Checks if graph is bipartite.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.bipartite.basic.is_bipartite(g)
-    return "Is bipartite", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.bipartite.basic.is_bipartite(g))
+    return 'Is bipartite', ret
 
 
 def _is_planar(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is planar."""
+    '''Checks if graph is planar.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.planarity.check_planarity(g)[0]
-    return "Is planar", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.planarity.check_planarity(g)[0])
+    return 'Is planar', ret
 
 
 def _is_biconnected(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Check if graph is biconnected."""
+    '''Check if graph is biconnected.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.is_biconnected(nx.MultiDiGraph.to_undirected(g))
-    return "Is biconnected", ret
+    ret = (False if number_of_nodes == 0
+           else nx.is_biconnected(nx.MultiDiGraph.to_undirected(g)))
+    return 'Is biconnected', ret
 
 
 def _is_weakly_connected(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Check if graph is weakly connected."""
+    '''Check if graph is weakly connected.'''
     _, number_of_nodes = _number_of_nodes(g)
     ret = False if number_of_nodes == 0 else nx.is_weakly_connected(g)
-    return "Is weakly connected", ret
+    return 'Is weakly connected', ret
 
 
 def _is_strongly_connected(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is strongly connected."""
+    '''Checks if graph is strongly connected.'''
     _, number_of_nodes = _number_of_nodes(g)
     ret = False if number_of_nodes == 0 else nx.is_strongly_connected(g)
-    return "Is strongly connected", ret
+    return 'Is strongly connected', ret
 
 
 def _is_dag(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Check if graph is directed acyclic graph (DAG)"""
+    '''Check if graph is directed acyclic graph (DAG)'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.dag.is_directed_acyclic_graph(g)
-    return "Is DAG", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.dag.is_directed_acyclic_graph(g))
+    return 'Is DAG', ret
 
 
 def _is_eulerian(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is Eulerian."""
+    '''Checks if graph is Eulerian.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.euler.is_eulerian(g)
-    return "Is eulerian", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.euler.is_eulerian(g))
+    return 'Is eulerian', ret
 
 
 def _is_forest(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is forest, all components must be trees."""
+    '''Checks if graph is forest, all components must be trees.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.tree.recognition.is_forest(g)
-    return "Is forest", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.tree.recognition.is_forest(g))
+    return 'Is forest', ret
 
 
 def _is_tree(g: nx.MultiDiGraph) -> Tuple[str, bool]:
-    """Checks if graph is tree."""
+    '''Checks if graph is tree.'''
     _, number_of_nodes = _number_of_nodes(g)
-    ret = False if number_of_nodes == 0 else nx.algorithms.tree.recognition.is_tree(g)
-    return "Is tree", ret
+    ret = (False if number_of_nodes == 0
+           else nx.algorithms.tree.recognition.is_tree(g))
+    return 'Is tree', ret
 
 
 def _bridges(g: nx.MultiDiGraph) -> Tuple[str, int]:
-    """Returns number of bridges, multiple edges between same nodes are
-    mapped to one edge."""
-    return "Number of bridges", sum(1 for _ in nx.bridges(nx.Graph(g)))
+    '''Returns number of bridges, multiple edges between same nodes are
+       mapped to one edge.'''
+    return 'Number of bridges', sum(1 for _ in nx.bridges(nx.Graph(g)))
 
 
 def _articulation_points(g: nx.MultiDiGraph):
-    """Returns number of articulation points."""
+    '''Returns number of articulation points.'''
     undirected = nx.MultiDiGraph.to_undirected(g)
-    return (
-        "Number of articulation points",
-        sum(1 for _ in nx.articulation_points(undirected)),
-    )
+    return ('Number of articulation points',
+            sum(1 for _ in nx.articulation_points(undirected)))
 
 
 def _weakly_components(g: nx.MultiDiGraph):
-    """Returns number of weakly components."""
+    '''Returns number of weakly components.'''
     comps = nx.algorithms.components.number_weakly_connected_components(g)
-    return "Number of weakly connected components", comps
+    return 'Number of weakly connected components', comps
 
 
 def _strongly_components(g: nx.MultiDiGraph):
-    """Returns number of strongly connected components."""
+    '''Returns number of strongly connected components.'''
     comps = nx.algorithms.components.number_strongly_connected_components(g)
-    return "Number of strongly connected components", comps
+    return 'Number of strongly connected components', comps

query_modules/mgp_networkx.py

@@ -1,22 +1,20 @@
 import sys
 import mgp
 import collections
-
 try:
     import networkx as nx
 except ImportError as import_error:
-    sys.stderr.write(
-        (
-            "\n"
-            "NOTE: Please install networkx to be able to use Memgraph NetworkX "
-            "wrappers. Using Python:\n" + sys.version + "\n"
-        )
-    )
+    sys.stderr.write((
+        '\n'
+        'NOTE: Please install networkx to be able to use Memgraph NetworkX '
+        'wrappers. Using Python:\n'
+        + sys.version +
+        '\n'))
     raise import_error
 
 
 class MemgraphAdjlistOuterDict(collections.abc.Mapping):
-    __slots__ = ("_ctx", "_succ", "_multi")
+    __slots__ = ('_ctx', '_succ', '_multi')
 
     def __init__(self, ctx, succ=True, multi=True):
         self._ctx = ctx
@@ -26,7 +24,8 @@ class MemgraphAdjlistOuterDict(collections.abc.Mapping):
     def __getitem__(self, key):
         if key not in self:
             raise KeyError
-        return MemgraphAdjlistInnerDict(key, succ=self._succ, multi=self._multi)
+        return MemgraphAdjlistInnerDict(key, succ=self._succ,
+                                        multi=self._multi)
 
     def __iter__(self):
         return iter(self._ctx.graph.vertices)
@@ -41,7 +40,7 @@ class MemgraphAdjlistOuterDict(collections.abc.Mapping):
 
 
 class MemgraphAdjlistInnerDict(collections.abc.Mapping):
-    __slots__ = ("_node", "_succ", "_multi", "_neighbors")
+    __slots__ = ('_node', '_succ', '_multi', '_neighbors')
 
     def __init__(self, node, succ=True, multi=True):
         self._node = node
@@ -72,26 +71,31 @@ class MemgraphAdjlistInnerDict(collections.abc.Mapping):
     def _get_neighbors(self):
         if not self._neighbors:
             if self._succ:
-                self._neighbors = set(e.to_vertex for e in self._node.out_edges)
+                self._neighbors = set(
+                    e.to_vertex for e in self._node.out_edges)
             else:
-                self._neighbors = set(e.from_vertex for e in self._node.in_edges)
+                self._neighbors = set(
+                    e.from_vertex for e in self._node.in_edges)
         return self._neighbors
 
     def _get_edge(self, neighbor):
         if self._succ:
-            edge = list(filter(lambda e: e.to_vertex == neighbor, self._node.out_edges))
+            edge = list(filter(lambda e: e.to_vertex == neighbor,
+                               self._node.out_edges))
         else:
-            edge = list(filter(lambda e: e.from_vertex == neighbor, self._node.in_edges))
+            edge = list(filter(lambda e: e.from_vertex == neighbor,
+                               self._node.in_edges))
 
         assert len(edge) >= 1
         if len(edge) > 1:
-            raise RuntimeError("Graph contains multiedges but " "is of non-multigraph type: {}".format(edge))
+            raise RuntimeError('Graph contains multiedges but '
+                               'is of non-multigraph type: {}'.format(edge))
 
         return edge[0]
 
 
 class MemgraphEdgeKeyDict(collections.abc.Mapping):
-    __slots__ = ("_node", "_neighbor", "_succ", "_edges")
+    __slots__ = ('_node', '_neighbor', '_succ', '_edges')
 
     def __init__(self, node, neighbor, succ=True):
         self._node = node
@@ -118,14 +122,18 @@ class MemgraphEdgeKeyDict(collections.abc.Mapping):
     def _get_edges(self):
         if not self._edges:
             if self._succ:
-                self._edges = list(filter(lambda e: e.to_vertex == self._neighbor, self._node.out_edges))
+                self._edges = list(filter(
+                    lambda e: e.to_vertex == self._neighbor,
+                    self._node.out_edges))
             else:
-                self._edges = list(filter(lambda e: e.from_vertex == self._neighbor, self._node.in_edges))
+                self._edges = list(filter(
+                    lambda e: e.from_vertex == self._neighbor,
+                    self._node.in_edges))
         return self._edges
 
 
 class UnhashableProperties(collections.abc.Mapping):
-    __slots__ = "_properties"
+    __slots__ = ('_properties')
 
     def __init__(self, properties):
         self._properties = properties
@@ -147,7 +155,7 @@ class UnhashableProperties(collections.abc.Mapping):
 
 
 class MemgraphNodeDict(collections.abc.Mapping):
-    __slots__ = ("_ctx",)
+    __slots__ = ('_ctx',)
 
     def __init__(self, ctx):
         self._ctx = ctx
@@ -179,7 +187,8 @@ class MemgraphNodeDict(collections.abc.Mapping):
 
 
 class MemgraphDiGraphBase:
-    def __init__(self, incoming_graph_data=None, ctx=None, multi=True, **kwargs):
+    def __init__(self, incoming_graph_data=None, ctx=None, multi=True,
+                 **kwargs):
         # NOTE: We assume that our graph will never be given any initial data
         # because we already pull our data from the Memgraph database. This
         # assert is triggered by certain NetworkX procedures because they
@@ -192,30 +201,23 @@ class MemgraphDiGraphBase:
         # modify the graph's internal attributes and don't try to populate it
         # with initial data or modify it.
 
-        self.node_dict_factory = lambda: MemgraphNodeDict(ctx) if ctx else self._error
+        self.node_dict_factory = lambda: MemgraphNodeDict(ctx) \
+            if ctx else self._error
         self.node_attr_dict_factory = self._error
 
-        self.adjlist_outer_dict_factory = lambda: MemgraphAdjlistOuterDict(ctx, multi=multi) if ctx else self._error
+        self.adjlist_outer_dict_factory = \
+            lambda: MemgraphAdjlistOuterDict(ctx, multi=multi) \
+            if ctx else self._error
         self.adjlist_inner_dict_factory = self._error
         self.edge_key_dict_factory = self._error
         self.edge_attr_dict_factory = self._error
 
         # NOTE: We forbid any mutating operations because our graph is
         # immutable and pulls its data from the Memgraph database.
-        for f in [
-            "add_node",
-            "add_nodes_from",
-            "remove_node",
-            "remove_nodes_from",
-            "add_edge",
-            "add_edges_from",
-            "add_weighted_edges_from",
-            "new_edge_key",
-            "remove_edge",
-            "remove_edges_from",
-            "update",
-            "clear",
-        ]:
+        for f in ['add_node', 'add_nodes_from', 'remove_node',
+                  'remove_nodes_from', 'add_edge', 'add_edges_from',
+                  'add_weighted_edges_from', 'new_edge_key', 'remove_edge',
+                  'remove_edges_from', 'update', 'clear']:
             setattr(self, f, lambda *args, **kwargs: self._error())
 
         super().__init__(None, **kwargs)
@@ -229,29 +231,33 @@ class MemgraphDiGraphBase:
         self._pred = MemgraphAdjlistOuterDict(ctx, succ=False, multi=multi)
 
     def _error(self):
-        raise RuntimeError("Modification operations are not supported")
+        raise RuntimeError('Modification operations are not supported')
 
 
 class MemgraphMultiDiGraph(MemgraphDiGraphBase, nx.MultiDiGraph):
     def __init__(self, incoming_graph_data=None, ctx=None, **kwargs):
-        super().__init__(incoming_graph_data=incoming_graph_data, ctx=ctx, multi=True, **kwargs)
+        super().__init__(incoming_graph_data=incoming_graph_data,
+                         ctx=ctx, multi=True, **kwargs)
 
 
 def MemgraphMultiGraph(incoming_graph_data=None, ctx=None, **kwargs):
-    return MemgraphMultiDiGraph(incoming_graph_data=incoming_graph_data, ctx=ctx, **kwargs).to_undirected(as_view=True)
+    return MemgraphMultiDiGraph(incoming_graph_data=incoming_graph_data,
+                                ctx=ctx, **kwargs).to_undirected(as_view=True)
 
 
 class MemgraphDiGraph(MemgraphDiGraphBase, nx.DiGraph):
     def __init__(self, incoming_graph_data=None, ctx=None, **kwargs):
-        super().__init__(incoming_graph_data=incoming_graph_data, ctx=ctx, multi=False, **kwargs)
+        super().__init__(incoming_graph_data=incoming_graph_data,
+                         ctx=ctx, multi=False, **kwargs)
 
 
 def MemgraphGraph(incoming_graph_data=None, ctx=None, **kwargs):
-    return MemgraphDiGraph(incoming_graph_data=incoming_graph_data, ctx=ctx, **kwargs).to_undirected(as_view=True)
+    return MemgraphDiGraph(incoming_graph_data=incoming_graph_data,
+                           ctx=ctx, **kwargs).to_undirected(as_view=True)
 
 
 class PropertiesDictionary(collections.abc.Mapping):
-    __slots__ = ("_ctx", "_prop", "_len")
+    __slots__ = ('_ctx', '_prop', '_len')
 
     def __init__(self, ctx, prop):
         self._ctx = ctx
@@ -264,7 +270,8 @@ class PropertiesDictionary(collections.abc.Mapping):
         try:
             return vertex.properties[self._prop]
         except KeyError:
-            raise KeyError(("{} doesn\t have the required " + "property '{}'").format(vertex, self._prop))
+            raise KeyError(("{} doesn\t have the required " +
+                            "property '{}'").format(vertex, self._prop))
 
     def __iter__(self):
         for v in self._ctx.graph.vertices:

query_modules/wcc.py

@@ -1,20 +1,23 @@
 import sys
 import mgp
-
 try:
     import networkx as nx
 except ImportError as import_error:
     sys.stderr.write(
-        "\n" "NOTE: Please install networkx to be able to use wcc module.\n" "Using Python:\n" + sys.version + "\n"
-    )
+        '\n'
+        'NOTE: Please install networkx to be able to use wcc module.\n'
+        'Using Python:\n'
+        + sys.version +
+        '\n')
     raise import_error
 
 
 @mgp.read_proc
-def get_components(
-    vertices: mgp.List[mgp.Vertex], edges: mgp.List[mgp.Edge]
-) -> mgp.Record(n_components=int, components=mgp.List[mgp.List[mgp.Vertex]]):
-    """
+def get_components(vertices: mgp.List[mgp.Vertex],
+                   edges: mgp.List[mgp.Edge]
+                   ) -> mgp.Record(n_components=int,
+                                   components=mgp.List[mgp.List[mgp.Vertex]]):
+    '''
     This procedure finds weakly connected components of a given subgraph of a
     directed graph.
 
@@ -38,7 +41,7 @@ def get_components(
     WITH collect(n) AS nodes, collect(e) AS edges
     CALL wcc.get_components(nodes, edges) YIELD *
     RETURN n_components, components;
-    """
+    '''
     g = nx.DiGraph()
     g.add_nodes_from(vertices)
     g.add_edges_from([(edge.from_vertex, edge.to_vertex) for edge in edges])

release/get_version.py

@@ -104,9 +104,7 @@ def retry(retry_limit, timeout=100):
                 except Exception:
                     time.sleep(timeout)
             return func(*args, **kwargs)
-
         return wrapper
-
     return inner_func
 
 
@@ -165,15 +163,8 @@ def format_version(variant, version, offering, distance=None, shorthash=None, su
 
 # Parse arguments.
 parser = argparse.ArgumentParser(description="Get the current version of Memgraph.")
-parser.add_argument(
-    "--open-source",
-    action="store_true",
-    help="set the current offering to 'open-source'",
-)
-parser.add_argument(
-    "version",
-    help="manual version override, if supplied the version isn't " "determined using git",
-)
+parser.add_argument("--open-source", action="store_true", help="set the current offering to 'open-source'")
+parser.add_argument("version", help="manual version override, if supplied the version isn't " "determined using git")
 parser.add_argument("suffix", help="custom suffix for the current version being built")
 parser.add_argument(
     "--variant",
@@ -182,9 +173,7 @@ parser.add_argument(
     help="which variant of the version string should be generated",
 )
 parser.add_argument(
-    "--memgraph-root-dir",
-    help="The root directory of the checked out " "Memgraph repository.",
-    default=".",
+    "--memgraph-root-dir", help="The root directory of the checked out " "Memgraph repository.", default="."
 )
 args = parser.parse_args()
 
@@ -267,27 +256,14 @@ for version in versions:
 if current_version is None:
     raise Exception("You are attempting to determine the version for a very " "old version of Memgraph!")
 version, branch, master_branch_merge = current_version
-distance = int(
-    get_output(
-        "git",
-        "rev-list",
-        "--count",
-        "--first-parent",
-        master_branch_merge + ".." + current_hash,
-    )
-)
+distance = int(get_output("git", "rev-list", "--count", "--first-parent", master_branch_merge + ".." + current_hash))
 version_str = ".".join(map(str, version)) + ".0"
 if distance == 0:
     print(format_version(args.variant, version_str, offering, suffix=args.suffix), end="")
 else:
     print(
         format_version(
-            args.variant,
-            version_str,
-            offering,
-            distance=distance,
-            shorthash=current_hash_short,
-            suffix=args.suffix,
+            args.variant, version_str, offering, distance=distance, shorthash=current_hash_short, suffix=args.suffix
         ),
         end="",
     )

release/mgp/.gitignore

@@ -0,0 +1,3 @@
+.venv
+dist
+mgp.py

release/mgp/LICENSE

@@ -0,0 +1,201 @@
+                                 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/mgp/README.md

@@ -0,0 +1,4 @@
+# mgp
+
+PyPi package used for type hinting when creating MAGE modules. The get started
+using MAGE repository checkout the repository here: https://github.com/memgraph/mage.

release/mgp/_mgp.py

@@ -0,0 +1,255 @@
+from typing import Any
+
+
+class MgpIterable:
+    def get() -> Any:
+        pass
+
+    def next() -> Any:
+        pass
+
+
+class Vertex:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+    def underlying_graph_is_mutable() -> bool:  # type: ignore
+        pass
+
+    def iter_properties() -> MgpIterable:  # type: ignore
+        pass
+
+    def get_property(self, property_name: str) -> "Property":  # type: ignore
+        pass
+
+    def set_property(self, property_name: str, value: Any) -> "Property":  # type: ignore
+        pass
+
+    def get_id() -> "VertexId":  # type: ignore
+        pass
+
+    def label_at(self, index: int) -> "Label":  # type: ignore
+        pass
+
+    def labels_count() -> int:  # type: ignore
+        pass
+
+    def add_label(self, label: Any):
+        pass
+
+    def remove_label(self, label: Any):
+        pass
+
+    def iter_in_edges() -> MgpIterable:  # type: ignore
+        pass
+
+    def iter_out_edges() -> MgpIterable:  # type: ignore
+        pass
+
+
+class Edge:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+    def underlying_graph_is_mutable() -> bool:  # type: ignore
+        pass
+
+    def iter_properties() -> MgpIterable:  # type: ignore
+        pass
+
+    def get_property(self, property_name: str) -> "Property":  # type: ignore
+        pass
+
+    def set_property(self, property_name: str, valuse: Any) -> "Property":  # type: ignore
+        pass
+
+    def get_type_name() -> str:  # type: ignore
+        pass
+
+    def get_id() -> "EdgeId":  # type: ignore
+        pass
+
+    def from_vertex() -> Vertex:  # type: ignore
+        pass
+
+    def to_vertex() -> Vertex:  # type: ignore
+        pass
+
+
+class Path:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+    @staticmethod
+    def make_with_start(vertex: Vertex) -> "Path":  # type: ignore
+        pass
+
+
+class Graph:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+
+class CypherType:
+    pass
+
+
+class Message:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+    def source_type() -> str:  # type: ignore
+        pass
+
+    def topic_name() -> str:  # type: ignore
+        pass
+
+    def key() -> bytes:  # type: ignore
+        pass
+
+    def timestamp() -> int:  # type: ignore
+        pass
+
+    def offset() -> int:  # type: ignore
+        pass
+
+    def payload() -> bytes:  # type: ignore
+        pass
+
+
+class Messages:
+    def is_valid() -> bool:  # type: ignore
+        pass
+
+    def message_at(self, id: int) -> Message:  # type: ignore
+        pass
+
+    def total_messages() -> int:  # type: ignore
+        pass
+
+
+class UnknownError(Exception):
+    pass
+
+
+class UnableToAllocateError(Exception):
+    pass
+
+
+class InsufficientBufferError(Exception):
+    pass
+
+
+class OutOfRangeError(Exception):
+    pass
+
+
+class LogicErrorError(Exception):
+
+    pass
+
+
+class DeletedObjectError(Exception):
+    pass
+
+
+class InvalidArgumentError(Exception):
+    pass
+
+
+class KeyAlreadyExistsError(Exception):
+    pass
+
+
+class ImmutableObjectError(Exception):
+    pass
+
+
+class ValueConversionError(Exception):
+    pass
+
+
+class SerializationError(Exception):
+    pass
+
+
+def type_nullable(elem: Any):
+    pass
+
+
+def type_list(elem: Any):
+    pass
+
+
+def type_bool():
+    pass
+
+
+def type_string():
+    pass
+
+
+def type_int():
+    pass
+
+
+def type_float():
+    pass
+
+
+def type_number():
+    pass
+
+
+def type_map():
+    pass
+
+
+def type_node():
+    pass
+
+
+def type_relationship():
+    pass
+
+
+def type_path():
+    pass
+
+
+def type_date():
+    pass
+
+
+def type_local_time():
+    pass
+
+
+def type_local_date_time():
+    pass
+
+
+def type_duration():
+    pass
+
+
+def type_any():
+    pass
+
+
+class _MODULE:
+    @staticmethod
+    def add_read_procedure(wrapper):
+        pass
+
+    @staticmethod
+    def add_write_procedure(wrapper):
+        pass
+
+    @staticmethod
+    def add_transformation(wrapper):
+        pass
+
+    @staticmethod
+    def add_function(wrapper):
+        pass

release/mgp/instructions.md

@@ -0,0 +1,22 @@
+# How to publish new versions
+## Prerequisites
+1. Installed poetry
+```
+pip install poetry
+```
+2. Set up [API tokens](https://pypi.org/help/#apitoken)
+3. Be a collaborator on [pypi](https://pypi.org/project/mgp/)
+
+## Making changes
+1. Make changes to the package
+2. Bump version in `pyproject.tml`
+3. `poetry build`
+4. `poetry publish`
+
+## Why is this not automatized?
+
+Because someone always has to manually bump up the version in `pyproject.toml`
+
+## Why does `_mgp.py` exists?
+Because we are mocking here all the types that are created by Memgraph
+in order to fix typing errors in `mgp.py`.

release/mgp/pyproject.toml

@@ -0,0 +1,23 @@
+[tool.poetry]
+name = "mgp"
+version = "1.0.0"
+description = "Memgraph's module for developing MAGE modules. Used only for type hinting!"
+authors = [
+    "MasterMedo <mislav.vuletic@gmail.com>",
+    "jbajic <jure.bajic@memgraph.io>",
+    "katarinasupe <katarina.supe@memgraph.io>",
+    "antejavor <ante.javor@memgraph.io>",
+    "antaljanosbenjamin <benjamin.antal@memgraph.io>",
+]
+license = "Apache-2.0"
+readme = "README.md"
+include = ["mgp.py", "_mgp.py"]
+
+[tool.poetry.dependencies]
+python = "^3.7"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

src/auth/auth.hpp

@@ -21,7 +21,7 @@
 namespace memgraph::auth {
 /**
  * This class serves as the main Authentication/Authorization storage.
- * It provides functions for managing Users, Roles and Permissions.
+ * It provides functions for managing Users, Roles, Permissions and FineGrainedAccessPermissions.
  * NOTE: The non-const functions in this class aren't thread safe.
  * TODO (mferencevic): Disable user/role modification functions when they are
  * being managed by the auth module.

src/auth/models.cpp

@@ -8,7 +8,10 @@
 
 #include "auth/models.hpp"
 
+#include <algorithm>
+#include <iterator>
 #include <regex>
+#include <unordered_set>
 
 #include <gflags/gflags.h>
 
@@ -84,8 +87,6 @@ std::string PermissionToString(Permission permission) {
       return "MODULE_WRITE";
     case Permission::WEBSOCKET:
       return "WEBSOCKET";
-    case Permission::LABELS:
-      return "LABELS";
   }
 }
 
@@ -100,12 +101,7 @@ std::string PermissionLevelToString(PermissionLevel level) {
   }
 }
 
-Permissions::Permissions(uint64_t grants, uint64_t denies) {
-  // The deny bitmask has higher priority than the grant bitmask.
-  denies_ = denies;
-  // Mask out the grant bitmask to make sure that it is correct.
-  grants_ = grants & (~denies);
-}
+Permissions::Permissions(uint64_t grants, uint64_t denies) : grants_(grants & (~denies)), denies_(denies) {}
 
 PermissionLevel Permissions::Has(Permission permission) const {
   // Check for the deny first because it has greater priority than a grant.
@@ -185,35 +181,55 @@ bool operator==(const Permissions &first, const Permissions &second) {
 
 bool operator!=(const Permissions &first, const Permissions &second) { return !(first == second); }
 
-LabelPermissions::LabelPermissions(const std::unordered_set<std::string> &grants,
-                                   const std::unordered_set<std::string> &denies)
+const std::string ASTERISK = "*";
+
+FineGrainedAccessPermissions::FineGrainedAccessPermissions(const std::unordered_set<std::string> &grants,
+                                                           const std::unordered_set<std::string> &denies)
     : grants_(grants), denies_(denies) {}
 
-PermissionLevel LabelPermissions::Has(const std::string &permission) const {
-  if (denies_.find(permission) != denies_.end()) {
+PermissionLevel FineGrainedAccessPermissions::Has(const std::string &permission) const {
+  if ((denies_.size() == 1 && denies_.find(ASTERISK) != denies_.end()) || denies_.find(permission) != denies_.end()) {
     return PermissionLevel::DENY;
   }
 
-  if (grants_.find(permission) != denies_.end()) {
+  if ((grants_.size() == 1 && grants_.find(ASTERISK) != grants_.end()) || grants_.find(permission) != denies_.end()) {
     return PermissionLevel::GRANT;
   }
 
   return PermissionLevel::NEUTRAL;
 }
 
-void LabelPermissions::Grant(const std::string &permission) {
+void FineGrainedAccessPermissions::Grant(const std::string &permission) {
+  if (permission == ASTERISK) {
+    grants_.clear();
+    grants_.insert(permission);
+
+    return;
+  }
+
   auto deniedPermissionIter = denies_.find(permission);
 
   if (deniedPermissionIter != denies_.end()) {
     denies_.erase(deniedPermissionIter);
   }
 
+  if (grants_.size() == 1 && grants_.find(ASTERISK) != grants_.end()) {
+    grants_.erase(ASTERISK);
+  }
+
   if (grants_.find(permission) == grants_.end()) {
     grants_.insert(permission);
   }
 }
 
-void LabelPermissions::Revoke(const std::string &permission) {
+void FineGrainedAccessPermissions::Revoke(const std::string &permission) {
+  if (permission == ASTERISK) {
+    grants_.clear();
+    denies_.clear();
+
+    return;
+  }
+
   auto deniedPermissionIter = denies_.find(permission);
   auto grantedPermissionIter = grants_.find(permission);
 
@@ -226,66 +242,115 @@ void LabelPermissions::Revoke(const std::string &permission) {
   }
 }
 
-void LabelPermissions::Deny(const std::string &permission) {
+void FineGrainedAccessPermissions::Deny(const std::string &permission) {
+  if (permission == ASTERISK) {
+    denies_.clear();
+    denies_.insert(permission);
+
+    return;
+  }
+
   auto grantedPermissionIter = grants_.find(permission);
 
   if (grantedPermissionIter != grants_.end()) {
     grants_.erase(grantedPermissionIter);
   }
 
+  if (denies_.size() == 1 && denies_.find(ASTERISK) != denies_.end()) {
+    denies_.erase(ASTERISK);
+  }
+
   if (denies_.find(permission) == denies_.end()) {
     denies_.insert(permission);
   }
 }
 
-std::unordered_set<std::string> LabelPermissions::GetGrants() const { return grants_; }
-
-std::unordered_set<std::string> LabelPermissions::GetDenies() const { return denies_; }
-
-nlohmann::json LabelPermissions::Serialize() const {
+nlohmann::json FineGrainedAccessPermissions::Serialize() const {
   nlohmann::json data = nlohmann::json::object();
   data["grants"] = grants_;
   data["denies"] = denies_;
   return data;
 }
 
-LabelPermissions LabelPermissions::Deserialize(const nlohmann::json &data) {
+FineGrainedAccessPermissions FineGrainedAccessPermissions::Deserialize(const nlohmann::json &data) {
   if (!data.is_object()) {
     throw AuthException("Couldn't load permissions data!");
   }
 
-  return {LabelPermissions(data["grants"], data["denies"])};
+  return FineGrainedAccessPermissions(data["grants"], data["denies"]);
 }
 
-std::unordered_set<std::string> LabelPermissions::grants() const { return grants_; }
-std::unordered_set<std::string> LabelPermissions::denies() const { return denies_; }
+const std::unordered_set<std::string> &FineGrainedAccessPermissions::grants() const { return grants_; }
+const std::unordered_set<std::string> &FineGrainedAccessPermissions::denies() const { return denies_; }
 
-bool operator==(const LabelPermissions &first, const LabelPermissions &second) {
+bool operator==(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second) {
   return first.grants() == second.grants() && first.denies() == second.denies();
 }
 
-bool operator!=(const LabelPermissions &first, const LabelPermissions &second) { return !(first == second); }
+bool operator!=(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second) {
+  return !(first == second);
+}
+
+FineGrainedAccessHandler::FineGrainedAccessHandler(const FineGrainedAccessPermissions &labelPermissions,
+                                                   const FineGrainedAccessPermissions &edgeTypePermissions)
+    : label_permissions_(labelPermissions), edge_type_permissions_(edgeTypePermissions) {}
+
+const FineGrainedAccessPermissions &FineGrainedAccessHandler::label_permissions() const { return label_permissions_; }
+FineGrainedAccessPermissions &FineGrainedAccessHandler::label_permissions() { return label_permissions_; }
+
+const FineGrainedAccessPermissions &FineGrainedAccessHandler::edge_type_permissions() const {
+  return edge_type_permissions_;
+}
+FineGrainedAccessPermissions &FineGrainedAccessHandler::edge_type_permissions() { return edge_type_permissions_; }
+
+nlohmann::json FineGrainedAccessHandler::Serialize() const {
+  nlohmann::json data = nlohmann::json::object();
+  data["label_permissions"] = label_permissions_.Serialize();
+  data["edge_type_permissions"] = edge_type_permissions_.Serialize();
+  return data;
+}
+
+FineGrainedAccessHandler FineGrainedAccessHandler::Deserialize(const nlohmann::json &data) {
+  if (!data.is_object()) {
+    throw AuthException("Couldn't load role data!");
+  }
+  if (!data["label_permissions"].is_object() && !data["edge_type_permissions"].is_object()) {
+    throw AuthException("Couldn't load label_permissions or edge_type_permissions data!");
+  }
+  auto label_permissions = FineGrainedAccessPermissions::Deserialize(data["label_permissions"]);
+  auto edge_type_permissions = FineGrainedAccessPermissions::Deserialize(data["edge_type_permissions"]);
+
+  return FineGrainedAccessHandler(label_permissions, edge_type_permissions);
+}
+
+bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second) {
+  return first.label_permissions_ == second.label_permissions_ &&
+         first.edge_type_permissions_ == second.edge_type_permissions_;
+}
+
+bool operator!=(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second) {
+  return !(first == second);
+}
 
 Role::Role(const std::string &rolename) : rolename_(utils::ToLowerCase(rolename)) {}
 
-Role::Role(const std::string &rolename, const Permissions &permissions)
-    : rolename_(utils::ToLowerCase(rolename)), permissions_(permissions) {}
-
-Role::Role(const std::string &rolename, const Permissions &permissions, const LabelPermissions &labelPermissions)
-    : rolename_(utils::ToLowerCase(rolename)), permissions_(permissions), labelPermissions_(labelPermissions) {}
+Role::Role(const std::string &rolename, const Permissions &permissions,
+           const FineGrainedAccessHandler &fine_grained_access_handler)
+    : rolename_(utils::ToLowerCase(rolename)),
+      permissions_(permissions),
+      fine_grained_access_handler_(fine_grained_access_handler) {}
 
 const std::string &Role::rolename() const { return rolename_; }
 const Permissions &Role::permissions() const { return permissions_; }
 Permissions &Role::permissions() { return permissions_; }
-
-LabelPermissions &Role::labelPermissions() { return labelPermissions_; }
+const FineGrainedAccessHandler &Role::fine_grained_access_handler() const { return fine_grained_access_handler_; }
+FineGrainedAccessHandler &Role::fine_grained_access_handler() { return fine_grained_access_handler_; }
 
 nlohmann::json Role::Serialize() const {
   nlohmann::json data = nlohmann::json::object();
   data["rolename"] = rolename_;
   data["permissions"] = permissions_.Serialize();
-  data["labelPermissions"] = labelPermissions_.Serialize();
-
+  data["fine_grained_access_handler"] = fine_grained_access_handler_.Serialize();
   return data;
 }
 
@@ -293,30 +358,28 @@ Role Role::Deserialize(const nlohmann::json &data) {
   if (!data.is_object()) {
     throw AuthException("Couldn't load role data!");
   }
-  if (!data["rolename"].is_string() || !data["permissions"].is_object()) {
+  if (!data["rolename"].is_string() || !data["permissions"].is_object() ||
+      !data["fine_grained_access_handler"].is_object()) {
     throw AuthException("Couldn't load role data!");
   }
   auto permissions = Permissions::Deserialize(data["permissions"]);
-  auto labelPermissions = LabelPermissions::Deserialize(data["labelPermissions"]);
-
-  return {data["rolename"], permissions, labelPermissions};
+  auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
+  return {data["rolename"], permissions, fine_grained_access_handler};
 }
 
 bool operator==(const Role &first, const Role &second) {
-  return first.rolename_ == second.rolename_ && first.permissions_ == second.permissions_;
+  return first.rolename_ == second.rolename_ && first.permissions_ == second.permissions_ &&
+         first.fine_grained_access_handler_ == second.fine_grained_access_handler_;
 }
 
 User::User(const std::string &username) : username_(utils::ToLowerCase(username)) {}
 
-User::User(const std::string &username, const std::string &password_hash, const Permissions &permissions)
-    : username_(utils::ToLowerCase(username)), password_hash_(password_hash), permissions_(permissions) {}
-
 User::User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-           const LabelPermissions &labelPermissions)
+           const FineGrainedAccessHandler &fine_grained_access_handler)
     : username_(utils::ToLowerCase(username)),
       password_hash_(password_hash),
       permissions_(permissions),
-      labelPermissions_(labelPermissions) {}
+      fine_grained_access_handler_(fine_grained_access_handler) {}
 
 bool User::CheckPassword(const std::string &password) {
   if (password_hash_.empty()) return true;
@@ -359,18 +422,64 @@ void User::ClearRole() { role_ = std::nullopt; }
 
 Permissions User::GetPermissions() const {
   if (role_) {
-    return Permissions(permissions_.grants() | role_->permissions().grants(),
-                       permissions_.denies() | role_->permissions().denies());
+    return {permissions_.grants() | role_->permissions().grants(),
+            permissions_.denies() | role_->permissions().denies()};
   }
   return permissions_;
 }
 
+FineGrainedAccessPermissions User::GetFineGrainedAccessLabelPermissions() const {
+  if (role_) {
+    std::unordered_set<std::string> resultGrants;
+
+    std::set_union(fine_grained_access_handler_.label_permissions().grants().begin(),
+                   fine_grained_access_handler_.label_permissions().grants().end(),
+                   role_->fine_grained_access_handler().label_permissions().grants().begin(),
+                   role_->fine_grained_access_handler().label_permissions().grants().end(),
+                   std::inserter(resultGrants, resultGrants.begin()));
+
+    std::unordered_set<std::string> resultDenies;
+
+    std::set_union(fine_grained_access_handler_.label_permissions().denies().begin(),
+                   fine_grained_access_handler_.label_permissions().denies().end(),
+                   role_->fine_grained_access_handler().label_permissions().denies().begin(),
+                   role_->fine_grained_access_handler().label_permissions().denies().end(),
+                   std::inserter(resultDenies, resultDenies.begin()));
+
+    return FineGrainedAccessPermissions(resultGrants, resultDenies);
+  }
+  return fine_grained_access_handler_.label_permissions();
+}
+
+FineGrainedAccessPermissions User::GetFineGrainedAccessEdgeTypePermissions() const {
+  if (role_) {
+    std::unordered_set<std::string> resultGrants;
+
+    std::set_union(fine_grained_access_handler_.edge_type_permissions().grants().begin(),
+                   fine_grained_access_handler_.edge_type_permissions().grants().end(),
+                   role_->fine_grained_access_handler().edge_type_permissions().grants().begin(),
+                   role_->fine_grained_access_handler().edge_type_permissions().grants().end(),
+                   std::inserter(resultGrants, resultGrants.begin()));
+
+    std::unordered_set<std::string> resultDenies;
+
+    std::set_union(fine_grained_access_handler_.edge_type_permissions().denies().begin(),
+                   fine_grained_access_handler_.edge_type_permissions().denies().end(),
+                   role_->fine_grained_access_handler().edge_type_permissions().denies().begin(),
+                   role_->fine_grained_access_handler().edge_type_permissions().denies().end(),
+                   std::inserter(resultDenies, resultDenies.begin()));
+
+    return FineGrainedAccessPermissions(resultGrants, resultDenies);
+  }
+  return fine_grained_access_handler_.edge_type_permissions();
+}
+
 const std::string &User::username() const { return username_; }
 
 const Permissions &User::permissions() const { return permissions_; }
 Permissions &User::permissions() { return permissions_; }
-
-LabelPermissions &User::labelPermissions() { return labelPermissions_; }
+const FineGrainedAccessHandler &User::fine_grained_access_handler() const { return fine_grained_access_handler_; }
+FineGrainedAccessHandler &User::fine_grained_access_handler() { return fine_grained_access_handler_; }
 
 const Role *User::role() const {
   if (role_.has_value()) {
@@ -384,7 +493,7 @@ nlohmann::json User::Serialize() const {
   data["username"] = username_;
   data["password_hash"] = password_hash_;
   data["permissions"] = permissions_.Serialize();
-  data["labelPermissions"] = labelPermissions_.Serialize();
+  data["fine_grained_access_handler"] = fine_grained_access_handler_.Serialize();
   // The role shouldn't be serialized here, it is stored as a foreign key.
   return data;
 }
@@ -393,18 +502,19 @@ User User::Deserialize(const nlohmann::json &data) {
   if (!data.is_object()) {
     throw AuthException("Couldn't load user data!");
   }
-  if (!data["username"].is_string() || !data["password_hash"].is_string() || !data["permissions"].is_object()) {
+  if (!data["username"].is_string() || !data["password_hash"].is_string() || !data["permissions"].is_object() ||
+      !data["fine_grained_access_handler"].is_object()) {
     throw AuthException("Couldn't load user data!");
   }
   auto permissions = Permissions::Deserialize(data["permissions"]);
-  auto labelPermissions = LabelPermissions::Deserialize(data["labelPermissions"]);
-
-  return {data["username"], data["password_hash"], permissions, labelPermissions};
+  auto fine_grained_access_handler = FineGrainedAccessHandler::Deserialize(data["fine_grained_access_handler"]);
+  return {data["username"], data["password_hash"], permissions, fine_grained_access_handler};
 }
 
 bool operator==(const User &first, const User &second) {
   return first.username_ == second.username_ && first.password_hash_ == second.password_hash_ &&
-         first.permissions_ == second.permissions_ && first.role_ == second.role_;
+         first.permissions_ == second.permissions_ && first.role_ == second.role_ &&
+         first.fine_grained_access_handler_ == second.fine_grained_access_handler_;
 }
 
 }  // namespace memgraph::auth

src/auth/models.hpp

@@ -10,6 +10,7 @@
 
 #include <optional>
 #include <string>
+#include <unordered_set>
 
 #include <json/json.hpp>
 #include <unordered_set>
@@ -39,8 +40,7 @@ enum class Permission : uint64_t {
   STREAM       = 1U << 17U,
   MODULE_READ  = 1U << 18U,
   MODULE_WRITE = 1U << 19U,
-  WEBSOCKET    = 1U << 20U,
-  LABELS       = 1U << 21U
+  WEBSOCKET    = 1U << 20U
 };
 // clang-format on
 
@@ -90,10 +90,10 @@ bool operator==(const Permissions &first, const Permissions &second);
 
 bool operator!=(const Permissions &first, const Permissions &second);
 
-class LabelPermissions final {
+class FineGrainedAccessPermissions final {
  public:
-  LabelPermissions(const std::unordered_set<std::string> &grants = {},
-                   const std::unordered_set<std::string> &denies = {});
+  explicit FineGrainedAccessPermissions(const std::unordered_set<std::string> &grants = {},
+                                        const std::unordered_set<std::string> &denies = {});
 
   PermissionLevel Has(const std::string &permission) const;
 
@@ -103,38 +103,61 @@ class LabelPermissions final {
 
   void Deny(const std::string &permission);
 
-  std::unordered_set<std::string> GetGrants() const;
-  std::unordered_set<std::string> GetDenies() const;
-
   nlohmann::json Serialize() const;
 
   /// @throw AuthException if unable to deserialize.
-  static LabelPermissions Deserialize(const nlohmann::json &data);
+  static FineGrainedAccessPermissions Deserialize(const nlohmann::json &data);
 
-  std::unordered_set<std::string> grants() const;
-  std::unordered_set<std::string> denies() const;
+  const std::unordered_set<std::string> &grants() const;
+  const std::unordered_set<std::string> &denies() const;
 
  private:
   std::unordered_set<std::string> grants_{};
   std::unordered_set<std::string> denies_{};
 };
 
-bool operator==(const LabelPermissions &first, const LabelPermissions &second);
+bool operator==(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second);
+
+bool operator!=(const FineGrainedAccessPermissions &first, const FineGrainedAccessPermissions &second);
+
+class FineGrainedAccessHandler final {
+ public:
+  explicit FineGrainedAccessHandler(
+      const FineGrainedAccessPermissions &labelPermissions = FineGrainedAccessPermissions(),
+      const FineGrainedAccessPermissions &edgeTypePermissions = FineGrainedAccessPermissions());
+
+  const FineGrainedAccessPermissions &label_permissions() const;
+  FineGrainedAccessPermissions &label_permissions();
+
+  const FineGrainedAccessPermissions &edge_type_permissions() const;
+  FineGrainedAccessPermissions &edge_type_permissions();
+
+  nlohmann::json Serialize() const;
+
+  /// @throw AuthException if unable to deserialize.
+  static FineGrainedAccessHandler Deserialize(const nlohmann::json &data);
+
+  friend bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second);
+
+ private:
+  FineGrainedAccessPermissions label_permissions_;
+  FineGrainedAccessPermissions edge_type_permissions_;
+};
+
+bool operator==(const FineGrainedAccessHandler &first, const FineGrainedAccessHandler &second);
 
-bool operator!=(const LabelPermissions &first, const LabelPermissions &second);
 class Role final {
  public:
   Role(const std::string &rolename);
 
-  Role(const std::string &rolename, const Permissions &permissions);
-
-  Role(const std::string &rolename, const Permissions &permissions, const LabelPermissions &labelPermissions);
+  Role(const std::string &rolename, const Permissions &permissions,
+       const FineGrainedAccessHandler &fine_grained_access_handler);
 
   const std::string &rolename() const;
   const Permissions &permissions() const;
   Permissions &permissions();
-
-  LabelPermissions &labelPermissions();
+  const FineGrainedAccessHandler &fine_grained_access_handler() const;
+  FineGrainedAccessHandler &fine_grained_access_handler();
 
   nlohmann::json Serialize() const;
 
@@ -146,7 +169,7 @@ class Role final {
  private:
   std::string rolename_;
   Permissions permissions_;
-  LabelPermissions labelPermissions_;
+  FineGrainedAccessHandler fine_grained_access_handler_;
 };
 
 bool operator==(const Role &first, const Role &second);
@@ -156,10 +179,8 @@ class User final {
  public:
   User(const std::string &username);
 
-  User(const std::string &username, const std::string &password_hash, const Permissions &permissions);
-
   User(const std::string &username, const std::string &password_hash, const Permissions &permissions,
-       const LabelPermissions &labelPermissions);
+       const FineGrainedAccessHandler &fine_grained_access_handler);
 
   /// @throw AuthException if unable to verify the password.
   bool CheckPassword(const std::string &password);
@@ -172,16 +193,18 @@ class User final {
   void ClearRole();
 
   Permissions GetPermissions() const;
+  FineGrainedAccessPermissions GetFineGrainedAccessLabelPermissions() const;
+  FineGrainedAccessPermissions GetFineGrainedAccessEdgeTypePermissions() const;
 
   const std::string &username() const;
 
   const Permissions &permissions() const;
   Permissions &permissions();
+  const FineGrainedAccessHandler &fine_grained_access_handler() const;
+  FineGrainedAccessHandler &fine_grained_access_handler();
 
   const Role *role() const;
 
-  LabelPermissions &labelPermissions();
-
   nlohmann::json Serialize() const;
 
   /// @throw AuthException if unable to deserialize.
@@ -193,10 +216,9 @@ class User final {
   std::string username_;
   std::string password_hash_;
   Permissions permissions_;
+  FineGrainedAccessHandler fine_grained_access_handler_;
   std::optional<Role> role_;
-  LabelPermissions labelPermissions_;
 };
 
 bool operator==(const User &first, const User &second);
-
 }  // namespace memgraph::auth

src/auth/reference_modules/ldap.py

@@ -18,24 +18,19 @@ roles_config = config["roles"]
 # Initialize LDAP server.
 tls = None
 if server_config["encryption"] != "disabled":
-    cert_file = server_config["cert_file"] if server_config["cert_file"] else None
+    cert_file = server_config["cert_file"] if server_config["cert_file"] \
+        else None
     key_file = server_config["key_file"] if server_config["key_file"] else None
     ca_file = server_config["ca_file"] if server_config["ca_file"] else None
-    validate = ssl.CERT_REQUIRED if server_config["validate_cert"] else ssl.CERT_NONE
-    tls = ldap3.Tls(
-        local_private_key_file=key_file,
-        local_certificate_file=cert_file,
-        ca_certs_file=ca_file,
-        validate=validate,
-    )
+    validate = ssl.CERT_REQUIRED if server_config["validate_cert"] \
+        else ssl.CERT_NONE
+    tls = ldap3.Tls(local_private_key_file=key_file,
+                    local_certificate_file=cert_file,
+                    ca_certs_file=ca_file,
+                    validate=validate)
 use_ssl = server_config["encryption"] == "ssl"
-server = ldap3.Server(
-    server_config["host"],
-    port=server_config["port"],
-    tls=tls,
-    use_ssl=use_ssl,
-    get_info=ldap3.ALL,
-)
+server = ldap3.Server(server_config["host"], port=server_config["port"],
+                      tls=tls, use_ssl=use_ssl, get_info=ldap3.ALL)
 
 
 # Main authentication/authorization function.
@@ -45,12 +40,14 @@ def authenticate(username, password):
         return {"authenticated": False, "role": ""}
 
     # Create the DN of the user
-    dn = users_config["prefix"] + ldap3.utils.dn.escape_rdn(username) + users_config["suffix"]
+    dn = users_config["prefix"] + ldap3.utils.dn.escape_rdn(username) + \
+        users_config["suffix"]
 
     # Bind to the server
     conn = ldap3.Connection(server, dn, password)
     if server_config["encryption"] == "starttls" and not conn.start_tls():
-        print("ERROR: Couldn't issue STARTTLS to the LDAP server!", file=sys.stderr)
+        print("ERROR: Couldn't issue STARTTLS to the LDAP server!",
+              file=sys.stderr)
         return {"authenticated": False, "role": ""}
     if not conn.bind():
         return {"authenticated": False, "role": ""}
@@ -59,32 +56,25 @@ def authenticate(username, password):
     if roles_config["root_dn"] != "":
         # search for role
         search_filter = "(&(objectclass={objclass})({attr}={value}))".format(
-            objclass=roles_config["root_objectclass"],
-            attr=roles_config["user_attribute"],
-            value=ldap3.utils.conv.escape_filter_chars(dn),
-        )
-        succ = conn.search(
-            roles_config["root_dn"],
-            search_filter,
-            search_scope=ldap3.LEVEL,
-            attributes=[roles_config["role_attribute"]],
-        )
+                objclass=roles_config["root_objectclass"],
+                attr=roles_config["user_attribute"],
+                value=ldap3.utils.conv.escape_filter_chars(dn))
+        succ = conn.search(roles_config["root_dn"], search_filter,
+                           search_scope=ldap3.LEVEL,
+                           attributes=[roles_config["role_attribute"]])
         if not succ or len(conn.entries) == 0:
             return {"authenticated": True, "role": ""}
         if len(conn.entries) > 1:
-            roles = list(map(lambda x: x[roles_config["role_attribute"]].value, conn.entries))
+            roles = list(map(lambda x: x[roles_config["role_attribute"]].value,
+                             conn.entries))
             # Because we don't know exactly which role the user should have
             # we authorize the user with an empty role.
-            print(
-                "WARNING: Found more than one role for " "user '" + username + "':",
-                ", ".join(roles) + "!",
-                file=sys.stderr,
-            )
+            print("WARNING: Found more than one role for "
+                  "user '" + username + "':", ", ".join(roles) + "!",
+                  file=sys.stderr)
             return {"authenticated": True, "role": ""}
-        return {
-            "authenticated": True,
-            "role": conn.entries[0][roles_config["role_attribute"]].value,
-        }
+        return {"authenticated": True,
+                "role": conn.entries[0][roles_config["role_attribute"]].value}
     else:
         return {"authenticated": True, "role": ""}
 

src/glue/auth.cpp

@@ -57,8 +57,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::LABELS:
-      return auth::Permission::LABELS;
   }
 }
 }  // namespace memgraph::glue

src/memgraph.cpp

@@ -216,6 +216,11 @@ DEFINE_bool(telemetry_enabled, false,
             "the database runtime (vertex and edge counts and resource usage) "
             "to allow for easier improvement of the product.");
 
+// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
+DEFINE_bool(storage_restore_replicas_on_startup, true,
+            "Controls replicas should be restored automatically.");  // TODO(42jeremy) this must be removed once T0835
+                                                                     // is implemented.
+
 // Streams flags
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_uint32(
@@ -501,7 +506,7 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
 
       if (first_user) {
         spdlog::info("{} is first created user. Granting all privileges.", username);
-        GrantPrivilege(username, memgraph::query::kPrivilegesAll, {"*"});
+        GrantPrivilege(username, memgraph::query::kPrivilegesAll, {"*"}, {"*"});
       }
 
       return user_added;
@@ -746,10 +751,28 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
     }
   }
 
+  memgraph::auth::User *GetUser(const std::string &username) override {
+    if (!std::regex_match(username, name_regex_)) {
+      throw memgraph::query::QueryRuntimeException("Invalid user name.");
+    }
+    try {
+      auto locked_auth = auth_->Lock();
+      auto user = locked_auth->GetUser(username);
+      if (!user) {
+        throw memgraph::query::QueryRuntimeException("User '{}' doesn't exist .", username);
+      }
+
+      return new memgraph::auth::User(*user);
+
+    } catch (const memgraph::auth::AuthException &e) {
+      throw memgraph::query::QueryRuntimeException(e.what());
+    }
+  }
+
   void GrantPrivilege(const std::string &user_or_role,
                       const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                      const std::vector<std::string> &labels) override {
-    EditPermissions(user_or_role, privileges, labels, [](auto *permissions, const auto &permission) {
+                      const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) override {
+    EditPermissions(user_or_role, privileges, labels, edgeTypes, [](auto *permissions, const auto &permission) {
       // TODO (mferencevic): should we first check that the
       // privilege is granted/denied/revoked before
       // unconditionally granting/denying/revoking it?
@@ -759,8 +782,8 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
 
   void DenyPrivilege(const std::string &user_or_role,
                      const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                     const std::vector<std::string> &labels) override {
-    EditPermissions(user_or_role, privileges, labels, [](auto *permissions, const auto &permission) {
+                     const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) override {
+    EditPermissions(user_or_role, privileges, labels, edgeTypes, [](auto *permissions, const auto &permission) {
       // TODO (mferencevic): should we first check that the
       // privilege is granted/denied/revoked before
       // unconditionally granting/denying/revoking it?
@@ -770,8 +793,8 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
 
   void RevokePrivilege(const std::string &user_or_role,
                        const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                       const std::vector<std::string> &labels) override {
-    EditPermissions(user_or_role, privileges, labels, [](auto *permissions, const auto &permission) {
+                       const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) override {
+    EditPermissions(user_or_role, privileges, labels, edgeTypes, [](auto *permissions, const auto &permission) {
       // TODO (mferencevic): should we first check that the
       // privilege is granted/denied/revoked before
       // unconditionally granting/denying/revoking it?
@@ -783,7 +806,8 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
   template <class TEditFun>
   void EditPermissions(const std::string &user_or_role,
                        const std::vector<memgraph::query::AuthQuery::Privilege> &privileges,
-                       const std::vector<std::string> &labels, const TEditFun &edit_fun) {
+                       const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes,
+                       const TEditFun &edit_fun) {
     if (!std::regex_match(user_or_role, name_regex_)) {
       throw memgraph::query::QueryRuntimeException("Invalid user or role name.");
     }
@@ -804,16 +828,24 @@ class AuthQueryHandler final : public memgraph::query::AuthQueryHandler {
           edit_fun(&user->permissions(), permission);
         }
         for (const auto &label : labels) {
-          edit_fun(&user->labelPermissions(), label);
+          edit_fun(&user->fine_grained_access_handler().label_permissions(), label);
         }
+        for (const auto &edgeType : edgeTypes) {
+          edit_fun(&user->fine_grained_access_handler().edge_type_permissions(), edgeType);
+        }
+
         locked_auth->SaveUser(*user);
       } else {
         for (const auto &permission : permissions) {
           edit_fun(&role->permissions(), permission);
         }
         for (const auto &label : labels) {
-          edit_fun(&role->labelPermissions(), label);
+          edit_fun(&user->fine_grained_access_handler().label_permissions(), label);
         }
+        for (const auto &edgeType : edgeTypes) {
+          edit_fun(&role->fine_grained_access_handler().edge_type_permissions(), edgeType);
+        }
+
         locked_auth->SaveRole(*role);
       }
     } catch (const memgraph::auth::AuthException &e) {
@@ -853,6 +885,20 @@ class AuthChecker final : public memgraph::query::AuthChecker {
     return maybe_user.has_value() && IsUserAuthorized(*maybe_user, privileges);
   }
 
+  bool IsUserAuthorizedLabels(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                              const std::vector<memgraph::storage::LabelId> &labels) const final {
+    return std::any_of(labels.begin(), labels.end(), [dba, user](const auto label) {
+      return user->GetFineGrainedAccessLabelPermissions().Has(dba->LabelToName(label)) ==
+             memgraph::auth::PermissionLevel::GRANT;
+    });
+  }
+
+  bool IsUserAuthorizedEdgeType(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                                const memgraph::storage::EdgeTypeId &edgeType) const final {
+    return user->GetFineGrainedAccessEdgeTypePermissions().Has(dba->EdgeTypeToName(edgeType)) ==
+           memgraph::auth::PermissionLevel::GRANT;
+  }
+
  private:
   memgraph::utils::Synchronized<memgraph::auth::Auth, memgraph::utils::WritePrioritizedRWLock> *auth_;
 };
@@ -1205,7 +1251,8 @@ int main(int argc, char **argv) {
                      .snapshot_retention_count = FLAGS_storage_snapshot_retention_count,
                      .wal_file_size_kibibytes = FLAGS_storage_wal_file_size_kib,
                      .wal_file_flush_every_n_tx = FLAGS_storage_wal_file_flush_every_n_tx,
-                     .snapshot_on_exit = FLAGS_storage_snapshot_on_exit},
+                     .snapshot_on_exit = FLAGS_storage_snapshot_on_exit,
+                     .restore_replicas_on_startup = FLAGS_storage_restore_replicas_on_startup},
       .transaction = {.isolation_level = ParseIsolationLevel()}};
   if (FLAGS_storage_snapshot_interval_sec == 0) {
     if (FLAGS_storage_wal_enabled) {
@@ -1256,9 +1303,8 @@ int main(int argc, char **argv) {
     // the triggers
     auto storage_accessor = interpreter_context.db->Access();
     auto dba = memgraph::query::DbAccessor{&storage_accessor};
-    interpreter_context.trigger_store.RestoreTriggers(&interpreter_context.ast_cache, &dba,
-                                                      &interpreter_context.antlr_lock, interpreter_context.config.query,
-                                                      interpreter_context.auth_checker);
+    interpreter_context.trigger_store.RestoreTriggers(
+        &interpreter_context.ast_cache, &dba, interpreter_context.config.query, interpreter_context.auth_checker);
   }
 
   // As the Stream transformations are using modules, they have to be restored after the query modules are loaded.

src/query/CMakeLists.txt

@@ -82,7 +82,7 @@ add_custom_command(
     OUTPUT ${antlr_opencypher_generated_src} ${antlr_opencypher_generated_include}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${opencypher_generated}
     COMMAND
-        java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.9.2-complete.jar
+        java -jar ${CMAKE_SOURCE_DIR}/libs/antlr-4.10.1-complete.jar
             -Dlanguage=Cpp -visitor -package antlropencypher
             -o ${opencypher_generated}
             ${opencypher_lexer_grammar} ${opencypher_parser_grammar}

src/query/auth_checker.hpp

@@ -11,13 +11,19 @@
 
 #pragma once
 
+#include "auth/models.hpp"
 #include "query/frontend/ast/ast.hpp"
-
 namespace memgraph::query {
 class AuthChecker {
  public:
   virtual bool IsUserAuthorized(const std::optional<std::string> &username,
                                 const std::vector<query::AuthQuery::Privilege> &privileges) const = 0;
+
+  virtual bool IsUserAuthorizedLabels(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                                      const std::vector<memgraph::storage::LabelId> &labels) const = 0;
+
+  virtual bool IsUserAuthorizedEdgeType(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                                        const memgraph::storage::EdgeTypeId &edgeType) const = 0;
 };
 
 class AllowEverythingAuthChecker final : public query::AuthChecker {
@@ -25,5 +31,14 @@ class AllowEverythingAuthChecker final : public query::AuthChecker {
                         const std::vector<query::AuthQuery::Privilege> &privileges) const override {
     return true;
   }
+  bool IsUserAuthorizedLabels(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                              const std::vector<memgraph::storage::LabelId> &labels) const override {
+    return true;
+  };
+
+  bool IsUserAuthorizedEdgeType(const memgraph::auth::User *user, const memgraph::query::DbAccessor *dba,
+                                const memgraph::storage::EdgeTypeId &edgeType) const override {
+    return true;
+  };
 };
-}  // namespace memgraph::query
+}  // namespace memgraph::query

src/query/context.hpp

@@ -72,6 +72,8 @@ struct ExecutionContext {
   ExecutionStats execution_stats;
   TriggerContextCollector *trigger_context_collector{nullptr};
   utils::AsyncTimer timer;
+  AuthChecker *auth_checker{nullptr};
+  memgraph::auth::User *user{nullptr};
 };
 
 static_assert(std::is_move_assignable_v<ExecutionContext>, "ExecutionContext must be move assignable!");

src/query/cypher_query_interpreter.cpp

@@ -21,8 +21,7 @@ namespace memgraph::query {
 CachedPlan::CachedPlan(std::unique_ptr<LogicalPlan> plan) : plan_(std::move(plan)) {}
 
 ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::string, storage::PropertyValue> &params,
-                       utils::SkipList<QueryCacheEntry> *cache, utils::SpinLock *antlr_lock,
-                       const InterpreterConfig::Query &query_config) {
+                       utils::SkipList<QueryCacheEntry> *cache, const InterpreterConfig::Query &query_config) {
   // Strip the query for caching purposes. The process of stripping a query
   // "normalizes" it by replacing any literals with new parameters. This
   // results in just the *structure* of the query being taken into account for
@@ -63,20 +62,16 @@ ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::stri
   };
 
   if (it == accessor.end()) {
-    {
-      std::unique_lock<utils::SpinLock> guard(*antlr_lock);
+    try {
+      parser = std::make_unique<frontend::opencypher::Parser>(stripped_query.query());
+    } catch (const SyntaxException &e) {
+      // There is a syntax exception in the stripped query. Re-run the parser
+      // on the original query to get an appropriate error messsage.
+      parser = std::make_unique<frontend::opencypher::Parser>(query_string);
 
-      try {
-        parser = std::make_unique<frontend::opencypher::Parser>(stripped_query.query());
-      } catch (const SyntaxException &e) {
-        // There is a syntax exception in the stripped query. Re-run the parser
-        // on the original query to get an appropriate error messsage.
-        parser = std::make_unique<frontend::opencypher::Parser>(query_string);
-
-        // If an exception was not thrown here, the stripper messed something
-        // up.
-        LOG_FATAL("The stripped query can't be parsed, but the original can.");
-      }
+      // If an exception was not thrown here, the stripper messed something
+      // up.
+      LOG_FATAL("The stripped query can't be parsed, but the original can.");
     }
 
     // Convert the ANTLR4 parse tree into an AST.

src/query/cypher_query_interpreter.hpp

@@ -111,8 +111,7 @@ struct ParsedQuery {
 };
 
 ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::string, storage::PropertyValue> &params,
-                       utils::SkipList<QueryCacheEntry> *cache, utils::SpinLock *antlr_lock,
-                       const InterpreterConfig::Query &query_config);
+                       utils::SkipList<QueryCacheEntry> *cache, const InterpreterConfig::Query &query_config);
 
 class SingleNodeLogicalPlan final : public LogicalPlan {
  public:

src/query/frontend/ast/ast.lcp

@@ -2234,17 +2234,18 @@ cpp<#
   (:serialize (:slk))
   (:clone))
 
+
 (lcp:define-class auth-query (query)
   ((action "Action" :scope :public)
    (user "std::string" :scope :public)
    (role "std::string" :scope :public)
    (user-or-role "std::string" :scope :public)
-
    (password "Expression *" :initval "nullptr" :scope :public
              :slk-save #'slk-save-ast-pointer
              :slk-load (slk-load-ast-pointer "Expression"))
+   (privileges "std::vector<Privilege>" :scope :public)
    (labels "std::vector<std::string>" :scope :public)
-   (privileges "std::vector<Privilege>" :scope :public))
+   (edgeTypes "std::vector<std::string>" :scope :public))
   (:public
     (lcp:define-enum action
         (create-role drop-role show-roles create-user set-password drop-user
@@ -2255,7 +2256,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 labels)
+         websocket)
       (:serialize))
     #>cpp
     AuthQuery() = default;
@@ -2266,14 +2267,16 @@ cpp<#
     #>cpp
     AuthQuery(Action action, std::string user, std::string role,
               std::string user_or_role, Expression *password,
-              std::vector<std::string> labels ,std::vector<Privilege> privileges)
+              std::vector<Privilege> privileges, std::vector<std::string> labels,
+              std::vector<std::string> edgeTypes)
         : action_(action),
           user_(user),
           role_(role),
           user_or_role_(user_or_role),
           password_(password),
+          privileges_(privileges),
           labels_(labels),
-          privileges_(privileges){}
+          edgetypes_(edgeTypes) {}
     cpp<#)
   (:private
     #>cpp
@@ -2298,8 +2301,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::LABELS};
+    AuthQuery::Privilege::WEBSOCKET};
 cpp<#
 
 (lcp:define-class info-query (query)
@@ -2379,10 +2381,7 @@ cpp<#
    (port "Expression *" :initval "nullptr" :scope :public
              :slk-save #'slk-save-ast-pointer
              :slk-load (slk-load-ast-pointer "Expression"))
-   (sync_mode "SyncMode" :scope :public)
-   (timeout "Expression *" :initval "nullptr" :scope :public
-             :slk-save #'slk-save-ast-pointer
-             :slk-load (slk-load-ast-pointer "Expression")))
+   (sync_mode "SyncMode" :scope :public))
 
   (:public
     (lcp:define-enum action

src/query/frontend/ast/cypher_main_visitor.hpp

@@ -115,7 +115,7 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
     auto operators = ExtractOperators(all_children, allowed_operators);
 
     for (auto *expression : _expressions) {
-      expressions.push_back(expression->accept(this));
+      expressions.push_back(std::any_cast<Expression *>(expression->accept(this)));
     }
 
     Expression *first_operand = expressions[0];
@@ -131,7 +131,7 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
     DMG_ASSERT(_expression, "can't happen");
     auto operators = ExtractOperators(all_children, allowed_operators);
 
-    Expression *expression = _expression->accept(this);
+    Expression *expression = std::any_cast<Expression *>(_expression->accept(this));
     for (int i = (int)operators.size() - 1; i >= 0; --i) {
       expression = CreateUnaryOperatorByToken(operators[i], expression);
     }
@@ -468,21 +468,26 @@ class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
    */
   antlrcpp::Any visitRevokePrivilege(MemgraphCypher::RevokePrivilegeContext *ctx) override;
 
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitEdgeTypeList(MemgraphCypher::EdgeTypeListContext *ctx) override;
+
   /**
    * @return AuthQuery::Privilege
    */
   antlrcpp::Any visitPrivilege(MemgraphCypher::PrivilegeContext *ctx) override;
 
-  /**
-   * @return AuthQuery::LabelList
-   */
-  antlrcpp::Any visitLabelList(MemgraphCypher::LabelListContext *ctx) override;
-
   /**
    * @return AuthQuery*
    */
   antlrcpp::Any visitShowPrivileges(MemgraphCypher::ShowPrivilegesContext *ctx) override;
 
+  /**
+   * @return AuthQuery::LabelList
+   */
+  antlrcpp::Any visitLabelList(MemgraphCypher::LabelListContext *ctx) override;
+
   /**
    * @return AuthQuery*
    */

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

@@ -45,6 +45,7 @@ memgraphCypherKeyword : cypherKeyword
                       | DENY
                       | DROP
                       | DUMP
+                      | EDGE_TYPES
                       | EXECUTE
                       | FOR
                       | FOREACH
@@ -255,14 +256,23 @@ privilege : CREATE
           | MODULE_READ
           | MODULE_WRITE
           | WEBSOCKET
+          | EDGE_TYPES edgeTypes = edgeTypeList
           | LABELS labels=labelList
           ;
 
 privilegeList : privilege ( ',' privilege )* ;
 
-labelList : COLON label ( ',' COLON label )* ;
+edgeTypeList : '*' | listOfEdgeTypes ;
 
-label : ( '*' | symbolicName ) ;
+listOfEdgeTypes : edgeType ( ',' edgeType )* ;
+
+edgeType : COLON symbolicName ;
+
+labelList : '*' | listOfLabels ;
+
+listOfLabels : label ( ',' label )* ;
+
+label : COLON symbolicName ;
 
 showPrivileges : SHOW PRIVILEGES FOR userOrRole=userOrRoleName ;
 
@@ -282,7 +292,6 @@ replicaName : symbolicName ;
 socketAddress : literal ;
 
 registerReplica : REGISTER REPLICA replicaName ( SYNC | ASYNC )
-                ( WITH TIMEOUT timeout=literal ) ?
                 TO socketAddress ;
 
 dropReplica : DROP REPLICA replicaName ;

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

@@ -115,3 +115,4 @@ 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/stripped_lexer_constants.hpp

@@ -206,7 +206,8 @@ const trie::Trie kKeywords = {"union",
                               "version",
                               "websocket",
                               "foreach",
-                              "labels"};
+                              "labels",
+                              "edge_types"};
 
 // Unicode codepoints that are allowed at the start of the unescaped name.
 const std::bitset<kBitsetSize> kUnescapedNameAllowedStarts(

src/query/interpret/awesome_memgraph_functions.cpp

@@ -882,21 +882,36 @@ TypedValue Id(const TypedValue *args, int64_t nargs, const FunctionContext &ctx)
 }
 
 TypedValue ToString(const TypedValue *args, int64_t nargs, const FunctionContext &ctx) {
-  FType<Or<Null, String, Number, Bool>>("toString", args, nargs);
+  FType<Or<Null, String, Number, Date, LocalTime, LocalDateTime, Duration, Bool>>("toString", args, nargs);
   const auto &arg = args[0];
   if (arg.IsNull()) {
     return TypedValue(ctx.memory);
-  } else if (arg.IsString()) {
+  }
+  if (arg.IsString()) {
     return TypedValue(arg, ctx.memory);
-  } else if (arg.IsInt()) {
+  }
+  if (arg.IsInt()) {
     // TODO: This is making a pointless copy of std::string, we may want to
     // use a different conversion to string
     return TypedValue(std::to_string(arg.ValueInt()), ctx.memory);
-  } else if (arg.IsDouble()) {
-    return TypedValue(std::to_string(arg.ValueDouble()), ctx.memory);
-  } else {
-    return TypedValue(arg.ValueBool() ? "true" : "false", ctx.memory);
   }
+  if (arg.IsDouble()) {
+    return TypedValue(std::to_string(arg.ValueDouble()), ctx.memory);
+  }
+  if (arg.IsDate()) {
+    return TypedValue(arg.ValueDate().ToString(), ctx.memory);
+  }
+  if (arg.IsLocalTime()) {
+    return TypedValue(arg.ValueLocalTime().ToString(), ctx.memory);
+  }
+  if (arg.IsLocalDateTime()) {
+    return TypedValue(arg.ValueLocalDateTime().ToString(), ctx.memory);
+  }
+  if (arg.IsDuration()) {
+    return TypedValue(arg.ValueDuration().ToString(), ctx.memory);
+  }
+
+  return TypedValue(arg.ValueBool() ? "true" : "false", ctx.memory);
 }
 
 TypedValue Timestamp(const TypedValue *args, int64_t nargs, const FunctionContext &ctx) {

src/query/interpret/eval.hpp

@@ -111,7 +111,7 @@ class ExpressionEvaluator : public ExpressionVisitor<TypedValue> {
   TypedValue Visit(IfOperator &if_operator) override {
     auto condition = if_operator.condition_->Accept(*this);
     if (condition.IsNull()) {
-      return if_operator.then_expression_->Accept(*this);
+      return if_operator.else_expression_->Accept(*this);
     }
     if (condition.type() != TypedValue::Type::Bool) {
       // At the moment IfOperator is used only in CASE construct.

src/query/interpreter.cpp

@@ -43,6 +43,8 @@
 #include "query/stream/common.hpp"
 #include "query/trigger.hpp"
 #include "query/typed_value.hpp"
+#include "storage/v2/edge.hpp"
+#include "storage/v2/id_types.hpp"
 #include "storage/v2/property_value.hpp"
 #include "utils/algorithm.hpp"
 #include "utils/csv_parsing.hpp"
@@ -160,7 +162,7 @@ class ReplQueryHandler final : public query::ReplicationQueryHandler {
 
   /// @throw QueryRuntimeException if an error ocurred.
   void RegisterReplica(const std::string &name, const std::string &socket_address,
-                       const ReplicationQuery::SyncMode sync_mode, const std::optional<double> timeout,
+                       const ReplicationQuery::SyncMode sync_mode,
                        const std::chrono::seconds replica_check_frequency) override {
     if (db_->GetReplicationRole() == storage::ReplicationRole::REPLICA) {
       // replica can't register another replica
@@ -183,9 +185,9 @@ class ReplQueryHandler final : public query::ReplicationQueryHandler {
         io::network::Endpoint::ParseSocketOrIpAddress(socket_address, query::kDefaultReplicationPort);
     if (maybe_ip_and_port) {
       auto [ip, port] = *maybe_ip_and_port;
-      auto ret = db_->RegisterReplica(
-          name, {std::move(ip), port}, repl_mode,
-          {.timeout = timeout, .replica_check_frequency = replica_check_frequency, .ssl = std::nullopt});
+      auto ret = db_->RegisterReplica(name, {std::move(ip), port}, repl_mode,
+                                      storage::replication::RegistrationMode::MUST_BE_INSTANTLY_VALID,
+                                      {.replica_check_frequency = replica_check_frequency, .ssl = std::nullopt});
       if (ret.HasError()) {
         throw QueryRuntimeException(fmt::format("Couldn't register replica '{}'!", name));
       }
@@ -228,9 +230,6 @@ class ReplQueryHandler final : public query::ReplicationQueryHandler {
           replica.sync_mode = ReplicationQuery::SyncMode::ASYNC;
           break;
       }
-      if (repl_info.timeout) {
-        replica.timeout = *repl_info.timeout;
-      }
 
       replica.current_timestamp_of_replica = repl_info.timestamp_info.current_timestamp_of_replica;
       replica.current_number_of_timestamp_behind_master =
@@ -275,6 +274,7 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
   // TODO: MemoryResource for EvaluationContext, it should probably be passed as
   // the argument to Callback.
   evaluation_context.timestamp = QueryTimestamp();
+
   evaluation_context.parameters = parameters;
   ExpressionEvaluator evaluator(&frame, symbol_table, evaluation_context, db_accessor, storage::View::OLD);
 
@@ -282,8 +282,8 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
   std::string rolename = auth_query->role_;
   std::string user_or_role = auth_query->user_or_role_;
   std::vector<AuthQuery::Privilege> privileges = auth_query->privileges_;
+  std::vector<std::string> edgeTypes = auth_query->edgetypes_;
   std::vector<std::string> labels = auth_query->labels_;
-  // std::vector<storage::LabelId> labels = NamesToLabels(labels, db_accessor);
   auto password = EvaluateOptionalExpression(auth_query->password_, &evaluator);
 
   Callback callback;
@@ -296,11 +296,11 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
       AuthQuery::Action::REVOKE_PRIVILEGE,  AuthQuery::Action::SHOW_PRIVILEGES, AuthQuery::Action::SHOW_USERS_FOR_ROLE,
       AuthQuery::Action::SHOW_ROLE_FOR_USER};
 
-  if (license_check_result.HasError() && enterprise_only_methods.contains(auth_query->action_)) {
-    throw utils::BasicException(
-        utils::license::LicenseCheckErrorToString(license_check_result.GetError(), "advanced authentication
-        features"));
-  }
+  // if (license_check_result.HasError() && enterprise_only_methods.contains(auth_query->action_)) {
+  //   throw utils::BasicException(
+  //       utils::license::LicenseCheckErrorToString(license_check_result.GetError(), "advanced authentication
+  //       features"));
+  // }
 
   switch (auth_query->action_) {
     case AuthQuery::Action::CREATE_USER:
@@ -314,7 +314,7 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
         // If the license is not valid we create users with admin access
         if (!valid_enterprise_license) {
           spdlog::warn("Granting all the privileges to {}.", username);
-          auth->GrantPrivilege(username, kPrivilegesAll, {});
+          auth->GrantPrivilege(username, kPrivilegesAll, {"*"}, {"*"});
         }
 
         return std::vector<std::vector<TypedValue>>();
@@ -389,20 +389,20 @@ Callback HandleAuthQuery(AuthQuery *auth_query, AuthQueryHandler *auth, const Pa
       };
       return callback;
     case AuthQuery::Action::GRANT_PRIVILEGE:
-      callback.fn = [auth, user_or_role, privileges, labels] {
-        auth->GrantPrivilege(user_or_role, privileges, labels);
+      callback.fn = [auth, user_or_role, privileges, labels, edgeTypes] {
+        auth->GrantPrivilege(user_or_role, privileges, labels, edgeTypes);
         return std::vector<std::vector<TypedValue>>();
       };
       return callback;
     case AuthQuery::Action::DENY_PRIVILEGE:
-      callback.fn = [auth, user_or_role, privileges, labels] {
-        auth->DenyPrivilege(user_or_role, privileges, labels);
+      callback.fn = [auth, user_or_role, privileges, labels, edgeTypes] {
+        auth->DenyPrivilege(user_or_role, privileges, labels, edgeTypes);
         return std::vector<std::vector<TypedValue>>();
       };
       return callback;
     case AuthQuery::Action::REVOKE_PRIVILEGE: {
-      callback.fn = [auth, user_or_role, privileges, labels] {
-        auth->RevokePrivilege(user_or_role, privileges, labels);
+      callback.fn = [auth, user_or_role, privileges, labels, edgeTypes] {
+        auth->RevokePrivilege(user_or_role, privileges, labels, edgeTypes);
         return std::vector<std::vector<TypedValue>>();
       };
       return callback;
@@ -490,22 +490,11 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
       const auto &name = repl_query->replica_name_;
       const auto &sync_mode = repl_query->sync_mode_;
       auto socket_address = repl_query->socket_address_->Accept(evaluator);
-      auto timeout = EvaluateOptionalExpression(repl_query->timeout_, &evaluator);
       const auto replica_check_frequency = interpreter_context->config.replication_replica_check_frequency;
-      std::optional<double> maybe_timeout;
-      if (timeout.IsDouble()) {
-        maybe_timeout = timeout.ValueDouble();
-      } else if (timeout.IsInt()) {
-        maybe_timeout = static_cast<double>(timeout.ValueInt());
-      }
-      if (maybe_timeout && *maybe_timeout <= 0.0) {
-        throw utils::BasicException("Parameter TIMEOUT must be strictly greater than 0.");
-      }
 
       callback.fn = [handler = ReplQueryHandler{interpreter_context->db}, name, socket_address, sync_mode,
-                     maybe_timeout, replica_check_frequency]() mutable {
-        handler.RegisterReplica(name, std::string(socket_address.ValueString()), sync_mode, maybe_timeout,
-                                replica_check_frequency);
+                     replica_check_frequency]() mutable {
+        handler.RegisterReplica(name, std::string(socket_address.ValueString()), sync_mode, replica_check_frequency);
         return std::vector<std::vector<TypedValue>>();
       };
       notifications->emplace_back(SeverityLevel::INFO, NotificationCode::REGISTER_REPLICA,
@@ -525,13 +514,9 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
     }
 
     case ReplicationQuery::Action::SHOW_REPLICAS: {
-      callback.header = {"name",
-                         "socket_address",
-                         "sync_mode",
-                         "timeout",
-                         "current_timestamp_of_replica",
-                         "number_of_timestamp_behind_master",
-                         "state"};
+      callback.header = {
+          "name", "socket_address", "sync_mode", "current_timestamp_of_replica", "number_of_timestamp_behind_master",
+          "state"};
       callback.fn = [handler = ReplQueryHandler{interpreter_context->db}, replica_nfields = callback.header.size()] {
         const auto &replicas = handler.ShowReplicas();
         auto typed_replicas = std::vector<std::vector<TypedValue>>{};
@@ -552,12 +537,6 @@ Callback HandleReplicationQuery(ReplicationQuery *repl_query, const Parameters &
               break;
           }
 
-          if (replica.timeout) {
-            typed_replica.emplace_back(TypedValue(*replica.timeout));
-          } else {
-            typed_replica.emplace_back(TypedValue());
-          }
-
           typed_replica.emplace_back(TypedValue(static_cast<int64_t>(replica.current_timestamp_of_replica)));
           typed_replica.emplace_back(
               TypedValue(static_cast<int64_t>(replica.current_number_of_timestamp_behind_master)));
@@ -923,7 +902,7 @@ struct PullPlanVector {
 struct PullPlan {
   explicit PullPlan(std::shared_ptr<CachedPlan> plan, const Parameters &parameters, bool is_profile_query,
                     DbAccessor *dba, InterpreterContext *interpreter_context, utils::MemoryResource *execution_memory,
-                    TriggerContextCollector *trigger_context_collector = nullptr,
+                    std::optional<std::string> username, TriggerContextCollector *trigger_context_collector = nullptr,
                     std::optional<size_t> memory_limit = {});
   std::optional<plan::ProfilingStatsWithTotalTime> Pull(AnyStream *stream, std::optional<int> n,
                                                         const std::vector<Symbol> &output_symbols,
@@ -952,7 +931,8 @@ struct PullPlan {
 
 PullPlan::PullPlan(const std::shared_ptr<CachedPlan> plan, const Parameters &parameters, const bool is_profile_query,
                    DbAccessor *dba, InterpreterContext *interpreter_context, utils::MemoryResource *execution_memory,
-                   TriggerContextCollector *trigger_context_collector, const std::optional<size_t> memory_limit)
+                   std::optional<std::string> username, TriggerContextCollector *trigger_context_collector,
+                   const std::optional<size_t> memory_limit)
     : plan_(plan),
       cursor_(plan->plan().MakeCursor(execution_memory)),
       frame_(plan->symbol_table().max_position(), execution_memory),
@@ -963,6 +943,12 @@ PullPlan::PullPlan(const std::shared_ptr<CachedPlan> plan, const Parameters &par
   ctx_.evaluation_context.parameters = parameters;
   ctx_.evaluation_context.properties = NamesToProperties(plan->ast_storage().properties_, dba);
   ctx_.evaluation_context.labels = NamesToLabels(plan->ast_storage().labels_, dba);
+#ifdef MG_ENTERPRISE
+  if (username.has_value()) {
+    ctx_.user = interpreter_context->auth->GetUser(*username);
+    ctx_.auth_checker = interpreter_context->auth_checker;
+  }
+#endif
   if (interpreter_context->config.execution_timeout_sec > 0) {
     ctx_.timer = utils::AsyncTimer{interpreter_context->config.execution_timeout_sec};
   }
@@ -1136,6 +1122,7 @@ PreparedQuery Interpreter::PrepareTransactionQuery(std::string_view query_upper)
 PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string, TypedValue> *summary,
                                  InterpreterContext *interpreter_context, DbAccessor *dba,
                                  utils::MemoryResource *execution_memory, std::vector<Notification> *notifications,
+                                 const std::string *username,
                                  TriggerContextCollector *trigger_context_collector = nullptr) {
   auto *cypher_query = utils::Downcast<CypherQuery>(parsed_query.query);
 
@@ -1144,6 +1131,7 @@ PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string,
   EvaluationContext evaluation_context;
   evaluation_context.timestamp = QueryTimestamp();
   evaluation_context.parameters = parsed_query.parameters;
+
   ExpressionEvaluator evaluator(&frame, symbol_table, evaluation_context, dba, storage::View::OLD);
   const auto memory_limit = EvaluateMemoryLimit(&evaluator, cypher_query->memory_limit_, cypher_query->memory_scale_);
   if (memory_limit) {
@@ -1179,8 +1167,9 @@ PreparedQuery PrepareCypherQuery(ParsedQuery parsed_query, std::map<std::string,
     header.push_back(
         utils::FindOr(parsed_query.stripped_query.named_expressions(), symbol.token_position(), symbol.name()).first);
   }
-  auto pull_plan = std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context,
-                                              execution_memory, trigger_context_collector, memory_limit);
+  auto pull_plan =
+      std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context, execution_memory,
+                                 StringPointerToOptional(username), trigger_context_collector, memory_limit);
   return PreparedQuery{std::move(header), std::move(parsed_query.required_privileges),
                        [pull_plan = std::move(pull_plan), output_symbols = std::move(output_symbols), summary](
                            AnyStream *stream, std::optional<int> n) -> std::optional<QueryHandlerResult> {
@@ -1207,7 +1196,7 @@ PreparedQuery PrepareExplainQuery(ParsedQuery parsed_query, std::map<std::string
   // full query string) when given just the inner query to execute.
   ParsedQuery parsed_inner_query =
       ParseQuery(parsed_query.query_string.substr(kExplainQueryStart.size()), parsed_query.user_parameters,
-                 &interpreter_context->ast_cache, &interpreter_context->antlr_lock, interpreter_context->config.query);
+                 &interpreter_context->ast_cache, interpreter_context->config.query);
 
   auto *cypher_query = utils::Downcast<CypherQuery>(parsed_inner_query.query);
   MG_ASSERT(cypher_query, "Cypher grammar should not allow other queries in EXPLAIN");
@@ -1240,7 +1229,8 @@ PreparedQuery PrepareExplainQuery(ParsedQuery parsed_query, std::map<std::string
 
 PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                   std::map<std::string, TypedValue> *summary, InterpreterContext *interpreter_context,
-                                  DbAccessor *dba, utils::MemoryResource *execution_memory) {
+                                  DbAccessor *dba, utils::MemoryResource *execution_memory,
+                                  const std::string *username) {
   const std::string kProfileQueryStart = "profile ";
 
   MG_ASSERT(utils::StartsWith(utils::ToLowerCase(parsed_query.stripped_query.query()), kProfileQueryStart),
@@ -1274,7 +1264,7 @@ PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_tra
   // full query string) when given just the inner query to execute.
   ParsedQuery parsed_inner_query =
       ParseQuery(parsed_query.query_string.substr(kProfileQueryStart.size()), parsed_query.user_parameters,
-                 &interpreter_context->ast_cache, &interpreter_context->antlr_lock, interpreter_context->config.query);
+                 &interpreter_context->ast_cache, interpreter_context->config.query);
 
   auto *cypher_query = utils::Downcast<CypherQuery>(parsed_inner_query.query);
   MG_ASSERT(cypher_query, "Cypher grammar should not allow other queries in PROFILE");
@@ -1290,12 +1280,14 @@ PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_tra
       parsed_inner_query.stripped_query.hash(), std::move(parsed_inner_query.ast_storage), cypher_query,
       parsed_inner_query.parameters, parsed_inner_query.is_cacheable ? &interpreter_context->plan_cache : nullptr, dba);
   auto rw_type_checker = plan::ReadWriteTypeChecker();
+  auto optional_username = StringPointerToOptional(username);
+
   rw_type_checker.InferRWType(const_cast<plan::LogicalOperator &>(cypher_query_plan->plan()));
 
   return PreparedQuery{{"OPERATOR", "ACTUAL HITS", "RELATIVE TIME", "ABSOLUTE TIME"},
                        std::move(parsed_query.required_privileges),
                        [plan = std::move(cypher_query_plan), parameters = std::move(parsed_inner_query.parameters),
-                        summary, dba, interpreter_context, execution_memory, memory_limit,
+                        summary, dba, interpreter_context, execution_memory, memory_limit, optional_username,
                         // We want to execute the query we are profiling lazily, so we delay
                         // the construction of the corresponding context.
                         stats_and_total_time = std::optional<plan::ProfilingStatsWithTotalTime>{},
@@ -1304,7 +1296,7 @@ PreparedQuery PrepareProfileQuery(ParsedQuery parsed_query, bool in_explicit_tra
                          // No output symbols are given so that nothing is streamed.
                          if (!stats_and_total_time) {
                            stats_and_total_time = PullPlan(plan, parameters, true, dba, interpreter_context,
-                                                           execution_memory, nullptr, memory_limit)
+                                                           execution_memory, optional_username, nullptr, memory_limit)
                                                       .Pull(stream, {}, {}, summary);
                            pull_plan = std::make_shared<PullPlanVector>(ProfilingStatsToTable(*stats_and_total_time));
                          }
@@ -1439,7 +1431,7 @@ PreparedQuery PrepareIndexQuery(ParsedQuery parsed_query, bool in_explicit_trans
 
 PreparedQuery PrepareAuthQuery(ParsedQuery parsed_query, bool in_explicit_transaction,
                                std::map<std::string, TypedValue> *summary, InterpreterContext *interpreter_context,
-                               DbAccessor *dba, utils::MemoryResource *execution_memory) {
+                               DbAccessor *dba, utils::MemoryResource *execution_memory, const std::string *username) {
   if (in_explicit_transaction) {
     throw UserModificationInMulticommandTxException();
   }
@@ -1459,8 +1451,8 @@ PreparedQuery PrepareAuthQuery(ParsedQuery parsed_query, bool in_explicit_transa
                                           [fn = callback.fn](Frame *, ExecutionContext *) { return fn(); }),
       0.0, AstStorage{}, symbol_table));
 
-  auto pull_plan =
-      std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context, execution_memory);
+  auto pull_plan = std::make_shared<PullPlan>(plan, parsed_query.parameters, false, dba, interpreter_context,
+                                              execution_memory, StringPointerToOptional(username));
   return PreparedQuery{
       callback.header, std::move(parsed_query.required_privileges),
       [pull_plan = std::move(pull_plan), callback = std::move(callback), output_symbols = std::move(output_symbols),
@@ -1592,8 +1584,7 @@ Callback CreateTrigger(TriggerQuery *trigger_query,
         interpreter_context->trigger_store.AddTrigger(
             std::move(trigger_name), trigger_statement, user_parameters, ToTriggerEventType(event_type),
             before_commit ? TriggerPhase::BEFORE_COMMIT : TriggerPhase::AFTER_COMMIT, &interpreter_context->ast_cache,
-            dba, &interpreter_context->antlr_lock, interpreter_context->config.query, std::move(owner),
-            interpreter_context->auth_checker);
+            dba, interpreter_context->config.query, std::move(owner), interpreter_context->auth_checker);
         return {};
       }};
 }
@@ -2149,8 +2140,8 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
     query_execution->summary["cost_estimate"] = 0.0;
 
     utils::Timer parsing_timer;
-    ParsedQuery parsed_query = ParseQuery(query_string, params, &interpreter_context_->ast_cache,
-                                          &interpreter_context_->antlr_lock, interpreter_context_->config.query);
+    ParsedQuery parsed_query =
+        ParseQuery(query_string, params, &interpreter_context_->ast_cache, interpreter_context_->config.query);
     query_execution->summary["parsing_time"] = parsing_timer.Elapsed().count();
 
     // Some queries require an active transaction in order to be prepared.
@@ -2173,7 +2164,7 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
     if (utils::Downcast<CypherQuery>(parsed_query.query)) {
       prepared_query = PrepareCypherQuery(std::move(parsed_query), &query_execution->summary, interpreter_context_,
                                           &*execution_db_accessor_, &query_execution->execution_memory,
-                                          &query_execution->notifications,
+                                          &query_execution->notifications, username,
                                           trigger_context_collector_ ? &*trigger_context_collector_ : nullptr);
     } else if (utils::Downcast<ExplainQuery>(parsed_query.query)) {
       prepared_query = PrepareExplainQuery(std::move(parsed_query), &query_execution->summary, interpreter_context_,
@@ -2181,7 +2172,7 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
     } else if (utils::Downcast<ProfileQuery>(parsed_query.query)) {
       prepared_query = PrepareProfileQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
                                            interpreter_context_, &*execution_db_accessor_,
-                                           &query_execution->execution_memory_with_exception);
+                                           &query_execution->execution_memory_with_exception, username);
     } else if (utils::Downcast<DumpQuery>(parsed_query.query)) {
       prepared_query = PrepareDumpQuery(std::move(parsed_query), &query_execution->summary, &*execution_db_accessor_,
                                         &query_execution->execution_memory);
@@ -2191,7 +2182,7 @@ Interpreter::PrepareResult Interpreter::Prepare(const std::string &query_string,
     } else if (utils::Downcast<AuthQuery>(parsed_query.query)) {
       prepared_query = PrepareAuthQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
                                         interpreter_context_, &*execution_db_accessor_,
-                                        &query_execution->execution_memory_with_exception);
+                                        &query_execution->execution_memory_with_exception, username);
     } else if (utils::Downcast<InfoQuery>(parsed_query.query)) {
       prepared_query = PrepareInfoQuery(std::move(parsed_query), in_explicit_transaction_, &query_execution->summary,
                                         interpreter_context_, interpreter_context_->db,
@@ -2276,8 +2267,14 @@ void RunTriggersIndividually(const utils::SkipList<Trigger> &triggers, Interpret
 
     trigger_context.AdaptForAccessor(&db_accessor);
     try {
+      auto owner = trigger.Owner();
+      memgraph::auth::User *user = nullptr;
+      if (owner.has_value()) {
+        user = interpreter_context->auth->GetUser(*owner);
+      }
+
       trigger.Execute(&db_accessor, &execution_memory, interpreter_context->config.execution_timeout_sec,
-                      &interpreter_context->is_shutting_down, trigger_context, interpreter_context->auth_checker);
+                      &interpreter_context->is_shutting_down, trigger_context, user, interpreter_context->auth_checker);
     } catch (const utils::BasicException &exception) {
       spdlog::warn("Trigger '{}' failed with exception:\n{}", trigger.Name(), exception.what());
       db_accessor.Abort();
@@ -2331,8 +2328,15 @@ void Interpreter::Commit() {
       utils::MonotonicBufferResource execution_memory{kExecutionMemoryBlockSize};
       AdvanceCommand();
       try {
+        auto owner = trigger.Owner();
+        memgraph::auth::User *user = nullptr;
+        if (owner.has_value()) {
+          user = interpreter_context_->auth->GetUser(*owner);
+        }
+
         trigger.Execute(&*execution_db_accessor_, &execution_memory, interpreter_context_->config.execution_timeout_sec,
-                        &interpreter_context_->is_shutting_down, *trigger_context, interpreter_context_->auth_checker);
+                        &interpreter_context_->is_shutting_down, *trigger_context, user,
+                        interpreter_context_->auth_checker);
       } catch (const utils::BasicException &e) {
         throw utils::BasicException(
             fmt::format("Trigger '{}' caused the transaction to fail.\nException: {}", trigger.Name(), e.what()));

src/query/interpreter.hpp

@@ -13,6 +13,7 @@
 
 #include <gflags/gflags.h>
 
+#include "auth/models.hpp"
 #include "query/auth_checker.hpp"
 #include "query/config.hpp"
 #include "query/context.hpp"
@@ -98,17 +99,20 @@ class AuthQueryHandler {
 
   virtual std::vector<std::vector<TypedValue>> GetPrivileges(const std::string &user_or_role) = 0;
 
+  /// @throw QueryRuntimeException if an error ocurred.
+  virtual memgraph::auth::User *GetUser(const std::string &username) = 0;
+
   /// @throw QueryRuntimeException if an error ocurred.
   virtual void GrantPrivilege(const std::string &user_or_role, const std::vector<AuthQuery::Privilege> &privileges,
-                              const std::vector<std::string> &labels) = 0;
+                              const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) = 0;
 
   /// @throw QueryRuntimeException if an error ocurred.
   virtual void DenyPrivilege(const std::string &user_or_role, const std::vector<AuthQuery::Privilege> &privileges,
-                             const std::vector<std::string> &labels) = 0;
+                             const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) = 0;
 
   /// @throw QueryRuntimeException if an error ocurred.
   virtual void RevokePrivilege(const std::string &user_or_role, const std::vector<AuthQuery::Privilege> &privileges,
-                               const std::vector<std::string> &labels) = 0;
+                               const std::vector<std::string> &labels, const std::vector<std::string> &edgeTypes) = 0;
 };
 
 enum class QueryHandlerResult { COMMIT, ABORT, NOTHING };
@@ -142,7 +146,7 @@ class ReplicationQueryHandler {
 
   /// @throw QueryRuntimeException if an error ocurred.
   virtual void RegisterReplica(const std::string &name, const std::string &socket_address,
-                               const ReplicationQuery::SyncMode sync_mode, const std::optional<double> timeout,
+                               ReplicationQuery::SyncMode sync_mode,
                                const std::chrono::seconds replica_check_frequency) = 0;
 
   /// @throw QueryRuntimeException if an error ocurred.
@@ -175,13 +179,6 @@ struct InterpreterContext {
 
   storage::Storage *db;
 
-  // ANTLR has singleton instance that is shared between threads. It is
-  // protected by locks inside of ANTLR. Unfortunately, they are not protected
-  // in a very good way. Once we have ANTLR version without race conditions we
-  // can remove this lock. This will probably never happen since ANTLR
-  // developers introduce more bugs in each version. Fortunately, we have
-  // cache so this lock probably won't impact performance much...
-  utils::SpinLock antlr_lock;
   std::optional<double> tsc_frequency{utils::GetTSCFrequency()};
   std::atomic<bool> is_shutting_down{false};
 

src/query/plan/operator.cpp

@@ -38,6 +38,7 @@
 #include "query/procedure/mg_procedure_impl.hpp"
 #include "query/procedure/module.hpp"
 #include "storage/v2/property_value.hpp"
+#include "storage/v2/view.hpp"
 #include "utils/algorithm.hpp"
 #include "utils/csv_parsing.hpp"
 #include "utils/event_counter.hpp"
@@ -683,6 +684,13 @@ bool Expand::ExpandCursor::Pull(Frame &frame, ExecutionContext &context) {
     // attempt to get a value from the incoming edges
     if (in_edges_ && *in_edges_it_ != in_edges_->end()) {
       auto edge = *(*in_edges_it_)++;
+      if (context.auth_checker &&
+          (!context.auth_checker->IsUserAuthorizedEdgeType(context.user, context.db_accessor, edge.EdgeType()) ||
+           !context.auth_checker->IsUserAuthorizedLabels(context.user, context.db_accessor,
+                                                         edge.To().Labels(storage::View::OLD).GetValue()) ||
+           !context.auth_checker->IsUserAuthorizedLabels(context.user, context.db_accessor,
+                                                         edge.From().Labels(storage::View::OLD).GetValue())))
+        continue;
       frame[self_.common_.edge_symbol] = edge;
       pull_node(edge, EdgeAtom::Direction::IN);
       return true;
@@ -695,6 +703,13 @@ bool Expand::ExpandCursor::Pull(Frame &frame, ExecutionContext &context) {
       // we should do only one expansion for cycles, and it was
       // already done in the block above
       if (self_.common_.direction == EdgeAtom::Direction::BOTH && edge.IsCycle()) continue;
+      if (context.auth_checker &&
+          (!context.auth_checker->IsUserAuthorizedEdgeType(context.user, context.db_accessor, edge.EdgeType()) ||
+           !context.auth_checker->IsUserAuthorizedLabels(context.user, context.db_accessor,
+                                                         edge.To().Labels(storage::View::OLD).GetValue()) ||
+           !context.auth_checker->IsUserAuthorizedLabels(context.user, context.db_accessor,
+                                                         edge.From().Labels(storage::View::OLD).GetValue())))
+        continue;
       frame[self_.common_.edge_symbol] = edge;
       pull_node(edge, EdgeAtom::Direction::OUT);
       return true;
@@ -832,6 +847,7 @@ auto ExpandFromVertex(const VertexAccessor &vertex, EdgeAtom::Direction directio
       chain_elements.emplace_back(wrapper(EdgeAtom::Direction::IN, std::move(edges)));
     }
   }
+
   if (direction != EdgeAtom::Direction::IN) {
     auto edges = UnwrapEdgesResult(vertex.OutEdges(view, edge_types));
     if (edges.begin() != edges.end()) {
@@ -1012,8 +1028,6 @@ class ExpandVariableCursor : public Cursor {
         edges_on_frame.resize(std::min(edges_on_frame.size(), edges_.size()));
       }
 
-      // if we are here, we have a valid stack,
-      // get the edge, increase the relevant iterator
       auto current_edge = *edges_it_.back()++;
 
       // Check edge-uniqueness.
@@ -1021,11 +1035,11 @@ class ExpandVariableCursor : public Cursor {
           std::any_of(edges_on_frame.begin(), edges_on_frame.end(),
                       [&current_edge](const TypedValue &edge) { return current_edge.first == edge.ValueEdge(); });
       if (found_existing) continue;
-
-      AppendEdge(current_edge.first, &edges_on_frame);
       VertexAccessor current_vertex =
           current_edge.second == EdgeAtom::Direction::IN ? current_edge.first.From() : current_edge.first.To();
 
+      AppendEdge(current_edge.first, &edges_on_frame);
+
       if (!self_.common_.existing_node) {
         frame[self_.common_.node_symbol] = current_vertex;
       }
@@ -1362,6 +1376,7 @@ class SingleSourceShortestPathCursor : public query::plan::Cursor {
 
         const auto &vertex = vertex_value.ValueVertex();
         processed_.emplace(vertex, std::nullopt);
+
         expand_from_vertex(vertex);
 
         // go back to loop start and see if we expanded anything
@@ -2600,13 +2615,13 @@ namespace {
  * when there are */
 TypedValue DefaultAggregationOpValue(const Aggregate::Element &element, utils::MemoryResource *memory) {
   switch (element.op) {
-    case Aggregation::Op::COUNT:
-      return TypedValue(0, memory);
-    case Aggregation::Op::SUM:
     case Aggregation::Op::MIN:
     case Aggregation::Op::MAX:
     case Aggregation::Op::AVG:
       return TypedValue(memory);
+    case Aggregation::Op::COUNT:
+    case Aggregation::Op::SUM:
+      return TypedValue(0, memory);
     case Aggregation::Op::COLLECT_LIST:
       return TypedValue(TypedValue::TVector(memory));
     case Aggregation::Op::COLLECT_MAP:
@@ -2628,9 +2643,7 @@ class AggregateCursor : public Cursor {
       pulled_all_input_ = true;
       aggregation_it_ = aggregation_.begin();
 
-      // in case there is no input and no group_bys we need to return true
-      // just this once
-      if (aggregation_.empty() && self_.group_by_.empty()) {
+      if (aggregation_.empty()) {
         auto *pull_memory = context.evaluation_context.memory;
         // place default aggregation values on the frame
         for (const auto &elem : self_.aggregations_)

src/query/stream/streams.cpp

@@ -619,10 +619,10 @@ void Streams::Drop(const std::string &stream_name) {
   // no running Test function for this consumer, therefore it can be erased.
   std::visit([&](const auto &stream_data) { stream_data.stream_source->Lock(); }, it->second);
 
-  locked_streams->erase(it);
   if (!storage_.Delete(stream_name)) {
     throw StreamsException("Couldn't delete stream '{}' from persistent store!", stream_name);
   }
+  locked_streams->erase(it);
 
   // TODO(antaljanosbenjamin) Release the transformation
 }

src/query/stream/streams.hpp

@@ -188,7 +188,7 @@ class Streams final {
   void Persist(StreamStatus<TStream> &&status) {
     const std::string stream_name = status.name;
     if (!storage_.Put(stream_name, nlohmann::json(std::move(status)).dump())) {
-      throw StreamsException{"Couldn't persist steam data for stream '{}'", stream_name};
+      throw StreamsException{"Couldn't persist stream data for stream '{}'", stream_name};
     }
   }
 

src/query/trigger.cpp

@@ -153,10 +153,10 @@ std::vector<std::pair<Identifier, TriggerIdentifierTag>> GetPredefinedIdentifier
 Trigger::Trigger(std::string name, const std::string &query,
                  const std::map<std::string, storage::PropertyValue> &user_parameters,
                  const TriggerEventType event_type, utils::SkipList<QueryCacheEntry> *query_cache,
-                 DbAccessor *db_accessor, utils::SpinLock *antlr_lock, const InterpreterConfig::Query &query_config,
+                 DbAccessor *db_accessor, const InterpreterConfig::Query &query_config,
                  std::optional<std::string> owner, const query::AuthChecker *auth_checker)
     : name_{std::move(name)},
-      parsed_statements_{ParseQuery(query, user_parameters, query_cache, antlr_lock, query_config)},
+      parsed_statements_{ParseQuery(query, user_parameters, query_cache, query_config)},
       event_type_{event_type},
       owner_{std::move(owner)} {
   // We check immediately if the query is valid by trying to create a plan.
@@ -195,7 +195,7 @@ std::shared_ptr<Trigger::TriggerPlan> Trigger::GetPlan(DbAccessor *db_accessor,
 
 void Trigger::Execute(DbAccessor *dba, utils::MonotonicBufferResource *execution_memory,
                       const double max_execution_time_sec, std::atomic<bool> *is_shutting_down,
-                      const TriggerContext &context, const AuthChecker *auth_checker) const {
+                      const TriggerContext &context, memgraph::auth::User *user, AuthChecker *auth_checker) const {
   if (!context.ShouldEventTrigger(event_type_)) {
     return;
   }
@@ -215,6 +215,8 @@ void Trigger::Execute(DbAccessor *dba, utils::MonotonicBufferResource *execution
   ctx.timer = utils::AsyncTimer(max_execution_time_sec);
   ctx.is_shutting_down = is_shutting_down;
   ctx.is_profile_query = false;
+  ctx.user = user;
+  ctx.auth_checker = auth_checker;
 
   // Set up temporary memory for a single Pull. Initial memory comes from the
   // stack. 256 KiB should fit on the stack and should be more than enough for a
@@ -257,7 +259,7 @@ inline constexpr uint64_t kVersion{2};
 TriggerStore::TriggerStore(std::filesystem::path directory) : storage_{std::move(directory)} {}
 
 void TriggerStore::RestoreTriggers(utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor,
-                                   utils::SpinLock *antlr_lock, const InterpreterConfig::Query &query_config,
+                                   const InterpreterConfig::Query &query_config,
                                    const query::AuthChecker *auth_checker) {
   MG_ASSERT(before_commit_triggers_.size() == 0 && after_commit_triggers_.size() == 0,
             "Cannot restore trigger when some triggers already exist!");
@@ -317,8 +319,8 @@ void TriggerStore::RestoreTriggers(utils::SkipList<QueryCacheEntry> *query_cache
 
     std::optional<Trigger> trigger;
     try {
-      trigger.emplace(trigger_name, statement, user_parameters, event_type, query_cache, db_accessor, antlr_lock,
-                      query_config, std::move(owner), auth_checker);
+      trigger.emplace(trigger_name, statement, user_parameters, event_type, query_cache, db_accessor, query_config,
+                      std::move(owner), auth_checker);
     } catch (const utils::BasicException &e) {
       spdlog::warn("Failed to create trigger '{}' because: {}", trigger_name, e.what());
       continue;
@@ -336,8 +338,8 @@ void TriggerStore::AddTrigger(std::string name, const std::string &query,
                               const std::map<std::string, storage::PropertyValue> &user_parameters,
                               TriggerEventType event_type, TriggerPhase phase,
                               utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor,
-                              utils::SpinLock *antlr_lock, const InterpreterConfig::Query &query_config,
-                              std::optional<std::string> owner, const query::AuthChecker *auth_checker) {
+                              const InterpreterConfig::Query &query_config, std::optional<std::string> owner,
+                              const query::AuthChecker *auth_checker) {
   std::unique_lock store_guard{store_lock_};
   if (storage_.Get(name)) {
     throw utils::BasicException("Trigger with the same name already exists.");
@@ -345,8 +347,8 @@ void TriggerStore::AddTrigger(std::string name, const std::string &query,
 
   std::optional<Trigger> trigger;
   try {
-    trigger.emplace(std::move(name), query, user_parameters, event_type, query_cache, db_accessor, antlr_lock,
-                    query_config, std::move(owner), auth_checker);
+    trigger.emplace(std::move(name), query, user_parameters, event_type, query_cache, db_accessor, query_config,
+                    std::move(owner), auth_checker);
   } catch (const utils::BasicException &e) {
     const auto identifiers = GetPredefinedIdentifiers(event_type);
     std::stringstream identifier_names_stream;

src/query/trigger.hpp

@@ -34,13 +34,13 @@ namespace memgraph::query {
 struct Trigger {
   explicit Trigger(std::string name, const std::string &query,
                    const std::map<std::string, storage::PropertyValue> &user_parameters, TriggerEventType event_type,
-                   utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor, utils::SpinLock *antlr_lock,
+                   utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor,
                    const InterpreterConfig::Query &query_config, std::optional<std::string> owner,
                    const query::AuthChecker *auth_checker);
 
   void Execute(DbAccessor *dba, utils::MonotonicBufferResource *execution_memory, double max_execution_time_sec,
-               std::atomic<bool> *is_shutting_down, const TriggerContext &context,
-               const AuthChecker *auth_checker) const;
+               std::atomic<bool> *is_shutting_down, const TriggerContext &context, memgraph::auth::User *user,
+               AuthChecker *auth_checker) const;
 
   bool operator==(const Trigger &other) const { return name_ == other.name_; }
   // NOLINTNEXTLINE (modernize-use-nullptr)
@@ -81,14 +81,13 @@ struct TriggerStore {
   explicit TriggerStore(std::filesystem::path directory);
 
   void RestoreTriggers(utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor,
-                       utils::SpinLock *antlr_lock, const InterpreterConfig::Query &query_config,
-                       const query::AuthChecker *auth_checker);
+                       const InterpreterConfig::Query &query_config, const query::AuthChecker *auth_checker);
 
   void AddTrigger(std::string name, const std::string &query,
                   const std::map<std::string, storage::PropertyValue> &user_parameters, TriggerEventType event_type,
                   TriggerPhase phase, utils::SkipList<QueryCacheEntry> *query_cache, DbAccessor *db_accessor,
-                  utils::SpinLock *antlr_lock, const InterpreterConfig::Query &query_config,
-                  std::optional<std::string> owner, const query::AuthChecker *auth_checker);
+                  const InterpreterConfig::Query &query_config, std::optional<std::string> owner,
+                  const query::AuthChecker *auth_checker);
 
   void DropTrigger(const std::string &name);
 

src/storage/v2/CMakeLists.txt

@@ -13,7 +13,6 @@ set(storage_v2_src_files
     storage.cpp)
 
 ##### Replication #####
-
 define_add_lcp(add_lcp_storage lcp_storage_cpp_files generated_lcp_storage_files)
 
 add_lcp_storage(replication/rpc.lcp SLK_SERIALIZE)
@@ -26,10 +25,10 @@ set(storage_v2_src_files
     replication/replication_server.cpp
     replication/serialization.cpp
     replication/slk.cpp
+    replication/replication_persistence_helper.cpp
     ${lcp_storage_cpp_files})
 
 #######################
-
 find_package(gflags REQUIRED)
 find_package(Threads REQUIRED)
 

src/storage/v2/config.hpp

@@ -49,7 +49,7 @@ struct Config {
     uint64_t wal_file_flush_every_n_tx{100000};
 
     bool snapshot_on_exit{false};
-
+    bool restore_replicas_on_startup{false};
   } durability;
 
   struct Transaction {

src/storage/v2/durability/paths.hpp

@@ -22,6 +22,7 @@ static const std::string kSnapshotDirectory{"snapshots"};
 static const std::string kWalDirectory{"wal"};
 static const std::string kBackupDirectory{".backup"};
 static const std::string kLockFile{".lock"};
+static const std::string kReplicationDirectory{"replication"};
 
 // This is the prefix used for Snapshot and WAL filenames. It is a timestamp
 // format that equals to: YYYYmmddHHMMSSffffff

src/storage/v2/replication/config.hpp

@@ -10,12 +10,13 @@
 // licenses/APL.txt.
 
 #pragma once
+
+#include <chrono>
 #include <optional>
 #include <string>
 
 namespace memgraph::storage::replication {
 struct ReplicationClientConfig {
-  std::optional<double> timeout;
   // The default delay between main checking/pinging replicas is 1s because
   // that seems like a reasonable timeframe in which main should notice a
   // replica is down.
@@ -24,6 +25,8 @@ struct ReplicationClientConfig {
   struct SSL {
     std::string key_file = "";
     std::string cert_file = "";
+
+    friend bool operator==(const SSL &, const SSL &) = default;
   };
 
   std::optional<SSL> ssl;

src/storage/v2/replication/enums.hpp

@@ -16,4 +16,6 @@ namespace memgraph::storage::replication {
 enum class ReplicationMode : std::uint8_t { SYNC, ASYNC };
 
 enum class ReplicaState : std::uint8_t { READY, REPLICATING, RECOVERY, INVALID };
+
+enum class RegistrationMode : std::uint8_t { MUST_BE_INSTANTLY_VALID, CAN_BE_INVALID };
 }  // namespace memgraph::storage::replication

src/storage/v2/replication/replication_client.cpp

@@ -43,12 +43,6 @@ Storage::ReplicationClient::ReplicationClient(std::string name, Storage *storage
   rpc_client_.emplace(endpoint, &*rpc_context_);
   TryInitializeClientSync();
 
-  if (config.timeout && replica_state_ != replication::ReplicaState::INVALID) {
-    MG_ASSERT(*config.timeout > 0);
-    timeout_.emplace(*config.timeout);
-    timeout_dispatcher_.emplace();
-  }
-
   // Help the user to get the most accurate replica state possible.
   if (config.replica_check_frequency > std::chrono::seconds(0)) {
     replica_checker_.Run("Replica Checker", config.replica_check_frequency, [&] { FrequentCheck(); });
@@ -239,41 +233,6 @@ void Storage::ReplicationClient::FinalizeTransactionReplication() {
 
   if (mode_ == replication::ReplicationMode::ASYNC) {
     thread_pool_.AddTask([this] { this->FinalizeTransactionReplicationInternal(); });
-  } else if (timeout_) {
-    MG_ASSERT(mode_ == replication::ReplicationMode::SYNC, "Only SYNC replica can have a timeout.");
-    MG_ASSERT(timeout_dispatcher_, "Timeout thread is missing");
-    timeout_dispatcher_->WaitForTaskToFinish();
-
-    timeout_dispatcher_->active = true;
-    thread_pool_.AddTask([&, this] {
-      this->FinalizeTransactionReplicationInternal();
-      std::unique_lock main_guard(timeout_dispatcher_->main_lock);
-      // TimerThread can finish waiting for timeout
-      timeout_dispatcher_->active = false;
-      // Notify the main thread
-      timeout_dispatcher_->main_cv.notify_one();
-    });
-
-    timeout_dispatcher_->StartTimeoutTask(*timeout_);
-
-    // Wait until one of the threads notifies us that they finished executing
-    // Both threads should first set the active flag to false
-    {
-      std::unique_lock main_guard(timeout_dispatcher_->main_lock);
-      timeout_dispatcher_->main_cv.wait(main_guard, [&] { return !timeout_dispatcher_->active.load(); });
-    }
-
-    // TODO (antonio2368): Document and/or polish SEMI-SYNC to ASYNC fallback.
-    if (replica_state_ == replication::ReplicaState::REPLICATING) {
-      mode_ = replication::ReplicationMode::ASYNC;
-      timeout_.reset();
-      // This can only happen if we timeouted so we are sure that
-      // Timeout task finished
-      // We need to delete timeout dispatcher AFTER the replication
-      // finished because it tries to acquire the timeout lock
-      // and acces the `active` variable`
-      thread_pool_.AddTask([this] { timeout_dispatcher_.reset(); });
-    }
   } else {
     FinalizeTransactionReplicationInternal();
   }
@@ -566,30 +525,6 @@ Storage::TimestampInfo Storage::ReplicationClient::GetTimestampInfo() {
   return info;
 }
 
-////// TimeoutDispatcher //////
-void Storage::ReplicationClient::TimeoutDispatcher::WaitForTaskToFinish() {
-  // Wait for the previous timeout task to finish
-  std::unique_lock main_guard(main_lock);
-  main_cv.wait(main_guard, [&] { return finished; });
-}
-
-void Storage::ReplicationClient::TimeoutDispatcher::StartTimeoutTask(const double timeout) {
-  timeout_pool.AddTask([timeout, this] {
-    finished = false;
-    using std::chrono::steady_clock;
-    const auto timeout_duration =
-        std::chrono::duration_cast<steady_clock::duration>(std::chrono::duration<double>(timeout));
-    const auto end_time = steady_clock::now() + timeout_duration;
-    while (active && (steady_clock::now() < end_time)) {
-      std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    }
-
-    std::unique_lock main_guard(main_lock);
-    finished = true;
-    active = false;
-    main_cv.notify_one();
-  });
-}
 ////// ReplicaStream //////
 Storage::ReplicationClient::ReplicaStream::ReplicaStream(ReplicationClient *self,
                                                          const uint64_t previous_commit_timestamp,

src/storage/v2/replication/replication_client.hpp

@@ -120,8 +120,6 @@ class Storage::ReplicationClient {
 
   auto Mode() const { return mode_; }
 
-  auto Timeout() const { return timeout_; }
-
   const auto &Endpoint() const { return rpc_client_->Endpoint(); }
 
   Storage::TimestampInfo GetTimestampInfo();
@@ -158,30 +156,6 @@ class Storage::ReplicationClient {
   std::optional<ReplicaStream> replica_stream_;
   replication::ReplicationMode mode_{replication::ReplicationMode::SYNC};
 
-  // Dispatcher class for timeout tasks
-  struct TimeoutDispatcher {
-    explicit TimeoutDispatcher(){};
-
-    void WaitForTaskToFinish();
-
-    void StartTimeoutTask(double timeout);
-
-    // If the Timeout task should continue waiting
-    std::atomic<bool> active{false};
-
-    std::mutex main_lock;
-    std::condition_variable main_cv;
-
-   private:
-    // if the Timeout task finished executing
-    bool finished{true};
-
-    utils::ThreadPool timeout_pool{1};
-  };
-
-  std::optional<double> timeout_;
-  std::optional<TimeoutDispatcher> timeout_dispatcher_;
-
   utils::SpinLock client_lock_;
   // This thread pool is used for background tasks so we don't
   // block the main storage thread

src/storage/v2/replication/replication_persistence_helper.cpp

@@ -0,0 +1,83 @@
+// 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
+// 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 "storage/v2/replication/replication_persistence_helper.hpp"
+#include "utils/logging.hpp"
+
+namespace {
+const std::string kReplicaName = "replica_name";
+const std::string kIpAddress = "replica_ip_address";
+const std::string kPort = "replica_port";
+const std::string kSyncMode = "replica_sync_mode";
+const std::string kCheckFrequency = "replica_check_frequency";
+const std::string kSSLKeyFile = "replica_ssl_key_file";
+const std::string kSSLCertFile = "replica_ssl_cert_file";
+}  // namespace
+
+namespace memgraph::storage::replication {
+
+nlohmann::json ReplicaStatusToJSON(ReplicaStatus &&status) {
+  auto data = nlohmann::json::object();
+
+  data[kReplicaName] = std::move(status.name);
+  data[kIpAddress] = std::move(status.ip_address);
+  data[kPort] = status.port;
+  data[kSyncMode] = status.sync_mode;
+
+  data[kCheckFrequency] = status.replica_check_frequency.count();
+
+  if (status.ssl.has_value()) {
+    data[kSSLKeyFile] = std::move(status.ssl->key_file);
+    data[kSSLCertFile] = std::move(status.ssl->cert_file);
+  } else {
+    data[kSSLKeyFile] = nullptr;
+    data[kSSLCertFile] = nullptr;
+  }
+
+  return data;
+}
+
+std::optional<ReplicaStatus> JSONToReplicaStatus(nlohmann::json &&data) {
+  ReplicaStatus replica_status;
+
+  const auto get_failed_message = [](const std::string_view message, const std::string_view nested_message) {
+    return fmt::format("Failed to deserialize replica's configuration: {} : {}", message, nested_message);
+  };
+
+  try {
+    data.at(kReplicaName).get_to(replica_status.name);
+    data.at(kIpAddress).get_to(replica_status.ip_address);
+    data.at(kPort).get_to(replica_status.port);
+    data.at(kSyncMode).get_to(replica_status.sync_mode);
+
+    replica_status.replica_check_frequency = std::chrono::seconds(data.at(kCheckFrequency));
+
+    const auto &key_file = data.at(kSSLKeyFile);
+    const auto &cert_file = data.at(kSSLCertFile);
+
+    MG_ASSERT(key_file.is_null() == cert_file.is_null());
+
+    if (!key_file.is_null()) {
+      replica_status.ssl = replication::ReplicationClientConfig::SSL{};
+      data.at(kSSLKeyFile).get_to(replica_status.ssl->key_file);
+      data.at(kSSLCertFile).get_to(replica_status.ssl->cert_file);
+    }
+  } catch (const nlohmann::json::type_error &exception) {
+    spdlog::error(get_failed_message("Invalid type conversion", exception.what()));
+    return std::nullopt;
+  } catch (const nlohmann::json::out_of_range &exception) {
+    spdlog::error(get_failed_message("Non existing field", exception.what()));
+    return std::nullopt;
+  }
+
+  return replica_status;
+}
+}  // namespace memgraph::storage::replication

src/storage/v2/replication/replication_persistence_helper.hpp

@@ -0,0 +1,40 @@
+// 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
+// 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 <chrono>
+#include <compare>
+#include <optional>
+#include <string>
+
+#include <json/json.hpp>
+
+#include "storage/v2/replication/config.hpp"
+#include "storage/v2/replication/enums.hpp"
+
+namespace memgraph::storage::replication {
+
+struct ReplicaStatus {
+  std::string name;
+  std::string ip_address;
+  uint16_t port;
+  ReplicationMode sync_mode;
+  std::chrono::seconds replica_check_frequency;
+  std::optional<ReplicationClientConfig::SSL> ssl;
+
+  friend bool operator==(const ReplicaStatus &, const ReplicaStatus &) = default;
+};
+
+nlohmann::json ReplicaStatusToJSON(ReplicaStatus &&status);
+
+std::optional<ReplicaStatus> JSONToReplicaStatus(nlohmann::json &&data);
+}  // namespace memgraph::storage::replication

src/storage/v2/storage.cpp

@@ -17,6 +17,7 @@
 #include <variant>
 
 #include <gflags/gflags.h>
+#include <spdlog/spdlog.h>
 
 #include "io/network/endpoint.hpp"
 #include "storage/v2/durability/durability.hpp"
@@ -28,6 +29,8 @@
 #include "storage/v2/indices.hpp"
 #include "storage/v2/mvcc.hpp"
 #include "storage/v2/replication/config.hpp"
+#include "storage/v2/replication/enums.hpp"
+#include "storage/v2/replication/replication_persistence_helper.hpp"
 #include "storage/v2/transaction.hpp"
 #include "storage/v2/vertex_accessor.hpp"
 #include "utils/file.hpp"
@@ -50,6 +53,19 @@ using OOMExceptionEnabler = utils::MemoryTracker::OutOfMemoryExceptionEnabler;
 
 namespace {
 inline constexpr uint16_t kEpochHistoryRetention = 1000;
+
+std::string RegisterReplicaErrorToString(Storage::RegisterReplicaError error) {
+  switch (error) {
+    case Storage::RegisterReplicaError::NAME_EXISTS:
+      return "NAME_EXISTS";
+    case Storage::RegisterReplicaError::END_POINT_EXISTS:
+      return "END_POINT_EXISTS";
+    case Storage::RegisterReplicaError::CONNECTION_FAILED:
+      return "CONNECTION_FAILED";
+    case Storage::RegisterReplicaError::COULD_NOT_BE_PERSISTED:
+      return "COULD_NOT_BE_PERSISTED";
+  }
+}
 }  // namespace
 
 auto AdvanceToVisibleVertex(utils::SkipList<Vertex>::Iterator it, utils::SkipList<Vertex>::Iterator end,
@@ -400,6 +416,16 @@ Storage::Storage(Config config)
   } else {
     commit_log_.emplace(timestamp_);
   }
+
+  if (config_.durability.restore_replicas_on_startup) {
+    spdlog::info("Replica's configuration will be stored and will be automatically restored in case of a crash.");
+    utils::EnsureDirOrDie(config_.durability.storage_directory / durability::kReplicationDirectory);
+    storage_ =
+        std::make_unique<kvstore::KVStore>(config_.durability.storage_directory / durability::kReplicationDirectory);
+    RestoreReplicas();
+  } else {
+    spdlog::warn("Replicas' configuration will NOT be stored. When the server restarts, replicas will be forgotten.");
+  }
 }
 
 Storage::~Storage() {
@@ -1882,7 +1908,7 @@ bool Storage::SetMainReplicationRole() {
 
 utils::BasicResult<Storage::RegisterReplicaError> Storage::RegisterReplica(
     std::string name, io::network::Endpoint endpoint, const replication::ReplicationMode replication_mode,
-    const replication::ReplicationClientConfig &config) {
+    const replication::RegistrationMode registration_mode, const replication::ReplicationClientConfig &config) {
   MG_ASSERT(replication_role_.load() == ReplicationRole::MAIN, "Only main instance can register a replica!");
 
   const bool name_exists = replication_clients_.WithLock([&](auto &clients) {
@@ -1902,12 +1928,28 @@ utils::BasicResult<Storage::RegisterReplicaError> Storage::RegisterReplica(
     return RegisterReplicaError::END_POINT_EXISTS;
   }
 
-  MG_ASSERT(replication_mode == replication::ReplicationMode::SYNC || !config.timeout,
-            "Only SYNC mode can have a timeout set");
+  if (ShouldStoreAndRestoreReplicas()) {
+    auto data = replication::ReplicaStatusToJSON(
+        replication::ReplicaStatus{.name = name,
+                                   .ip_address = endpoint.address,
+                                   .port = endpoint.port,
+                                   .sync_mode = replication_mode,
+                                   .replica_check_frequency = config.replica_check_frequency,
+                                   .ssl = config.ssl});
+    if (!storage_->Put(name, data.dump())) {
+      spdlog::error("Error when saving replica {} in settings.", name);
+      return RegisterReplicaError::COULD_NOT_BE_PERSISTED;
+    }
+  }
 
   auto client = std::make_unique<ReplicationClient>(std::move(name), this, endpoint, replication_mode, config);
+
   if (client->State() == replication::ReplicaState::INVALID) {
-    return RegisterReplicaError::CONNECTION_FAILED;
+    if (replication::RegistrationMode::CAN_BE_INVALID != registration_mode) {
+      return RegisterReplicaError::CONNECTION_FAILED;
+    }
+
+    spdlog::warn("Connection failed when registering replica {}. Replica will still be registered.", client->Name());
   }
 
   return replication_clients_.WithLock([&](auto &clients) -> utils::BasicResult<Storage::RegisterReplicaError> {
@@ -1928,8 +1970,15 @@ utils::BasicResult<Storage::RegisterReplicaError> Storage::RegisterReplica(
   });
 }
 
-bool Storage::UnregisterReplica(const std::string_view name) {
+bool Storage::UnregisterReplica(const std::string &name) {
   MG_ASSERT(replication_role_.load() == ReplicationRole::MAIN, "Only main instance can unregister a replica!");
+  if (ShouldStoreAndRestoreReplicas()) {
+    if (!storage_->Delete(name)) {
+      spdlog::error("Error when removing replica {} from settings.", name);
+      return false;
+    }
+  }
+
   return replication_clients_.WithLock([&](auto &clients) {
     return std::erase_if(clients, [&](const auto &client) { return client->Name() == name; });
   });
@@ -1952,11 +2001,10 @@ std::vector<Storage::ReplicaInfo> Storage::ReplicasInfo() {
   return replication_clients_.WithLock([](auto &clients) {
     std::vector<Storage::ReplicaInfo> replica_info;
     replica_info.reserve(clients.size());
-    std::transform(clients.begin(), clients.end(), std::back_inserter(replica_info),
-                   [](const auto &client) -> ReplicaInfo {
-                     return {client->Name(),     client->Mode(),  client->Timeout(),
-                             client->Endpoint(), client->State(), client->GetTimestampInfo()};
-                   });
+    std::transform(
+        clients.begin(), clients.end(), std::back_inserter(replica_info), [](const auto &client) -> ReplicaInfo {
+          return {client->Name(), client->Mode(), client->Endpoint(), client->State(), client->GetTimestampInfo()};
+        });
     return replica_info;
   });
 }
@@ -1966,4 +2014,41 @@ void Storage::SetIsolationLevel(IsolationLevel isolation_level) {
   isolation_level_ = isolation_level;
 }
 
+void Storage::RestoreReplicas() {
+  MG_ASSERT(memgraph::storage::ReplicationRole::MAIN == GetReplicationRole());
+  if (!ShouldStoreAndRestoreReplicas()) {
+    return;
+  }
+  spdlog::info("Restoring replicas.");
+
+  for (const auto &[replica_name, replica_data] : *storage_) {
+    spdlog::info("Restoring replica {}.", replica_name);
+
+    const auto maybe_replica_status = replication::JSONToReplicaStatus(nlohmann::json::parse(replica_data));
+    if (!maybe_replica_status.has_value()) {
+      LOG_FATAL("Cannot parse previously saved configuration of replica {}.", replica_name);
+    }
+
+    auto replica_status = *maybe_replica_status;
+    MG_ASSERT(replica_status.name == replica_name, "Expected replica name is '{}', but got '{}'", replica_status.name,
+              replica_name);
+
+    auto ret =
+        RegisterReplica(std::move(replica_status.name), {std::move(replica_status.ip_address), replica_status.port},
+                        replica_status.sync_mode, replication::RegistrationMode::CAN_BE_INVALID,
+                        {
+                            .replica_check_frequency = replica_status.replica_check_frequency,
+                            .ssl = replica_status.ssl,
+                        });
+
+    if (ret.HasError()) {
+      MG_ASSERT(RegisterReplicaError::CONNECTION_FAILED != ret.GetError());
+      LOG_FATAL("Failure when restoring replica {}: {}.", replica_name, RegisterReplicaErrorToString(ret.GetError()));
+    }
+    spdlog::info("Replica {} restored.", replica_name);
+  }
+}
+
+bool Storage::ShouldStoreAndRestoreReplicas() const { return nullptr != storage_; }
+
 }  // namespace memgraph::storage

src/storage/v2/storage.hpp

@@ -18,6 +18,7 @@
 #include <variant>
 
 #include "io/network/endpoint.hpp"
+#include "kvstore/kvstore.hpp"
 #include "storage/v2/commit_log.hpp"
 #include "storage/v2/config.hpp"
 #include "storage/v2/constraints.hpp"
@@ -411,15 +412,20 @@ class Storage final {
 
   bool SetMainReplicationRole();
 
-  enum class RegisterReplicaError : uint8_t { NAME_EXISTS, END_POINT_EXISTS, CONNECTION_FAILED };
+  enum class RegisterReplicaError : uint8_t {
+    NAME_EXISTS,
+    END_POINT_EXISTS,
+    CONNECTION_FAILED,
+    COULD_NOT_BE_PERSISTED
+  };
 
   /// @pre The instance should have a MAIN role
   /// @pre Timeout can only be set for SYNC replication
   utils::BasicResult<RegisterReplicaError, void> RegisterReplica(
       std::string name, io::network::Endpoint endpoint, replication::ReplicationMode replication_mode,
-      const replication::ReplicationClientConfig &config = {});
+      replication::RegistrationMode registration_mode, const replication::ReplicationClientConfig &config = {});
   /// @pre The instance should have a MAIN role
-  bool UnregisterReplica(std::string_view name);
+  bool UnregisterReplica(const std::string &name);
 
   std::optional<replication::ReplicaState> GetReplicaState(std::string_view name);
 
@@ -433,7 +439,6 @@ class Storage final {
   struct ReplicaInfo {
     std::string name;
     replication::ReplicationMode mode;
-    std::optional<double> timeout;
     io::network::Endpoint endpoint;
     replication::ReplicaState state;
     TimestampInfo timestamp_info;
@@ -475,6 +480,10 @@ class Storage final {
 
   uint64_t CommitTimestamp(std::optional<uint64_t> desired_commit_timestamp = {});
 
+  void RestoreReplicas();
+
+  bool ShouldStoreAndRestoreReplicas() const;
+
   // Main storage lock.
   //
   // Accessors take a shared lock when starting, so it is possible to block
@@ -535,6 +544,7 @@ class Storage final {
   std::filesystem::path wal_directory_;
   std::filesystem::path lock_file_path_;
   utils::OutputFile lock_file_handle_;
+  std::unique_ptr<kvstore::KVStore> storage_;
 
   utils::Scheduler snapshot_runner_;
   utils::SpinLock snapshot_lock_;

src/utils/temporal.cpp

@@ -15,6 +15,7 @@
 #include <chrono>
 #include <ctime>
 #include <limits>
+#include <string>
 #include <string_view>
 
 #include "utils/exceptions.hpp"
@@ -175,6 +176,10 @@ int64_t Date::MicrosecondsSinceEpoch() const {
 
 int64_t Date::DaysSinceEpoch() const { return utils::DaysSinceEpoch(year, month, day).count(); }
 
+std::string Date::ToString() const {
+  return fmt::format("{:0>4}-{:0>2}-{:0>2}", year, static_cast<int>(month), static_cast<int>(day));
+}
+
 size_t DateHash::operator()(const Date &date) const {
   utils::HashCombine<uint64_t, uint64_t> hasher;
   size_t result = hasher(0, date.year);
@@ -377,6 +382,15 @@ int64_t LocalTime::NanosecondsSinceEpoch() const {
   return chrono::duration_cast<chrono::nanoseconds>(SumLocalTimeParts()).count();
 }
 
+std::string LocalTime::ToString() const {
+  using milli = std::chrono::milliseconds;
+  using micro = std::chrono::microseconds;
+  const auto subseconds = milli(millisecond) + micro(microsecond);
+
+  return fmt::format("{:0>2}:{:0>2}:{:0>2}.{:0>6}", static_cast<int>(hour), static_cast<int>(minute),
+                     static_cast<int>(second), subseconds.count());
+}
+
 size_t LocalTimeHash::operator()(const LocalTime &local_time) const {
   utils::HashCombine<uint64_t, uint64_t> hasher;
   size_t result = hasher(0, local_time.hour);
@@ -486,6 +500,8 @@ int64_t LocalDateTime::SubSecondsAsNanoseconds() const {
   return (milli_as_nanos + micros_as_nanos).count();
 }
 
+std::string LocalDateTime::ToString() const { return date.ToString() + 'T' + local_time.ToString(); }
+
 LocalDateTime::LocalDateTime(const DateParameters &date_parameters, const LocalTimeParameters &local_time_parameters)
     : date(date_parameters), local_time(local_time_parameters) {}
 
@@ -699,6 +715,23 @@ int64_t Duration::SubSecondsAsNanoseconds() const {
   return chrono::duration_cast<chrono::nanoseconds>(micros - secs).count();
 }
 
+std::string Duration::ToString() const {
+  // Format [nD]T[nH]:[nM]:[nS].
+  namespace chrono = std::chrono;
+  auto micros = chrono::microseconds(microseconds);
+  const auto dd = GetAndSubtractDuration<chrono::days>(micros);
+  const auto h = GetAndSubtractDuration<chrono::hours>(micros);
+  const auto m = GetAndSubtractDuration<chrono::minutes>(micros);
+  const auto s = GetAndSubtractDuration<chrono::seconds>(micros);
+
+  auto first_half = fmt::format("P{}DT{}H{}M", dd, h, m);
+  auto second_half = fmt::format("{}.{:0>6}S", s, std::abs(micros.count()));
+  if (s == 0 && micros.count() < 0) {
+    return first_half + '-' + second_half;
+  }
+  return first_half + second_half;
+}
+
 Duration Duration::operator-() const {
   if (microseconds == std::numeric_limits<decltype(microseconds)>::min()) [[unlikely]] {
     throw temporal::InvalidArgumentException("Duration arithmetic overflows");

src/utils/temporal.hpp

@@ -87,20 +87,9 @@ struct Duration {
   int64_t SubDaysAsNanoseconds() const;
   int64_t SubSecondsAsNanoseconds() const;
 
-  friend std::ostream &operator<<(std::ostream &os, const Duration &dur) {
-    // Format [nD]T[nH]:[nM]:[nS].
-    namespace chrono = std::chrono;
-    auto micros = chrono::microseconds(dur.microseconds);
-    const auto dd = GetAndSubtractDuration<chrono::days>(micros);
-    const auto h = GetAndSubtractDuration<chrono::hours>(micros);
-    const auto m = GetAndSubtractDuration<chrono::minutes>(micros);
-    const auto s = GetAndSubtractDuration<chrono::seconds>(micros);
-    os << fmt::format("P{}DT{}H{}M", dd, h, m);
-    if (s == 0 && micros.count() < 0) {
-      os << '-';
-    }
-    return os << fmt::format("{}.{:0>6}S", s, std::abs(micros.count()));
-  }
+  std::string ToString() const;
+
+  friend std::ostream &operator<<(std::ostream &os, const Duration &dur) { return os << dur.ToString(); }
 
   Duration operator-() const;
 
@@ -155,13 +144,11 @@ struct Date {
   explicit Date(int64_t microseconds);
   explicit Date(const DateParameters &date_parameters);
 
-  friend std::ostream &operator<<(std::ostream &os, const Date &date) {
-    return os << fmt::format("{:0>2}-{:0>2}-{:0>2}", date.year, static_cast<int>(date.month),
-                             static_cast<int>(date.day));
-  }
+  friend std::ostream &operator<<(std::ostream &os, const Date &date) { return os << date.ToString(); }
 
   int64_t MicrosecondsSinceEpoch() const;
   int64_t DaysSinceEpoch() const;
+  std::string ToString() const;
 
   friend Date operator+(const Date &date, const Duration &dur) {
     namespace chrono = std::chrono;
@@ -217,17 +204,11 @@ struct LocalTime {
   // Epoch means the start of the day, i,e, midnight
   int64_t MicrosecondsSinceEpoch() const;
   int64_t NanosecondsSinceEpoch() const;
+  std::string ToString() const;
 
   auto operator<=>(const LocalTime &) const = default;
 
-  friend std::ostream &operator<<(std::ostream &os, const LocalTime &lt) {
-    namespace chrono = std::chrono;
-    using milli = chrono::milliseconds;
-    using micro = chrono::microseconds;
-    const auto subseconds = milli(lt.millisecond) + micro(lt.microsecond);
-    return os << fmt::format("{:0>2}:{:0>2}:{:0>2}.{:0>6}", static_cast<int>(lt.hour), static_cast<int>(lt.minute),
-                             static_cast<int>(lt.second), subseconds.count());
-  }
+  friend std::ostream &operator<<(std::ostream &os, const LocalTime &lt) { return os << lt.ToString(); }
 
   friend LocalTime operator+(const LocalTime &local_time, const Duration &dur) {
     namespace chrono = std::chrono;
@@ -279,13 +260,11 @@ struct LocalDateTime {
   int64_t MicrosecondsSinceEpoch() const;
   int64_t SecondsSinceEpoch() const;  // seconds since epoch
   int64_t SubSecondsAsNanoseconds() const;
+  std::string ToString() const;
 
   auto operator<=>(const LocalDateTime &) const = default;
 
-  friend std::ostream &operator<<(std::ostream &os, const LocalDateTime &ldt) {
-    os << ldt.date << 'T' << ldt.local_time;
-    return os;
-  }
+  friend std::ostream &operator<<(std::ostream &os, const LocalDateTime &ldt) { return os << ldt.ToString(); }
 
   friend LocalDateTime operator+(const LocalDateTime &dt, const Duration &dur) {
     const auto local_date_time_as_duration = Duration(dt.MicrosecondsSinceEpoch());

tests/drivers/python/v4_1/docs_how_to_query.py

@@ -15,31 +15,33 @@
 import sys
 from neo4j import GraphDatabase, basic_auth
 
-driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("", ""), encrypted=False)
+driver = GraphDatabase.driver('bolt://localhost:7687',
+                              auth=basic_auth('', ''),
+                              encrypted=False)
 session = driver.session()
 
-session.run("MATCH (n) DETACH DELETE n").consume()
-print("Database cleared.")
+session.run('MATCH (n) DETACH DELETE n').consume()
+print('Database cleared.')
 
 session.run('CREATE (alice:Person {name: "Alice", age: 22})').consume()
-print("Record created.")
+print('Record created.')
 
-node = session.run("MATCH (n) RETURN n").single()["n"]
-print("Record matched.")
+node = session.run('MATCH (n) RETURN n').single()['n']
+print('Record matched.')
 
 label = list(node.labels)[0]
-name = node["name"]
-age = node["age"]
+name = node['name']
+age = node['age']
 
-if label != "Person" or name != "Alice" or age != 22:
-    print("Data does not match")
+if label != 'Person' or name != 'Alice' or age != 22:
+    print('Data does not match')
     sys.exit(1)
 
-print("Label: %s" % label)
-print("name: %s" % name)
-print("age: %s" % age)
+print('Label: %s' % label)
+print('name: %s' % name)
+print('age: %s' % age)
 
 session.close()
 driver.close()
 
-print("All ok!")
+print('All ok!')

tests/drivers/python/v4_1/max_query_length.py

@@ -14,7 +14,9 @@
 
 from neo4j import GraphDatabase, basic_auth
 
-driver = GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("", ""), encrypted=False)
+driver = GraphDatabase.driver("bolt://localhost:7687",
+                              auth=basic_auth("", ""),
+                              encrypted=False)
 
 query_template = 'CREATE (n {name:"%s"})'
 template_size = len(query_template) - 2  # because of %s
@@ -24,11 +26,10 @@ max_len = 1000000
 # binary search because we have to find the maximum size (in number of chars)
 # of a query that can be executed via driver
 while True:
-    assert min_len > 0 and max_len > 0, (
-        "The lengths have to be positive values! If this happens something"
-        " is terrible wrong with min & max lengths OR the database"
+    assert min_len > 0 and max_len > 0, \
+        "The lengths have to be positive values! If this happens something" \
+        " is terrible wrong with min & max lengths OR the database" \
         " isn't available."
-    )
     property_size = (max_len + min_len) // 2
     try:
         driver.session().run(query_template % ("a" * property_size)).consume()
@@ -41,7 +42,8 @@ while True:
 
 assert property_size == max_len, "max_len probably has to be increased!"
 
-print("\nThe max length of a query from Python driver is: %s\n" % (template_size + property_size))
+print("\nThe max length of a query from Python driver is: %s\n" %
+      (template_size + property_size))
 
 # sessions are not closed bacause all sessions that are
 # executed with wrong query size might be broken

tests/drivers/python/v4_1/transactions.py

@@ -15,7 +15,6 @@
 from neo4j import GraphDatabase, basic_auth
 from neo4j.exceptions import ClientError, TransientError
 
-
 def tx_error(tx, name, name2):
     a = tx.run("CREATE (a:Person {name: $name}) RETURN a", name=name).value()
     print(a[0])
@@ -23,19 +22,17 @@ def tx_error(tx, name, name2):
     a = tx.run("CREATE (a:Person {name: $name}) RETURN a", name=name2).value()
     print(a[0])
 
-
 def tx_good(tx, name, name2):
     a = tx.run("CREATE (a:Person {name: $name}) RETURN a", name=name).value()
     print(a[0])
     a = tx.run("CREATE (a:Person {name: $name}) RETURN a", name=name2).value()
     print(a[0])
 
-
 def tx_too_long(tx):
     tx.run("MATCH (a), (b), (c), (d), (e), (f) RETURN COUNT(*) AS cnt")
 
-
-with GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("", ""), encrypted=False) as driver:
+with GraphDatabase.driver("bolt://localhost:7687", auth=basic_auth("", ""),
+                          encrypted=False) as driver:
 
     def add_person(f, name, name2):
         with driver.session() as session:

tests/e2e/interactive_mg_runner.py

@@ -36,6 +36,7 @@ import os
 import subprocess
 from argparse import ArgumentParser
 from pathlib import Path
+import tempfile
 import time
 import sys
 from inspect import signature
@@ -67,7 +68,7 @@ MEMGRAPH_INSTANCES_DESCRIPTION = {
         "log_file": "main.log",
         "setup_queries": [
             "REGISTER REPLICA replica1 SYNC TO '127.0.0.1:10001'",
-            "REGISTER REPLICA replica2 SYNC WITH TIMEOUT 1 TO '127.0.0.1:10002'",
+            "REGISTER REPLICA replica2 SYNC TO '127.0.0.1:10002'",
         ],
     },
 }
@@ -103,7 +104,7 @@ def is_port_in_use(port: int) -> bool:
         return s.connect_ex(("localhost", port)) == 0
 
 
-def _start_instance(name, args, log_file, queries, use_ssl, procdir):
+def _start_instance(name, args, log_file, queries, use_ssl, procdir, data_directory):
     assert (
         name not in MEMGRAPH_INSTANCES.keys()
     ), "If this raises, you are trying to start an instance with the same name than one already running."
@@ -113,7 +114,8 @@ def _start_instance(name, args, log_file, queries, use_ssl, procdir):
     mg_instance = MemgraphInstanceRunner(MEMGRAPH_BINARY, use_ssl)
     MEMGRAPH_INSTANCES[name] = mg_instance
     log_file_path = os.path.join(BUILD_DIR, "logs", log_file)
-    binary_args = args + ["--log-file", log_file_path]
+    data_directory_path = os.path.join(BUILD_DIR, data_directory)
+    binary_args = args + ["--log-file", log_file_path] + ["--data-directory", data_directory_path]
 
     if len(procdir) != 0:
         binary_args.append("--query-modules-directory=" + procdir)
@@ -175,8 +177,13 @@ def start_instance(context, name, procdir):
         if "ssl" in value:
             use_ssl = bool(value["ssl"])
             value.pop("ssl")
+        data_directory = ""
+        if "data_directory" in value:
+            data_directory = value["data_directory"]
+        else:
+            data_directory = tempfile.TemporaryDirectory().name
 
-        instance = _start_instance(name, args, log_file, queries, use_ssl, procdir)
+        instance = _start_instance(name, args, log_file, queries, use_ssl, procdir, data_directory)
         mg_instances[name] = instance
 
     assert len(mg_instances) == 1

tests/e2e/magic_functions/function_example.py

@@ -106,7 +106,6 @@ def test_try_to_write(connection, function_type):
             f"MATCH (n) RETURN {function_type}_write.try_to_write(n, 'property', 1);",
         )
 
-
 @pytest.mark.parametrize("function_type", ["py", "c"])
 def test_case_sensitivity(connection, function_type):
     cursor = connection.cursor()

tests/e2e/memgraph.py

@@ -76,11 +76,8 @@ class MemgraphInstanceRunner:
         self.stop()
         self.args = copy.deepcopy(args)
         self.args = [replace_paths(arg) for arg in self.args]
-        self.data_directory = tempfile.TemporaryDirectory()
         args_mg = [
             self.binary_path,
-            "--data-directory",
-            self.data_directory.name,
             "--storage-wal-enabled",
             "--storage-snapshot-interval-sec",
             "300",

tests/e2e/mg_utils.py

@@ -0,0 +1,16 @@
+import time
+
+
+def mg_sleep_and_assert(expected_value, function_to_retrieve_data, max_duration=20, time_between_attempt=0.05):
+    result = function_to_retrieve_data()
+    start_time = time.time()
+    while result != expected_value:
+        current_time = time.time()
+        duration = current_time - start_time
+        if duration > max_duration:
+            assert False, " mg_sleep_and_assert has tried for too long and did not get the expected result!"
+
+        time.sleep(time_between_attempt)
+        result = function_to_retrieve_data()
+
+    return result

tests/e2e/monitoring_server/workloads.yaml

@@ -5,7 +5,7 @@ monitoring_port: &monitoring_port "7444"
 template_cluster: &template_cluster
   cluster:
     monitoring:
-      args: ["--bolt-port=7687", "--log-level=TRACE", "--"]
+      args: ["--bolt-port=7687", "--log-level=TRACE"]
       log_file: "monitoring-websocket-e2e.log"
 template_cluster_ssl: &template_cluster_ssl
   cluster:
@@ -21,7 +21,6 @@ template_cluster_ssl: &template_cluster_ssl
           *cert_file,
           "--bolt-key-file",
           *key_file,
-          "--",
         ]
       log_file: "monitoring-websocket-ssl-e2e.log"
       ssl: true

tests/e2e/replication/CMakeLists.txt

@@ -12,3 +12,4 @@ copy_e2e_python_files(replication_show show.py)
 copy_e2e_python_files(replication_show show_while_creating_invalid_state.py)
 copy_e2e_python_files_from_parent_folder(replication_show ".." memgraph.py)
 copy_e2e_python_files_from_parent_folder(replication_show ".." interactive_mg_runner.py)
+copy_e2e_python_files_from_parent_folder(replication_show ".." mg_utils.py)

tests/e2e/replication/show.py

@@ -15,6 +15,7 @@ import pytest
 import time
 
 from common import execute_and_fetch_all
+from mg_utils import mg_sleep_and_assert
 
 
 @pytest.mark.parametrize(
@@ -36,20 +37,19 @@ def test_show_replicas(connection):
         "name",
         "socket_address",
         "sync_mode",
-        "timeout",
         "current_timestamp_of_replica",
         "number_of_timestamp_behind_master",
         "state",
     }
     actual_column_names = {x.name for x in cursor.description}
-    assert expected_column_names == actual_column_names
+    assert actual_column_names == expected_column_names
 
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2.0, 0, 0, "ready"),
-        ("replica_2", "127.0.0.1:10002", "sync", 1.0, 0, 0, "ready"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 0, 0, "ready"),
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "ready"),
     }
-    assert expected_data == actual_data
+    assert actual_data == expected_data
 
 
 def test_show_replicas_while_inserting_data(connection):
@@ -68,43 +68,43 @@ def test_show_replicas_while_inserting_data(connection):
         "name",
         "socket_address",
         "sync_mode",
-        "timeout",
         "current_timestamp_of_replica",
         "number_of_timestamp_behind_master",
         "state",
     }
     actual_column_names = {x.name for x in cursor.description}
-    assert expected_column_names == actual_column_names
+    assert actual_column_names == expected_column_names
 
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2.0, 0, 0, "ready"),
-        ("replica_2", "127.0.0.1:10002", "sync", 1.0, 0, 0, "ready"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 0, 0, "ready"),
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "ready"),
     }
-    assert expected_data == actual_data
+    assert actual_data == expected_data
 
     # 1/
     execute_and_fetch_all(cursor, "CREATE (n1:Number {name: 'forty_two', value:42});")
-    time.sleep(1)
 
     # 2/
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2.0, 4, 0, "ready"),
-        ("replica_2", "127.0.0.1:10002", "sync", 1.0, 4, 0, "ready"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 4, 0, "ready"),
+        ("replica_1", "127.0.0.1:10001", "sync", 4, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 4, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 4, 0, "ready"),
     }
-    actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
-    print("actual_data=" + str(actual_data))
-    print("expected_data=" + str(expected_data))
-    assert expected_data == actual_data
+
+    def retrieve_data():
+        return set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
+    actual_data = mg_sleep_and_assert(expected_data, retrieve_data)
+    assert actual_data == expected_data
 
     # 3/
     res = execute_and_fetch_all(cursor, "MATCH (node) return node;")
-    assert 1 == len(res)
+    assert len(res) == 1
 
     # 4/
     actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
-    assert expected_data == actual_data
+    assert actual_data == expected_data
 
 
 if __name__ == "__main__":

tests/e2e/replication/show_while_creating_invalid_state.py

@@ -13,11 +13,12 @@ import sys
 
 import os
 import pytest
-import time
 
 from common import execute_and_fetch_all
+from mg_utils import mg_sleep_and_assert
 import interactive_mg_runner
 import mgclient
+import tempfile
 
 interactive_mg_runner.SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 interactive_mg_runner.PROJECT_DIR = os.path.normpath(
@@ -51,8 +52,8 @@ MEMGRAPH_INSTANCES_DESCRIPTION = {
         "args": ["--bolt-port", "7687", "--log-level=TRACE"],
         "log_file": "main.log",
         "setup_queries": [
-            "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT 2 TO '127.0.0.1:10001';",
-            "REGISTER REPLICA replica_2 SYNC WITH TIMEOUT 1 TO '127.0.0.1:10002';",
+            "REGISTER REPLICA replica_1 SYNC TO '127.0.0.1:10001';",
+            "REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002';",
             "REGISTER REPLICA replica_3 ASYNC TO '127.0.0.1:10003';",
             "REGISTER REPLICA replica_4 ASYNC TO '127.0.0.1:10004';",
         ],
@@ -78,32 +79,31 @@ def test_show_replicas(connection):
         "name",
         "socket_address",
         "sync_mode",
-        "timeout",
         "current_timestamp_of_replica",
         "number_of_timestamp_behind_master",
         "state",
     }
 
     actual_column_names = {x.name for x in cursor.description}
-    assert EXPECTED_COLUMN_NAMES == actual_column_names
+    assert actual_column_names == EXPECTED_COLUMN_NAMES
 
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2, 0, 0, "ready"),
-        ("replica_2", "127.0.0.1:10002", "sync", 1.0, 0, 0, "ready"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 0, 0, "ready"),
-        ("replica_4", "127.0.0.1:10004", "async", None, 0, 0, "ready"),
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 0, 0, "ready"),
     }
-    assert expected_data == actual_data
+    assert actual_data == expected_data
 
     # 2/
     execute_and_fetch_all(cursor, "DROP REPLICA replica_2")
     actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2.0, 0, 0, "ready"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 0, 0, "ready"),
-        ("replica_4", "127.0.0.1:10004", "async", None, 0, 0, "ready"),
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 0, 0, "ready"),
     }
-    assert expected_data == actual_data
+    assert actual_data == expected_data
 
     # 3/
     interactive_mg_runner.kill(MEMGRAPH_INSTANCES_DESCRIPTION, "replica_1")
@@ -111,53 +111,296 @@ def test_show_replicas(connection):
     interactive_mg_runner.stop(MEMGRAPH_INSTANCES_DESCRIPTION, "replica_4")
 
     # We leave some time for the main to realise the replicas are down.
-    time.sleep(2)
-    actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+    def retrieve_data():
+        return set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
     expected_data = {
-        ("replica_1", "127.0.0.1:10001", "sync", 2.0, 0, 0, "invalid"),
-        ("replica_3", "127.0.0.1:10003", "async", None, 0, 0, "invalid"),
-        ("replica_4", "127.0.0.1:10004", "async", None, 0, 0, "invalid"),
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "invalid"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "invalid"),
+        ("replica_4", "127.0.0.1:10004", "async", 0, 0, "invalid"),
     }
-    assert expected_data == actual_data
+    actual_data = mg_sleep_and_assert(expected_data, retrieve_data)
+    assert actual_data == expected_data
 
 
-def test_add_replica_invalid_timeout(connection):
-    # Goal of this test is to check the registration of replica with invalid timeout raises an exception
+def test_basic_recovery(connection):
+    # Goal of this test is to check the recovery of main.
+    # 0/ We start all replicas manually: we want to be able to kill them ourselves without relying on external tooling to kill processes.
+    # 1/ We check that all replicas have the correct state: they should all be ready.
+    # 2/ We kill main.
+    # 3/ We re-start main.
+    # 4/ We check that all replicas have the correct state: they should all be ready.
+    # 5/ Drop one replica.
+    # 6/ We add some data to main, then kill it and restart.
+    # 7/ We check that all replicas but one have the expected data.
+    # 8/ We kill another replica.
+    # 9/ We add some data to main.
+    # 10/ We re-add the two replicas droped/killed and check the data.
+    # 11/ We kill another replica.
+    # 12/ Add some more data to main.
+    # 13/ Check the states of replicas.
+
+    # 0/
+    data_directory = tempfile.TemporaryDirectory()
     CONFIGURATION = {
         "replica_1": {
             "args": ["--bolt-port", "7688", "--log-level=TRACE"],
             "log_file": "replica1.log",
             "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10001;"],
         },
+        "replica_2": {
+            "args": ["--bolt-port", "7689", "--log-level=TRACE"],
+            "log_file": "replica2.log",
+            "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10002;"],
+        },
+        "replica_3": {
+            "args": ["--bolt-port", "7690", "--log-level=TRACE"],
+            "log_file": "replica3.log",
+            "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10003;"],
+        },
+        "replica_4": {
+            "args": ["--bolt-port", "7691", "--log-level=TRACE"],
+            "log_file": "replica4.log",
+            "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10004;"],
+        },
         "main": {
-            "args": ["--bolt-port", "7687", "--log-level=TRACE"],
+            "args": ["--bolt-port", "7687", "--log-level=TRACE", "--storage-recover-on-startup=true"],
             "log_file": "main.log",
             "setup_queries": [],
+            "data_directory": f"{data_directory.name}",
+        },
+    }
+
+    interactive_mg_runner.start_all(CONFIGURATION)
+    cursor = connection(7687, "main").cursor()
+
+    # We want to execute manually and not via the configuration, otherwise re-starting main would also execute these registration.
+    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_1 SYNC TO '127.0.0.1:10001';")
+    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002';")
+    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_3 ASYNC TO '127.0.0.1:10003';")
+    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_4 ASYNC TO '127.0.0.1:10004';")
+
+    # 1/
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 0, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 0, 0, "ready"),
+    }
+    actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
+    assert actual_data == expected_data
+
+    def check_roles():
+        assert "main" == interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("SHOW REPLICATION ROLE;")[0][0]
+        for index in range(1, 4):
+            assert (
+                "replica"
+                == interactive_mg_runner.MEMGRAPH_INSTANCES[f"replica_{index}"].query("SHOW REPLICATION ROLE;")[0][0]
+            )
+
+    check_roles()
+
+    # 2/
+    interactive_mg_runner.kill(CONFIGURATION, "main")
+
+    # 3/
+    interactive_mg_runner.start(CONFIGURATION, "main")
+    cursor = connection(7687, "main").cursor()
+    check_roles()
+
+    # 4/
+    def retrieve_data():
+        return set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
+    actual_data = mg_sleep_and_assert(expected_data, retrieve_data)
+    assert actual_data == expected_data
+
+    # 5/
+    execute_and_fetch_all(cursor, "DROP REPLICA replica_2;")
+
+    # 6/
+    execute_and_fetch_all(cursor, "CREATE (p1:Number {name:'Magic', value:42})")
+    interactive_mg_runner.kill(CONFIGURATION, "main")
+    interactive_mg_runner.start(CONFIGURATION, "main")
+    cursor = connection(7687, "main").cursor()
+    check_roles()
+
+    # 7/
+    QUERY_TO_CHECK = "MATCH (node) return node;"
+    res_from_main = execute_and_fetch_all(cursor, QUERY_TO_CHECK)
+    assert len(res_from_main) == 1
+    for index in (1, 3, 4):
+        assert res_from_main == interactive_mg_runner.MEMGRAPH_INSTANCES[f"replica_{index}"].query(QUERY_TO_CHECK)
+
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 2, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 2, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 2, 0, "ready"),
+    }
+    actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+    assert actual_data == expected_data
+
+    # Replica_2 was dropped, we check it does not have the data from main.
+    assert len(interactive_mg_runner.MEMGRAPH_INSTANCES["replica_2"].query(QUERY_TO_CHECK)) == 0
+
+    # 8/
+    interactive_mg_runner.kill(CONFIGURATION, "replica_3")
+
+    # 9/
+    execute_and_fetch_all(cursor, "CREATE (p1:Number {name:'Magic_again', value:43})")
+    res_from_main = execute_and_fetch_all(cursor, QUERY_TO_CHECK)
+    assert len(res_from_main) == 2
+
+    # 10/
+    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002';")
+    interactive_mg_runner.start(CONFIGURATION, "replica_3")
+
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 6, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 6, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 6, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 6, 0, "ready"),
+    }
+
+    def retrieve_data2():
+        return set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
+    actual_data = mg_sleep_and_assert(expected_data, retrieve_data2)
+
+    assert actual_data == expected_data
+    for index in (1, 2, 3, 4):
+        assert interactive_mg_runner.MEMGRAPH_INSTANCES[f"replica_{index}"].query(QUERY_TO_CHECK) == res_from_main
+
+    # 11/
+    interactive_mg_runner.kill(CONFIGURATION, "replica_1")
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "invalid"),
+        ("replica_2", "127.0.0.1:10002", "sync", 6, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 6, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 6, 0, "ready"),
+    }
+
+    def retrieve_data3():
+        return set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+
+    actual_data = mg_sleep_and_assert(expected_data, retrieve_data3)
+    assert actual_data == expected_data
+
+    # 12/
+    execute_and_fetch_all(cursor, "CREATE (p1:Number {name:'Magic_again_again', value:44})")
+    res_from_main = execute_and_fetch_all(cursor, QUERY_TO_CHECK)
+    assert len(res_from_main) == 3
+    for index in (2, 3, 4):
+        assert interactive_mg_runner.MEMGRAPH_INSTANCES[f"replica_{index}"].query(QUERY_TO_CHECK) == res_from_main
+
+    # 13/
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "invalid"),
+        ("replica_2", "127.0.0.1:10002", "sync", 9, 0, "ready"),
+        ("replica_3", "127.0.0.1:10003", "async", 9, 0, "ready"),
+        ("replica_4", "127.0.0.1:10004", "async", 9, 0, "ready"),
+    }
+    actual_data = set(execute_and_fetch_all(cursor, "SHOW REPLICAS;"))
+    assert actual_data == expected_data
+
+
+def test_conflict_at_startup(connection):
+    # Goal of this test is to check starting up several instance with different replicas' configuration directory works as expected.
+    # main_1 and main_2 have different directory.
+
+    data_directory1 = tempfile.TemporaryDirectory()
+    data_directory2 = tempfile.TemporaryDirectory()
+    CONFIGURATION = {
+        "main_1": {
+            "args": ["--bolt-port", "7687", "--log-level=TRACE"],
+            "log_file": "main1.log",
+            "setup_queries": [],
+            "data_directory": f"{data_directory1.name}",
+        },
+        "main_2": {
+            "args": ["--bolt-port", "7688", "--log-level=TRACE"],
+            "log_file": "main2.log",
+            "setup_queries": [],
+            "data_directory": f"{data_directory2.name}",
+        },
+    }
+
+    interactive_mg_runner.start_all(CONFIGURATION)
+    cursor_1 = connection(7687, "main_1").cursor()
+    cursor_2 = connection(7688, "main_2").cursor()
+
+    assert execute_and_fetch_all(cursor_1, "SHOW REPLICATION ROLE;")[0][0] == "main"
+    assert execute_and_fetch_all(cursor_2, "SHOW REPLICATION ROLE;")[0][0] == "main"
+
+
+def test_basic_recovery_when_replica_is_kill_when_main_is_down(connection):
+    # Goal of this test is to check the recovery of main.
+    # 0/ We start all replicas manually: we want to be able to kill them ourselves without relying on external tooling to kill processes.
+    # 1/ We check that all replicas have the correct state: they should all be ready.
+    # 2/ We kill main then kill a replica.
+    # 3/ We re-start main: it should be able to restart.
+    # 4/ Check status of replica: replica_2 is invalid.
+
+    data_directory = tempfile.TemporaryDirectory()
+    CONFIGURATION = {
+        "replica_1": {
+            "args": ["--bolt-port", "7688", "--log-level=TRACE"],
+            "log_file": "replica1.log",
+            "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10001;"],
+        },
+        "replica_2": {
+            "args": ["--bolt-port", "7689", "--log-level=TRACE"],
+            "log_file": "replica2.log",
+            "setup_queries": ["SET REPLICATION ROLE TO REPLICA WITH PORT 10002;"],
+        },
+        "main": {
+            "args": ["--bolt-port", "7687", "--log-level=TRACE", "--storage-recover-on-startup=true"],
+            "log_file": "main.log",
+            "setup_queries": [],
+            "data_directory": f"{data_directory.name}",
         },
     }
 
     interactive_mg_runner.start_all(CONFIGURATION)
 
-    cursor = connection(7687, "main").cursor()
+    # We want to execute manually and not via the configuration, otherwise re-starting main would also execute these registration.
+    interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("REGISTER REPLICA replica_1 SYNC TO '127.0.0.1:10001';")
+    interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002';")
 
-    with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT 0 TO '127.0.0.1:10001';",
-        )
+    # 1/
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "ready"),
+    }
+    actual_data = set(interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("SHOW REPLICAS;"))
 
-    with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT -5 TO '127.0.0.1:10001';",
-        )
+    assert actual_data == expected_data
 
-    actual_data = execute_and_fetch_all(cursor, "SHOW REPLICAS;")
-    assert 0 == len(actual_data)
+    def check_roles():
+        assert "main" == interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("SHOW REPLICATION ROLE;")[0][0]
+        for index in range(1, 2):
+            assert (
+                "replica"
+                == interactive_mg_runner.MEMGRAPH_INSTANCES[f"replica_{index}"].query("SHOW REPLICATION ROLE;")[0][0]
+            )
 
-    execute_and_fetch_all(cursor, "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT 1 TO '127.0.0.1:10001';")
-    actual_data = execute_and_fetch_all(cursor, "SHOW REPLICAS;")
-    assert 1 == len(actual_data)
+    check_roles()
+
+    # 2/
+    interactive_mg_runner.kill(CONFIGURATION, "main")
+    interactive_mg_runner.kill(CONFIGURATION, "replica_2")
+
+    # 3/
+    interactive_mg_runner.start(CONFIGURATION, "main")
+
+    # 4/
+    expected_data = {
+        ("replica_1", "127.0.0.1:10001", "sync", 0, 0, "ready"),
+        ("replica_2", "127.0.0.1:10002", "sync", 0, 0, "invalid"),
+    }
+    actual_data = set(interactive_mg_runner.MEMGRAPH_INSTANCES["main"].query("SHOW REPLICAS;"))
+    assert actual_data == expected_data
 
 
 if __name__ == "__main__":

tests/e2e/replication/workloads.yaml

@@ -29,8 +29,8 @@ template_cluster: &template_cluster
       args: ["--bolt-port", "7687", "--log-level=TRACE"]
       log_file: "replication-e2e-main.log"
       setup_queries: [
-        "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT 2 TO '127.0.0.1:10001'",
-        "REGISTER REPLICA replica_2 SYNC WITH TIMEOUT 1 TO '127.0.0.1:10002'",
+        "REGISTER REPLICA replica_1 SYNC TO '127.0.0.1:10001'",
+        "REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002'",
         "REGISTER REPLICA replica_3 ASYNC TO '127.0.0.1:10003'"
       ]
       <<: *template_validation_queries
@@ -69,8 +69,8 @@ workloads:
         args: ["--bolt-port", "7687", "--log-level=TRACE"]
         log_file: "replication-e2e-main.log"
         setup_queries: [
-          "REGISTER REPLICA replica_1 SYNC WITH TIMEOUT 2 TO '127.0.0.1:10001'",
-          "REGISTER REPLICA replica_2 SYNC WITH TIMEOUT 1 TO '127.0.0.1:10002'",
+          "REGISTER REPLICA replica_1 SYNC TO '127.0.0.1:10001'",
+          "REGISTER REPLICA replica_2 SYNC TO '127.0.0.1:10002'",
           "REGISTER REPLICA replica_3 ASYNC TO '127.0.0.1:10003'"
         ]
         validation_queries: []

tests/e2e/server/workloads.yaml

@@ -4,7 +4,7 @@ bolt_port: &bolt_port "7687"
 template_cluster: &template_cluster
   cluster:
     server:
-      args: ["--bolt-port=7687", "--log-level=TRACE", "--"]
+      args: ["--bolt-port=7687", "--log-level=TRACE"]
       log_file: "server-connection-e2e.log"
 template_cluster_ssl: &template_cluster_ssl
   cluster:
@@ -18,7 +18,6 @@ template_cluster_ssl: &template_cluster_ssl
           *cert_file,
           "--bolt-key-file",
           *key_file,
-          "--",
         ]
       log_file: "server-connection-ssl-e2e.log"
       ssl: true

tests/e2e/streams/CMakeLists.txt

@@ -9,3 +9,5 @@ copy_streams_e2e_python_files(streams_owner_tests.py)
 copy_streams_e2e_python_files(pulsar_streams_tests.py)
 
 add_subdirectory(transformations)
+
+copy_e2e_python_files_from_parent_folder(streams ".." mg_utils.py)

tests/e2e/streams/common.py

@@ -13,6 +13,7 @@ import mgclient
 import pytest
 import time
 
+from mg_utils import mg_sleep_and_assert
 from multiprocessing import Manager, Process, Value
 
 # These are the indices of the different values in the result of SHOW STREAM
@@ -115,10 +116,7 @@ def start_stream(cursor, stream_name):
 
 def start_stream_with_limit(cursor, stream_name, batch_limit, timeout=None):
     if timeout is not None:
-        execute_and_fetch_all(
-            cursor,
-            f"START STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout} ",
-        )
+        execute_and_fetch_all(cursor, f"START STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout} ")
     else:
         execute_and_fetch_all(cursor, f"START STREAM {stream_name} BATCH_LIMIT {batch_limit}")
 
@@ -159,12 +157,7 @@ def pulsar_default_namespace_topic(topic):
 
 
 def test_start_and_stop_during_check(
-    operation,
-    connection,
-    stream_creator,
-    message_sender,
-    already_stopped_error,
-    batchSize,
+    operation, connection, stream_creator, message_sender, already_stopped_error, batchSize
 ):
     # This test is quite complex. The goal is to call START/STOP queries
     # while a CHECK query is waiting for its result. Because the Global
@@ -325,42 +318,24 @@ def test_check_stream_same_number_of_queries_than_messages(connection, stream_cr
 
     expected_queries_and_raw_messages_1 = (
         [  # queries
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 01"},
-                QUERY_LITERAL: "Message: 01",
-            },
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 02"},
-                QUERY_LITERAL: "Message: 02",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: 01"}, QUERY_LITERAL: "Message: 01"},
+            {PARAMETERS_LITERAL: {"value": "Parameter: 02"}, QUERY_LITERAL: "Message: 02"},
         ],
         ["01", "02"],  # raw message
     )
 
     expected_queries_and_raw_messages_2 = (
         [  # queries
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 03"},
-                QUERY_LITERAL: "Message: 03",
-            },
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 04"},
-                QUERY_LITERAL: "Message: 04",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: 03"}, QUERY_LITERAL: "Message: 03"},
+            {PARAMETERS_LITERAL: {"value": "Parameter: 04"}, QUERY_LITERAL: "Message: 04"},
         ],
         ["03", "04"],  # raw message
     )
 
     expected_queries_and_raw_messages_3 = (
         [  # queries
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 05"},
-                QUERY_LITERAL: "Message: 05",
-            },
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 06"},
-                QUERY_LITERAL: "Message: 06",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: 05"}, QUERY_LITERAL: "Message: 05"},
+            {PARAMETERS_LITERAL: {"value": "Parameter: 06"}, QUERY_LITERAL: "Message: 06"},
         ],
         ["05", "06"],  # raw message
     )
@@ -415,32 +390,20 @@ def test_check_stream_different_number_of_queries_than_messages(connection, stre
 
     expected_queries_and_raw_messages_2 = (
         [  # queries
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 03"},
-                QUERY_LITERAL: "Message: 03",
-            },
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 04"},
-                QUERY_LITERAL: "Message: 04",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: 03"}, QUERY_LITERAL: "Message: 03"},
+            {PARAMETERS_LITERAL: {"value": "Parameter: 04"}, QUERY_LITERAL: "Message: 04"},
         ],
         ["03", "04"],  # raw message
     )
 
     expected_queries_and_raw_messages_3 = (
         [  # queries
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: b_05"},
-                QUERY_LITERAL: "Message: b_05",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: b_05"}, QUERY_LITERAL: "Message: b_05"},
             {
                 PARAMETERS_LITERAL: {"value": "Parameter: extra_b_05"},
                 QUERY_LITERAL: "Message: extra_b_05",
             },
-            {
-                PARAMETERS_LITERAL: {"value": "Parameter: 06"},
-                QUERY_LITERAL: "Message: 06",
-            },
+            {PARAMETERS_LITERAL: {"value": "Parameter: 06"}, QUERY_LITERAL: "Message: 06"},
         ],
         ["b_05", "06"],  # raw message
     )
@@ -465,8 +428,10 @@ def test_start_stream_with_batch_limit(connection, stream_creator, messages_send
     thread_stream_running = Process(target=start_new_stream_with_limit, daemon=True, args=(STREAM_NAME, BATCH_LIMIT))
     thread_stream_running.start()
 
-    time.sleep(2)
-    assert get_is_running(cursor, STREAM_NAME)
+    def is_running():
+        return get_is_running(cursor, STREAM_NAME)
+
+    assert mg_sleep_and_assert(True, is_running)
 
     messages_sender(BATCH_LIMIT - 1)
 
@@ -476,10 +441,8 @@ def test_start_stream_with_batch_limit(connection, stream_creator, messages_send
     # We send a last message to reach the batch_limit
     messages_sender(1)
 
-    time.sleep(2)
-
     # We check that the stream has correctly stoped.
-    assert not get_is_running(cursor, STREAM_NAME)
+    assert not mg_sleep_and_assert(False, is_running)
 
 
 def test_start_stream_with_batch_limit_timeout(connection, stream_creator):
@@ -505,10 +468,7 @@ def test_start_stream_with_batch_limit_reaching_timeout(connection, stream_creat
     start_time = time.time()
 
     with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            f"START STREAM {STREAM_NAME} BATCH_LIMIT {BATCH_LIMIT} TIMEOUT {TIMEOUT}",
-        )
+        execute_and_fetch_all(cursor, f"START STREAM {STREAM_NAME} BATCH_LIMIT {BATCH_LIMIT} TIMEOUT {TIMEOUT}")
 
     end_time = time.time()
     assert (
@@ -524,10 +484,7 @@ def test_start_stream_with_batch_limit_while_check_running(
     def start_check_stream(stream_name, batch_limit, timeout):
         connection = connect()
         cursor = connection.cursor()
-        execute_and_fetch_all(
-            cursor,
-            f"CHECK STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout}",
-        )
+        execute_and_fetch_all(cursor, f"CHECK STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout}")
 
     def start_new_stream_with_limit(stream_name, batch_limit, timeout):
         connection = connect()
@@ -548,8 +505,11 @@ def test_start_stream_with_batch_limit_while_check_running(
     # 1/
     thread_stream_check = Process(target=start_check_stream, daemon=True, args=(STREAM_NAME, BATCH_LIMIT, TIMEOUT))
     thread_stream_check.start()
-    time.sleep(2)
-    assert get_is_running(cursor, STREAM_NAME)
+
+    def is_running():
+        return get_is_running(cursor, STREAM_NAME)
+
+    assert mg_sleep_and_assert(True, is_running)
 
     with pytest.raises(mgclient.DatabaseError):
         start_stream_with_limit(cursor, STREAM_NAME, BATCH_LIMIT, timeout=TIMEOUT)
@@ -562,18 +522,15 @@ def test_start_stream_with_batch_limit_while_check_running(
 
     # 2/
     thread_stream_running = Process(
-        target=start_new_stream_with_limit,
-        daemon=True,
-        args=(STREAM_NAME, BATCH_LIMIT + 1, TIMEOUT),
+        target=start_new_stream_with_limit, daemon=True, args=(STREAM_NAME, BATCH_LIMIT + 1, TIMEOUT)
     )  # Sending BATCH_LIMIT + 1 messages as BATCH_LIMIT messages have already been sent during the CHECK STREAM (and not consumed)
     thread_stream_running.start()
-    time.sleep(2)
-    assert get_is_running(cursor, STREAM_NAME)
+
+    assert mg_sleep_and_assert(True, is_running)
 
     message_sender(SIMPLE_MSG)
-    time.sleep(2)
 
-    assert not get_is_running(cursor, STREAM_NAME)
+    assert not mg_sleep_and_assert(False, is_running)
 
 
 def test_check_while_stream_with_batch_limit_running(connection, stream_creator, message_sender):
@@ -587,10 +544,7 @@ def test_check_while_stream_with_batch_limit_running(connection, stream_creator,
     def start_check_stream(stream_name, batch_limit, timeout):
         connection = connect()
         cursor = connection.cursor()
-        execute_and_fetch_all(
-            cursor,
-            f"CHECK STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout}",
-        )
+        execute_and_fetch_all(cursor, f"CHECK STREAM {stream_name} BATCH_LIMIT {batch_limit} TIMEOUT {timeout}")
 
     STREAM_NAME = "test_batch_limit_and_check"
     BATCH_LIMIT = 1
@@ -602,42 +556,34 @@ def test_check_while_stream_with_batch_limit_running(connection, stream_creator,
 
     # 1/
     thread_stream_running = Process(
-        target=start_new_stream_with_limit,
-        daemon=True,
-        args=(STREAM_NAME, BATCH_LIMIT, TIMEOUT),
+        target=start_new_stream_with_limit, daemon=True, args=(STREAM_NAME, BATCH_LIMIT, TIMEOUT)
     )
     start_time = time.time()
     thread_stream_running.start()
-    time.sleep(2)
-    assert get_is_running(cursor, STREAM_NAME)
+
+    def is_running():
+        return get_is_running(cursor, STREAM_NAME)
+
+    assert mg_sleep_and_assert(True, is_running)
 
     with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {BATCH_LIMIT} TIMEOUT {TIMEOUT}",
-        )
+        execute_and_fetch_all(cursor, f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {BATCH_LIMIT} TIMEOUT {TIMEOUT}")
 
     end_time = time.time()
     assert (end_time - start_time) < 0.8 * TIMEOUT, "The CHECK STREAM has probably thrown due to timeout!"
 
     message_sender(SIMPLE_MSG)
-    time.sleep(2)
 
-    assert not get_is_running(cursor, STREAM_NAME)
+    assert not mg_sleep_and_assert(False, is_running)
 
     # 2/
     thread_stream_check = Process(target=start_check_stream, daemon=True, args=(STREAM_NAME, BATCH_LIMIT, TIMEOUT))
     start_time = time.time()
     thread_stream_check.start()
-    time.sleep(2)
-    assert get_is_running(cursor, STREAM_NAME)
+    assert mg_sleep_and_assert(True, is_running)
 
     message_sender(SIMPLE_MSG)
-    time.sleep(2)
-    end_time = time.time()
-    assert (end_time - start_time) < 0.8 * TIMEOUT_IN_SECONDS, "The CHECK STREAM has probably thrown due to timeout!"
-
-    assert not get_is_running(cursor, STREAM_NAME)
+    assert not mg_sleep_and_assert(False, is_running)
 
 
 def test_start_stream_with_batch_limit_with_invalid_batch_limit(connection, stream_creator):
@@ -686,10 +632,7 @@ def test_check_stream_with_batch_limit_with_invalid_batch_limit(connection, stre
     start_time = time.time()
 
     with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {batch_limit} TIMEOUT {TIMEOUT}",
-        )
+        execute_and_fetch_all(cursor, f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {batch_limit} TIMEOUT {TIMEOUT}")
 
     end_time = time.time()
     assert (end_time - start_time) < 0.8 * TIMEOUT_IN_SECONDS, "The CHECK STREAM has probably thrown due to timeout!"
@@ -699,10 +642,7 @@ def test_check_stream_with_batch_limit_with_invalid_batch_limit(connection, stre
     start_time = time.time()
 
     with pytest.raises(mgclient.DatabaseError):
-        execute_and_fetch_all(
-            cursor,
-            f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {batch_limit} TIMEOUT {TIMEOUT}",
-        )
+        execute_and_fetch_all(cursor, f"CHECK STREAM {STREAM_NAME} BATCH_LIMIT {batch_limit} TIMEOUT {TIMEOUT}")
 
     end_time = time.time()
     assert (end_time - start_time) < 0.8 * TIMEOUT_IN_SECONDS, "The CHECK STREAM has probably thrown due to timeout!"

tests/e2e/streams/conftest.py

@@ -37,22 +37,29 @@ def connection():
 
 
 def get_topics(num):
-    return [f"topic_{i}" for i in range(num)]
+    return [f'topic_{i}' for i in range(num)]
 
 
 @pytest.fixture(scope="function")
 def kafka_topics():
-    admin_client = KafkaAdminClient(bootstrap_servers="localhost:9092", client_id="test")
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:9092",
+        client_id="test")
     # The issue arises if we remove default kafka topics, e.g.
     # "__consumer_offsets"
-    previous_topics = [topic for topic in admin_client.list_topics() if topic != "__consumer_offsets"]
+    previous_topics = [
+        topic for topic in admin_client.list_topics() if topic != "__consumer_offsets"]
     if previous_topics:
         admin_client.delete_topics(topics=previous_topics, timeout_ms=5000)
 
     topics = get_topics(3)
     topics_to_create = []
     for topic in topics:
-        topics_to_create.append(NewTopic(name=topic, num_partitions=1, replication_factor=1))
+        topics_to_create.append(
+            NewTopic(
+                name=topic,
+                num_partitions=1,
+                replication_factor=1))
 
     admin_client.create_topics(new_topics=topics_to_create, timeout_ms=5000)
     yield topics
@@ -73,5 +80,6 @@ def pulsar_client():
 def pulsar_topics():
     topics = get_topics(3)
     for topic in topics:
-        requests.delete(f"http://127.0.0.1:6652/admin/v2/persistent/public/default/{topic}?force=true")
+        requests.delete(
+            f'http://127.0.0.1:6652/admin/v2/persistent/public/default/{topic}?force=true')
     yield topics

tests/e2e/streams/kafka_streams_tests.py

@@ -15,15 +15,13 @@ import sys
 import pytest
 import mgclient
 import time
+from mg_utils import mg_sleep_and_assert
 from multiprocessing import Process, Value
 import common
 
 TRANSFORMATIONS_TO_CHECK_C = ["c_transformations.empty_transformation"]
 
-TRANSFORMATIONS_TO_CHECK_PY = [
-    "kafka_transform.simple",
-    "kafka_transform.with_parameters",
-]
+TRANSFORMATIONS_TO_CHECK_PY = ["kafka_transform.simple", "kafka_transform.with_parameters"]
 
 
 @pytest.mark.parametrize("transformation", TRANSFORMATIONS_TO_CHECK_PY)
@@ -466,14 +464,13 @@ def test_start_stream_with_batch_limit_while_check_running(kafka_producer, kafka
         kafka_producer.send(kafka_topics[0], message).get(timeout=6000)
 
     def setup_function(start_check_stream, cursor, stream_name, batch_limit, timeout):
-        thread_stream_check = Process(
-            target=start_check_stream,
-            daemon=True,
-            args=(stream_name, batch_limit, timeout),
-        )
+        thread_stream_check = Process(target=start_check_stream, daemon=True, args=(stream_name, batch_limit, timeout))
         thread_stream_check.start()
-        time.sleep(2)
-        assert common.get_is_running(cursor, stream_name)
+
+        def is_running():
+            return common.get_is_running(cursor, stream_name)
+
+        assert mg_sleep_and_assert(True, is_running)
         message_sender(common.SIMPLE_MSG)
         thread_stream_check.join()
 

tests/e2e/streams/pulsar_streams_tests.py

@@ -18,20 +18,13 @@ import time
 from multiprocessing import Process, Value
 import common
 
-TRANSFORMATIONS_TO_CHECK = [
-    "pulsar_transform.simple",
-    "pulsar_transform.with_parameters",
-]
+TRANSFORMATIONS_TO_CHECK = ["pulsar_transform.simple", "pulsar_transform.with_parameters"]
 
 
 def check_vertex_exists_with_topic_and_payload(cursor, topic, payload_byte):
     decoded_payload = payload_byte.decode("utf-8")
     common.check_vertex_exists_with_properties(
-        cursor,
-        {
-            "topic": f'"{common.pulsar_default_namespace_topic(topic)}"',
-            "payload": f'"{decoded_payload}"',
-        },
+        cursor, {"topic": f'"{common.pulsar_default_namespace_topic(topic)}"', "payload": f'"{decoded_payload}"'}
     )
 
 
@@ -44,7 +37,6 @@ def test_simple(pulsar_client, pulsar_topics, connection, transformation):
         f"CREATE PULSAR STREAM test TOPICS '{','.join(pulsar_topics)}' TRANSFORM {transformation}",
     )
     common.start_stream(cursor, "test")
-    time.sleep(5)
 
     for topic in pulsar_topics:
         producer = pulsar_client.create_producer(
@@ -73,8 +65,6 @@ def test_separate_consumers(pulsar_client, pulsar_topics, connection, transforma
     for stream_name in stream_names:
         common.start_stream(cursor, stream_name)
 
-    time.sleep(5)
-
     for topic in pulsar_topics:
         producer = pulsar_client.create_producer(topic, send_timeout_millis=60000)
         producer.send(common.SIMPLE_MSG)
@@ -96,7 +86,6 @@ def test_start_from_latest_messages(pulsar_client, pulsar_topics, connection):
         f"CREATE PULSAR STREAM test TOPICS {pulsar_topics[0]} TRANSFORM pulsar_transform.simple",
     )
     common.start_stream(cursor, "test")
-    time.sleep(1)
 
     def assert_message_not_consumed(message):
         vertices_with_msg = common.execute_and_fetch_all(
@@ -107,8 +96,7 @@ def test_start_from_latest_messages(pulsar_client, pulsar_topics, connection):
         assert len(vertices_with_msg) == 0
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
     producer.send(common.SIMPLE_MSG)
 
@@ -162,11 +150,9 @@ def test_check_stream(pulsar_client, pulsar_topics, connection, transformation):
         f"CREATE PULSAR STREAM test TOPICS {pulsar_topics[0]} TRANSFORM {transformation} BATCH_SIZE {BATCH_SIZE}",
     )
     common.start_stream(cursor, "test")
-    time.sleep(1)
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
     producer.send(common.SIMPLE_MSG)
     check_vertex_exists_with_topic_and_payload(cursor, pulsar_topics[0], common.SIMPLE_MSG)
@@ -272,8 +258,7 @@ def test_start_and_stop_during_check(pulsar_client, pulsar_topics, connection, o
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM pulsar_transform.simple BATCH_SIZE {BATCH_SIZE}"
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def message_sender(msg):
@@ -318,17 +303,14 @@ def test_restart_after_error(pulsar_client, pulsar_topics, connection):
     )
 
     common.start_stream(cursor, "test_stream")
-    time.sleep(1)
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
     producer.send(common.SIMPLE_MSG)
     assert common.timed_wait(lambda: not common.get_is_running(cursor, "test_stream"))
 
     common.start_stream(cursor, "test_stream")
-    time.sleep(1)
     producer.send(b"CREATE (n:VERTEX { id : 42 })")
     assert common.check_one_result_row(cursor, "MATCH (n:VERTEX { id : 42 }) RETURN n")
 
@@ -343,7 +325,6 @@ def test_service_url(pulsar_client, pulsar_topics, connection, transformation):
         f"CREATE PULSAR STREAM test TOPICS {','.join(pulsar_topics)} TRANSFORM {transformation} SERVICE_URL '{LOCAL}'",
     )
     common.start_stream(cursor, "test")
-    time.sleep(5)
 
     for topic in pulsar_topics:
         producer = pulsar_client.create_producer(
@@ -362,8 +343,7 @@ def test_start_stream_with_batch_limit(pulsar_client, pulsar_topics, connection)
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM pulsar_transform.simple BATCH_SIZE 1"
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def messages_sender(nof_messages):
@@ -398,8 +378,7 @@ def test_start_stream_with_batch_limit_while_check_running(pulsar_client, pulsar
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM pulsar_transform.simple BATCH_SIZE 1"
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def message_sender(message):
@@ -415,8 +394,7 @@ def test_check_while_stream_with_batch_limit_running(pulsar_client, pulsar_topic
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM pulsar_transform.simple BATCH_SIZE 1"
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def message_sender(message):
@@ -434,8 +412,7 @@ def test_check_stream_same_number_of_queries_than_messages(pulsar_client, pulsar
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM {TRANSFORMATION} BATCH_INTERVAL 3000 BATCH_SIZE  {batch_size} "
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def message_sender(msg):
@@ -453,8 +430,7 @@ def test_check_stream_different_number_of_queries_than_messages(pulsar_client, p
         return f"CREATE PULSAR STREAM {stream_name} TOPICS {pulsar_topics[0]} TRANSFORM {TRANSFORMATION} BATCH_INTERVAL 3000 BATCH_SIZE  {batch_size} "
 
     producer = pulsar_client.create_producer(
-        common.pulsar_default_namespace_topic(pulsar_topics[0]),
-        send_timeout_millis=60000,
+        common.pulsar_default_namespace_topic(pulsar_topics[0]), send_timeout_millis=60000
     )
 
     def message_sender(msg):

tests/e2e/streams/streams_owner_tests.py

@@ -15,7 +15,6 @@ import time
 import mgclient
 import common
 
-
 def get_cursor_with_user(username):
     connection = common.connect(username=username, password="")
     return connection.cursor()
@@ -23,21 +22,23 @@ def get_cursor_with_user(username):
 
 def create_admin_user(cursor, admin_user):
     common.execute_and_fetch_all(cursor, f"CREATE USER {admin_user}")
-    common.execute_and_fetch_all(cursor, f"GRANT ALL PRIVILEGES TO {admin_user}")
+    common.execute_and_fetch_all(
+        cursor, f"GRANT ALL PRIVILEGES TO {admin_user}")
 
 
 def create_stream_user(cursor, stream_user):
     common.execute_and_fetch_all(cursor, f"CREATE USER {stream_user}")
-    common.execute_and_fetch_all(cursor, f"GRANT STREAM TO {stream_user}")
+    common.execute_and_fetch_all(
+        cursor, f"GRANT STREAM TO {stream_user}")
 
 
 def test_ownerless_stream(kafka_producer, kafka_topics, connection):
     assert len(kafka_topics) > 0
     userless_cursor = connection.cursor()
-    common.execute_and_fetch_all(
-        userless_cursor,
-        "CREATE KAFKA STREAM ownerless " f"TOPICS {kafka_topics[0]} " f"TRANSFORM kafka_transform.simple",
-    )
+    common.execute_and_fetch_all(userless_cursor,
+                                 "CREATE KAFKA STREAM ownerless "
+                                 f"TOPICS {kafka_topics[0]} "
+                                 f"TRANSFORM kafka_transform.simple")
     common.start_stream(userless_cursor, "ownerless")
     time.sleep(1)
 
@@ -45,9 +46,11 @@ def test_ownerless_stream(kafka_producer, kafka_topics, connection):
     create_admin_user(userless_cursor, admin_user)
 
     kafka_producer.send(kafka_topics[0], b"first message").get(timeout=60)
-    assert common.timed_wait(lambda: not common.get_is_running(userless_cursor, "ownerless"))
+    assert common.timed_wait(
+        lambda: not common.get_is_running(userless_cursor, "ownerless"))
 
-    assert len(common.execute_and_fetch_all(userless_cursor, "MATCH (n) RETURN n")) == 0
+    assert len(common.execute_and_fetch_all(
+        userless_cursor, "MATCH (n) RETURN n")) == 0
 
     common.execute_and_fetch_all(userless_cursor, f"DROP USER {admin_user}")
     common.start_stream(userless_cursor, "ownerless")
@@ -55,9 +58,11 @@ def test_ownerless_stream(kafka_producer, kafka_topics, connection):
 
     second_message = b"second message"
     kafka_producer.send(kafka_topics[0], second_message).get(timeout=60)
-    common.kafka_check_vertex_exists_with_topic_and_payload(userless_cursor, kafka_topics[0], second_message)
+    common.kafka_check_vertex_exists_with_topic_and_payload(
+        userless_cursor, kafka_topics[0], second_message)
 
-    assert len(common.execute_and_fetch_all(userless_cursor, "MATCH (n) RETURN n")) == 1
+    assert len(common.execute_and_fetch_all(
+        userless_cursor, "MATCH (n) RETURN n")) == 1
 
 
 def test_owner_is_shown(kafka_topics, connection):
@@ -68,16 +73,12 @@ def test_owner_is_shown(kafka_topics, connection):
     create_stream_user(userless_cursor, stream_user)
     stream_cursor = get_cursor_with_user(stream_user)
 
-    common.execute_and_fetch_all(
-        stream_cursor,
-        "CREATE KAFKA STREAM test " f"TOPICS {kafka_topics[0]} " f"TRANSFORM kafka_transform.simple",
-    )
+    common.execute_and_fetch_all(stream_cursor, "CREATE KAFKA STREAM test "
+                                 f"TOPICS {kafka_topics[0]} "
+                                 f"TRANSFORM kafka_transform.simple")
 
-    common.check_stream_info(
-        userless_cursor,
-        "test",
-        ("test", "kafka", 100, 1000, "kafka_transform.simple", stream_user, False),
-    )
+    common.check_stream_info(userless_cursor, "test", ("test", "kafka", 100, 1000,
+        "kafka_transform.simple", stream_user, False))
 
 
 def test_insufficient_privileges(kafka_producer, kafka_topics, connection):
@@ -92,10 +93,10 @@ def test_insufficient_privileges(kafka_producer, kafka_topics, connection):
     create_stream_user(userless_cursor, stream_user)
     stream_cursor = get_cursor_with_user(stream_user)
 
-    common.execute_and_fetch_all(
-        stream_cursor,
-        "CREATE KAFKA STREAM insufficient_test " f"TOPICS {kafka_topics[0]} " f"TRANSFORM kafka_transform.simple",
-    )
+    common.execute_and_fetch_all(stream_cursor,
+                                 "CREATE KAFKA STREAM insufficient_test "
+                                 f"TOPICS {kafka_topics[0]} "
+                                 f"TRANSFORM kafka_transform.simple")
 
     # the stream is started by admin, but should check against the owner
     # privileges
@@ -103,19 +104,24 @@ def test_insufficient_privileges(kafka_producer, kafka_topics, connection):
     time.sleep(1)
 
     kafka_producer.send(kafka_topics[0], b"first message").get(timeout=60)
-    assert common.timed_wait(lambda: not common.get_is_running(userless_cursor, "insufficient_test"))
+    assert common.timed_wait(
+        lambda: not common.get_is_running(userless_cursor, "insufficient_test"))
 
-    assert len(common.execute_and_fetch_all(userless_cursor, "MATCH (n) RETURN n")) == 0
+    assert len(common.execute_and_fetch_all(
+        userless_cursor, "MATCH (n) RETURN n")) == 0
 
-    common.execute_and_fetch_all(admin_cursor, f"GRANT CREATE TO {stream_user}")
+    common.execute_and_fetch_all(
+        admin_cursor, f"GRANT CREATE TO {stream_user}")
     common.start_stream(userless_cursor, "insufficient_test")
     time.sleep(1)
 
     second_message = b"second message"
     kafka_producer.send(kafka_topics[0], second_message).get(timeout=60)
-    common.kafka_check_vertex_exists_with_topic_and_payload(userless_cursor, kafka_topics[0], second_message)
+    common.kafka_check_vertex_exists_with_topic_and_payload(
+        userless_cursor, kafka_topics[0], second_message)
 
-    assert len(common.execute_and_fetch_all(userless_cursor, "MATCH (n) RETURN n")) == 1
+    assert len(common.execute_and_fetch_all(
+        userless_cursor, "MATCH (n) RETURN n")) == 1
 
 
 def test_happy_case(kafka_producer, kafka_topics, connection):
@@ -129,12 +135,13 @@ def test_happy_case(kafka_producer, kafka_topics, connection):
     stream_user = "stream_user"
     create_stream_user(userless_cursor, stream_user)
     stream_cursor = get_cursor_with_user(stream_user)
-    common.execute_and_fetch_all(admin_cursor, f"GRANT CREATE TO {stream_user}")
-
     common.execute_and_fetch_all(
-        stream_cursor,
-        "CREATE KAFKA STREAM insufficient_test " f"TOPICS {kafka_topics[0]} " f"TRANSFORM kafka_transform.simple",
-    )
+        admin_cursor, f"GRANT CREATE TO {stream_user}")
+
+    common.execute_and_fetch_all(stream_cursor,
+                                 "CREATE KAFKA STREAM insufficient_test "
+                                 f"TOPICS {kafka_topics[0]} "
+                                 f"TRANSFORM kafka_transform.simple")
 
     common.start_stream(stream_cursor, "insufficient_test")
     time.sleep(1)
@@ -142,9 +149,11 @@ def test_happy_case(kafka_producer, kafka_topics, connection):
     first_message = b"first message"
     kafka_producer.send(kafka_topics[0], first_message).get(timeout=60)
 
-    common.kafka_check_vertex_exists_with_topic_and_payload(userless_cursor, kafka_topics[0], first_message)
+    common.kafka_check_vertex_exists_with_topic_and_payload(
+        userless_cursor, kafka_topics[0], first_message)
 
-    assert len(common.execute_and_fetch_all(userless_cursor, "MATCH (n) RETURN n")) == 1
+    assert len(common.execute_and_fetch_all(
+        userless_cursor, "MATCH (n) RETURN n")) == 1
 
 
 if __name__ == "__main__":

tests/e2e/streams/transformations/common_transform.py

@@ -23,10 +23,7 @@ def check_stream_no_filtering(
         message = messages.message_at(i)
         payload_as_str = message.payload().decode("utf-8")
         result_queries.append(
-            mgp.Record(
-                query=f"Message: {payload_as_str}",
-                parameters={"value": f"Parameter: {payload_as_str}"},
-            )
+            mgp.Record(query=f"Message: {payload_as_str}", parameters={"value": f"Parameter: {payload_as_str}"})
         )
 
     return result_queries
@@ -47,17 +44,13 @@ def check_stream_with_filtering(
             continue
 
         result_queries.append(
-            mgp.Record(
-                query=f"Message: {payload_as_str}",
-                parameters={"value": f"Parameter: {payload_as_str}"},
-            )
+            mgp.Record(query=f"Message: {payload_as_str}", parameters={"value": f"Parameter: {payload_as_str}"})
         )
 
         if "b" in payload_as_str:
             result_queries.append(
                 mgp.Record(
-                    query=f"Message: extra_{payload_as_str}",
-                    parameters={"value": f"Parameter: extra_{payload_as_str}"},
+                    query=f"Message: extra_{payload_as_str}", parameters={"value": f"Parameter: extra_{payload_as_str}"}
                 )
             )
 

tests/e2e/streams/transformations/pulsar_transform.py

@@ -59,9 +59,7 @@ def with_parameters(context: mgp.TransCtx, messages: mgp.Messages) -> mgp.Record
 
 
 @mgp.transformation
-def query(
-    messages: mgp.Messages,
-) -> mgp.Record(query=str, parameters=mgp.Nullable[mgp.Map]):
+def query(messages: mgp.Messages) -> mgp.Record(query=str, parameters=mgp.Nullable[mgp.Map]):
     result_queries = []
 
     for i in range(0, messages.total_messages()):

tests/e2e/triggers/procedures/write.py

@@ -11,7 +11,6 @@
 
 import mgp
 
-
 @mgp.write_proc
 def create_vertex(ctx: mgp.ProcCtx, id: mgp.Any) -> mgp.Record(v=mgp.Any):
     v = None
@@ -37,14 +36,15 @@ def detach_delete_vertex(ctx: mgp.ProcCtx, v: mgp.Any) -> mgp.Record():
 
 
 @mgp.write_proc
-def create_edge(
-    ctx: mgp.ProcCtx, from_vertex: mgp.Vertex, to_vertex: mgp.Vertex, edge_type: str
-) -> mgp.Record(e=mgp.Any):
+def create_edge(ctx: mgp.ProcCtx, from_vertex: mgp.Vertex,
+                to_vertex: mgp.Vertex,
+                edge_type: str) -> mgp.Record(e=mgp.Any):
     e = None
     try:
-        e = ctx.graph.create_edge(from_vertex, to_vertex, mgp.EdgeType(edge_type))
-        e.properties.set("id", 1)
-        e.properties.set("tbd", 0)
+        e = ctx.graph.create_edge(
+            from_vertex, to_vertex, mgp.EdgeType(edge_type))
+        e.properties.set("id", 1);
+        e.properties.set("tbd", 0);
     except RuntimeError as ex:
         return mgp.Record(e=str(ex))
     return mgp.Record(e=e)
@@ -61,20 +61,19 @@ def set_property(ctx: mgp.ProcCtx, object: mgp.Any) -> mgp.Record():
     object.properties.set("id", 2)
     return mgp.Record()
 
-
 @mgp.write_proc
 def remove_property(ctx: mgp.ProcCtx, object: mgp.Any) -> mgp.Record():
     object.properties.set("tbd", None)
     return mgp.Record()
 
-
 @mgp.write_proc
-def add_label(ctx: mgp.ProcCtx, object: mgp.Any, name: str) -> mgp.Record(o=mgp.Any):
+def add_label(ctx: mgp.ProcCtx, object: mgp.Any,
+              name: str) -> mgp.Record(o=mgp.Any):
     object.add_label(name)
     return mgp.Record(o=object)
 
-
 @mgp.write_proc
-def remove_label(ctx: mgp.ProcCtx, object: mgp.Any, name: str) -> mgp.Record(o=mgp.Any):
+def remove_label(ctx: mgp.ProcCtx, object: mgp.Any,
+                 name: str) -> mgp.Record(o=mgp.Any):
     object.remove_label(name)
     return mgp.Record(o=object)

tests/e2e/write_procedures/common.py

@@ -13,7 +13,8 @@ import mgclient
 import typing
 
 
-def execute_and_fetch_all(cursor: mgclient.Cursor, query: str, params: dict = {}) -> typing.List[tuple]:
+def execute_and_fetch_all(cursor: mgclient.Cursor, query: str,
+                          params: dict = {}) -> typing.List[tuple]:
     cursor.execute(query, params)
     return cursor.fetchall()
 

tests/e2e/write_procedures/procedures/read.py

@@ -13,7 +13,8 @@ import mgp
 
 
 @mgp.read_proc
-def underlying_graph_is_mutable(ctx: mgp.ProcCtx, object: mgp.Any) -> mgp.Record(mutable=bool):
+def underlying_graph_is_mutable(ctx: mgp.ProcCtx,
+                                object: mgp.Any) -> mgp.Record(mutable=bool):
     return mgp.Record(mutable=object.underlying_graph_is_mutable())
 
 

tests/e2e/write_procedures/procedures/write.py

@@ -35,12 +35,13 @@ def detach_delete_vertex(ctx: mgp.ProcCtx, v: mgp.Any) -> mgp.Record():
 
 
 @mgp.write_proc
-def create_edge(
-    ctx: mgp.ProcCtx, from_vertex: mgp.Vertex, to_vertex: mgp.Vertex, edge_type: str
-) -> mgp.Record(e=mgp.Any):
+def create_edge(ctx: mgp.ProcCtx, from_vertex: mgp.Vertex,
+                to_vertex: mgp.Vertex,
+                edge_type: str) -> mgp.Record(e=mgp.Any):
     e = None
     try:
-        e = ctx.graph.create_edge(from_vertex, to_vertex, mgp.EdgeType(edge_type))
+        e = ctx.graph.create_edge(
+            from_vertex, to_vertex, mgp.EdgeType(edge_type))
     except RuntimeError as ex:
         return mgp.Record(e=str(ex))
     return mgp.Record(e=e)
@@ -53,25 +54,29 @@ def delete_edge(ctx: mgp.ProcCtx, edge: mgp.Edge) -> mgp.Record():
 
 
 @mgp.write_proc
-def set_property(ctx: mgp.ProcCtx, object: mgp.Any, name: str, value: mgp.Nullable[mgp.Any]) -> mgp.Record():
+def set_property(ctx: mgp.ProcCtx, object: mgp.Any,
+                 name: str, value: mgp.Nullable[mgp.Any]) -> mgp.Record():
     object.properties.set(name, value)
     return mgp.Record()
 
 
 @mgp.write_proc
-def add_label(ctx: mgp.ProcCtx, object: mgp.Any, name: str) -> mgp.Record(o=mgp.Any):
+def add_label(ctx: mgp.ProcCtx, object: mgp.Any,
+              name: str) -> mgp.Record(o=mgp.Any):
     object.add_label(name)
     return mgp.Record(o=object)
 
 
 @mgp.write_proc
-def remove_label(ctx: mgp.ProcCtx, object: mgp.Any, name: str) -> mgp.Record(o=mgp.Any):
+def remove_label(ctx: mgp.ProcCtx, object: mgp.Any,
+                 name: str) -> mgp.Record(o=mgp.Any):
     object.remove_label(name)
     return mgp.Record(o=object)
 
 
 @mgp.write_proc
-def underlying_graph_is_mutable(ctx: mgp.ProcCtx, object: mgp.Any) -> mgp.Record(mutable=bool):
+def underlying_graph_is_mutable(ctx: mgp.ProcCtx,
+                                object: mgp.Any) -> mgp.Record(mutable=bool):
     return mgp.Record(mutable=object.underlying_graph_is_mutable())