Comment on the usecase of the ThriftHandle::Send() method

Co-authored-by: János Benjamin Antal <antaljanosbenjamin@users.noreply.github.com>

.github/workflows/daily_benchmark.yaml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)

.github/workflows/diff.yaml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -64,7 +64,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -75,39 +75,14 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch
 
-      - name: Initialize deps
-        run: |
-          # Activate toolchain.
-          source /opt/toolchain-v4/activate
-          # Initialize dependencies.
-          ./init
-
-      - 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: Python code analysis
-        run: |
-          CHANGED_FILES=$(git diff -U0 ${{ env.BASE_BRANCH }}... --name-only)
-          for file in ${CHANGED_FILES}; do
-            echo ${file}
-            if [[ ${file} == *.py ]]; then
-              python3 -m black --check --diff ${file}
-              python3 -m isort --check-only --diff ${file}
-            fi
-          done
-
       - name: Build combined ASAN, UBSAN and coverage binaries
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
 
+          # Initialize dependencies.
+          ./init
+
           cd build
           cmake -DTEST_COVERAGE=ON -DASAN=ON -DUBSAN=ON ..
           make -j$THREADS memgraph__unit
@@ -135,7 +110,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -155,7 +130,7 @@ jobs:
           source /opt/toolchain-v4/activate
 
           # Restrict clang-tidy results only to the modified parts
-          git diff -U0 ${{ env.BASE_BRANCH }}... -- src | ./tools/github/clang-tidy/clang-tidy-diff.py -p 1 -j $THREADS -extra-arg="-DMG_CLANG_TIDY_CHECK" -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 | 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
@@ -170,7 +145,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -189,23 +164,52 @@ jobs:
           cmake ..
           make -j$THREADS
 
-      - name: Run simulation tests
+      - name: Run leftover CTest tests
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
 
-          # Run simulation tests.
+          # Run leftover CTest tests (all except unit and benchmark tests).
           cd build
-          ctest -R memgraph__simulation --output-on-failure -j$THREADS
+          ctest -E "(memgraph__unit|memgraph__benchmark|memgraph__simulation)" --output-on-failure
 
-      - name: Run single benchmark test
+      - name: Run drivers tests
+        run: |
+          ./tests/drivers/run.sh
+
+      - name: Run integration tests
+        run: |
+          cd tests/integration
+          for name in *; do
+            if [ ! -d $name ]; then continue; fi
+            pushd $name >/dev/null
+            echo "Running: $name"
+            if [ -x prepare.sh ]; then
+              ./prepare.sh
+            fi
+            if [ -x runner.py ]; then
+              ./runner.py
+            elif [ -x runner.sh ]; then
+              ./runner.sh
+            fi
+            echo
+            popd >/dev/null
+          done
+
+      - name: Run cppcheck and clang-format
         run: |
           # Activate toolchain.
           source /opt/toolchain-v4/activate
 
-          # Run simulation tests.
-          cd tests/mgbench
-          ./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg  "split-file splitfiles/accesscontrol_small.shard_configuration bolt-num-workers 1"
+          # Run cppcheck and clang-format.
+          cd tools/github
+          ./cppcheck_and_clang_format diff
+
+      - name: Save cppcheck and clang-format errors
+        uses: actions/upload-artifact@v2
+        with:
+          name: "Code coverage"
+          path: tools/github/cppcheck_and_clang_format.txt
 
   release_build:
     name: "Release build"
@@ -217,7 +221,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -236,6 +240,19 @@ jobs:
           cmake -DCMAKE_BUILD_TYPE=release ..
           make -j$THREADS
 
+      - name: Run GQL Behave tests
+        run: |
+          cd tests/gql_behave
+          ./continuous_integration
+
+      - name: Save quality assurance status
+        uses: actions/upload-artifact@v2
+        with:
+          name: "GQL Behave Status"
+          path: |
+            tests/gql_behave/gql_behave_status.csv
+            tests/gql_behave/gql_behave_status.html
+
       - name: Run unit tests
         run: |
           # Activate toolchain.
@@ -250,19 +267,10 @@ jobs:
           # Activate toolchain.
           source /opt/toolchain-v4/activate
 
-          # Run simulation tests.
+          # Run unit tests.
           cd build
           ctest -R memgraph__simulation --output-on-failure -j$THREADS
 
-      - name: Run single benchmark test
-        run: |
-          # Activate toolchain.
-          source /opt/toolchain-v4/activate
-
-          # Run simulation tests.
-          cd tests/mgbench
-          ./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg  "split-file splitfiles/accesscontrol_small.shard_configuration bolt-num-workers 1"
-
       - name: Run e2e tests
         run: |
           # TODO(gitbuda): Setup mgclient and pymgclient properly.
@@ -270,4 +278,167 @@ jobs:
           ./setup.sh
           source ve3/bin/activate
           cd e2e
-          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory ./distributed_queries
+          LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../../libs/mgclient/lib python runner.py --workloads-root-directory .
+
+      - name: Run stress test (plain)
+        run: |
+          cd tests/stress
+          ./continuous_integration
+
+      - name: Run stress test (SSL)
+        run: |
+          cd tests/stress
+          ./continuous_integration --use-ssl
+
+      - name: Run durability test
+        run: |
+          cd tests/stress
+          source ve3/bin/activate
+          python3 durability --num-steps 5
+
+      - name: Create enterprise DEB package
+        run: |
+          # Activate toolchain.
+          source /opt/toolchain-v4/activate
+
+          cd build
+
+          # create mgconsole
+          # we use the -B to force the build
+          make -j$THREADS -B mgconsole
+
+          # Create enterprise DEB package.
+          mkdir output && cd output
+          cpack -G DEB --config ../CPackConfig.cmake
+
+      - name: Save enterprise DEB package
+        uses: actions/upload-artifact@v2
+        with:
+          name: "Enterprise DEB package"
+          path: build/output/memgraph*.deb
+
+      - name: Save test data
+        uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: "Test data"
+          path: |
+            # multiple paths could be defined
+            build/logs
+
+  release_jepsen_test:
+    name: "Release Jepsen Test"
+    runs-on: [self-hosted, Linux, X64, Debian10, JepsenControl]
+    #continue-on-error: true
+    env:
+      THREADS: 24
+      MEMGRAPH_ENTERPRISE_LICENSE: ${{ secrets.MEMGRAPH_ENTERPRISE_LICENSE }}
+      MEMGRAPH_ORGANIZATION_NAME: ${{ secrets.MEMGRAPH_ORGANIZATION_NAME }}
+
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@v2
+        with:
+          # Number of commits to fetch. `0` indicates all history for all
+          # branches and tags. (default: 1)
+          fetch-depth: 0
+
+      - name: Build release binaries
+        run: |
+          # Activate toolchain.
+          source /opt/toolchain-v4/activate
+
+          # Initialize dependencies.
+          ./init
+
+          # Build only memgraph release binarie.
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=release ..
+          make -j$THREADS memgraph
+
+      - name: Run Jepsen tests
+        run: |
+          cd tests/jepsen
+          ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
+
+      - name: Save Jepsen report
+        uses: actions/upload-artifact@v2
+        if: ${{ always() }}
+        with:
+          name: "Jepsen Report"
+          path: tests/jepsen/Jepsen.tar.gz
+
+  release_benchmarks:
+    name: "Release benchmarks"
+    runs-on: [self-hosted, Linux, X64, Diff, Gen7]
+    env:
+      THREADS: 24
+      MEMGRAPH_ENTERPRISE_LICENSE: ${{ secrets.MEMGRAPH_ENTERPRISE_LICENSE }}
+      MEMGRAPH_ORGANIZATION_NAME: ${{ secrets.MEMGRAPH_ORGANIZATION_NAME }}
+
+    steps:
+      - name: Set up repository
+        uses: actions/checkout@v2
+        with:
+          # Number of commits to fetch. `0` indicates all history for all
+          # branches and tags. (default: 1)
+          fetch-depth: 0
+
+      - name: Build release binaries
+        run: |
+          # Activate toolchain.
+          source /opt/toolchain-v4/activate
+
+          # Initialize dependencies.
+          ./init
+
+          # Build only memgraph release binaries.
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=release ..
+          make -j$THREADS
+
+      - name: Run macro benchmarks
+        run: |
+          cd tests/macro_benchmark
+          ./harness QuerySuite MemgraphRunner \
+            --groups aggregation 1000_create unwind_create dense_expand match \
+            --no-strict
+
+      - name: Get branch name (merge)
+        if: github.event_name != 'pull_request'
+        shell: bash
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
+
+      - name: Get branch name (pull request)
+        if: github.event_name == 'pull_request'
+        shell: bash
+        run: echo "BRANCH_NAME=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
+
+      - name: Upload macro benchmark results
+        run: |
+          cd tools/bench-graph-client
+          virtualenv -p python3 ve3
+          source ve3/bin/activate
+          pip install -r requirements.txt
+          ./main.py --benchmark-name "macro_benchmark" \
+                    --benchmark-results-path "../../tests/macro_benchmark/.harness_summary" \
+                    --github-run-id "${{ github.run_id }}" \
+                    --github-run-number "${{ github.run_number }}" \
+                    --head-branch-name "${{ env.BRANCH_NAME }}"
+
+      - name: Run mgbench
+        run: |
+          cd tests/mgbench
+          ./benchmark.py --num-workers-for-benchmark 12 --export-results benchmark_result.json pokec/medium/*/*
+
+      - name: Upload mgbench results
+        run: |
+          cd tools/bench-graph-client
+          virtualenv -p python3 ve3
+          source ve3/bin/activate
+          pip install -r requirements.txt
+          ./main.py --benchmark-name "mgbench" \
+                    --benchmark-results-path "../../tests/mgbench/benchmark_result.json" \
+                    --github-run-id "${{ github.run_id }}" \
+                    --github-run-number "${{ github.run_number }}" \
+                    --head-branch-name "${{ env.BRANCH_NAME }}"

.github/workflows/full_clang_tidy.yaml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -39,7 +39,7 @@ jobs:
           source /opt/toolchain-v4/activate
 
           # The results are also written to standard output in order to retain them in the logs
-          ./tools/github/clang-tidy/run-clang-tidy.py -p build -j $THREADS -extra-arg="-DMG_CLANG_TIDY_CHECK" -clang-tidy-binary=/opt/toolchain-v4/bin/clang-tidy "$PWD/src/*" |
+          ./tools/github/clang-tidy/run-clang-tidy.py -p build -j $THREADS -clang-tidy-binary=/opt/toolchain-v4/bin/clang-tidy "$PWD/src/*" |
             tee ./build/full_clang_tidy_output.txt
 
       - name: Summarize clang-tidy results

.github/workflows/package_all.yaml

@@ -17,7 +17,7 @@ jobs:
         run: |
           ./release/package/run.sh package centos-7
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: centos-7
           path: build/output/centos-7/memgraph*.rpm
@@ -34,7 +34,7 @@ jobs:
         run: |
           ./release/package/run.sh package centos-9
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: centos-9
           path: build/output/centos-9/memgraph*.rpm
@@ -51,7 +51,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-10
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-10
           path: build/output/debian-10/memgraph*.deb
@@ -68,7 +68,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-11
           path: build/output/debian-11/memgraph*.deb
@@ -87,7 +87,7 @@ jobs:
           ./run.sh package debian-11 --for-docker
           ./run.sh docker
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: docker
           path: build/output/docker/memgraph*.tar.gz
@@ -104,7 +104,7 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-18.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ubuntu-1804
           path: build/output/ubuntu-18.04/memgraph*.deb
@@ -121,7 +121,7 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-20.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ubuntu-2004
           path: build/output/ubuntu-20.04/memgraph*.deb
@@ -138,7 +138,7 @@ jobs:
         run: |
           ./release/package/run.sh package ubuntu-22.04
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ubuntu-2204
           path: build/output/ubuntu-22.04/memgraph*.deb
@@ -155,7 +155,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11 --for-platform
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-11-platform
           path: build/output/debian-11/memgraph*.deb
@@ -172,7 +172,7 @@ jobs:
         run: |
           ./release/package/run.sh package debian-11-arm
       - name: "Upload package"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: debian-11-arm
           path: build/output/debian-11-arm/memgraph*.deb

.github/workflows/release_centos8.yaml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -225,7 +225,7 @@ jobs:
           rpmlint memgraph*.rpm
 
       - name: Save enterprise RPM package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise RPM package"
           path: build/output/memgraph*.rpm
@@ -262,7 +262,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |

.github/workflows/release_debian10.yaml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -224,7 +224,7 @@ jobs:
           cpack -G DEB --config ../CPackConfig.cmake
 
       - name: Save enterprise DEB package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise DEB package"
           path: build/output/memgraph*.deb
@@ -261,7 +261,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |
@@ -324,7 +324,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -349,7 +349,7 @@ jobs:
           ./run.sh test --binary ../../build/memgraph --run-args "test-all --node-configs resources/node-config.edn" --ignore-run-stdout-logs --ignore-run-stderr-logs
 
       - name: Save Jepsen report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
           name: "Jepsen Report"

.github/workflows/release_docker.yaml

@@ -19,7 +19,7 @@ jobs:
       DOCKER_REPOSITORY_NAME: memgraph
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/release_ubuntu2004.yaml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -97,7 +97,7 @@ jobs:
           tar -czf code_coverage.tar.gz coverage.json html report.json summary.rmu
 
       - name: Save code coverage
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/generated/code_coverage.tar.gz
@@ -112,7 +112,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -173,7 +173,7 @@ jobs:
           ./cppcheck_and_clang_format diff
 
       - name: Save cppcheck and clang-format errors
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Code coverage"
           path: tools/github/cppcheck_and_clang_format.txt
@@ -189,7 +189,7 @@ jobs:
 
     steps:
       - name: Set up repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           # Number of commits to fetch. `0` indicates all history for all
           # branches and tags. (default: 1)
@@ -224,7 +224,7 @@ jobs:
           cpack -G DEB --config ../CPackConfig.cmake
 
       - name: Save enterprise DEB package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "Enterprise DEB package"
           path: build/output/memgraph*.deb
@@ -261,7 +261,7 @@ jobs:
           ./continuous_integration
 
       - name: Save quality assurance status
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: "GQL Behave Status"
           path: |

.gitignore

@@ -24,7 +24,6 @@ cmake/DownloadProject/
 dist/
 src/query/frontend/opencypher/generated/
 src/query/v2/frontend/opencypher/generated/
-src/parser/opencypher/generated
 tags
 ve/
 ve3/
@@ -54,7 +53,6 @@ src/distributed/token_sharing_rpc_messages.hpp
 src/distributed/updates_rpc_messages.hpp
 src/query/v2/frontend/ast/ast.hpp
 src/query/frontend/ast/ast.hpp
-src/storage/v3/bindings/ast/ast.hpp
 src/query/distributed/frontend/ast/ast_serialization.hpp
 src/query/v2/distributed/frontend/ast/ast_serialization.hpp
 src/durability/distributed/state_delta.hpp
@@ -62,15 +60,12 @@ src/durability/single_node/state_delta.hpp
 src/durability/single_node_ha/state_delta.hpp
 src/query/frontend/semantic/symbol.hpp
 src/query/v2/frontend/semantic/symbol.hpp
-src/expr/semantic/symbol.hpp
 src/query/distributed/frontend/semantic/symbol_serialization.hpp
 src/query/v2/distributed/frontend/semantic/symbol_serialization.hpp
 src/query/distributed/plan/ops.hpp
 src/query/v2/distributed/plan/ops.hpp
 src/query/plan/operator.hpp
 src/query/v2/plan/operator.hpp
-src/parser/opencypher/generated
-src/expr/semantic/symbol.hpp
 src/raft/log_entry.hpp
 src/raft/raft_rpc_messages.hpp
 src/raft/snapshot_metadata.hpp

.pre-commit-config.yaml

@@ -6,14 +6,18 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
-    hooks:
-      - id: isort
-        name: isort (python)
+        args: # arguments to configure black
+          - --line-length=120
+          - --include='\.pyi?$'
+          # these folders wont be formatted by black
+          - --exclude="""\.git |
+            \.__pycache__|
+            build|
+            libs|
+            .cache"""
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v13.0.0
     hooks:

CMakeLists.txt

@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.8)
 
 # !! IMPORTANT !! run ./project_root/init.sh before cmake command
 # to download dependencies
+
 if(NOT UNIX)
   message(FATAL_ERROR "Unsupported operating system.")
 endif()
@@ -18,7 +19,6 @@ set_directory_properties(PROPERTIES CLEAN_NO_CUSTOM TRUE)
 find_program(CCACHE_FOUND ccache)
 option(USE_CCACHE "ccache:" ON)
 message(STATUS "CCache: ${USE_CCACHE}")
-
 if(CCACHE_FOUND AND USE_CCACHE)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
@@ -28,8 +28,7 @@ endif(CCACHE_FOUND AND USE_CCACHE)
 # NOTE: must be choosen before use of project() or enable_language()
 find_program(CLANG_FOUND clang)
 find_program(CLANGXX_FOUND clang++)
-
-if(CLANG_FOUND AND CLANGXX_FOUND)
+if (CLANG_FOUND AND CLANGXX_FOUND)
   set(CMAKE_C_COMPILER ${CLANG_FOUND})
   set(CMAKE_CXX_COMPILER ${CLANGXX_FOUND})
 else()
@@ -37,11 +36,12 @@ else()
 endif()
 
 # -----------------------------------------------------------------------------
+
 project(memgraph)
 
 # Install licenses.
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/licenses/
-  DESTINATION share/doc/memgraph)
+        DESTINATION share/doc/memgraph)
 
 # For more information about how to release a new version of Memgraph, see
 # `release/README.md`.
@@ -61,65 +61,61 @@ set(MEMGRAPH_OVERRIDE_VERSION "")
 set(MEMGRAPH_OVERRIDE_VERSION_SUFFIX "")
 
 # Variables used to generate the versions.
-if(MG_ENTERPRISE)
+if (MG_ENTERPRISE)
   set(get_version_offering "")
 else()
   set(get_version_offering "--open-source")
 endif()
-
 set(get_version_script "${CMAKE_CURRENT_SOURCE_DIR}/release/get_version.py")
 
 # Get version that should be used in the binary.
 execute_process(
-  OUTPUT_VARIABLE MEMGRAPH_VERSION
-  RESULT_VARIABLE MEMGRAPH_VERSION_RESULT
-  COMMAND "${get_version_script}" ${get_version_offering}
-  "${MEMGRAPH_OVERRIDE_VERSION}"
-  "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
-  "--memgraph-root-dir"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
+    OUTPUT_VARIABLE MEMGRAPH_VERSION
+    RESULT_VARIABLE MEMGRAPH_VERSION_RESULT
+    COMMAND "${get_version_script}" ${get_version_offering}
+                "${MEMGRAPH_OVERRIDE_VERSION}"
+                "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
+                "--memgraph-root-dir"
+                "${CMAKE_CURRENT_SOURCE_DIR}"
 )
-
 if(MEMGRAPH_VERSION_RESULT AND NOT MEMGRAPH_VERSION_RESULT EQUAL 0)
-  message(FATAL_ERROR "Unable to get Memgraph version.")
+    message(FATAL_ERROR "Unable to get Memgraph version.")
 else()
-  MESSAGE(STATUS "Memgraph version: ${MEMGRAPH_VERSION}")
+    MESSAGE(STATUS "Memgraph version: ${MEMGRAPH_VERSION}")
 endif()
 
 # Get version that should be used in the DEB package.
 execute_process(
-  OUTPUT_VARIABLE MEMGRAPH_VERSION_DEB
-  RESULT_VARIABLE MEMGRAPH_VERSION_DEB_RESULT
-  COMMAND "${get_version_script}" ${get_version_offering}
-  --variant deb
-  "${MEMGRAPH_OVERRIDE_VERSION}"
-  "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
-  "--memgraph-root-dir"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
+    OUTPUT_VARIABLE MEMGRAPH_VERSION_DEB
+    RESULT_VARIABLE MEMGRAPH_VERSION_DEB_RESULT
+    COMMAND "${get_version_script}" ${get_version_offering}
+                --variant deb
+                "${MEMGRAPH_OVERRIDE_VERSION}"
+                "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
+                "--memgraph-root-dir"
+                "${CMAKE_CURRENT_SOURCE_DIR}"
 )
-
 if(MEMGRAPH_VERSION_DEB_RESULT AND NOT MEMGRAPH_VERSION_DEB_RESULT EQUAL 0)
-  message(FATAL_ERROR "Unable to get Memgraph DEB version.")
+    message(FATAL_ERROR "Unable to get Memgraph DEB version.")
 else()
-  MESSAGE(STATUS "Memgraph DEB version: ${MEMGRAPH_VERSION_DEB}")
+    MESSAGE(STATUS "Memgraph DEB version: ${MEMGRAPH_VERSION_DEB}")
 endif()
 
 # Get version that should be used in the RPM package.
 execute_process(
-  OUTPUT_VARIABLE MEMGRAPH_VERSION_RPM
-  RESULT_VARIABLE MEMGRAPH_VERSION_RPM_RESULT
-  COMMAND "${get_version_script}" ${get_version_offering}
-  --variant rpm
-  "${MEMGRAPH_OVERRIDE_VERSION}"
-  "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
-  "--memgraph-root-dir"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
+    OUTPUT_VARIABLE MEMGRAPH_VERSION_RPM
+    RESULT_VARIABLE MEMGRAPH_VERSION_RPM_RESULT
+    COMMAND "${get_version_script}" ${get_version_offering}
+                --variant rpm
+                "${MEMGRAPH_OVERRIDE_VERSION}"
+                "${MEMGRAPH_OVERRIDE_VERSION_SUFFIX}"
+                "--memgraph-root-dir"
+                "${CMAKE_CURRENT_SOURCE_DIR}"
 )
-
 if(MEMGRAPH_VERSION_RPM_RESULT AND NOT MEMGRAPH_VERSION_RPM_RESULT EQUAL 0)
-  message(FATAL_ERROR "Unable to get Memgraph RPM version.")
+    message(FATAL_ERROR "Unable to get Memgraph RPM version.")
 else()
-  MESSAGE(STATUS "Memgraph RPM version: ${MEMGRAPH_VERSION_RPM}")
+    MESSAGE(STATUS "Memgraph RPM version: ${MEMGRAPH_VERSION_RPM}")
 endif()
 
 # We want the above variables to be updated each time something is committed to
@@ -139,24 +135,22 @@ endif()
 # unnecessary recalculations of the release version. The release version only
 # changes on every `git commit` or `git checkout`. That is why we watch the
 # following files for changes:
-# - `.git/HEAD` -> changes each time a `git checkout` is issued
-# - `.git/refs/heads/...` -> the value in `.git/HEAD` is a branch name (when
-# you are on a branch) and you have to monitor the file of the specific
-# branch to detect when a `git commit` was issued
+#   - `.git/HEAD` -> changes each time a `git checkout` is issued
+#   - `.git/refs/heads/...` -> the value in `.git/HEAD` is a branch name (when
+#     you are on a branch) and you have to monitor the file of the specific
+#     branch to detect when a `git commit` was issued
 # More details about the contents of the `.git` directory and the specific
 # files used can be seen here:
 # https://git-scm.com/book/en/v2/Git-Internals-Git-References
 set(git_directory "${CMAKE_SOURCE_DIR}/.git")
-
-if(EXISTS "${git_directory}")
+if (EXISTS "${git_directory}")
   set_property(DIRECTORY APPEND PROPERTY
-    CMAKE_CONFIGURE_DEPENDS "${git_directory}/HEAD")
+      CMAKE_CONFIGURE_DEPENDS "${git_directory}/HEAD")
   file(STRINGS "${git_directory}/HEAD" git_head_data)
-
-  if(git_head_data MATCHES "^ref: ")
+  if (git_head_data MATCHES "^ref: ")
     string(SUBSTRING "${git_head_data}" 5 -1 git_head_ref)
     set_property(DIRECTORY APPEND PROPERTY
-      CMAKE_CONFIGURE_DEPENDS "${git_directory}/${git_head_ref}")
+        CMAKE_CONFIGURE_DEPENDS "${git_directory}/${git_head_ref}")
   endif()
 endif()
 
@@ -165,19 +159,16 @@ endif()
 # setup CMake module path, defines path for include() and find_package()
 # https://cmake.org/cmake/help/latest/variable/CMAKE_MODULE_PATH.html
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
-
 # custom function definitions
 include(functions)
-
 # -----------------------------------------------------------------------------
 
 # We want out of source builds, so that cmake generated files don't get mixed
 # with source files. This allows for easier clean up.
 disallow_in_source_build()
 add_custom_target(clean_all
-  COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/clean_all.cmake
-  COMMENT "Removing all files in ${CMAKE_BINARY_DIR}")
-
+                  COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/clean_all.cmake
+                  COMMENT "Removing all files in ${CMAKE_BINARY_DIR}")
 # -----------------------------------------------------------------------------
 
 # build flags -----------------------------------------------------------------
@@ -188,19 +179,17 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
 # c99-designator is disabled because of required mixture of designated and
 # non-designated initializers in Python Query Module code (`py_module.cpp`).
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall \
     -Werror=switch -Werror=switch-bool -Werror=return-type \
     -Werror=return-stack-address \
     -Wno-c99-designator \
-    -DBOOST_STACKTRACE_USE_ADDR2LINE \
     -DBOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT")
 
 # Don't omit frame pointer in RelWithDebInfo, for additional callchain debug.
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-  "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
+    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-omit-frame-pointer")
 
 # Statically link libgcc and libstdc++, the GCC allows this according to:
 # https://gcc.gnu.org/onlinedocs/gcc-10.2.0/libstdc++/manual/manual/license.html
@@ -218,47 +207,42 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
 
 SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -pthread")
 
-# debug flags
+#debug flags
 set(PREFERRED_DEBUGGER "gdb" CACHE STRING
-  "Tunes the debug output for your preferred debugger (gdb or lldb).")
-
-if("${PREFERRED_DEBUGGER}" STREQUAL "gdb" AND
-  "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|GNU")
-  set(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
-elseif("${PREFERRED_DEBUGGER}" STREQUAL "lldb" AND
-  "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  set(CMAKE_CXX_FLAGS_DEBUG "-glldb")
+    "Tunes the debug output for your preferred debugger (gdb or lldb).")
+if ("${PREFERRED_DEBUGGER}" STREQUAL "gdb" AND
+    "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang|GNU")
+    set(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+elseif ("${PREFERRED_DEBUGGER}" STREQUAL "lldb" AND
+        "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set(CMAKE_CXX_FLAGS_DEBUG "-glldb")
 else()
-  message(WARNING "Unable to tune for PREFERRED_DEBUGGER: "
-    "'${PREFERRED_DEBUGGER}' with compiler: '${CMAKE_CXX_COMPILER_ID}'")
-  set(CMAKE_CXX_FLAGS_DEBUG "-g")
+    message(WARNING "Unable to tune for PREFERRED_DEBUGGER: "
+            "'${PREFERRED_DEBUGGER}' with compiler: '${CMAKE_CXX_COMPILER_ID}'")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g")
 endif()
 
 # -----------------------------------------------------------------------------
 
 # default build type is debug
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE "Debug")
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug")
 endif()
-
 message(STATUS "CMake build type: ${CMAKE_BUILD_TYPE}")
-
 # -----------------------------------------------------------------------------
+
 set(MG_ARCH "x86_64" CACHE STRING "Host architecture to build Memgraph on. Supported values are x86_64 (default), ARM64.")
 
 # setup external dependencies -------------------------------------------------
 
 # threading
 find_package(Threads REQUIRED)
-
 # optional readline
 option(USE_READLINE "Use GNU Readline library if available (default ON). \
 Set this to OFF to prevent linking with Readline even if it is available." ON)
-
-if(USE_READLINE)
+if (USE_READLINE)
   find_package(Readline)
-
-  if(READLINE_FOUND)
+  if (READLINE_FOUND)
     add_definitions(-DHAS_READLINE)
   endif()
 endif()
@@ -274,27 +258,24 @@ option(ASAN "Build with Address Sanitizer. To get a reasonable performance optio
 option(TSAN "Build with Thread Sanitizer. To get a reasonable performance option should be used only in Release or RelWithDebInfo build " OFF)
 option(UBSAN "Build with Undefined Behaviour Sanitizer" OFF)
 
-if(TEST_COVERAGE)
+if (TEST_COVERAGE)
   string(TOLOWER ${CMAKE_BUILD_TYPE} lower_build_type)
-
-  if(NOT lower_build_type STREQUAL "debug")
+  if (NOT lower_build_type STREQUAL "debug")
     message(FATAL_ERROR "Generating test coverage unsupported in non Debug builds. Current build type is '${CMAKE_BUILD_TYPE}'")
   endif()
-
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
 endif()
 
-if(MG_ENTERPRISE)
+if (MG_ENTERPRISE)
   add_definitions(-DMG_ENTERPRISE)
 endif()
 
 set(ENABLE_JEMALLOC ON)
 
-if(ASAN)
+if (ASAN)
   message(WARNING "Disabling jemalloc as it doesn't work well with ASAN")
   set(ENABLE_JEMALLOC OFF)
-
   # Enable Addres sanitizer and get nicer stack traces in error messages.
   # NOTE: AddressSanitizer uses llvm-symbolizer binary from the Clang
   # distribution to symbolize the stack traces (note that ideally the
@@ -303,20 +284,19 @@ if(ASAN)
   # provide it in separate ASAN_SYMBOLIZER_PATH environment variable.
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-
   # To detect Stack-use-after-return bugs set run-time flag:
-  # ASAN_OPTIONS=detect_stack_use_after_return=1
+  #   ASAN_OPTIONS=detect_stack_use_after_return=1
   # To check initialization order bugs set run-time flag:
-  # ASAN_OPTIONS=check_initialization_order=true
-  # This mode reports an error if initializer for a global variable accesses
-  # dynamically initialized global from another translation unit, which is
-  # not yet initialized
-  # ASAN_OPTIONS=strict_init_order=true
-  # This mode reports an error if initializer for a global variable accesses
-  # any dynamically initialized global from another translation unit.
+  #   ASAN_OPTIONS=check_initialization_order=true
+  #     This mode reports an error if initializer for a global variable accesses
+  #     dynamically initialized global from another translation unit, which is
+  #     not yet initialized
+  #   ASAN_OPTIONS=strict_init_order=true
+  #     This mode reports an error if initializer for a global variable accesses
+  #     any dynamically initialized global from another translation unit.
 endif()
 
-if(TSAN)
+if (TSAN)
   # ThreadSanitizer generally requires all code to be compiled with -fsanitize=thread.
   # If some code (e.g. dynamic libraries) is not compiled with the flag, it can
   # lead to false positive race reports, false negative race reports and/or
@@ -329,21 +309,19 @@ if(TSAN)
   # (unwinding stack on each memory access is too expensive).
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
-
   # By default ThreadSanitizer uses addr2line utility to symbolize reports.
   # llvm-symbolizer is faster, consumes less memory and produces much better
   # reports. To use it set runtime flag:
-  # TSAN_OPTIONS="extern-symbolizer-path=~/llvm-symbolizer"
+  #   TSAN_OPTIONS="extern-symbolizer-path=~/llvm-symbolizer"
   # For more runtime flags see: https://github.com/google/sanitizers/wiki/ThreadSanitizerFlags
 endif()
 
-if(UBSAN)
+if (UBSAN)
   # Compile with UBSAN but disable vptr check. This is disabled because it
   # requires linking with clang++ to make sure C++ specific parts of the
   # runtime library and c++ standard libraries are present.
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-omit-frame-pointer -fno-sanitize=vptr")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fno-sanitize=vptr")
-
   # Run program with environment variable UBSAN_OPTIONS=print_stacktrace=1.
   # Make sure llvm-symbolizer binary is in path.
   # To make the program abort on undefined behavior, use UBSAN_OPTIONS=halt_on_error=1.
@@ -362,7 +340,7 @@ add_subdirectory(release)
 option(MG_ENABLE_TESTING "Set this to OFF to disable building test binaries" ON)
 message(STATUS "MG_ENABLE_TESTING: ${MG_ENABLE_TESTING}")
 
-if(MG_ENABLE_TESTING)
+if (MG_ENABLE_TESTING)
   enable_testing()
   add_subdirectory(tests)
 endif()

cmake/FindSodium.cmake

@@ -0,0 +1,303 @@
+# Written in 2016 by Henrik Steffen Gaßmann <henrik@gassmann.onl>
+#
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication
+# along with this software. If not, see
+#
+# http://creativecommons.org/publicdomain/zero/1.0/
+#
+# #######################################################################
+# Tries to find the local libsodium installation.
+#
+# On Windows the sodium_DIR environment variable is used as a default
+# hint which can be overridden by setting the corresponding cmake variable.
+#
+# Once done the following variables will be defined:
+#
+# sodium_FOUND
+# sodium_INCLUDE_DIR
+# sodium_LIBRARY_DEBUG
+# sodium_LIBRARY_RELEASE
+#
+#
+# Furthermore an imported "sodium" target is created.
+#
+
+if(CMAKE_C_COMPILER_ID STREQUAL "GNU"
+  OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+  set(_GCC_COMPATIBLE 1)
+endif()
+
+# static library option
+if(NOT DEFINED sodium_USE_STATIC_LIBS)
+  option(sodium_USE_STATIC_LIBS "enable to statically link against sodium" OFF)
+endif()
+
+if(NOT(sodium_USE_STATIC_LIBS EQUAL sodium_USE_STATIC_LIBS_LAST))
+  unset(sodium_LIBRARY CACHE)
+  unset(sodium_LIBRARY_DEBUG CACHE)
+  unset(sodium_LIBRARY_RELEASE CACHE)
+  unset(sodium_DLL_DEBUG CACHE)
+  unset(sodium_DLL_RELEASE CACHE)
+  set(sodium_USE_STATIC_LIBS_LAST ${sodium_USE_STATIC_LIBS} CACHE INTERNAL "internal change tracking variable")
+endif()
+
+# #######################################################################
+# UNIX
+if(UNIX)
+  # import pkg-config
+  find_package(PkgConfig QUIET)
+
+  if(PKG_CONFIG_FOUND)
+    pkg_check_modules(sodium_PKG QUIET libsodium)
+  endif()
+
+  if(sodium_USE_STATIC_LIBS)
+    foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
+      if(NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
+        list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
+      endif()
+    endforeach()
+
+    list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+
+    # if pkgconfig for libsodium doesn't provide
+    # static lib info, then override PKG_STATIC here..
+    if(NOT sodium_PKG_STATIC_FOUND)
+      set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
+    endif()
+
+    set(XPREFIX sodium_PKG_STATIC)
+  else()
+    if(NOT sodium_PKG_FOUND)
+      set(sodium_PKG_LIBRARIES sodium)
+    endif()
+
+    set(XPREFIX sodium_PKG)
+  endif()
+
+  find_path(sodium_INCLUDE_DIR sodium.h
+    HINTS ${${XPREFIX}_INCLUDE_DIRS}
+  )
+  find_library(sodium_LIBRARY_DEBUG NAMES ${${XPREFIX}_LIBRARIES}
+    HINTS ${${XPREFIX}_LIBRARY_DIRS}
+  )
+  find_library(sodium_LIBRARY_RELEASE NAMES ${${XPREFIX}_LIBRARIES}
+    HINTS ${${XPREFIX}_LIBRARY_DIRS}
+  )
+
+# #######################################################################
+# Windows
+elseif(WIN32)
+  set(sodium_DIR "$ENV{sodium_DIR}" CACHE FILEPATH "sodium install directory")
+  mark_as_advanced(sodium_DIR)
+
+  find_path(sodium_INCLUDE_DIR sodium.h
+    HINTS ${sodium_DIR}
+    PATH_SUFFIXES include
+  )
+
+  if(MSVC)
+    # detect target architecture
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
+            #if defined _M_IX86
+            #error ARCH_VALUE x86_32
+            #elif defined _M_X64
+            #error ARCH_VALUE x86_64
+            #endif
+            #error ARCH_VALUE unknown
+        ]=])
+    try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
+      OUTPUT_VARIABLE _COMPILATION_LOG
+    )
+    string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+
+    # construct library path
+    if(_TARGET_ARCH STREQUAL "x86_32")
+      string(APPEND _PLATFORM_PATH "Win32")
+    elseif(_TARGET_ARCH STREQUAL "x86_64")
+      string(APPEND _PLATFORM_PATH "x64")
+    else()
+      message(FATAL_ERROR "the ${_TARGET_ARCH} architecture is not supported by Findsodium.cmake.")
+    endif()
+
+    string(APPEND _PLATFORM_PATH "/$$CONFIG$$")
+
+    if(MSVC_VERSION LESS 1900)
+      math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 60")
+    else()
+      math(EXPR _VS_VERSION "${MSVC_VERSION} / 10 - 50")
+    endif()
+
+    string(APPEND _PLATFORM_PATH "/v${_VS_VERSION}")
+
+    if(sodium_USE_STATIC_LIBS)
+      string(APPEND _PLATFORM_PATH "/static")
+    else()
+      string(APPEND _PLATFORM_PATH "/dynamic")
+    endif()
+
+    string(REPLACE "$$CONFIG$$" "Debug" _DEBUG_PATH_SUFFIX "${_PLATFORM_PATH}")
+    string(REPLACE "$$CONFIG$$" "Release" _RELEASE_PATH_SUFFIX "${_PLATFORM_PATH}")
+
+    find_library(sodium_LIBRARY_DEBUG libsodium.lib
+      HINTS ${sodium_DIR}
+      PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+    )
+    find_library(sodium_LIBRARY_RELEASE libsodium.lib
+      HINTS ${sodium_DIR}
+      PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+    )
+
+    if(NOT sodium_USE_STATIC_LIBS)
+      set(CMAKE_FIND_LIBRARY_SUFFIXES_BCK ${CMAKE_FIND_LIBRARY_SUFFIXES})
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
+      find_library(sodium_DLL_DEBUG libsodium
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES ${_DEBUG_PATH_SUFFIX}
+      )
+      find_library(sodium_DLL_RELEASE libsodium
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES ${_RELEASE_PATH_SUFFIX}
+      )
+      set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BCK})
+    endif()
+
+  elseif(_GCC_COMPATIBLE)
+    if(sodium_USE_STATIC_LIBS)
+      find_library(sodium_LIBRARY_DEBUG libsodium.a
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES lib
+      )
+      find_library(sodium_LIBRARY_RELEASE libsodium.a
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES lib
+      )
+    else()
+      find_library(sodium_LIBRARY_DEBUG libsodium.dll.a
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES lib
+      )
+      find_library(sodium_LIBRARY_RELEASE libsodium.dll.a
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES lib
+      )
+
+      file(GLOB _DLL
+        LIST_DIRECTORIES false
+        RELATIVE "${sodium_DIR}/bin"
+        "${sodium_DIR}/bin/libsodium*.dll"
+      )
+      find_library(sodium_DLL_DEBUG ${_DLL} libsodium
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES bin
+      )
+      find_library(sodium_DLL_RELEASE ${_DLL} libsodium
+        HINTS ${sodium_DIR}
+        PATH_SUFFIXES bin
+      )
+    endif()
+  else()
+    message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+  endif()
+
+# #######################################################################
+# unsupported
+else()
+  message(FATAL_ERROR "this platform is not supported by FindSodium.cmake")
+endif()
+
+# #######################################################################
+# common stuff
+
+# extract sodium version
+if(sodium_INCLUDE_DIR)
+  set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
+
+  if(EXISTS _VERSION_HEADER)
+    file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
+    string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
+      sodium_VERSION "${_VERSION_HEADER_CONTENT}")
+    set(sodium_VERSION "${sodium_VERSION}" PARENT_SCOPE)
+  endif()
+endif()
+
+# communicate results
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  Sodium # The name must be either uppercase or match the filename case.
+  REQUIRED_VARS
+  sodium_LIBRARY_RELEASE
+  sodium_LIBRARY_DEBUG
+  sodium_INCLUDE_DIR
+  VERSION_VAR
+  sodium_VERSION
+)
+
+if(Sodium_FOUND)
+  set(sodium_LIBRARIES
+    optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
+endif()
+
+# mark file paths as advanced
+mark_as_advanced(sodium_INCLUDE_DIR)
+mark_as_advanced(sodium_LIBRARY_DEBUG)
+mark_as_advanced(sodium_LIBRARY_RELEASE)
+
+if(WIN32)
+  mark_as_advanced(sodium_DLL_DEBUG)
+  mark_as_advanced(sodium_DLL_RELEASE)
+endif()
+
+# create imported target
+if(sodium_USE_STATIC_LIBS)
+  set(_LIB_TYPE STATIC)
+else()
+  set(_LIB_TYPE SHARED)
+endif()
+
+if(NOT TARGET sodium)
+  add_library(sodium ${_LIB_TYPE} IMPORTED)
+endif()
+
+set_target_properties(sodium PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}"
+  IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+)
+
+if(sodium_USE_STATIC_LIBS)
+  set_target_properties(sodium PROPERTIES
+    INTERFACE_COMPILE_DEFINITIONS "SODIUM_STATIC"
+    IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+    IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+  )
+else()
+  if(UNIX)
+    set_target_properties(sodium PROPERTIES
+      IMPORTED_LOCATION "${sodium_LIBRARY_RELEASE}"
+      IMPORTED_LOCATION_DEBUG "${sodium_LIBRARY_DEBUG}"
+    )
+  elseif(WIN32)
+    set_target_properties(sodium PROPERTIES
+      IMPORTED_IMPLIB "${sodium_LIBRARY_RELEASE}"
+      IMPORTED_IMPLIB_DEBUG "${sodium_LIBRARY_DEBUG}"
+    )
+
+    if(NOT(sodium_DLL_DEBUG MATCHES ".*-NOTFOUND"))
+      set_target_properties(sodium PROPERTIES
+        IMPORTED_LOCATION_DEBUG "${sodium_DLL_DEBUG}"
+      )
+    endif()
+
+    if(NOT(sodium_DLL_RELEASE MATCHES ".*-NOTFOUND"))
+      set_target_properties(sodium PROPERTIES
+        IMPORTED_LOCATION_RELWITHDEBINFO "${sodium_DLL_RELEASE}"
+        IMPORTED_LOCATION_MINSIZEREL "${sodium_DLL_RELEASE}"
+        IMPORTED_LOCATION_RELEASE "${sodium_DLL_RELEASE}"
+      )
+    endif()
+  endif()
+endif()

cmake/MgThrift.cmake

@@ -0,0 +1,176 @@
+find_package(Gflags)
+find_package(Folly)
+find_package(wangle)
+find_package(fizz)
+find_package(proxygen)
+find_package(FBThrift)
+set(THRIFTCPP2 "FBThrift::thriftcpp2")
+set(THRIFT1 ${FBTHRIFT_COMPILER})
+
+include(${FBTHRIFT_INCLUDE_DIR}/thrift/ThriftLibrary.cmake)
+
+set(MG_INTERFACE_TARGET_NAME_PREFIX "mg-interface")
+
+function(_mg_thrift_generate
+  file_name
+  services
+  language
+  options
+  file_path
+  output_path
+  include_prefix
+)
+  cmake_parse_arguments(THRIFT_GENERATE # Prefix
+    "" # Options
+    "" # One Value args
+    "THRIFT_INCLUDE_DIRECTORIES" # Multi-value args
+    "${ARGN}")
+
+  set(thrift_include_directories)
+
+  foreach(dir ${THRIFT_GENERATE_THRIFT_INCLUDE_DIRECTORIES})
+    list(APPEND thrift_include_directories "-I" "${dir}")
+  endforeach()
+
+  set("${file_name}-${language}-HEADERS"
+    ${output_path}/gen-${language}/${file_name}_constants.h
+    ${output_path}/gen-${language}/${file_name}_data.h
+    ${output_path}/gen-${language}/${file_name}_metadata.h
+    ${output_path}/gen-${language}/${file_name}_types.h
+    ${output_path}/gen-${language}/${file_name}_types.tcc
+  )
+  set("${file_name}-${language}-SOURCES"
+    ${output_path}/gen-${language}/${file_name}_constants.cpp
+    ${output_path}/gen-${language}/${file_name}_data.cpp
+    ${output_path}/gen-${language}/${file_name}_types.cpp
+  )
+
+  if(NOT "${options}" MATCHES "no_metadata")
+    set("${file_name}-${language}-SOURCES"
+      ${${file_name}-${language}-SOURCES}
+      ${output_path}/gen-${language}/${file_name}_metadata.cpp
+    )
+  endif()
+
+  foreach(service ${services})
+    set("${file_name}-${language}-HEADERS"
+      ${${file_name}-${language}-HEADERS}
+      ${output_path}/gen-${language}/${service}.h
+      ${output_path}/gen-${language}/${service}.tcc
+      ${output_path}/gen-${language}/${service}AsyncClient.h
+      ${output_path}/gen-${language}/${service}_custom_protocol.h
+    )
+    set("${file_name}-${language}-SOURCES"
+      ${${file_name}-${language}-SOURCES}
+      ${output_path}/gen-${language}/${service}.cpp
+      ${output_path}/gen-${language}/${service}AsyncClient.cpp
+    )
+  endforeach()
+
+  if("${include_prefix}" STREQUAL "")
+    set(include_prefix_text "")
+  else()
+    set(include_prefix_text "include_prefix=${include_prefix}")
+
+    if(NOT "${options}" STREQUAL "")
+      set(include_prefix_text ",${include_prefix_text}")
+    endif()
+  endif()
+
+  set(gen_language ${language})
+
+  if("${language}" STREQUAL "cpp2")
+    set(gen_language "mstch_cpp2")
+  elseif("${language}" STREQUAL "py3")
+    set(gen_language "mstch_py3")
+    file(WRITE "${output_path}/gen-${language}/${file_name}/__init__.py")
+  endif()
+
+  add_custom_command(
+    OUTPUT ${${file_name}-${language}-HEADERS}
+    ${${file_name}-${language}-SOURCES}
+    COMMAND ${THRIFT1}
+    --gen "${gen_language}:${options}${include_prefix_text}"
+    -o ${output_path}
+    ${thrift_include_directories}
+    "${file_path}/${file_name}.thrift"
+    DEPENDS
+    ${THRIFT1}
+    "${file_path}/${file_name}.thrift"
+    COMMENT "Generating ${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language} files. Output: ${output_path}"
+  )
+  add_custom_target(
+    ${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-target ALL
+    DEPENDS ${${language}-${language}-HEADERS}
+    ${${file_name}-${language}-SOURCES}
+  )
+
+  set("${file_name}-${language}-SOURCES" ${${file_name}-${language}-SOURCES} PARENT_SCOPE)
+  install(
+    DIRECTORY gen-${language}
+    DESTINATION include/${include_prefix}
+    FILES_MATCHING PATTERN "*.h")
+  install(
+    DIRECTORY gen-${language}
+    DESTINATION include/${include_prefix}
+    FILES_MATCHING PATTERN "*.tcc")
+endfunction()
+
+function(_mg_thrift_object
+  file_name
+  services
+  language
+  options
+  file_path
+  output_path
+  include_prefix
+)
+  _mg_thrift_generate(
+    "${file_name}"
+    "${services}"
+    "${language}"
+    "${options}"
+    "${file_path}"
+    "${output_path}"
+    "${include_prefix}"
+    "${ARGN}"
+  )
+  bypass_source_check(${${file_name}-${language}-SOURCES})
+  add_library(
+    "${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-obj"
+    OBJECT
+    ${${file_name}-${language}-SOURCES}
+  )
+  add_dependencies(
+    "${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-obj"
+    "${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-target"
+  )
+  target_include_directories(${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-obj PUBLIC ${output_path})
+  message(STATUS "MgThrift will create the Object file : ${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-${language}-obj")
+endfunction()
+
+function(mg_thrift_library
+  file_name
+  services
+  file_path
+  output_path
+  include_prefix
+)
+  _mg_thrift_object(
+    "${file_name}"
+    "${services}"
+    "cpp2"
+    "stack_arguments" # options
+    "${file_path}"
+    "${output_path}"
+    "${include_prefix}"
+    THRIFT_INCLUDE_DIRECTORIES "${FBTHRIFT_INCLUDE_DIR}"
+  )
+  set(LIBRARY_NAME "${MG_INTERFACE_TARGET_NAME_PREFIX}-${file_name}-cpp2")
+  add_library(
+    "${LIBRARY_NAME}"
+    $<TARGET_OBJECTS:${LIBRARY_NAME}-obj>
+  )
+  target_link_libraries("${LIBRARY_NAME}" ${THRIFTCPP2})
+  message("MgThrift will create the library file : ${LIBRARY_NAME}")
+endfunction()

config/flags.yaml

@@ -83,9 +83,13 @@ modifications:
     value: "true"
     override: true
 
-  # - name: "query_modules_directory"
-  #   value: "/usr/lib/memgraph/query_modules"
-  #   override: true
+  - name: "query_modules_directory"
+    value: "/usr/lib/memgraph/query_modules"
+    override: true
+
+  - name: "auth_module_executable"
+    value: "/usr/lib/memgraph/auth_module/example.py"
+    override: false
 
   - name: "memory_limit"
     value: "0"

environment/toolchain/fbthrift.patch

@@ -0,0 +1,12 @@
+diff -ur a/thrift/lib/cpp2/server/IOWorkerContext.h b/thrift/lib/cpp2/server/IOWorkerContext.h
+--- a/thrift/lib/cpp2/server/IOWorkerContext.h  2022-06-08 11:50:43.043948657 +0200
++++ b/thrift/lib/cpp2/server/IOWorkerContext.h  2022-06-08 11:47:33.232695125 +0200
+@@ -59,7 +59,7 @@
+           auto aliveLocked = alive->rlock();
+           if (*aliveLocked) {
+             // IOWorkerContext is still alive and so is replyQueue_
+-            queue->startConsumingInternal(&evb);
++            queue->startConsuming(&evb);
+           }
+         });
+   }

init

@@ -140,12 +140,5 @@ done;
 python3 -m pip install pre-commit
 python3 -m pre_commit install
 
-# Install py format tools
-echo "Install black formatter"
-python3 -m pip install black==22.10.*
-echo "Install isort"
-python3 -m pip install isort==5.10.*
-
-
 # Link `include/mgp.py` with `release/mgp/mgp.py`
 ln -v -f include/mgp.py release/mgp/mgp.py

libs/setup.sh

@@ -116,7 +116,7 @@ declare -A primary_urls=(
   ["pymgclient"]="http://$local_cache_host/git/pymgclient.git"
   ["mgconsole"]="http://$local_cache_host/git/mgconsole.git"
   ["spdlog"]="http://$local_cache_host/git/spdlog"
-  ["nlohmann"]="http://$local_cache_host/file/nlohmann/json/9d69186291aca4f0137b69c1dee313b391ff564c/single_include/nlohmann/json.hpp"
+  ["nlohmann"]="http://$local_cache_host/file/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
   ["neo4j"]="http://$local_cache_host/file/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="http://$local_cache_host/git/librdkafka.git"
   ["protobuf"]="http://$local_cache_host/git/protobuf.git"
@@ -141,7 +141,7 @@ declare -A secondary_urls=(
   ["pymgclient"]="https://github.com/memgraph/pymgclient.git"
   ["mgconsole"]="http://github.com/memgraph/mgconsole.git"
   ["spdlog"]="https://github.com/gabime/spdlog"
-  ["nlohmann"]="https://raw.githubusercontent.com/nlohmann/json/9d69186291aca4f0137b69c1dee313b391ff564c/single_include/nlohmann/json.hpp"
+  ["nlohmann"]="https://raw.githubusercontent.com/nlohmann/json/4f8fba14066156b73f1189a2b8bd568bde5284c5/single_include/nlohmann/json.hpp"
   ["neo4j"]="https://s3-eu-west-1.amazonaws.com/deps.memgraph.io/neo4j-community-3.2.3-unix.tar.gz"
   ["librdkafka"]="https://github.com/edenhill/librdkafka.git"
   ["protobuf"]="https://github.com/protocolbuffers/protobuf.git"

pyproject.toml

@@ -1,12 +0,0 @@
-[tool.black]
-line-length = 120
-include = '\.pyi?$'
-extend-exclude = '''
-/(
-    | .git
-    | .__pycache__
-    | build
-    | libs
-    | .cache
-)/
-'''

src/CMakeLists.txt

@@ -1,6 +1,8 @@
 # CMake configuration for the main memgraph library and executable
+include(MgThrift)
 
 # add memgraph sub libraries, ordered by dependency
+add_subdirectory(interface)
 add_subdirectory(lisp)
 add_subdirectory(utils)
 add_subdirectory(requests)
@@ -18,8 +20,6 @@ add_subdirectory(query/v2)
 add_subdirectory(slk)
 add_subdirectory(rpc)
 add_subdirectory(auth)
-add_subdirectory(parser)
-add_subdirectory(expr)
 add_subdirectory(coordinator)
 
 if (MG_ENTERPRISE)
@@ -37,13 +37,13 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 # Memgraph Single Node v2 Executable
 # ----------------------------------------------------------------------------
 set(mg_single_node_v2_sources
-        glue/v2/communication.cpp
-        memgraph.cpp
-        glue/v2/auth.cpp
+    glue/communication.cpp
+    memgraph.cpp
+    glue/auth.cpp
 )
 
 set(mg_single_node_v2_libs stdc++fs Threads::Threads
-    telemetry_lib mg-query-v2 mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-io mg-coordinator)
+    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings FBThrift::thriftcpp2)
 if (MG_ENTERPRISE)
   # These are enterprise subsystems
   set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)
@@ -126,3 +126,19 @@ install(CODE "file(MAKE_DIRECTORY \$ENV{DESTDIR}/var/log/memgraph
 # ----------------------------------------------------------------------------
 # Memgraph CSV Import Tool Executable
 # ----------------------------------------------------------------------------
+
+add_executable(mg_import_csv mg_import_csv.cpp)
+target_link_libraries(mg_import_csv mg-storage-v2)
+
+# Strip the executable in release build.
+if (lower_build_type STREQUAL "release")
+  add_custom_command(TARGET mg_import_csv POST_BUILD
+                     COMMAND strip -s mg_import_csv
+                     COMMENT "Stripping symbols and sections from mg_import_csv")
+endif()
+
+install(TARGETS mg_import_csv RUNTIME DESTINATION bin)
+
+# ----------------------------------------------------------------------------
+# Memgraph CSV Import Tool Executable
+# ----------------------------------------------------------------------------

src/communication/v2/listener.hpp

@@ -30,7 +30,6 @@
 #include "communication/context.hpp"
 #include "communication/v2/pool.hpp"
 #include "communication/v2/session.hpp"
-#include "utils/message.hpp"
 #include "utils/spin_lock.hpp"
 #include "utils/synchronized.hpp"
 
@@ -59,10 +58,10 @@ class Listener final : public std::enable_shared_from_this<Listener<TSession, TS
   bool IsRunning() const noexcept { return alive_.load(std::memory_order_relaxed); }
 
  private:
-  Listener(boost::asio::io_context &io_context, TSessionData &data, ServerContext *server_context,
+  Listener(boost::asio::io_context &io_context, TSessionData *data, ServerContext *server_context,
            tcp::endpoint &endpoint, const std::string_view service_name, const uint64_t inactivity_timeout_sec)
       : io_context_(io_context),
-        data_(&data),
+        data_(data),
         server_context_(server_context),
         acceptor_(io_context_),
         endpoint_{endpoint},
@@ -111,7 +110,7 @@ class Listener final : public std::enable_shared_from_this<Listener<TSession, TS
       return OnError(ec, "accept");
     }
 
-    auto session = SessionHandler::Create(std::move(socket), *data_, *server_context_, endpoint_, inactivity_timeout_,
+    auto session = SessionHandler::Create(std::move(socket), data_, *server_context_, endpoint_, inactivity_timeout_,
                                           service_name_);
     session->Start();
     DoAccept();

src/communication/v2/server.hpp

@@ -72,7 +72,7 @@ class Server final {
    * Constructs and binds server to endpoint, operates on session data and
    * invokes workers_count workers
    */
-  Server(ServerEndpoint &endpoint, TSessionData &session_data, ServerContext *server_context,
+  Server(ServerEndpoint &endpoint, TSessionData *session_data, ServerContext *server_context,
          const int inactivity_timeout_sec, const std::string_view service_name,
          size_t workers_count = std::thread::hardware_concurrency())
       : endpoint_{endpoint},

src/communication/v2/session.hpp

@@ -41,7 +41,6 @@
 #include <boost/beast/websocket/rfc6455.hpp>
 #include <boost/system/detail/error_code.hpp>
 
-#include "communication/buffer.hpp"
 #include "communication/context.hpp"
 #include "communication/exceptions.hpp"
 #include "utils/logging.hpp"
@@ -140,7 +139,7 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession<TS
 
  private:
   // Take ownership of the socket
-  explicit WebsocketSession(tcp::socket &&socket, TSessionData &data, tcp::endpoint endpoint,
+  explicit WebsocketSession(tcp::socket &&socket, TSessionData *data, tcp::endpoint endpoint,
                             std::string_view service_name)
       : ws_(std::move(socket)),
         strand_{boost::asio::make_strand(ws_.get_executor())},
@@ -312,13 +311,13 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
   }
 
  private:
-  explicit Session(tcp::socket &&socket, TSessionData &data, ServerContext &server_context, tcp::endpoint endpoint,
+  explicit Session(tcp::socket &&socket, TSessionData *data, ServerContext &server_context, tcp::endpoint endpoint,
                    const std::chrono::seconds inactivity_timeout_sec, std::string_view service_name)
       : socket_(CreateSocket(std::move(socket), server_context)),
         strand_{boost::asio::make_strand(GetExecutor())},
         output_stream_([this](const uint8_t *data, size_t len, bool have_more) { return Write(data, len, have_more); }),
         session_(data, endpoint, input_buffer_.read_end(), &output_stream_),
-        data_{&data},
+        data_{data},
         endpoint_{endpoint},
         remote_endpoint_{GetRemoteEndpoint()},
         service_name_{service_name},
@@ -374,7 +373,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
         spdlog::info("Switching {} to websocket connection", remote_endpoint_);
         if (std::holds_alternative<TCPSocket>(socket_)) {
           auto sock = std::get<TCPSocket>(std::move(socket_));
-          WebsocketSession<TSession, TSessionData>::Create(std::move(sock), *data_, endpoint_, service_name_)
+          WebsocketSession<TSession, TSessionData>::Create(std::move(sock), data_, endpoint_, service_name_)
               ->DoAccept(parser.release());
           execution_active_ = false;
           return;
@@ -466,7 +465,7 @@ class Session final : public std::enable_shared_from_this<Session<TSession, TSes
     if (timeout_timer_.expiry() <= boost::asio::steady_timer::clock_type::now()) {
       // The deadline has passed. Stop the session. The other actors will
       // terminate as soon as possible.
-      spdlog::info("Shutting down session after {} of inactivity", timeout_seconds_.count());
+      spdlog::info("Shutting down session after {} of inactivity", timeout_seconds_);
       DoShutdown();
     } else {
       // Put the actor back to sleep.

src/coordinator/CMakeLists.txt

@@ -1,9 +1,10 @@
 set(coordinator_src_files
-    coordinator.cpp
-    shard_map.cpp)
+    coordinator.hpp
+    shard_map.hpp
+    hybrid_logical_clock.hpp)
 
 find_package(fmt REQUIRED)
 find_package(Threads REQUIRED)
 
 add_library(mg-coordinator STATIC ${coordinator_src_files})
-target_link_libraries(mg-coordinator stdc++fs Threads::Threads fmt::fmt mg-utils mg-storage-v3)
+target_link_libraries(mg-coordinator stdc++fs Threads::Threads fmt::fmt mg-utils)

src/coordinator/coordinator.cpp

@@ -1,129 +0,0 @@
-// 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 <coordinator/coordinator.hpp>
-
-namespace memgraph::coordinator {
-
-CoordinatorWriteResponses Coordinator::ApplyWrite(HeartbeatRequest &&heartbeat_request) {
-  spdlog::info("Coordinator handling HeartbeatRequest");
-
-  // add this storage engine to any under-replicated shards that it is not already a part of
-
-  auto initializing_rsms_for_shard_manager =
-      shard_map_.AssignShards(heartbeat_request.from_storage_manager, heartbeat_request.initialized_rsms);
-
-  return HeartbeatResponse{
-      .shards_to_initialize = initializing_rsms_for_shard_manager,
-  };
-}
-
-CoordinatorWriteResponses Coordinator::ApplyWrite(HlcRequest &&hlc_request) {
-  HlcResponse res{};
-
-  auto hlc_shard_map = shard_map_.GetHlc();
-
-  MG_ASSERT(!(hlc_request.last_shard_map_version.logical_id > hlc_shard_map.logical_id));
-
-  res.new_hlc = Hlc{
-      .logical_id = ++highest_allocated_timestamp_,
-      // TODO(tyler) probably pass some more context to the Coordinator here
-      // so that we can use our wall clock and enforce monotonicity.
-      // .coordinator_wall_clock = io_.Now(),
-  };
-
-  // Allways return fresher shard_map for now.
-  res.fresher_shard_map = std::make_optional(shard_map_);
-
-  return res;
-}
-
-CoordinatorWriteResponses Coordinator::ApplyWrite(AllocateEdgeIdBatchRequest &&ahr) {
-  AllocateEdgeIdBatchResponse res{};
-
-  uint64_t low = highest_allocated_edge_id_;
-
-  highest_allocated_edge_id_ += ahr.batch_size;
-
-  uint64_t high = highest_allocated_edge_id_;
-
-  res.low = low;
-  res.high = high;
-
-  return res;
-}
-
-/// This splits the shard immediately beneath the provided
-/// split key, keeping the assigned peers identical for now,
-/// but letting them be gradually migrated over time.
-CoordinatorWriteResponses Coordinator::ApplyWrite(SplitShardRequest &&split_shard_request) {
-  SplitShardResponse res{};
-
-  if (split_shard_request.previous_shard_map_version != shard_map_.shard_map_version) {
-    res.success = false;
-  } else {
-    res.success = shard_map_.SplitShard(split_shard_request.previous_shard_map_version, split_shard_request.label_id,
-                                        split_shard_request.split_key);
-  }
-
-  return res;
-}
-
-/// This adds the provided storage engine to the standby storage engine pool,
-/// which can be used to rebalance storage over time.
-CoordinatorWriteResponses Coordinator::ApplyWrite(
-    RegisterStorageEngineRequest && /* register_storage_engine_request */) {
-  RegisterStorageEngineResponse res{};
-  // TODO
-
-  return res;
-}
-
-/// This begins the process of draining the provided storage engine from all raft
-/// clusters that it might be participating in.
-CoordinatorWriteResponses Coordinator::ApplyWrite(
-    DeregisterStorageEngineRequest && /* register_storage_engine_request */) {
-  DeregisterStorageEngineResponse res{};
-  // TODO
-
-  return res;
-}
-
-CoordinatorWriteResponses Coordinator::ApplyWrite(InitializeLabelRequest &&initialize_label_request) {
-  InitializeLabelResponse res{};
-
-  std::optional<LabelId> new_label_id = shard_map_.InitializeNewLabel(
-      initialize_label_request.label_name, initialize_label_request.schema, initialize_label_request.replication_factor,
-      initialize_label_request.last_shard_map_version);
-
-  if (new_label_id) {
-    res.new_label_id = new_label_id.value();
-    res.fresher_shard_map = std::nullopt;
-    res.success = true;
-  } else {
-    res.fresher_shard_map = shard_map_;
-    res.success = false;
-  }
-
-  return res;
-}
-
-CoordinatorWriteResponses Coordinator::ApplyWrite(AllocatePropertyIdsRequest &&allocate_property_ids_request) {
-  AllocatePropertyIdsResponse res{};
-
-  auto property_ids = shard_map_.AllocatePropertyIds(allocate_property_ids_request.property_names);
-
-  res.property_ids = property_ids;
-
-  return res;
-}
-
-}  // namespace memgraph::coordinator

src/coordinator/coordinator.hpp

@@ -11,31 +11,18 @@
 
 #pragma once
 
-#include <optional>
-#include <set>
-#include <string>
 #include <unordered_set>
-#include <variant>
-#include <vector>
 
-#include <boost/uuid/uuid.hpp>
-
-#include <coordinator/hybrid_logical_clock.hpp>
-#include <coordinator/shard_map.hpp>
-#include <io/simulator/simulator.hpp>
-#include <io/time.hpp>
-#include <io/transport.hpp>
-#include <storage/v3/id_types.hpp>
-#include <storage/v3/schemas.hpp>
+#include "coordinator/hybrid_logical_clock.hpp"
+#include "coordinator/shard_map.hpp"
+#include "io/simulator/simulator.hpp"
+#include "io/time.hpp"
+#include "io/transport.hpp"
 
 namespace memgraph::coordinator {
 
-using memgraph::io::Address;
-using memgraph::storage::v3::LabelId;
-using memgraph::storage::v3::PropertyId;
-using memgraph::storage::v3::SchemaProperty;
+using Address = memgraph::io::Address;
 using SimT = memgraph::io::simulator::SimulatorTransport;
-using PrimaryKey = std::vector<PropertyValue>;
 
 struct HlcRequest {
   Hlc last_shard_map_version;
@@ -74,18 +61,10 @@ struct AllocateEdgeIdBatchResponse {
   uint64_t high;
 };
 
-struct AllocatePropertyIdsRequest {
-  std::vector<std::string> property_names;
-};
-
-struct AllocatePropertyIdsResponse {
-  std::map<std::string, PropertyId> property_ids;
-};
-
 struct SplitShardRequest {
   Hlc previous_shard_map_version;
-  LabelId label_id;
-  PrimaryKey split_key;
+  Label label;
+  CompoundKey split_key;
 };
 
 struct SplitShardResponse {
@@ -110,87 +89,155 @@ struct DeregisterStorageEngineResponse {
 
 struct InitializeLabelRequest {
   std::string label_name;
-  std::vector<SchemaProperty> schema;
-  size_t replication_factor;
   Hlc last_shard_map_version;
 };
 
 struct InitializeLabelResponse {
   bool success;
-  LabelId new_label_id;
   std::optional<ShardMap> fresher_shard_map;
 };
 
-struct HeartbeatRequest {
-  Address from_storage_manager;
-  std::set<boost::uuids::uuid> initialized_rsms;
-};
+using WriteRequests =
+    std::variant<AllocateHlcBatchRequest, AllocateEdgeIdBatchRequest, SplitShardRequest, RegisterStorageEngineRequest,
+                 DeregisterStorageEngineRequest, InitializeLabelRequest>;
+using WriteResponses =
+    std::variant<AllocateHlcBatchResponse, AllocateEdgeIdBatchResponse, SplitShardResponse,
+                 RegisterStorageEngineResponse, DeregisterStorageEngineResponse, InitializeLabelResponse>;
 
-struct HeartbeatResponse {
-  std::vector<ShardToInitialize> shards_to_initialize;
-};
-
-using CoordinatorWriteRequests =
-    std::variant<HlcRequest, AllocateEdgeIdBatchRequest, SplitShardRequest, RegisterStorageEngineRequest,
-                 DeregisterStorageEngineRequest, InitializeLabelRequest, AllocatePropertyIdsRequest, HeartbeatRequest>;
-using CoordinatorWriteResponses = std::variant<HlcResponse, AllocateEdgeIdBatchResponse, SplitShardResponse,
-                                               RegisterStorageEngineResponse, DeregisterStorageEngineResponse,
-                                               InitializeLabelResponse, AllocatePropertyIdsResponse, HeartbeatResponse>;
-
-using CoordinatorReadRequests = std::variant<GetShardMapRequest>;
-using CoordinatorReadResponses = std::variant<GetShardMapResponse>;
+using ReadRequests = std::variant<HlcRequest, GetShardMapRequest>;
+using ReadResponses = std::variant<HlcResponse, GetShardMapResponse>;
 
 class Coordinator {
- public:
-  explicit Coordinator(ShardMap sm) : shard_map_{std::move(sm)} {}
-
-  // NOLINTNEXTLINE(readability-convert-member-functions-to-static
-  CoordinatorReadResponses Read(CoordinatorReadRequests requests) {
-    return std::visit([&](auto &&request) { return HandleRead(std::forward<decltype(request)>(request)); },
-                      std::move(requests));  // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
-  }
-
-  // NOLINTNEXTLINE(readability-convert-member-functions-to-static
-  CoordinatorWriteResponses Apply(CoordinatorWriteRequests requests) {
-    return std::visit([&](auto &&request) mutable { return ApplyWrite(std::forward<decltype(request)>(request)); },
-                      std::move(requests));
-  }
-
- private:
   ShardMap shard_map_;
-  uint64_t highest_allocated_timestamp_{0};
+  /// The highest reserved timestamp / highest allocated timestamp
+  /// is a way for minimizing communication involved in query engines
+  /// reserving Hlc's for their transaction processing.
+  /// Periodically, the coordinator will allocate a batch of timestamps
+  /// and this will need to go over consensus. From that point forward,
+  /// each timestamp in that batch can be given out to "readers" who issue
+  /// HlcRequest without blocking on consensus first. But if
+  /// highest_allocated_timestamp_ approaches highest_reserved_timestamp_,
+  /// it is time to allocate another batch, so that we can keep guaranteeing
+  /// forward progress.
+  /// Any time a coordinator becomes a new leader, it will need to issue
+  /// a new AllocateHlcBatchRequest to create a pool of IDs to allocate.
+  uint64_t highest_allocated_timestamp_;
+  uint64_t highest_reserved_timestamp_;
 
   /// Query engines need to periodically request batches of unique edge IDs.
-  uint64_t highest_allocated_edge_id_{0};
+  uint64_t highest_allocated_edge_id_;
 
-  CoordinatorReadResponses HandleRead(GetShardMapRequest && /* get_shard_map_request */) {
+  /// Increment our
+  ReadResponses HandleRead(HlcRequest &&hlc_request) {
+    HlcResponse res{};
+
+    auto hlc_shard_map = shard_map_.GetHlc();
+
+    MG_ASSERT(!(hlc_request.last_shard_map_version.logical_id > hlc_shard_map.logical_id));
+
+    res.new_hlc = shard_map_.IncrementShardMapVersion();
+
+    // res.fresher_shard_map = hlc_request.last_shard_map_version.logical_id < hlc_shard_map.logical_id
+    //                             ? std::make_optional(shard_map_)
+    //                             : std::nullopt;
+
+    // Allways return fresher shard_map for now.
+    res.fresher_shard_map = std::make_optional(shard_map_);
+
+    return res;
+  }
+
+  ReadResponses HandleRead(GetShardMapRequest &&get_shard_map_request) {
     GetShardMapResponse res;
     res.shard_map = shard_map_;
     return res;
   }
 
-  CoordinatorWriteResponses ApplyWrite(HeartbeatRequest &&heartbeat_request);
+  WriteResponses ApplyWrite(AllocateHlcBatchRequest &&ahr) {
+    AllocateHlcBatchResponse res{};
 
-  CoordinatorWriteResponses ApplyWrite(HlcRequest &&hlc_request);
+    return res;
+  }
 
-  CoordinatorWriteResponses ApplyWrite(AllocateEdgeIdBatchRequest &&ahr);
+  WriteResponses ApplyWrite(AllocateEdgeIdBatchRequest &&ahr) {
+    AllocateEdgeIdBatchResponse res{};
+
+    uint64_t low = highest_allocated_edge_id_;
+
+    highest_allocated_edge_id_ += ahr.batch_size;
+
+    uint64_t high = highest_allocated_edge_id_;
+
+    res.low = low;
+    res.high = high;
+
+    return res;
+  }
 
   /// This splits the shard immediately beneath the provided
   /// split key, keeping the assigned peers identical for now,
   /// but letting them be gradually migrated over time.
-  CoordinatorWriteResponses ApplyWrite(SplitShardRequest &&split_shard_request);
+  WriteResponses ApplyWrite(SplitShardRequest &&split_shard_request) {
+    SplitShardResponse res{};
+
+    if (split_shard_request.previous_shard_map_version != shard_map_.shard_map_version) {
+      res.success = false;
+    } else {
+      res.success = shard_map_.SplitShard(split_shard_request.previous_shard_map_version, split_shard_request.label,
+                                          split_shard_request.split_key);
+    }
+
+    return res;
+  }
 
   /// This adds the provided storage engine to the standby storage engine pool,
   /// which can be used to rebalance storage over time.
-  static CoordinatorWriteResponses ApplyWrite(RegisterStorageEngineRequest && /* register_storage_engine_request */);
+  WriteResponses ApplyWrite(RegisterStorageEngineRequest &&register_storage_engine_request) {
+    RegisterStorageEngineResponse res{};
+    // TODO
+
+    return res;
+  }
 
   /// This begins the process of draining the provided storage engine from all raft
   /// clusters that it might be participating in.
-  static CoordinatorWriteResponses ApplyWrite(DeregisterStorageEngineRequest && /* register_storage_engine_request */);
+  WriteResponses ApplyWrite(DeregisterStorageEngineRequest &&register_storage_engine_request) {
+    DeregisterStorageEngineResponse res{};
+    // TODO
+    // const Address &address = register_storage_engine_request.address;
+    // storage_engine_pool_.erase(address);
+    // res.success = true;
 
-  CoordinatorWriteResponses ApplyWrite(InitializeLabelRequest &&initialize_label_request);
+    return res;
+  }
 
-  CoordinatorWriteResponses ApplyWrite(AllocatePropertyIdsRequest &&allocate_property_ids_request);
+  WriteResponses ApplyWrite(InitializeLabelRequest &&initialize_label_request) {
+    InitializeLabelResponse res{};
+
+    bool success = shard_map_.InitializeNewLabel(initialize_label_request.label_name,
+                                                 initialize_label_request.last_shard_map_version);
+
+    if (success) {
+      res.fresher_shard_map = shard_map_;
+      res.success = false;
+    } else {
+      res.fresher_shard_map = std::nullopt;
+      res.success = true;
+    }
+
+    return res;
+  }
+
+ public:
+  explicit Coordinator(ShardMap sm) : shard_map_{(sm)} {}
+
+  ReadResponses Read(ReadRequests requests) {
+    return std::visit([&](auto &&requests) { return HandleRead(std::move(requests)); }, std::move(requests));
+  }
+
+  WriteResponses Apply(WriteRequests requests) {
+    return std::visit([&](auto &&requests) { return ApplyWrite(std::move(requests)); }, std::move(requests));
+  }
 };
 
 }  // namespace memgraph::coordinator

src/coordinator/coordinator_client.hpp

@@ -1,24 +0,0 @@
-// 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 "coordinator/coordinator.hpp"
-#include "io/rsm/rsm_client.hpp"
-
-namespace memgraph::coordinator {
-
-using memgraph::io::rsm::RsmClient;
-
-template <typename IoImpl>
-using CoordinatorClient = RsmClient<IoImpl, CoordinatorWriteRequests, CoordinatorWriteResponses,
-                                    CoordinatorReadRequests, CoordinatorReadResponses>;
-}  // namespace memgraph::coordinator

src/coordinator/coordinator_worker.hpp

@@ -1,156 +0,0 @@
-// 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 <deque>
-#include <memory>
-#include <queue>
-#include <variant>
-
-#include "coordinator/coordinator.hpp"
-#include "coordinator/coordinator_rsm.hpp"
-#include "coordinator/shard_map.hpp"
-#include "io/address.hpp"
-#include "io/future.hpp"
-#include "io/messages.hpp"
-#include "io/rsm/raft.hpp"
-#include "io/time.hpp"
-#include "io/transport.hpp"
-#include "query/v2/requests.hpp"
-
-namespace memgraph::coordinator::coordinator_worker {
-
-/// Obligations:
-/// * ShutDown
-/// * Cron
-/// * RouteMessage
-
-using coordinator::Coordinator;
-using coordinator::CoordinatorRsm;
-using io::Address;
-using io::RequestId;
-using io::Time;
-using io::messages::CoordinatorMessages;
-using msgs::ReadRequests;
-using msgs::ReadResponses;
-using msgs::WriteRequests;
-using msgs::WriteResponses;
-
-struct ShutDown {};
-
-struct Cron {};
-
-struct RouteMessage {
-  CoordinatorMessages message;
-  RequestId request_id;
-  Address to;
-  Address from;
-};
-
-using Message = std::variant<RouteMessage, Cron, ShutDown>;
-
-struct QueueInner {
-  std::mutex mu{};
-  std::condition_variable cv;
-  // TODO(tyler) handle simulator communication std::shared_ptr<std::atomic<int>> blocked;
-
-  // TODO(tyler) investigate using a priority queue that prioritizes messages in a way that
-  // improves overall QoS. For example, maybe we want to schedule raft Append messages
-  // ahead of Read messages or generally writes before reads for lowering the load on the
-  // overall system faster etc... When we do this, we need to make sure to avoid
-  // starvation by sometimes randomizing priorities, rather than following a strict
-  // prioritization.
-  std::deque<Message> queue;
-};
-
-/// There are two reasons to implement our own Queue instead of using
-/// one off-the-shelf:
-/// 1. we will need to know in the simulator when all threads are waiting
-/// 2. we will want to implement our own priority queue within this for QoS
-class Queue {
-  std::shared_ptr<QueueInner> inner_ = std::make_shared<QueueInner>();
-
- public:
-  void Push(Message &&message) {
-    {
-      MG_ASSERT(inner_.use_count() > 0);
-      std::unique_lock<std::mutex> lock(inner_->mu);
-
-      inner_->queue.emplace_back(std::move(message));
-    }  // lock dropped before notifying condition variable
-
-    inner_->cv.notify_all();
-  }
-
-  Message Pop() {
-    MG_ASSERT(inner_.use_count() > 0);
-    std::unique_lock<std::mutex> lock(inner_->mu);
-
-    while (inner_->queue.empty()) {
-      inner_->cv.wait(lock);
-    }
-
-    Message message = std::move(inner_->queue.front());
-    inner_->queue.pop_front();
-
-    return message;
-  }
-};
-
-/// A CoordinatorWorker owns Raft<CoordinatorRsm> instances. receives messages from the MachineManager.
-template <typename IoImpl>
-class CoordinatorWorker {
-  io::Io<IoImpl> io_;
-  Queue queue_;
-  CoordinatorRsm<IoImpl> coordinator_;
-
-  bool Process(ShutDown && /*shut_down*/) { return false; }
-
-  bool Process(Cron && /* cron */) {
-    coordinator_.Cron();
-    return true;
-  }
-
-  bool Process(RouteMessage &&route_message) {
-    coordinator_.Handle(std::move(route_message.message), route_message.request_id, route_message.from);
-
-    return true;
-  }
-
- public:
-  CoordinatorWorker(io::Io<IoImpl> io, Queue queue, Coordinator coordinator)
-      : io_(std::move(io)),
-        queue_(std::move(queue)),
-        coordinator_{std::move(io_.ForkLocal()), {}, std::move(coordinator)} {}
-
-  CoordinatorWorker(CoordinatorWorker &&) noexcept = default;
-  CoordinatorWorker &operator=(CoordinatorWorker &&) noexcept = default;
-  CoordinatorWorker(const CoordinatorWorker &) = delete;
-  CoordinatorWorker &operator=(const CoordinatorWorker &) = delete;
-  ~CoordinatorWorker() = default;
-
-  void Run() {
-    while (true) {
-      Message message = queue_.Pop();
-
-      const bool should_continue = std::visit(
-          [this](auto &&msg) { return this->Process(std::forward<decltype(msg)>(msg)); }, std::move(message));
-
-      if (!should_continue) {
-        return;
-      }
-    }
-  }
-};
-
-}  // namespace memgraph::coordinator::coordinator_worker

src/coordinator/hybrid_logical_clock.hpp

@@ -11,11 +11,6 @@
 
 #pragma once
 
-#include <chrono>
-#include <compare>
-#include <ctime>
-#include <iomanip>
-
 #include "io/time.hpp"
 
 namespace memgraph::coordinator {
@@ -24,24 +19,11 @@ using Time = memgraph::io::Time;
 
 /// Hybrid-logical clock
 struct Hlc {
-  uint64_t logical_id = 0;
-  Time coordinator_wall_clock = Time::min();
+  uint64_t logical_id;
+  Time coordinator_wall_clock;
 
-  auto operator<=>(const Hlc &other) const { return logical_id <=> other.logical_id; }
-
-  bool operator==(const Hlc &other) const = default;
-  bool operator<(const Hlc &other) const = default;
-  bool operator==(const uint64_t other) const { return logical_id == other; }
-  bool operator<(const uint64_t other) const { return logical_id < other; }
-  bool operator>=(const uint64_t other) const { return logical_id >= other; }
-
-  friend std::ostream &operator<<(std::ostream &in, const Hlc &hlc) {
-    auto wall_clock = std::chrono::system_clock::to_time_t(hlc.coordinator_wall_clock);
-    in << "Hlc { logical_id: " << hlc.logical_id;
-    in << ", coordinator_wall_clock: " << std::put_time(std::localtime(&wall_clock), "%F %T");
-    in << " }";
-
-    return in;
+  bool operator==(const Hlc &other) const {
+    return (logical_id == other.logical_id) && (coordinator_wall_clock == other.coordinator_wall_clock);
   }
 };
 

src/coordinator/shard_map.cpp

@@ -1,552 +0,0 @@
-// 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 <optional>
-#include <unordered_map>
-#include <vector>
-
-#include "common/types.hpp"
-#include "coordinator/shard_map.hpp"
-#include "spdlog/spdlog.h"
-#include "storage/v3/schemas.hpp"
-#include "storage/v3/temporal.hpp"
-#include "utils/cast.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/string.hpp"
-
-namespace memgraph::coordinator {
-
-using memgraph::common::SchemaType;
-using memgraph::storage::v3::TemporalData;
-using memgraph::storage::v3::TemporalType;
-
-PrimaryKey SchemaToMinKey(const std::vector<SchemaProperty> &schema) {
-  PrimaryKey ret{};
-
-  const int64_t min_int = std::numeric_limits<int64_t>::min();
-
-  const TemporalData date{TemporalType::Date, min_int};
-  const TemporalData local_time{TemporalType::LocalTime, min_int};
-  const TemporalData local_date_time{TemporalType::LocalDateTime, min_int};
-  const TemporalData duration{TemporalType::Duration, min_int};
-
-  for (const auto &schema_property : schema) {
-    switch (schema_property.type) {
-      case SchemaType::BOOL:
-        ret.emplace_back(PropertyValue(false));
-        break;
-      case SchemaType::INT:
-        ret.emplace_back(PropertyValue(min_int));
-        break;
-      case SchemaType::STRING:
-        ret.emplace_back(PropertyValue(""));
-        break;
-      case SchemaType::DATE:
-        ret.emplace_back(PropertyValue(date));
-        break;
-      case SchemaType::LOCALTIME:
-        ret.emplace_back(PropertyValue(local_time));
-        break;
-      case SchemaType::LOCALDATETIME:
-        ret.emplace_back(PropertyValue(local_date_time));
-        break;
-      case SchemaType::DURATION:
-        ret.emplace_back(PropertyValue(duration));
-        break;
-    }
-  }
-
-  return ret;
-}
-
-ShardMap ShardMap::Parse(std::istream &input_stream) {
-  ShardMap shard_map;
-  const auto read_size = [&input_stream] {
-    size_t size{0};
-    input_stream >> size;
-    return size;
-  };
-
-  // Reads a string until the next whitespace
-  const auto read_word = [&input_stream] {
-    std::string word;
-    input_stream >> word;
-    return word;
-  };
-
-  const auto read_names = [&read_size, &read_word] {
-    const auto number_of_names = read_size();
-    spdlog::trace("Reading {} names", number_of_names);
-    std::vector<std::string> names;
-    names.reserve(number_of_names);
-
-    for (auto name_index = 0; name_index < number_of_names; ++name_index) {
-      names.push_back(read_word());
-      spdlog::trace("Read '{}'", names.back());
-    }
-    return names;
-  };
-
-  const auto read_line = [&input_stream] {
-    std::string line;
-    std::getline(input_stream, line);
-    return line;
-  };
-
-  const auto parse_type = [](const std::string &type) {
-    static const auto type_map = std::unordered_map<std::string, common::SchemaType>{
-        {"string", common::SchemaType::STRING}, {"int", common::SchemaType::INT}, {"bool", common::SchemaType::BOOL}};
-    const auto lower_case_type = utils::ToLowerCase(type);
-    auto it = type_map.find(lower_case_type);
-    MG_ASSERT(it != type_map.end(), "Invalid type in split files: {}", type);
-    return it->second;
-  };
-
-  const auto parse_property_value = [](std::string text, const common::SchemaType type) {
-    if (type == common::SchemaType::STRING) {
-      return storage::v3::PropertyValue{std::move(text)};
-    }
-    if (type == common::SchemaType::INT) {
-      size_t processed{0};
-      int64_t value = std::stoll(text, &processed);
-      MG_ASSERT(processed == text.size() || text[processed] == ' ', "Invalid integer format: '{}'", text);
-      return storage::v3::PropertyValue{value};
-    }
-    LOG_FATAL("Not supported type: {}", utils::UnderlyingCast(type));
-  };
-
-  spdlog::debug("Reading properties");
-  const auto properties = read_names();
-  MG_ASSERT(shard_map.AllocatePropertyIds(properties).size() == properties.size(),
-            "Unexpected number of properties created!");
-
-  spdlog::debug("Reading edge types");
-  const auto edge_types = read_names();
-  MG_ASSERT(shard_map.AllocateEdgeTypeIds(edge_types).size() == edge_types.size(),
-            "Unexpected number of properties created!");
-
-  spdlog::debug("Reading primary labels");
-  const auto number_of_primary_labels = read_size();
-  spdlog::debug("Reading {} primary labels", number_of_primary_labels);
-
-  for (auto label_index = 0; label_index < number_of_primary_labels; ++label_index) {
-    const auto primary_label = read_word();
-    spdlog::debug("Reading primary label named '{}'", primary_label);
-    const auto number_of_primary_properties = read_size();
-    spdlog::debug("Reading {} primary properties", number_of_primary_properties);
-    std::vector<std::string> pp_names;
-    std::vector<common::SchemaType> pp_types;
-    pp_names.reserve(number_of_primary_properties);
-    pp_types.reserve(number_of_primary_properties);
-    for (auto property_index = 0; property_index < number_of_primary_properties; ++property_index) {
-      pp_names.push_back(read_word());
-      spdlog::debug("Reading primary property named '{}'", pp_names.back());
-      pp_types.push_back(parse_type(read_word()));
-    }
-    auto pp_mapping = shard_map.AllocatePropertyIds(pp_names);
-    std::vector<SchemaProperty> schema;
-    schema.reserve(number_of_primary_properties);
-
-    for (auto property_index = 0; property_index < number_of_primary_properties; ++property_index) {
-      schema.push_back(storage::v3::SchemaProperty{pp_mapping.at(pp_names[property_index]), pp_types[property_index]});
-    }
-    const auto hlc = shard_map.GetHlc();
-    MG_ASSERT(shard_map.InitializeNewLabel(primary_label, schema, 1, hlc).has_value(),
-              "Cannot initialize new label: {}", primary_label);
-
-    const auto number_of_split_points = read_size();
-    spdlog::debug("Reading {} split points", number_of_split_points);
-
-    [[maybe_unused]] const auto remainder_from_last_line = read_line();
-    for (auto split_point_index = 0; split_point_index < number_of_split_points; ++split_point_index) {
-      const auto line = read_line();
-      spdlog::debug("Read split point '{}'", line);
-      MG_ASSERT(line.front() == '[', "Invalid split file format!");
-      MG_ASSERT(line.back() == ']', "Invalid split file format!");
-      std::string_view line_view{line};
-      line_view.remove_prefix(1);
-      line_view.remove_suffix(1);
-      static constexpr std::string_view kDelimiter{","};
-      auto pk_values_as_text = utils::Split(line_view, kDelimiter);
-      std::vector<PropertyValue> pk;
-      pk.reserve(number_of_primary_properties);
-      MG_ASSERT(pk_values_as_text.size() == number_of_primary_properties,
-                "Split point contains invalid number of values '{}'", line);
-
-      for (auto property_index = 0; property_index < number_of_primary_properties; ++property_index) {
-        pk.push_back(parse_property_value(std::move(pk_values_as_text[property_index]), schema[property_index].type));
-      }
-      shard_map.SplitShard(shard_map.GetHlc(), shard_map.labels.at(primary_label), pk);
-    }
-  }
-
-  return shard_map;
-}
-
-std::ostream &operator<<(std::ostream &in, const ShardMap &shard_map) {
-  using utils::print_helpers::operator<<;
-
-  in << "ShardMap { shard_map_version: " << shard_map.shard_map_version;
-  in << ", max_property_id: " << shard_map.max_property_id;
-  in << ", max_edge_type_id: " << shard_map.max_edge_type_id;
-  in << ", properties: " << shard_map.properties;
-  in << ", edge_types: " << shard_map.edge_types;
-  in << ", max_label_id: " << shard_map.max_label_id;
-  in << ", labels: " << shard_map.labels;
-  in << ", label_spaces: " << shard_map.label_spaces;
-  in << ", schemas: " << shard_map.schemas;
-  in << "}";
-  return in;
-}
-
-Shards ShardMap::GetShardsForLabel(const LabelName &label) const {
-  const auto id = labels.at(label);
-  const auto &shards = label_spaces.at(id).shards;
-  return shards;
-}
-
-std::vector<Shards> ShardMap::GetAllShards() const {
-  std::vector<Shards> all_shards;
-  all_shards.reserve(label_spaces.size());
-  std::transform(label_spaces.begin(), label_spaces.end(), std::back_inserter(all_shards),
-                 [](const auto &label_space) { return label_space.second.shards; });
-  return all_shards;
-}
-
-// TODO(gabor) later we will want to update the wallclock time with
-// the given Io<impl>'s time as well
-Hlc ShardMap::IncrementShardMapVersion() noexcept {
-  ++shard_map_version.logical_id;
-  return shard_map_version;
-}
-
-// TODO(antaljanosbenjamin) use a single map for all name id 
-// mapping and a single counter to maintain the next id
-std::unordered_map<uint64_t, std::string> ShardMap::IdToNames() {
-  std::unordered_map<uint64_t, std::string> id_to_names;
-
-  const auto map_type_ids = [&id_to_names](const auto &name_to_id_type) {
-    for (const auto &[name, id] : name_to_id_type) {
-      id_to_names.emplace(id.AsUint(), name);
-    }
-  };
-
-  map_type_ids(edge_types);
-  map_type_ids(labels);
-  map_type_ids(properties);
-
-  return id_to_names;
-}
-
-Hlc ShardMap::GetHlc() const noexcept { return shard_map_version; }
-
-std::vector<ShardToInitialize> ShardMap::AssignShards(Address storage_manager,
-                                                      std::set<boost::uuids::uuid> initialized) {
-  std::vector<ShardToInitialize> ret{};
-
-  bool mutated = false;
-
-  for (auto &[label_id, label_space] : label_spaces) {
-    for (auto it = label_space.shards.begin(); it != label_space.shards.end(); it++) {
-      auto &[low_key, shard] = *it;
-      std::optional<PrimaryKey> high_key;
-      if (const auto next_it = std::next(it); next_it != label_space.shards.end()) {
-        high_key = next_it->first;
-      }
-      // TODO(tyler) avoid these triple-nested loops by having the heartbeat include better info
-      bool machine_contains_shard = false;
-
-      for (auto &aas : shard) {
-        if (initialized.contains(aas.address.unique_id)) {
-          machine_contains_shard = true;
-          if (aas.status != Status::CONSENSUS_PARTICIPANT) {
-            spdlog::info("marking shard as full consensus participant: {}", aas.address.unique_id);
-            aas.status = Status::CONSENSUS_PARTICIPANT;
-          }
-        } else {
-          const bool same_machine = aas.address.last_known_ip == storage_manager.last_known_ip &&
-                                    aas.address.last_known_port == storage_manager.last_known_port;
-          if (same_machine) {
-            machine_contains_shard = true;
-            spdlog::info("reminding shard manager that they should begin participating in shard");
-
-            ret.push_back(ShardToInitialize{
-                .uuid = aas.address.unique_id,
-                .label_id = label_id,
-                .min_key = low_key,
-                .max_key = high_key,
-                .schema = schemas[label_id],
-                .config = Config{},
-                .id_to_names = IdToNames(),
-            });
-          }
-        }
-      }
-
-      if (!machine_contains_shard && shard.size() < label_space.replication_factor) {
-        Address address = storage_manager;
-
-        // TODO(tyler) use deterministic UUID so that coordinators don't diverge here
-        address.unique_id = boost::uuids::uuid{boost::uuids::random_generator()()},
-
-        spdlog::info("assigning shard manager to shard");
-
-        ret.push_back(ShardToInitialize{
-            .uuid = address.unique_id,
-            .label_id = label_id,
-            .min_key = low_key,
-            .max_key = high_key,
-            .schema = schemas[label_id],
-            .config = Config{},
-            .id_to_names = IdToNames(),
-        });
-
-        AddressAndStatus aas = {
-            .address = address,
-            .status = Status::INITIALIZING,
-        };
-
-        shard.emplace_back(aas);
-      }
-    }
-  }
-
-  if (mutated) {
-    IncrementShardMapVersion();
-  }
-  return ret;
-}
-
-bool ShardMap::SplitShard(Hlc previous_shard_map_version, LabelId label_id, const PrimaryKey &key) {
-  if (previous_shard_map_version != shard_map_version) {
-    return false;
-  }
-
-  auto &label_space = label_spaces.at(label_id);
-  auto &shards_in_map = label_space.shards;
-
-  MG_ASSERT(!shards_in_map.empty());
-  MG_ASSERT(!shards_in_map.contains(key));
-  MG_ASSERT(label_spaces.contains(label_id));
-
-  // Finding the Shard that the new PrimaryKey should map to.
-  auto prev = std::prev(shards_in_map.upper_bound(key));
-  Shard duplicated_shard = prev->second;
-
-  // Apply the split
-  shards_in_map[key] = duplicated_shard;
-
-  IncrementShardMapVersion();
-
-  return true;
-}
-
-std::optional<LabelId> ShardMap::InitializeNewLabel(std::string label_name, std::vector<SchemaProperty> schema,
-                                                    size_t replication_factor, Hlc last_shard_map_version) {
-  if (shard_map_version != last_shard_map_version || labels.contains(label_name)) {
-    return std::nullopt;
-  }
-
-  const LabelId label_id = LabelId::FromUint(++max_label_id);
-
-  labels.emplace(std::move(label_name), label_id);
-
-  PrimaryKey initial_key = SchemaToMinKey(schema);
-  Shard empty_shard = {};
-
-  Shards shards = {
-      {initial_key, empty_shard},
-  };
-
-  LabelSpace label_space{
-      .schema = schema,
-      .shards = shards,
-      .replication_factor = replication_factor,
-  };
-  schemas[label_id] = std::move(schema);
-
-  label_spaces.emplace(label_id, label_space);
-
-  IncrementShardMapVersion();
-
-  return label_id;
-}
-
-void ShardMap::AddServer(Address server_address) {
-  // Find a random place for the server to plug in
-}
-std::optional<LabelId> ShardMap::GetLabelId(const std::string &label) const {
-  if (const auto it = labels.find(label); it != labels.end()) {
-    return it->second;
-  }
-  return std::nullopt;
-}
-
-const std::string &ShardMap::GetLabelName(const LabelId label) const {
-  if (const auto it =
-          std::ranges::find_if(labels, [label](const auto &name_id_pair) { return name_id_pair.second == label; });
-      it != labels.end()) {
-    return it->first;
-  }
-  throw utils::BasicException("GetLabelName fails on the given label id!");
-}
-
-std::optional<PropertyId> ShardMap::GetPropertyId(const std::string &property_name) const {
-  if (const auto it = properties.find(property_name); it != properties.end()) {
-    return it->second;
-  }
-  return std::nullopt;
-}
-
-const std::string &ShardMap::GetPropertyName(const PropertyId property) const {
-  if (const auto it = std::ranges::find_if(
-          properties, [property](const auto &name_id_pair) { return name_id_pair.second == property; });
-      it != properties.end()) {
-    return it->first;
-  }
-  throw utils::BasicException("PropertyId not found!");
-}
-
-std::optional<EdgeTypeId> ShardMap::GetEdgeTypeId(const std::string &edge_type) const {
-  if (const auto it = edge_types.find(edge_type); it != edge_types.end()) {
-    return it->second;
-  }
-  return std::nullopt;
-}
-
-const std::string &ShardMap::GetEdgeTypeName(const EdgeTypeId property) const {
-  if (const auto it = std::ranges::find_if(
-          edge_types, [property](const auto &name_id_pair) { return name_id_pair.second == property; });
-      it != edge_types.end()) {
-    return it->first;
-  }
-  throw utils::BasicException("EdgeTypeId not found!");
-}
-
-Shards ShardMap::GetShardsForRange(const LabelName &label_name, const PrimaryKey &start_key,
-                                   const PrimaryKey &end_key) const {
-  MG_ASSERT(start_key <= end_key);
-  MG_ASSERT(labels.contains(label_name));
-
-  LabelId label_id = labels.at(label_name);
-
-  const auto &label_space = label_spaces.at(label_id);
-
-  const auto &shards_for_label = label_space.shards;
-
-  MG_ASSERT(shards_for_label.begin()->first <= start_key,
-            "the ShardMap must always contain a minimal key that is less than or equal to any requested key");
-
-  auto it = std::prev(shards_for_label.upper_bound(start_key));
-  const auto end_it = shards_for_label.upper_bound(end_key);
-
-  Shards shards{};
-
-  std::copy(it, end_it, std::inserter(shards, shards.end()));
-
-  return shards;
-}
-
-Shard ShardMap::GetShardForKey(const LabelName &label_name, const PrimaryKey &key) const {
-  MG_ASSERT(labels.contains(label_name));
-
-  LabelId label_id = labels.at(label_name);
-
-  const auto &label_space = label_spaces.at(label_id);
-
-  MG_ASSERT(label_space.shards.begin()->first <= key,
-            "the ShardMap must always contain a minimal key that is less than or equal to any requested key");
-
-  return std::prev(label_space.shards.upper_bound(key))->second;
-}
-
-Shard ShardMap::GetShardForKey(const LabelId &label_id, const PrimaryKey &key) const {
-  MG_ASSERT(label_spaces.contains(label_id));
-
-  const auto &label_space = label_spaces.at(label_id);
-
-  MG_ASSERT(label_space.shards.begin()->first <= key,
-            "the ShardMap must always contain a minimal key that is less than or equal to any requested key");
-
-  return std::prev(label_space.shards.upper_bound(key))->second;
-}
-
-PropertyMap ShardMap::AllocatePropertyIds(const std::vector<PropertyName> &new_properties) {
-  PropertyMap ret{};
-
-  bool mutated = false;
-
-  for (const auto &property_name : new_properties) {
-    if (properties.contains(property_name)) {
-      auto property_id = properties.at(property_name);
-      ret.emplace(property_name, property_id);
-    } else {
-      mutated = true;
-
-      const PropertyId property_id = PropertyId::FromUint(++max_property_id);
-      ret.emplace(property_name, property_id);
-      properties.emplace(property_name, property_id);
-    }
-  }
-
-  if (mutated) {
-    IncrementShardMapVersion();
-  }
-
-  return ret;
-}
-
-EdgeTypeIdMap ShardMap::AllocateEdgeTypeIds(const std::vector<EdgeTypeName> &new_edge_types) {
-  EdgeTypeIdMap ret;
-
-  bool mutated = false;
-
-  for (const auto &edge_type_name : new_edge_types) {
-    if (edge_types.contains(edge_type_name)) {
-      auto edge_type_id = edge_types.at(edge_type_name);
-      ret.emplace(edge_type_name, edge_type_id);
-    } else {
-      mutated = true;
-
-      const EdgeTypeId edge_type_id = EdgeTypeId::FromUint(++max_edge_type_id);
-      ret.emplace(edge_type_name, edge_type_id);
-      edge_types.emplace(edge_type_name, edge_type_id);
-    }
-  }
-
-  if (mutated) {
-    IncrementShardMapVersion();
-  }
-
-  return ret;
-}
-
-bool ShardMap::ClusterInitialized() const {
-  for (const auto &[label_id, label_space] : label_spaces) {
-    for (const auto &[low_key, shard] : label_space.shards) {
-      if (shard.size() < label_space.replication_factor) {
-        spdlog::info("label_space below desired replication factor");
-        return false;
-      }
-
-      for (const auto &aas : shard) {
-        if (aas.status != Status::CONSENSUS_PARTICIPANT) {
-          spdlog::info("shard member not yet a CONSENSUS_PARTICIPANT");
-          return false;
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-}  // namespace memgraph::coordinator

src/coordinator/shard_map.hpp

@@ -11,39 +11,15 @@
 
 #pragma once
 
-#include <algorithm>
-#include <limits>
 #include <map>
-#include <set>
 #include <vector>
 
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-
-#include "common/types.hpp"
 #include "coordinator/hybrid_logical_clock.hpp"
 #include "io/address.hpp"
-#include "storage/v3/config.hpp"
-#include "storage/v3/id_types.hpp"
-#include "storage/v3/name_id_mapper.hpp"
 #include "storage/v3/property_value.hpp"
-#include "storage/v3/schemas.hpp"
-#include "storage/v3/temporal.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/print_helpers.hpp"
 
 namespace memgraph::coordinator {
 
-constexpr int64_t kNotExistingId{0};
-
-using memgraph::io::Address;
-using memgraph::storage::v3::Config;
-using memgraph::storage::v3::EdgeTypeId;
-using memgraph::storage::v3::LabelId;
-using memgraph::storage::v3::PropertyId;
-using memgraph::storage::v3::PropertyValue;
-using memgraph::storage::v3::SchemaProperty;
-
 enum class Status : uint8_t {
   CONSENSUS_PARTICIPANT,
   INITIALIZING,
@@ -55,123 +31,105 @@ enum class Status : uint8_t {
 struct AddressAndStatus {
   memgraph::io::Address address;
   Status status;
-
-  friend bool operator<(const AddressAndStatus &lhs, const AddressAndStatus &rhs) { return lhs.address < rhs.address; }
-
-  friend std::ostream &operator<<(std::ostream &in, const AddressAndStatus &address_and_status) {
-    in << "AddressAndStatus { address: ";
-    in << address_and_status.address;
-    if (address_and_status.status == Status::CONSENSUS_PARTICIPANT) {
-      in << ", status: CONSENSUS_PARTICIPANT }";
-    } else {
-      in << ", status: INITIALIZING }";
-    }
-
-    return in;
-  }
-
-  friend bool operator==(const AddressAndStatus &lhs, const AddressAndStatus &rhs) {
-    return lhs.address == rhs.address;
-  }
 };
 
-using PrimaryKey = std::vector<PropertyValue>;
+using memgraph::io::Address;
+
+using CompoundKey = std::vector<memgraph::storage::v3::PropertyValue>;
 using Shard = std::vector<AddressAndStatus>;
-using Shards = std::map<PrimaryKey, Shard>;
-using LabelName = std::string;
-using PropertyName = std::string;
-using EdgeTypeName = std::string;
-using PropertyMap = std::map<PropertyName, PropertyId>;
-using EdgeTypeIdMap = std::map<EdgeTypeName, EdgeTypeId>;
+using Shards = std::map<CompoundKey, Shard>;
 
-struct ShardToInitialize {
-  boost::uuids::uuid uuid;
-  LabelId label_id;
-  PrimaryKey min_key;
-  std::optional<PrimaryKey> max_key;
-  std::vector<SchemaProperty> schema;
-  Config config;
-  std::unordered_map<uint64_t, std::string> id_to_names;
-};
-
-PrimaryKey SchemaToMinKey(const std::vector<SchemaProperty> &schema);
-
-struct LabelSpace {
-  std::vector<SchemaProperty> schema;
-  // Maps between the smallest primary key stored in the shard and the shard
-  std::map<PrimaryKey, Shard> shards;
-  size_t replication_factor;
-
-  friend std::ostream &operator<<(std::ostream &in, const LabelSpace &label_space) {
-    using utils::print_helpers::operator<<;
-
-    in << "LabelSpace { schema: ";
-    in << label_space.schema;
-    in << ", shards: ";
-    in << label_space.shards;
-    in << ", replication_factor: " << label_space.replication_factor << "}";
-
-    return in;
-  }
-};
+// use string for intermachine communication and NameIdMapper within the machine
+using Label = std::string;
 
 struct ShardMap {
   Hlc shard_map_version;
-  uint64_t max_property_id{kNotExistingId};
-  uint64_t max_edge_type_id{kNotExistingId};
-  std::map<PropertyName, PropertyId> properties;
-  std::map<EdgeTypeName, EdgeTypeId> edge_types;
-  uint64_t max_label_id{kNotExistingId};
-  std::map<LabelId, LabelSpace> label_spaces;
-  std::map<LabelId, std::vector<SchemaProperty>> schemas;
-  std::map<LabelName, LabelId> labels;
-
-  [[nodiscard]] static ShardMap Parse(std::istream &input_stream);
-  friend std::ostream &operator<<(std::ostream &in, const ShardMap &shard_map);
-
-  Shards GetShardsForLabel(const LabelName &label) const;
-
-  std::vector<Shards> GetAllShards() const;
+  std::map<Label, Shards> shards;
 
   // TODO(gabor) later we will want to update the wallclock time with
   // the given Io<impl>'s time as well
-  Hlc IncrementShardMapVersion() noexcept;
-  Hlc GetHlc() const noexcept;
+  Hlc IncrementShardMapVersion() noexcept {
+    ++shard_map_version.logical_id;
+    return shard_map_version;
+  }
 
-  std::unordered_map<uint64_t, std::string> IdToNames();
+  Hlc GetHlc() const noexcept { return shard_map_version; }
 
-  // Returns the shard UUIDs that have been assigned but not yet acknowledged for this storage manager
-  std::vector<ShardToInitialize> AssignShards(Address storage_manager, std::set<boost::uuids::uuid> initialized);
+  bool SplitShard(Hlc previous_shard_map_version, Label label, CompoundKey key) {
+    if (CompareShardMapVersions(previous_shard_map_version, shard_map_version)) {
+      MG_ASSERT(shards.contains(label));
+      auto &shards_in_map = shards[label];
+      MG_ASSERT(!shards_in_map.contains(key));
 
-  bool SplitShard(Hlc previous_shard_map_version, LabelId label_id, const PrimaryKey &key);
+      // Finding the Shard that the new CompoundKey should map to.
+      Shard shard_to_map_to;
+      CompoundKey prev_key = ((*shards_in_map.begin()).first);
 
-  std::optional<LabelId> InitializeNewLabel(std::string label_name, std::vector<SchemaProperty> schema,
-                                            size_t replication_factor, Hlc last_shard_map_version);
+      for (auto iter = std::next(shards_in_map.begin()); iter != shards_in_map.end(); ++iter) {
+        const auto &current_key = (*iter).first;
+        if (key > prev_key && key < current_key) {
+          shard_to_map_to = shards_in_map[prev_key];
+        }
 
-  void AddServer(Address server_address);
+        prev_key = (*iter).first;
+      }
 
-  std::optional<LabelId> GetLabelId(const std::string &label) const;
-  // TODO(antaljanosbenjamin): Remove this and instead use NameIdMapper
-  const std::string &GetLabelName(LabelId label) const;
-  std::optional<PropertyId> GetPropertyId(const std::string &property_name) const;
-  const std::string &GetPropertyName(PropertyId property) const;
-  std::optional<EdgeTypeId> GetEdgeTypeId(const std::string &edge_type) const;
-  const std::string &GetEdgeTypeName(EdgeTypeId property) const;
+      // Apply the split
+      shards_in_map[key] = shard_to_map_to;
 
-  Shards GetShardsForRange(const LabelName &label_name, const PrimaryKey &start_key, const PrimaryKey &end_key) const;
+      return true;
+    }
 
-  Shard GetShardForKey(const LabelName &label_name, const PrimaryKey &key) const;
+    return false;
+  }
 
-  Shard GetShardForKey(const LabelId &label_id, const PrimaryKey &key) const;
+  bool InitializeNewLabel(std::string label_name, Hlc last_shard_map_version) {
+    if (shard_map_version != last_shard_map_version) {
+      return false;
+    }
 
-  PropertyMap AllocatePropertyIds(const std::vector<PropertyName> &new_properties);
+    if (shards.contains(label_name)) {
+      return false;
+    }
 
-  EdgeTypeIdMap AllocateEdgeTypeIds(const std::vector<EdgeTypeName> &new_edge_types);
+    shards.emplace(label_name, Shards{});
 
-  /// Returns true if all shards have the desired number of replicas and they are in
-  /// the CONSENSUS_PARTICIPANT state. Note that this does not necessarily mean that
-  /// there is also an active leader for each shard.
-  bool ClusterInitialized() const;
+    IncrementShardMapVersion();
+
+    return true;
+  }
+
+  void AddServer(Address server_address) {
+    // Find a random place for the server to plug in
+  }
+
+  std::map<Label, Shards> &GetShards() noexcept { return shards; }
+
+  Shards GetShardsForRange(Label label, CompoundKey start, CompoundKey end);
+
+  Shard GetShardForKey(Label label, CompoundKey key) {
+    auto shard_for_label = shards.at(label);
+
+    auto max = (--shard_for_label.end())->first;
+
+    if (key > max) {
+      return shard_for_label[max];
+    }
+
+    for (auto it = shard_for_label.lower_bound(key);; --it) {
+      MG_ASSERT(it->first <= key);
+      return it->second;
+    }
+
+    MG_ASSERT(false, "failed to find shard with a key that is less than or equal to the provided key");
+  }
+
+ private:
+  // TODO(gabor) later we will want to update the wallclock time with
+  // the given Io<impl>'s time as well. This function should just be
+  // replaced with operator== since it is already overloaded for Hlc
+  // objects.
+  bool CompareShardMapVersions(Hlc one, Hlc two) { return one.logical_id == two.logical_id; }
 };
 
 }  // namespace memgraph::coordinator

src/expr/CMakeLists.txt

@@ -1,20 +0,0 @@
-define_add_lcp(add_lcp_expr lcp_expr_cpp_files generated_lcp_expr_files)
-
-add_lcp_expr(semantic/symbol.lcp)
-
-add_custom_target(generate_lcp_expr DEPENDS ${generated_lcp_expr_files})
-
-set(mg_expr_sources
-    ${lcp_expr_cpp_files}
-    parsing.cpp)
-
-find_package(Boost REQUIRED)
-
-add_library(mg-expr STATIC ${mg_expr_sources})
-add_dependencies(mg-expr generate_lcp_expr)
-target_include_directories(mg-expr PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_include_directories(mg-expr PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(mg-expr PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ast)
-target_include_directories(mg-expr PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/interpret)
-target_include_directories(mg-expr PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/semantic)
-target_link_libraries(mg-expr cppitertools Boost::headers mg-utils mg-parser)

src/expr/ast.hpp

@@ -1,33 +0,0 @@
-// 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
-
-#ifndef MG_AST_INCLUDE_PATH
-#ifdef MG_CLANG_TIDY_CHECK
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#include "query/v2/bindings/bindings.hpp"
-#else
-#error Missing AST include path
-#endif
-#endif
-
-#ifndef MG_INJECTED_NAMESPACE_NAME
-#ifdef MG_CLANG_TIDY_CHECK
-#else
-#error Missing AST namespace
-#endif
-#endif
-
-#include MG_AST_INCLUDE_PATH
-
-namespace memgraph::expr {
-using namespace MG_INJECTED_NAMESPACE_NAME;  // NOLINT(google-build-using-namespace)
-}  // namespace memgraph::expr

src/expr/ast/pretty_print.hpp

@@ -1,271 +0,0 @@
-// 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 <iostream>
-#include <type_traits>
-
-#include "expr/ast.hpp"
-#include "expr/typed_value.hpp"
-#include "utils/algorithm.hpp"
-#include "utils/logging.hpp"
-#include "utils/string.hpp"
-
-namespace memgraph::expr {
-namespace detail {
-template <typename T>
-void PrintObject(std::ostream *out, const T &arg) {
-  static_assert(!std::is_convertible<T, Expression *>::value,
-                "This overload shouldn't be called with pointers convertible "
-                "to Expression *. This means your other PrintObject overloads aren't "
-                "being called for certain AST nodes when they should (or perhaps such "
-                "overloads don't exist yet).");
-  *out << arg;
-}
-
-inline void PrintObject(std::ostream *out, const std::string &str) { *out << utils::Escape(str); }
-
-inline void PrintObject(std::ostream *out, Aggregation::Op op) { *out << Aggregation::OpToString(op); }
-
-inline void PrintObject(std::ostream *out, Expression *expr);
-
-inline void PrintObject(std::ostream *out, Identifier *expr) { PrintObject(out, static_cast<Expression *>(expr)); }
-
-template <typename T>
-void PrintObject(std::ostream *out, const std::vector<T> &vec) {
-  *out << "[";
-  utils::PrintIterable(*out, vec, ", ", [](auto &stream, const auto &item) { PrintObject(&stream, item); });
-  *out << "]";
-}
-
-template <typename T>
-void PrintObject(std::ostream *out, const std::vector<T, utils::Allocator<T>> &vec) {
-  *out << "[";
-  utils::PrintIterable(*out, vec, ", ", [](auto &stream, const auto &item) { PrintObject(&stream, item); });
-  *out << "]";
-}
-
-template <typename K, typename V>
-void PrintObject(std::ostream *out, const std::map<K, V> &map) {
-  *out << "{";
-  utils::PrintIterable(*out, map, ", ", [](auto &stream, const auto &item) {
-    PrintObject(&stream, item.first);
-    stream << ": ";
-    PrintObject(&stream, item.second);
-  });
-  *out << "}";
-}
-
-template <typename T>
-void PrintObject(std::ostream *out, const utils::pmr::map<utils::pmr::string, T> &map) {
-  *out << "{";
-  utils::PrintIterable(*out, map, ", ", [](auto &stream, const auto &item) {
-    PrintObject(&stream, item.first);
-    stream << ": ";
-    PrintObject(&stream, item.second);
-  });
-  *out << "}";
-}
-
-template <typename T1, typename T2, typename T3>
-inline void PrintObject(std::ostream *out, const TypedValueT<T1, T2, T3> &value) {
-  using TypedValue = TypedValueT<T1, T2, T3>;
-  switch (value.type()) {
-    case TypedValue::Type::Null:
-      *out << "null";
-      break;
-    case TypedValue::Type::String:
-      PrintObject(out, value.ValueString());
-      break;
-    case TypedValue::Type::Bool:
-      *out << (value.ValueBool() ? "true" : "false");
-      break;
-    case TypedValue::Type::Int:
-      PrintObject(out, value.ValueInt());
-      break;
-    case TypedValue::Type::Double:
-      PrintObject(out, value.ValueDouble());
-      break;
-    case TypedValue::Type::List:
-      PrintObject(out, value.ValueList());
-      break;
-    case TypedValue::Type::Map:
-      PrintObject(out, value.ValueMap());
-      break;
-    case TypedValue::Type::Date:
-      PrintObject(out, value.ValueDate());
-      break;
-    case TypedValue::Type::Duration:
-      PrintObject(out, value.ValueDuration());
-      break;
-    case TypedValue::Type::LocalTime:
-      PrintObject(out, value.ValueLocalTime());
-      break;
-    case TypedValue::Type::LocalDateTime:
-      PrintObject(out, value.ValueLocalDateTime());
-      break;
-    default:
-      MG_ASSERT(false, "PrintObject(std::ostream *out, const TypedValue &value) should not reach here");
-  }
-}
-
-template <typename T>
-void PrintOperatorArgs(std::ostream *out, const T &arg) {
-  *out << " ";
-  PrintObject(out, arg);
-  *out << ")";
-}
-
-template <typename T, typename... Ts>
-void PrintOperatorArgs(std::ostream *out, const T &arg, const Ts &...args) {
-  *out << " ";
-  PrintObject(out, arg);
-  PrintOperatorArgs(out, args...);
-}
-
-template <typename... Ts>
-void PrintOperator(std::ostream *out, const std::string &name, const Ts &...args) {
-  *out << "(" << name;
-  PrintOperatorArgs(out, args...);
-}
-}  // namespace detail
-
-class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
- public:
-  explicit ExpressionPrettyPrinter(std::ostream *out) : out_(out) {}
-
-  // Unary operators
-  // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define UNARY_OPERATOR_VISIT(OP_NODE, OP_STR)      \
-  /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
-  void Visit(OP_NODE &op) override { detail::PrintOperator(out_, OP_STR, op.expression_); }
-
-  UNARY_OPERATOR_VISIT(NotOperator, "Not");
-  UNARY_OPERATOR_VISIT(UnaryPlusOperator, "+");
-  UNARY_OPERATOR_VISIT(UnaryMinusOperator, "-");
-  UNARY_OPERATOR_VISIT(IsNullOperator, "IsNull");
-
-#undef UNARY_OPERATOR_VISIT
-
-  // Binary operators
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define BINARY_OPERATOR_VISIT(OP_NODE, OP_STR)     \
-  /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
-  void Visit(OP_NODE &op) override { detail::PrintOperator(out_, OP_STR, op.expression1_, op.expression2_); }
-
-  BINARY_OPERATOR_VISIT(OrOperator, "Or");
-  BINARY_OPERATOR_VISIT(XorOperator, "Xor");
-  BINARY_OPERATOR_VISIT(AndOperator, "And");
-  BINARY_OPERATOR_VISIT(AdditionOperator, "+");
-  BINARY_OPERATOR_VISIT(SubtractionOperator, "-");
-  BINARY_OPERATOR_VISIT(MultiplicationOperator, "*");
-  BINARY_OPERATOR_VISIT(DivisionOperator, "/");
-  BINARY_OPERATOR_VISIT(ModOperator, "%");
-  BINARY_OPERATOR_VISIT(NotEqualOperator, "!=");
-  BINARY_OPERATOR_VISIT(EqualOperator, "==");
-  BINARY_OPERATOR_VISIT(LessOperator, "<");
-  BINARY_OPERATOR_VISIT(GreaterOperator, ">");
-  BINARY_OPERATOR_VISIT(LessEqualOperator, "<=");
-  BINARY_OPERATOR_VISIT(GreaterEqualOperator, ">=");
-  BINARY_OPERATOR_VISIT(InListOperator, "In");
-  BINARY_OPERATOR_VISIT(SubscriptOperator, "Subscript");
-
-#undef BINARY_OPERATOR_VISIT
-
-  // Other
-  void Visit(ListSlicingOperator &op) override {
-    detail::PrintOperator(out_, "ListSlicing", op.list_, op.lower_bound_, op.upper_bound_);
-  }
-
-  void Visit(IfOperator &op) override {
-    detail::PrintOperator(out_, "If", op.condition_, op.then_expression_, op.else_expression_);
-  }
-
-  void Visit(ListLiteral &op) override { detail::PrintOperator(out_, "ListLiteral", op.elements_); }
-
-  void Visit(MapLiteral &op) override {
-    std::map<std::string, Expression *> map;
-    for (const auto &kv : op.elements_) {
-      map[kv.first.name] = kv.second;
-    }
-    detail::PrintObject(out_, map);
-  }
-
-  void Visit(LabelsTest &op) override { detail::PrintOperator(out_, "LabelsTest", op.expression_); }
-
-  void Visit(Aggregation &op) override { detail::PrintOperator(out_, "Aggregation", op.op_); }
-
-  void Visit(Function &op) override { detail::PrintOperator(out_, "Function", op.function_name_, op.arguments_); }
-
-  void Visit(Reduce &op) override {
-    detail::PrintOperator(out_, "Reduce", op.accumulator_, op.initializer_, op.identifier_, op.list_, op.expression_);
-  }
-
-  void Visit(Coalesce &op) override { detail::PrintOperator(out_, "Coalesce", op.expressions_); }
-
-  void Visit(Extract &op) override { detail::PrintOperator(out_, "Extract", op.identifier_, op.list_, op.expression_); }
-
-  void Visit(All &op) override {
-    detail::PrintOperator(out_, "All", op.identifier_, op.list_expression_, op.where_->expression_);
-  }
-
-  void Visit(Single &op) override {
-    detail::PrintOperator(out_, "Single", op.identifier_, op.list_expression_, op.where_->expression_);
-  }
-
-  void Visit(Any &op) override {
-    detail::PrintOperator(out_, "Any", op.identifier_, op.list_expression_, op.where_->expression_);
-  }
-
-  void Visit(None &op) override {
-    detail::PrintOperator(out_, "None", op.identifier_, op.list_expression_, op.where_->expression_);
-  }
-
-  void Visit(Identifier &op) override { detail::PrintOperator(out_, "Identifier", op.name_); }
-
-  void Visit(PrimitiveLiteral &op) override { detail::PrintObject(out_, op.value_); }
-
-  void Visit(PropertyLookup &op) override {
-    detail::PrintOperator(out_, "PropertyLookup", op.expression_, op.property_.name);
-  }
-
-  void Visit(ParameterLookup &op) override { detail::PrintOperator(out_, "ParameterLookup", op.token_position_); }
-
-  void Visit(NamedExpression &op) override { detail::PrintOperator(out_, "NamedExpression", op.name_, op.expression_); }
-
-  void Visit(RegexMatch &op) override { detail::PrintOperator(out_, "=~", op.string_expr_, op.regex_); }
-
- private:
-  std::ostream *out_;
-};
-
-namespace detail {
-inline void PrintObject(std::ostream *out, Expression *expr) {
-  if (expr) {
-    ExpressionPrettyPrinter printer{out};
-    expr->Accept(printer);
-  } else {
-    *out << "<null>";
-  }
-}
-}  // namespace detail
-
-inline void PrintExpression(Expression *expr, std::ostream *out) {
-  ExpressionPrettyPrinter printer{out};
-  expr->Accept(printer);
-}
-
-inline void PrintExpression(NamedExpression *expr, std::ostream *out) {
-  ExpressionPrettyPrinter printer{out};
-  expr->Accept(printer);
-}
-}  // namespace memgraph::expr

src/expr/ast/pretty_print_ast_to_original_expression.hpp

@@ -1,279 +0,0 @@
-// 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 <iostream>
-#include <type_traits>
-
-#include "expr/ast.hpp"
-#include "expr/typed_value.hpp"
-#include "utils/algorithm.hpp"
-#include "utils/logging.hpp"
-#include "utils/string.hpp"
-
-namespace memgraph::expr {
-inline constexpr const char *identifier_node_symbol = "MG_SYMBOL_NODE";
-inline constexpr const char *identifier_edge_symbol = "MG_SYMBOL_EDGE";
-
-namespace detail {
-template <typename T>
-void PrintObject(std::ostream *out, const T &arg) {
-  static_assert(!std::is_convertible<T, Expression *>::value,
-                "This overload shouldn't be called with pointers convertible "
-                "to Expression *. This means your other PrintObject overloads aren't "
-                "being called for certain AST nodes when they should (or perhaps such "
-                "overloads don't exist yet).");
-  *out << arg;
-}
-
-inline void PrintObject(std::ostream *out, const std::string &str) { *out << str; }
-
-inline void PrintObject(std::ostream * /*out*/, Aggregation::Op /*op*/) {
-  throw utils::NotYetImplemented("PrintObject: Aggregation::Op");
-}
-
-inline void PrintObject(std::ostream * /*out*/, Expression * /*expr*/);
-
-inline void PrintObject(std::ostream *out, Identifier *expr) { PrintObject(out, static_cast<Expression *>(expr)); }
-
-template <typename T>
-void PrintObject(std::ostream * /*out*/, const std::vector<T> & /*vec*/) {
-  throw utils::NotYetImplemented("PrintObject: vector<T>");
-}
-
-template <typename T>
-void PrintObject(std::ostream * /*out*/, const std::vector<T, utils::Allocator<T>> & /*vec*/) {
-  throw utils::NotYetImplemented("PrintObject: vector<T, utils::Allocator<T>>");
-}
-
-template <typename K, typename V>
-void PrintObject(std::ostream * /*out*/, const std::map<K, V> & /*map*/) {
-  throw utils::NotYetImplemented("PrintObject: map<K, V>");
-}
-
-template <typename T>
-void PrintObject(std::ostream * /*out*/, const utils::pmr::map<utils::pmr::string, T> & /*map*/) {
-  throw utils::NotYetImplemented("PrintObject: map<utils::pmr::string, V>");
-}
-
-template <typename T1, typename T2, typename T3>
-inline void PrintObject(std::ostream *out, const TypedValueT<T1, T2, T3> &value) {
-  using TypedValue = TypedValueT<T1, T2, T3>;
-  switch (value.type()) {
-    case TypedValue::Type::Null:
-      *out << "null";
-      break;
-    case TypedValue::Type::String:
-      PrintObject(out, value.ValueString());
-      break;
-    case TypedValue::Type::Bool:
-      *out << (value.ValueBool() ? "true" : "false");
-      break;
-    case TypedValue::Type::Int:
-      PrintObject(out, value.ValueInt());
-      break;
-    case TypedValue::Type::Double:
-      PrintObject(out, value.ValueDouble());
-      break;
-    case TypedValue::Type::List:
-      PrintObject(out, value.ValueList());
-      break;
-    case TypedValue::Type::Map:
-      PrintObject(out, value.ValueMap());
-      break;
-    case TypedValue::Type::Date:
-      PrintObject(out, value.ValueDate());
-      break;
-    case TypedValue::Type::Duration:
-      PrintObject(out, value.ValueDuration());
-      break;
-    case TypedValue::Type::LocalTime:
-      PrintObject(out, value.ValueLocalTime());
-      break;
-    case TypedValue::Type::LocalDateTime:
-      PrintObject(out, value.ValueLocalDateTime());
-      break;
-    default:
-      MG_ASSERT(false, "PrintObject(std::ostream *out, const TypedValue &value) should not reach here");
-  }
-}
-
-template <typename T>
-void PrintOperatorArgs(const std::string & /*name*/, std::ostream *out, bool with_parenthesis, const T &arg) {
-  PrintObject(out, arg);
-  if (with_parenthesis) {
-    *out << ")";
-  }
-}
-
-template <typename T, typename... Ts>
-void PrintOperatorArgs(const std::string &name, std::ostream *out, bool with_parenthesis, const T &arg,
-                       const Ts &...args) {
-  PrintObject(out, arg);
-  *out << " " << name << " ";
-  PrintOperatorArgs(name, out, with_parenthesis, args...);
-}
-
-template <typename... Ts>
-void PrintOperator(const std::string &name, std::ostream *out, bool with_parenthesis, const Ts &...args) {
-  if (with_parenthesis) {
-    *out << "(";
-  }
-  PrintOperatorArgs(name, out, with_parenthesis, args...);
-}
-
-// new
-template <typename T>
-void PrintOperatorArgs(std::ostream *out, const T &arg) {
-  PrintObject(out, arg);
-}
-
-template <typename T, typename... Ts>
-void PrintOperatorArgs(std::ostream *out, const T &arg, const Ts &...args) {
-  PrintObject(out, arg);
-  PrintOperatorArgs(out, args...);
-}
-
-template <typename... Ts>
-void PrintOperator(std::ostream *out, const Ts &...args) {
-  PrintOperatorArgs(out, args...);
-}
-}  // namespace detail
-
-class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
- public:
-  explicit ExpressionPrettyPrinter(std::ostream *out) : out_(out) {}
-
-  // Unary operators
-  // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define UNARY_OPERATOR_VISIT(OP_NODE, OP_STR)      \
-  /* NOLINTNEXTLINE(bugprone-macro-parentheses) */ \
-  void Visit(OP_NODE &op) override { detail::PrintOperator(OP_STR, out_, false /*with_parenthesis*/, op.expression_); }
-
-  UNARY_OPERATOR_VISIT(NotOperator, "Not");
-  UNARY_OPERATOR_VISIT(UnaryPlusOperator, "+");
-  UNARY_OPERATOR_VISIT(UnaryMinusOperator, "-");
-  UNARY_OPERATOR_VISIT(IsNullOperator, "IsNull");
-
-#undef UNARY_OPERATOR_VISIT
-
-  // Binary operators
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define BINARY_OPERATOR_VISIT(OP_NODE, OP_STR)                                                        \
-  /* NOLINTNEXTLINE(bugprone-macro-parentheses) */                                                    \
-  void Visit(OP_NODE &op) override {                                                                  \
-    detail::PrintOperator(OP_STR, out_, true /*with_parenthesis*/, op.expression1_, op.expression2_); \
-  }
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define BINARY_OPERATOR_VISIT_NOT_IMPL(OP_NODE, OP_STR) \
-  /* NOLINTNEXTLINE(bugprone-macro-parentheses) */      \
-  void Visit(OP_NODE & /*op*/) override { throw utils::NotYetImplemented("OP_NODE"); }
-
-  BINARY_OPERATOR_VISIT(OrOperator, "Or");
-  BINARY_OPERATOR_VISIT(XorOperator, "Xor");
-  BINARY_OPERATOR_VISIT(AndOperator, "And");
-  BINARY_OPERATOR_VISIT(AdditionOperator, "+");
-  BINARY_OPERATOR_VISIT(SubtractionOperator, "-");
-  BINARY_OPERATOR_VISIT(MultiplicationOperator, "*");
-  BINARY_OPERATOR_VISIT(DivisionOperator, "/");
-  BINARY_OPERATOR_VISIT(ModOperator, "%");
-  BINARY_OPERATOR_VISIT(NotEqualOperator, "!=");
-  BINARY_OPERATOR_VISIT(EqualOperator, "=");
-  BINARY_OPERATOR_VISIT(LessOperator, "<");
-  BINARY_OPERATOR_VISIT(GreaterOperator, ">");
-  BINARY_OPERATOR_VISIT(LessEqualOperator, "<=");
-  BINARY_OPERATOR_VISIT(GreaterEqualOperator, ">=");
-  BINARY_OPERATOR_VISIT_NOT_IMPL(InListOperator, "In");
-  BINARY_OPERATOR_VISIT_NOT_IMPL(SubscriptOperator, "Subscript");
-
-#undef BINARY_OPERATOR_VISIT
-#undef BINARY_OPERATOR_VISIT_NOT_IMPL
-
-  // Other
-  void Visit(ListSlicingOperator & /*op*/) override { throw utils::NotYetImplemented("ListSlicingOperator"); }
-
-  void Visit(IfOperator & /*op*/) override { throw utils::NotYetImplemented("IfOperator"); }
-
-  void Visit(ListLiteral & /*op*/) override { throw utils::NotYetImplemented("ListLiteral"); }
-
-  void Visit(MapLiteral & /*op*/) override { throw utils::NotYetImplemented("MapLiteral"); }
-
-  void Visit(LabelsTest & /*op*/) override { throw utils::NotYetImplemented("LabelsTest"); }
-
-  void Visit(Aggregation & /*op*/) override { throw utils::NotYetImplemented("Aggregation"); }
-
-  void Visit(Function & /*op*/) override { throw utils::NotYetImplemented("Function"); }
-
-  void Visit(Reduce & /*op*/) override { throw utils::NotYetImplemented("Reduce"); }
-
-  void Visit(Coalesce & /*op*/) override { throw utils::NotYetImplemented("Coalesce"); }
-
-  void Visit(Extract & /*op*/) override { throw utils::NotYetImplemented("Extract"); }
-
-  void Visit(All & /*op*/) override { throw utils::NotYetImplemented("All"); }
-
-  void Visit(Single & /*op*/) override { throw utils::NotYetImplemented("Single"); }
-
-  void Visit(Any & /*op*/) override { throw utils::NotYetImplemented("Any"); }
-
-  void Visit(None & /*op*/) override { throw utils::NotYetImplemented("None"); }
-
-  void Visit(Identifier &op) override {
-    auto is_node = true;
-    auto is_edge = false;
-    auto is_other = false;
-    if (is_node) {
-      detail::PrintOperator(out_, identifier_node_symbol);
-    } else if (is_edge) {
-      detail::PrintOperator(out_, identifier_edge_symbol);
-    } else {
-      MG_ASSERT(is_other);
-      detail::PrintOperator(out_, op.name_);
-    }
-  }
-
-  void Visit(PrimitiveLiteral &op) override { detail::PrintObject(out_, op.value_); }
-
-  void Visit(PropertyLookup &op) override { detail::PrintOperator(out_, op.expression_, ".", op.property_.name); }
-
-  void Visit(ParameterLookup & /*op*/) override { throw utils::NotYetImplemented("ParameterLookup"); }
-
-  void Visit(NamedExpression & /*op*/) override { throw utils::NotYetImplemented("NamedExpression"); }
-
-  void Visit(RegexMatch & /*op*/) override { throw utils::NotYetImplemented("RegexMatch"); }
-
- private:
-  std::ostream *out_;
-};
-
-namespace detail {
-inline void PrintObject(std::ostream *out, Expression *expr) {
-  if (expr) {
-    ExpressionPrettyPrinter printer{out};
-    expr->Accept(printer);
-  } else {
-    *out << "<null>";
-  }
-}
-}  // namespace detail
-
-inline void PrintExpressionToOriginalAndReplaceNodeAndEdgeSymbols(Expression *expr, std::ostream *out) {
-  ExpressionPrettyPrinter printer{out};
-  expr->Accept(printer);
-}
-
-inline std::string ExpressiontoStringWhileReplacingNodeAndEdgeSymbols(Expression *expr) {
-  std::ostringstream ss;
-  expr::PrintExpressionToOriginalAndReplaceNodeAndEdgeSymbols(expr, &ss);
-  return ss.str();
-}
-}  // namespace memgraph::expr

src/expr/exceptions.hpp

@@ -1,52 +0,0 @@
-// 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 "utils/exceptions.hpp"
-
-namespace memgraph::expr {
-
-class SyntaxException : public utils::BasicException {
- public:
-  using utils::BasicException::BasicException;
-  SyntaxException() : SyntaxException("") {}
-};
-
-class SemanticException : public utils::BasicException {
- public:
-  using utils::BasicException::BasicException;
-  SemanticException() : BasicException("") {}
-};
-
-class ExpressionRuntimeException : public utils::BasicException {
- public:
-  using utils::BasicException::BasicException;
-};
-
-class RedeclareVariableError : public SemanticException {
- public:
-  explicit RedeclareVariableError(const std::string &name) : SemanticException("Redeclaring variable: " + name + ".") {}
-};
-
-class UnboundVariableError : public SemanticException {
- public:
-  explicit UnboundVariableError(const std::string &name) : SemanticException("Unbound variable: " + name + ".") {}
-};
-
-class TypeMismatchError : public SemanticException {
- public:
-  TypeMismatchError(const std::string &name, const std::string &datum, const std::string &expected)
-      : SemanticException(fmt::format("Type mismatch: {} already defined as {}, expected {}.", name, datum, expected)) {
-  }
-};
-
-}  // namespace memgraph::expr

src/expr/semantic/symbol_generator.hpp

@@ -1,712 +0,0 @@
-// 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.
-
-// Copyright 2017 Memgraph
-//
-// Created by Teon Banek on 11-03-2017
-
-#pragma once
-
-#include <algorithm>
-#include <optional>
-#include <ranges>
-#include <unordered_map>
-#include <unordered_set>
-#include <variant>
-#include <vector>
-
-#include "expr/ast.hpp"
-#include "expr/ast/ast_visitor.hpp"
-#include "expr/exceptions.hpp"
-#include "expr/semantic/symbol_table.hpp"
-
-namespace memgraph::expr {
-namespace detail {
-inline std::unordered_map<std::string, Identifier *> GeneratePredefinedIdentifierMap(
-    const std::vector<Identifier *> &predefined_identifiers) {
-  std::unordered_map<std::string, Identifier *> identifier_map;
-  for (const auto &identifier : predefined_identifiers) {
-    identifier_map.emplace(identifier->name_, identifier);
-  }
-
-  return identifier_map;
-}
-}  // namespace detail
-
-/// Visits the AST and generates symbols for variables.
-///
-/// During the process of symbol generation, simple semantic checks are
-/// performed. Such as, redeclaring a variable or conflicting expectations of
-/// variable types.
-class SymbolGenerator : public HierarchicalTreeVisitor {
- public:
-  explicit SymbolGenerator(SymbolTable *symbol_table, const std::vector<Identifier *> &predefined_identifiers)
-      : symbol_table_(symbol_table),
-        predefined_identifiers_{detail::GeneratePredefinedIdentifierMap(predefined_identifiers)},
-        scopes_(1, Scope()) {}
-
-  using HierarchicalTreeVisitor::PostVisit;
-  using HierarchicalTreeVisitor::PreVisit;
-  using HierarchicalTreeVisitor::Visit;
-  using typename HierarchicalTreeVisitor::ReturnType;
-
-  // Query
-  bool PreVisit(SingleQuery & /*unused*/) override {
-    prev_return_names_ = curr_return_names_;
-    curr_return_names_.clear();
-    return true;
-  }
-
-  // Union
-  bool PreVisit(CypherUnion & /*unused*/) override {
-    scopes_.back() = Scope();
-    return true;
-  }
-
-  bool PostVisit(CypherUnion &cypher_union) override {
-    if (prev_return_names_ != curr_return_names_) {
-      throw SemanticException("All subqueries in an UNION must have the same column names.");
-    }
-
-    // create new symbols for the result of the union
-    for (const auto &name : curr_return_names_) {
-      auto symbol = CreateSymbol(name, false);
-      cypher_union.union_symbols_.push_back(symbol);
-    }
-
-    return true;
-  }
-
-  // Clauses
-  bool PreVisit(Create & /*unused*/) override {
-    scopes_.back().in_create = true;
-    return true;
-  }
-
-  bool PostVisit(Create & /*unused*/) override {
-    scopes_.back().in_create = false;
-    return true;
-  }
-
-  bool PreVisit(CallProcedure &call_proc) override {
-    for (auto *expr : call_proc.arguments_) {
-      expr->Accept(*this);
-    }
-    return false;
-  }
-
-  bool PostVisit(CallProcedure &call_proc) override {
-    for (auto *ident : call_proc.result_identifiers_) {
-      if (HasSymbolLocalScope(ident->name_)) {
-        throw RedeclareVariableError(ident->name_);
-      }
-      ident->MapTo(CreateSymbol(ident->name_, true));
-    }
-    return true;
-  }
-
-  bool PreVisit(LoadCsv & /*unused*/) override { return false; }
-
-  bool PostVisit(LoadCsv &load_csv) override {
-    if (HasSymbolLocalScope(load_csv.row_var_->name_)) {
-      throw RedeclareVariableError(load_csv.row_var_->name_);
-    }
-    load_csv.row_var_->MapTo(CreateSymbol(load_csv.row_var_->name_, true));
-    return true;
-  }
-
-  bool PreVisit(Return &ret) override {
-    auto &scope = scopes_.back();
-    scope.in_return = true;
-    VisitReturnBody(ret.body_);
-    scope.in_return = false;
-    return false;  // We handled the traversal ourselves.
-  }
-
-  bool PostVisit(Return & /*unused*/) override {
-    for (const auto &name_symbol : scopes_.back().symbols) curr_return_names_.insert(name_symbol.first);
-    return true;
-  }
-
-  bool PreVisit(With &with) override {
-    auto &scope = scopes_.back();
-    scope.in_with = true;
-    VisitReturnBody(with.body_, with.where_);
-    scope.in_with = false;
-    return false;  // We handled the traversal ourselves.
-  }
-
-  bool PreVisit(Where & /*unused*/) override {
-    scopes_.back().in_where = true;
-    return true;
-  }
-
-  bool PostVisit(Where & /*unused*/) override {
-    scopes_.back().in_where = false;
-    return true;
-  }
-
-  bool PreVisit(Merge & /*unused*/) override {
-    scopes_.back().in_merge = true;
-    return true;
-  }
-
-  bool PostVisit(Merge & /*unused*/) override {
-    scopes_.back().in_merge = false;
-    return true;
-  }
-
-  bool PostVisit(Unwind &unwind) override {
-    const auto &name = unwind.named_expression_->name_;
-    if (HasSymbolLocalScope(name)) {
-      throw RedeclareVariableError(name);
-    }
-    unwind.named_expression_->MapTo(CreateSymbol(name, true));
-    return true;
-  }
-
-  bool PreVisit(Match & /*unused*/) override {
-    scopes_.back().in_match = true;
-    return true;
-  }
-
-  bool PostVisit(Match & /*unused*/) override {
-    auto &scope = scopes_.back();
-    scope.in_match = false;
-    // Check variables in property maps after visiting Match, so that they can
-    // reference symbols out of bind order.
-    for (auto &ident : scope.identifiers_in_match) {
-      if (!HasSymbolLocalScope(ident->name_) && !ConsumePredefinedIdentifier(ident->name_))
-        throw UnboundVariableError(ident->name_);
-      ident->MapTo(scope.symbols[ident->name_]);
-    }
-    scope.identifiers_in_match.clear();
-    return true;
-  }
-
-  bool PreVisit(Foreach &for_each) override {
-    const auto &name = for_each.named_expression_->name_;
-    scopes_.emplace_back(Scope());
-    scopes_.back().in_foreach = true;
-    for_each.named_expression_->MapTo(
-        CreateSymbol(name, true, Symbol::Type::ANY, for_each.named_expression_->token_position_));
-    return true;
-  }
-
-  bool PostVisit(Foreach & /*unused*/) override {
-    scopes_.pop_back();
-    return true;
-  }
-
-  // Expressions
-  ReturnType Visit(Identifier &ident) override {
-    auto &scope = scopes_.back();
-    if (scope.in_skip || scope.in_limit) {
-      throw SemanticException("Variables are not allowed in {}.", scope.in_skip ? "SKIP" : "LIMIT");
-    }
-    Symbol symbol;
-    if (scope.in_pattern && !(scope.in_node_atom || scope.visiting_edge)) {
-      // If we are in the pattern, and outside of a node or an edge, the
-      // identifier is the pattern name.
-      symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, Symbol::Type::PATH);
-    } else if (scope.in_pattern && scope.in_pattern_atom_identifier) {
-      //  Patterns used to create nodes and edges cannot redeclare already
-      //  established bindings. Declaration only happens in single node
-      //  patterns and in edge patterns. OpenCypher example,
-      //  `MATCH (n) CREATE (n)` should throw an error that `n` is already
-      //  declared. While `MATCH (n) CREATE (n) -[:R]-> (n)` is allowed,
-      //  since `n` now references the bound node instead of declaring it.
-      if ((scope.in_create_node || scope.in_create_edge) && HasSymbolLocalScope(ident.name_)) {
-        throw RedeclareVariableError(ident.name_);
-      }
-      auto type = Symbol::Type::VERTEX;
-      if (scope.visiting_edge) {
-        // Edge referencing is not allowed (like in Neo4j):
-        // `MATCH (n) - [r] -> (n) - [r] -> (n) RETURN r` is not allowed.
-        if (HasSymbolLocalScope(ident.name_)) {
-          throw RedeclareVariableError(ident.name_);
-        }
-        type = scope.visiting_edge->IsVariable() ? Symbol::Type::EDGE_LIST : Symbol::Type::EDGE;
-      }
-      symbol = GetOrCreateSymbolLocalScope(ident.name_, ident.user_declared_, type);
-    } else if (scope.in_pattern && !scope.in_pattern_atom_identifier && scope.in_match) {
-      if (scope.in_edge_range && scope.visiting_edge->identifier_->name_ == ident.name_) {
-        // Prevent variable path bounds to reference the identifier which is bound
-        // by the variable path itself.
-        throw UnboundVariableError(ident.name_);
-      }
-      // Variables in property maps or bounds of variable length path during MATCH
-      // can reference symbols bound later in the same MATCH. We collect them
-      // here, so that they can be checked after visiting Match.
-      scope.identifiers_in_match.emplace_back(&ident);
-    } else {
-      // Everything else references a bound symbol.
-      if (!HasSymbol(ident.name_) && !ConsumePredefinedIdentifier(ident.name_)) throw UnboundVariableError(ident.name_);
-      symbol = GetOrCreateSymbol(ident.name_, ident.user_declared_, Symbol::Type::ANY);
-    }
-    ident.MapTo(symbol);
-    return true;
-  }
-
-  ReturnType Visit(PrimitiveLiteral & /*unused*/) override { return true; }
-
-  ReturnType Visit(ParameterLookup & /*unused*/) override { return true; }
-
-  bool PreVisit(Aggregation &aggr) override {
-    auto &scope = scopes_.back();
-    // Check if the aggregation can be used in this context. This check should
-    // probably move to a separate phase, which checks if the query is well
-    // formed.
-    if ((!scope.in_return && !scope.in_with) || scope.in_order_by || scope.in_skip || scope.in_limit ||
-        scope.in_where) {
-      throw SemanticException("Aggregation functions are only allowed in WITH and RETURN.");
-    }
-    if (scope.in_aggregation) {
-      throw SemanticException(
-          "Using aggregation functions inside aggregation functions is not "
-          "allowed.");
-    }
-    if (scope.num_if_operators) {
-      // Neo allows aggregations here and produces very interesting behaviors.
-      // To simplify implementation at this moment we decided to completely
-      // disallow aggregations inside of the CASE.
-      // However, in some cases aggregation makes perfect sense, for example:
-      //    CASE count(n) WHEN 10 THEN "YES" ELSE "NO" END.
-      // TODO: Rethink of allowing aggregations in some parts of the CASE
-      // construct.
-      throw SemanticException("Using aggregation functions inside of CASE is not allowed.");
-    }
-    // Create a virtual symbol for aggregation result.
-    // Currently, we only have aggregation operators which return numbers.
-    auto aggr_name = Aggregation::OpToString(aggr.op_) + std::to_string(aggr.symbol_pos_);
-    aggr.MapTo(CreateSymbol(aggr_name, false, Symbol::Type::NUMBER));
-    scope.in_aggregation = true;
-    scope.has_aggregation = true;
-    return true;
-  }
-
-  bool PostVisit(Aggregation & /*unused*/) override {
-    scopes_.back().in_aggregation = false;
-    return true;
-  }
-
-  bool PreVisit(IfOperator & /*unused*/) override {
-    ++scopes_.back().num_if_operators;
-    return true;
-  }
-
-  bool PostVisit(IfOperator & /*unused*/) override {
-    --scopes_.back().num_if_operators;
-    return true;
-  }
-
-  bool PreVisit(All &all) override {
-    all.list_expression_->Accept(*this);
-    VisitWithIdentifiers(all.where_->expression_, {all.identifier_});
-    return false;
-  }
-
-  bool PreVisit(Single &single) override {
-    single.list_expression_->Accept(*this);
-    VisitWithIdentifiers(single.where_->expression_, {single.identifier_});
-    return false;
-  }
-
-  bool PreVisit(Any &any) override {
-    any.list_expression_->Accept(*this);
-    VisitWithIdentifiers(any.where_->expression_, {any.identifier_});
-    return false;
-  }
-
-  bool PreVisit(None &none) override {
-    none.list_expression_->Accept(*this);
-    VisitWithIdentifiers(none.where_->expression_, {none.identifier_});
-    return false;
-  }
-
-  bool PreVisit(Reduce &reduce) override {
-    reduce.initializer_->Accept(*this);
-    reduce.list_->Accept(*this);
-    VisitWithIdentifiers(reduce.expression_, {reduce.accumulator_, reduce.identifier_});
-    return false;
-  }
-
-  bool PreVisit(Extract &extract) override {
-    extract.list_->Accept(*this);
-    VisitWithIdentifiers(extract.expression_, {extract.identifier_});
-    return false;
-  }
-
-  // Pattern and its subparts.
-  bool PreVisit(Pattern &pattern) override {
-    auto &scope = scopes_.back();
-    scope.in_pattern = true;
-    if ((scope.in_create || scope.in_merge) && pattern.atoms_.size() == 1U) {
-      MG_ASSERT(utils::IsSubtype(*pattern.atoms_[0], NodeAtom::kType), "Expected a single NodeAtom in Pattern");
-      scope.in_create_node = true;
-    }
-    return true;
-  }
-
-  bool PostVisit(Pattern & /*unused*/) override {
-    auto &scope = scopes_.back();
-    scope.in_pattern = false;
-    scope.in_create_node = false;
-    return true;
-  }
-
-  bool PreVisit(NodeAtom &node_atom) override {
-    auto &scope = scopes_.back();
-    auto check_node_semantic = [&node_atom, &scope, this](const bool props_or_labels) {
-      const auto &node_name = node_atom.identifier_->name_;
-      if ((scope.in_create || scope.in_merge) && props_or_labels && HasSymbolLocalScope(node_name)) {
-        throw SemanticException("Cannot create node '" + node_name +
-                                "' with labels or properties, because it is already declared.");
-      }
-      scope.in_pattern_atom_identifier = true;
-      node_atom.identifier_->Accept(*this);
-      scope.in_pattern_atom_identifier = false;
-    };
-
-    scope.in_node_atom = true;
-    if (auto *properties = std::get_if<std::unordered_map<PropertyIx, Expression *>>(&node_atom.properties_)) {
-      bool props_or_labels = !properties->empty() || !node_atom.labels_.empty();
-
-      check_node_semantic(props_or_labels);
-      for (auto kv : *properties) {
-        kv.second->Accept(*this);
-      }
-
-      return false;
-    }
-    auto &properties_parameter = std::get<ParameterLookup *>(node_atom.properties_);
-    bool props_or_labels = !properties_parameter || !node_atom.labels_.empty();
-
-    check_node_semantic(props_or_labels);
-    properties_parameter->Accept(*this);
-    return false;
-  }
-
-  bool PostVisit(NodeAtom & /*unused*/) override {
-    scopes_.back().in_node_atom = false;
-    return true;
-  }
-
-  bool PreVisit(EdgeAtom &edge_atom) override {
-    auto &scope = scopes_.back();
-    scope.visiting_edge = &edge_atom;
-    if (scope.in_create || scope.in_merge) {
-      scope.in_create_edge = true;
-      if (edge_atom.edge_types_.size() != 1U) {
-        throw SemanticException(
-            "A single relationship type must be specified "
-            "when creating an edge.");
-      }
-      if (scope.in_create &&  // Merge allows bidirectionality
-          edge_atom.direction_ == EdgeAtom::Direction::BOTH) {
-        throw SemanticException(
-            "Bidirectional relationship are not supported "
-            "when creating an edge");
-      }
-      if (edge_atom.IsVariable()) {
-        throw SemanticException(
-            "Variable length relationships are not supported when creating an "
-            "edge.");
-      }
-    }
-    if (auto *properties = std::get_if<std::unordered_map<PropertyIx, Expression *>>(&edge_atom.properties_)) {
-      for (auto kv : *properties) {
-        kv.second->Accept(*this);
-      }
-    } else {
-      std::get<ParameterLookup *>(edge_atom.properties_)->Accept(*this);
-    }
-    if (edge_atom.IsVariable()) {
-      scope.in_edge_range = true;
-      if (edge_atom.lower_bound_) {
-        edge_atom.lower_bound_->Accept(*this);
-      }
-      if (edge_atom.upper_bound_) {
-        edge_atom.upper_bound_->Accept(*this);
-      }
-      scope.in_edge_range = false;
-      scope.in_pattern = false;
-      if (edge_atom.filter_lambda_.expression) {
-        VisitWithIdentifiers(edge_atom.filter_lambda_.expression,
-                             {edge_atom.filter_lambda_.inner_edge, edge_atom.filter_lambda_.inner_node});
-      } else {
-        // Create inner symbols, but don't bind them in scope, since they are to
-        // be used in the missing filter expression.
-        auto *inner_edge = edge_atom.filter_lambda_.inner_edge;
-        inner_edge->MapTo(
-            symbol_table_->CreateSymbol(inner_edge->name_, inner_edge->user_declared_, Symbol::Type::EDGE));
-        auto *inner_node = edge_atom.filter_lambda_.inner_node;
-        inner_node->MapTo(
-            symbol_table_->CreateSymbol(inner_node->name_, inner_node->user_declared_, Symbol::Type::VERTEX));
-      }
-      if (edge_atom.weight_lambda_.expression) {
-        VisitWithIdentifiers(edge_atom.weight_lambda_.expression,
-                             {edge_atom.weight_lambda_.inner_edge, edge_atom.weight_lambda_.inner_node});
-      }
-      scope.in_pattern = true;
-    }
-    scope.in_pattern_atom_identifier = true;
-    edge_atom.identifier_->Accept(*this);
-    scope.in_pattern_atom_identifier = false;
-    if (edge_atom.total_weight_) {
-      if (HasSymbolLocalScope(edge_atom.total_weight_->name_)) {
-        throw RedeclareVariableError(edge_atom.total_weight_->name_);
-      }
-      edge_atom.total_weight_->MapTo(GetOrCreateSymbolLocalScope(
-          edge_atom.total_weight_->name_, edge_atom.total_weight_->user_declared_, Symbol::Type::NUMBER));
-    }
-    return false;
-  }
-
-  bool PostVisit(EdgeAtom & /*unused*/) override {
-    auto &scope = scopes_.back();
-    scope.visiting_edge = nullptr;
-    scope.in_create_edge = false;
-    return true;
-  }
-
- private:
-  // Scope stores the state of where we are when visiting the AST and a map of
-  // names to symbols.
-  struct Scope {
-    bool in_pattern{false};
-    bool in_merge{false};
-    bool in_create{false};
-    // in_create_node is true if we are creating or merging *only* a node.
-    // Therefore, it is *not* equivalent to (in_create || in_merge) &&
-    // in_node_atom.
-    bool in_create_node{false};
-    // True if creating an edge;
-    // shortcut for (in_create || in_merge) && visiting_edge.
-    bool in_create_edge{false};
-    bool in_node_atom{false};
-    EdgeAtom *visiting_edge{nullptr};
-    bool in_aggregation{false};
-    bool in_return{false};
-    bool in_with{false};
-    bool in_skip{false};
-    bool in_limit{false};
-    bool in_order_by{false};
-    bool in_where{false};
-    bool in_match{false};
-    bool in_foreach{false};
-    // True when visiting a pattern atom (node or edge) identifier, which can be
-    // reused or created in the pattern itself.
-    bool in_pattern_atom_identifier{false};
-    // True when visiting range bounds of a variable path.
-    bool in_edge_range{false};
-    // True if the return/with contains an aggregation in any named expression.
-    bool has_aggregation{false};
-    // Map from variable names to symbols.
-    std::map<std::string, Symbol> symbols;
-    // Identifiers found in property maps of patterns or as variable length path
-    // bounds in a single Match clause. They need to be checked after visiting
-    // Match. Identifiers created by naming vertices, edges and paths are *not*
-    // stored in here.
-    std::vector<Identifier *> identifiers_in_match;
-    // Number of nested IfOperators.
-    int num_if_operators{0};
-  };
-
-  inline static std::optional<Symbol> FindSymbolInScope(const std::string &name, const Scope &scope,
-                                                        Symbol::Type type) {
-    if (auto it = scope.symbols.find(name); it != scope.symbols.end()) {
-      const auto &symbol = it->second;
-      // Unless we have `ANY` type, check that types match.
-      if (type != Symbol::Type::ANY && symbol.type() != Symbol::Type::ANY && type != symbol.type()) {
-        throw TypeMismatchError(name, Symbol::TypeToString(symbol.type()), Symbol::TypeToString(type));
-      }
-      return symbol;
-    }
-    return std::nullopt;
-  }
-
-  bool HasSymbol(const std::string &name) const {
-    return std::ranges::any_of(scopes_, [&name](const auto &scope) { return scope.symbols.contains(name); });
-  }
-
-  bool HasSymbolLocalScope(const std::string &name) const { return scopes_.back().symbols.contains(name); }
-
-  // @return true if it added a predefined identifier with that name
-  bool ConsumePredefinedIdentifier(const std::string &name) {
-    auto it = predefined_identifiers_.find(name);
-
-    if (it == predefined_identifiers_.end()) {
-      return false;
-    }
-
-    // we can only use the predefined identifier in a single scope so we remove it after creating
-    // a symbol for it
-    auto &identifier = it->second;
-    MG_ASSERT(!identifier->user_declared_, "Predefined symbols cannot be user declared!");
-    identifier->MapTo(CreateSymbol(identifier->name_, identifier->user_declared_));
-    predefined_identifiers_.erase(it);
-    return true;
-  }
-
-  // Returns a freshly generated symbol. Previous mapping of the same name to a
-  // different symbol is replaced with the new one.
-  Symbol CreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY,
-                      int token_position = -1) {
-    auto symbol = symbol_table_->CreateSymbol(name, user_declared, type, token_position);
-    scopes_.back().symbols[name] = symbol;
-    return symbol;
-  }
-
-  Symbol GetOrCreateSymbol(const std::string &name, bool user_declared, Symbol::Type type = Symbol::Type::ANY) {
-    // NOLINTNEXTLINE
-    for (auto scope = scopes_.rbegin(); scope != scopes_.rend(); ++scope) {
-      if (auto maybe_symbol = FindSymbolInScope(name, *scope, type); maybe_symbol) {
-        return *maybe_symbol;
-      }
-    }
-    return CreateSymbol(name, user_declared, type);
-  }
-
-  // Returns the symbol by name. If the mapping already exists, checks if the
-  // types match. Otherwise, returns a new symbol.
-  Symbol GetOrCreateSymbolLocalScope(const std::string &name, bool user_declared,
-                                     Symbol::Type type = Symbol::Type::ANY) {
-    auto &scope = scopes_.back();
-    if (auto maybe_symbol = FindSymbolInScope(name, scope, type); maybe_symbol) {
-      return *maybe_symbol;
-    }
-    return CreateSymbol(name, user_declared, type);
-  }
-
-  void VisitReturnBody(ReturnBody &body, Where *where = nullptr) {
-    auto &scope = scopes_.back();
-    for (auto &expr : body.named_expressions) {
-      expr->Accept(*this);
-    }
-    std::vector<Symbol> user_symbols;
-    if (body.all_identifiers) {
-      // Carry over user symbols because '*' appeared.
-      for (const auto &sym_pair : scope.symbols) {
-        if (!sym_pair.second.user_declared()) {
-          continue;
-        }
-        user_symbols.emplace_back(sym_pair.second);
-      }
-      if (user_symbols.empty()) {
-        throw SemanticException("There are no variables in scope to use for '*'.");
-      }
-    }
-    // WITH/RETURN clause removes declarations of all the previous variables and
-    // declares only those established through named expressions. New declarations
-    // must not be visible inside named expressions themselves.
-    bool removed_old_names = false;
-    if ((!where && body.order_by.empty()) || scope.has_aggregation) {
-      // WHERE and ORDER BY need to see both the old and new symbols, unless we
-      // have an aggregation. Therefore, we can clear the symbols immediately if
-      // there is neither ORDER BY nor WHERE, or we have an aggregation.
-      scope.symbols.clear();
-      removed_old_names = true;
-    }
-    // Create symbols for named expressions.
-    std::unordered_set<std::string> new_names;
-    for (const auto &user_sym : user_symbols) {
-      new_names.insert(user_sym.name());
-      scope.symbols[user_sym.name()] = user_sym;
-    }
-    for (auto &named_expr : body.named_expressions) {
-      const auto &name = named_expr->name_;
-      if (!new_names.insert(name).second) {
-        throw SemanticException("Multiple results with the same name '{}' are not allowed.", name);
-      }
-      // An improvement would be to infer the type of the expression, so that the
-      // new symbol would have a more specific type.
-      named_expr->MapTo(CreateSymbol(name, true, Symbol::Type::ANY, named_expr->token_position_));
-    }
-    scope.in_order_by = true;
-    for (const auto &order_pair : body.order_by) {
-      order_pair.expression->Accept(*this);
-    }
-    scope.in_order_by = false;
-    if (body.skip) {
-      scope.in_skip = true;
-      body.skip->Accept(*this);
-      scope.in_skip = false;
-    }
-    if (body.limit) {
-      scope.in_limit = true;
-      body.limit->Accept(*this);
-      scope.in_limit = false;
-    }
-    if (where) where->Accept(*this);
-    if (!removed_old_names) {
-      // We have an ORDER BY or WHERE, but no aggregation, which means we didn't
-      // clear the old symbols, so do it now. We cannot just call clear, because
-      // we've added new symbols.
-      for (auto sym_it = scope.symbols.begin(); sym_it != scope.symbols.end();) {
-        if (new_names.find(sym_it->first) == new_names.end()) {
-          sym_it = scope.symbols.erase(sym_it);
-        } else {
-          sym_it++;
-        }
-      }
-    }
-    scopes_.back().has_aggregation = false;
-  }
-
-  void VisitWithIdentifiers(Expression *expr, const std::vector<Identifier *> &identifiers) {
-    auto &scope = scopes_.back();
-    std::vector<std::pair<std::optional<Symbol>, Identifier *>> prev_symbols;
-    // Collect previous symbols if they exist.
-    for (const auto &identifier : identifiers) {
-      std::optional<Symbol> prev_symbol;
-      auto prev_symbol_it = scope.symbols.find(identifier->name_);
-      if (prev_symbol_it != scope.symbols.end()) {
-        prev_symbol = prev_symbol_it->second;
-      }
-      identifier->MapTo(CreateSymbol(identifier->name_, identifier->user_declared_));
-      prev_symbols.emplace_back(prev_symbol, identifier);
-    }
-    // Visit the expression with the new symbols bound.
-    expr->Accept(*this);
-    // Restore back to previous symbols.
-    for (const auto &prev : prev_symbols) {
-      const auto &prev_symbol = prev.first;
-      const auto &identifier = prev.second;
-      if (prev_symbol) {
-        scope.symbols[identifier->name_] = *prev_symbol;
-      } else {
-        scope.symbols.erase(identifier->name_);
-      }
-    }
-  }
-
-  SymbolTable *symbol_table_;
-
-  // Identifiers which are injected from outside the query. Each identifier
-  // is mapped by its name.
-  std::unordered_map<std::string, Identifier *> predefined_identifiers_;
-  std::vector<Scope> scopes_;
-  std::unordered_set<std::string> prev_return_names_;
-  std::unordered_set<std::string> curr_return_names_;
-};
-
-inline SymbolTable MakeSymbolTable(CypherQuery *query, const std::vector<Identifier *> &predefined_identifiers = {}) {
-  SymbolTable symbol_table;
-  SymbolGenerator symbol_generator(&symbol_table, predefined_identifiers);
-  query->single_query_->Accept(symbol_generator);
-  for (auto *cypher_union : query->cypher_unions_) {
-    cypher_union->Accept(symbol_generator);
-  }
-  return symbol_table;
-}
-
-}  // namespace memgraph::expr

src/glue/v2/communication.cpp

@@ -15,17 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "coordinator/shard_map.hpp"
-#include "query/v2/accessors.hpp"
-#include "query/v2/requests.hpp"
-#include "query/v2/shard_request_manager.hpp"
 #include "storage/v3/edge_accessor.hpp"
-#include "storage/v3/id_types.hpp"
-#include "storage/v3/result.hpp"
-#include "storage/v3/shard.hpp"
+#include "storage/v3/storage.hpp"
 #include "storage/v3/vertex_accessor.hpp"
-#include "storage/v3/view.hpp"
-#include "utils/exceptions.hpp"
 #include "utils/temporal.hpp"
 
 using memgraph::communication::bolt::Value;
@@ -71,52 +63,17 @@ query::v2::TypedValue ToTypedValue(const Value &value) {
   }
 }
 
-storage::v3::Result<communication::bolt::Vertex> ToBoltVertex(
-    const query::v2::accessors::VertexAccessor &vertex, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View /*view*/) {
-  auto id = communication::bolt::Id::FromUint(0);
-
-  auto labels = vertex.Labels();
-  std::vector<std::string> new_labels;
-  new_labels.reserve(labels.size());
-  for (const auto &label : labels) {
-    new_labels.push_back(shard_request_manager->LabelToName(label.id));
-  }
-
-  auto properties = vertex.Properties();
-  std::map<std::string, Value> new_properties;
-  for (const auto &[prop, property_value] : properties) {
-    new_properties[shard_request_manager->PropertyToName(prop)] = ToBoltValue(property_value);
-  }
-  return communication::bolt::Vertex{id, new_labels, new_properties};
+storage::v3::Result<communication::bolt::Vertex> ToBoltVertex(const query::v2::VertexAccessor &vertex,
+                                                              const storage::v3::Storage &db, storage::v3::View view) {
+  return ToBoltVertex(vertex.impl_, db, view);
 }
 
-storage::v3::Result<communication::bolt::Edge> ToBoltEdge(
-    const query::v2::accessors::EdgeAccessor &edge, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View /*view*/) {
-  // TODO(jbajic) Fix bolt communication
-  auto id = communication::bolt::Id::FromUint(0);
-  auto from = communication::bolt::Id::FromUint(0);
-  auto to = communication::bolt::Id::FromUint(0);
-  const auto &type = shard_request_manager->EdgeTypeToName(edge.EdgeType());
-
-  auto properties = edge.Properties();
-  std::map<std::string, Value> new_properties;
-  for (const auto &[prop, property_value] : properties) {
-    new_properties[shard_request_manager->PropertyToName(prop)] = ToBoltValue(property_value);
-  }
-  return communication::bolt::Edge{id, from, to, type, new_properties};
+storage::v3::Result<communication::bolt::Edge> ToBoltEdge(const query::v2::EdgeAccessor &edge,
+                                                          const storage::v3::Storage &db, storage::v3::View view) {
+  return ToBoltEdge(edge.impl_, db, view);
 }
 
-storage::v3::Result<communication::bolt::Path> ToBoltPath(
-    const query::v2::accessors::Path & /*edge*/, const msgs::ShardRequestManagerInterface * /*shard_request_manager*/,
-    storage::v3::View /*view*/) {
-  // TODO(jbajic) Fix bolt communication
-  return {storage::v3::Error::DELETED_OBJECT};
-}
-
-storage::v3::Result<Value> ToBoltValue(const query::v2::TypedValue &value,
-                                       const msgs::ShardRequestManagerInterface *shard_request_manager,
+storage::v3::Result<Value> ToBoltValue(const query::v2::TypedValue &value, const storage::v3::Storage &db,
                                        storage::v3::View view) {
   switch (value.type()) {
     case query::v2::TypedValue::Type::Null:
@@ -133,7 +90,7 @@ storage::v3::Result<Value> ToBoltValue(const query::v2::TypedValue &value,
       std::vector<Value> values;
       values.reserve(value.ValueList().size());
       for (const auto &v : value.ValueList()) {
-        auto maybe_value = ToBoltValue(v, shard_request_manager, view);
+        auto maybe_value = ToBoltValue(v, db, view);
         if (maybe_value.HasError()) return maybe_value.GetError();
         values.emplace_back(std::move(*maybe_value));
       }
@@ -142,24 +99,24 @@ storage::v3::Result<Value> ToBoltValue(const query::v2::TypedValue &value,
     case query::v2::TypedValue::Type::Map: {
       std::map<std::string, Value> map;
       for (const auto &kv : value.ValueMap()) {
-        auto maybe_value = ToBoltValue(kv.second, shard_request_manager, view);
+        auto maybe_value = ToBoltValue(kv.second, db, view);
         if (maybe_value.HasError()) return maybe_value.GetError();
         map.emplace(kv.first, std::move(*maybe_value));
       }
       return Value(std::move(map));
     }
     case query::v2::TypedValue::Type::Vertex: {
-      auto maybe_vertex = ToBoltVertex(value.ValueVertex(), shard_request_manager, view);
+      auto maybe_vertex = ToBoltVertex(value.ValueVertex(), db, view);
       if (maybe_vertex.HasError()) return maybe_vertex.GetError();
       return Value(std::move(*maybe_vertex));
     }
     case query::v2::TypedValue::Type::Edge: {
-      auto maybe_edge = ToBoltEdge(value.ValueEdge(), shard_request_manager, view);
+      auto maybe_edge = ToBoltEdge(value.ValueEdge(), db, view);
       if (maybe_edge.HasError()) return maybe_edge.GetError();
       return Value(std::move(*maybe_edge));
     }
     case query::v2::TypedValue::Type::Path: {
-      auto maybe_path = ToBoltPath(value.ValuePath(), shard_request_manager, view);
+      auto maybe_path = ToBoltPath(value.ValuePath(), db, view);
       if (maybe_path.HasError()) return maybe_path.GetError();
       return Value(std::move(*maybe_path));
     }
@@ -174,41 +131,57 @@ storage::v3::Result<Value> ToBoltValue(const query::v2::TypedValue &value,
   }
 }
 
-Value ToBoltValue(msgs::Value value) {
-  switch (value.type) {
-    case msgs::Value::Type::Null:
-      return {};
-    case msgs::Value::Type::Bool:
-      return {value.bool_v};
-    case msgs::Value::Type::Int64:
-      return {value.int_v};
-    case msgs::Value::Type::Double:
-      return {value.double_v};
-    case msgs::Value::Type::String:
-      return {std::string(value.string_v)};
-    case msgs::Value::Type::List: {
-      std::vector<Value> values;
-      values.reserve(value.list_v.size());
-      for (const auto &v : value.list_v) {
-        auto maybe_value = ToBoltValue(v);
-        values.emplace_back(std::move(maybe_value));
-      }
-      return Value{std::move(values)};
-    }
-    case msgs::Value::Type::Map: {
-      std::map<std::string, Value> map;
-      for (const auto &kv : value.map_v) {
-        auto maybe_value = ToBoltValue(kv.second);
-        map.emplace(kv.first, std::move(maybe_value));
-      }
-      return Value{std::move(map)};
-    }
-    case msgs::Value::Type::Vertex:
-    case msgs::Value::Type::Edge: {
-      throw utils::BasicException("Vertex and Edge not supported!");
-    }
-      // TODO Value to Date types not supported
+storage::v3::Result<communication::bolt::Vertex> ToBoltVertex(const storage::v3::VertexAccessor &vertex,
+                                                              const storage::v3::Storage &db, storage::v3::View view) {
+  auto id = communication::bolt::Id::FromUint(vertex.Gid().AsUint());
+  auto maybe_labels = vertex.Labels(view);
+  if (maybe_labels.HasError()) return maybe_labels.GetError();
+  std::vector<std::string> labels;
+  labels.reserve(maybe_labels->size());
+  for (const auto &label : *maybe_labels) {
+    labels.push_back(db.LabelToName(label));
   }
+  auto maybe_properties = vertex.Properties(view);
+  if (maybe_properties.HasError()) return maybe_properties.GetError();
+  std::map<std::string, Value> properties;
+  for (const auto &prop : *maybe_properties) {
+    properties[db.PropertyToName(prop.first)] = ToBoltValue(prop.second);
+  }
+  return communication::bolt::Vertex{id, labels, properties};
+}
+
+storage::v3::Result<communication::bolt::Edge> ToBoltEdge(const storage::v3::EdgeAccessor &edge,
+                                                          const storage::v3::Storage &db, storage::v3::View view) {
+  auto id = communication::bolt::Id::FromUint(edge.Gid().AsUint());
+  auto from = communication::bolt::Id::FromUint(edge.FromVertex().Gid().AsUint());
+  auto to = communication::bolt::Id::FromUint(edge.ToVertex().Gid().AsUint());
+  const auto &type = db.EdgeTypeToName(edge.EdgeType());
+  auto maybe_properties = edge.Properties(view);
+  if (maybe_properties.HasError()) return maybe_properties.GetError();
+  std::map<std::string, Value> properties;
+  for (const auto &prop : *maybe_properties) {
+    properties[db.PropertyToName(prop.first)] = ToBoltValue(prop.second);
+  }
+  return communication::bolt::Edge{id, from, to, type, properties};
+}
+
+storage::v3::Result<communication::bolt::Path> ToBoltPath(const query::v2::Path &path, const storage::v3::Storage &db,
+                                                          storage::v3::View view) {
+  std::vector<communication::bolt::Vertex> vertices;
+  vertices.reserve(path.vertices().size());
+  for (const auto &v : path.vertices()) {
+    auto maybe_vertex = ToBoltVertex(v, db, view);
+    if (maybe_vertex.HasError()) return maybe_vertex.GetError();
+    vertices.emplace_back(std::move(*maybe_vertex));
+  }
+  std::vector<communication::bolt::Edge> edges;
+  edges.reserve(path.edges().size());
+  for (const auto &e : path.edges()) {
+    auto maybe_edge = ToBoltEdge(e, db, view);
+    if (maybe_edge.HasError()) return maybe_edge.GetError();
+    edges.emplace_back(std::move(*maybe_edge));
+  }
+  return communication::bolt::Path(vertices, edges);
 }
 
 storage::v3::PropertyValue ToPropertyValue(const Value &value) {

src/glue/v2/communication.hpp

@@ -13,12 +13,9 @@
 #pragma once
 
 #include "communication/bolt/v1/value.hpp"
-#include "coordinator/shard_map.hpp"
-#include "query/v2/bindings/typed_value.hpp"
-#include "query/v2/shard_request_manager.hpp"
+#include "query/v2/typed_value.hpp"
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/result.hpp"
-#include "storage/v3/shard.hpp"
 #include "storage/v3/view.hpp"
 
 namespace memgraph::storage::v3 {
@@ -31,40 +28,36 @@ namespace memgraph::glue::v2 {
 
 /// @param storage::v3::VertexAccessor for converting to
 ///        communication::bolt::Vertex.
-/// @param msgs::ShardRequestManagerInterface *shard_request_manager getting label and property names.
+/// @param storage::v3::Storage for getting label and property names.
 /// @param storage::v3::View for deciding which vertex attributes are visible.
 ///
 /// @throw std::bad_alloc
-storage::v3::Result<communication::bolt::Vertex> ToBoltVertex(
-    const storage::v3::VertexAccessor &vertex, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View view);
+storage::v3::Result<communication::bolt::Vertex> ToBoltVertex(const storage::v3::VertexAccessor &vertex,
+                                                              const storage::v3::Storage &db, storage::v3::View view);
 
 /// @param storage::v3::EdgeAccessor for converting to communication::bolt::Edge.
-/// @param msgs::ShardRequestManagerInterface *shard_request_manager getting edge type and property names.
+/// @param storage::v3::Storage for getting edge type and property names.
 /// @param storage::v3::View for deciding which edge attributes are visible.
 ///
 /// @throw std::bad_alloc
-storage::v3::Result<communication::bolt::Edge> ToBoltEdge(
-    const storage::v3::EdgeAccessor &edge, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View view);
+storage::v3::Result<communication::bolt::Edge> ToBoltEdge(const storage::v3::EdgeAccessor &edge,
+                                                          const storage::v3::Storage &db, storage::v3::View view);
 
 /// @param query::v2::Path for converting to communication::bolt::Path.
-/// @param msgs::ShardRequestManagerInterface *shard_request_manager ToBoltVertex and ToBoltEdge.
+/// @param storage::v3::Storage for ToBoltVertex and ToBoltEdge.
 /// @param storage::v3::View for ToBoltVertex and ToBoltEdge.
 ///
 /// @throw std::bad_alloc
-storage::v3::Result<communication::bolt::Path> ToBoltPath(
-    const query::v2::accessors::Path &path, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View view);
+storage::v3::Result<communication::bolt::Path> ToBoltPath(const query::v2::Path &path, const storage::v3::Storage &db,
+                                                          storage::v3::View view);
 
 /// @param query::v2::TypedValue for converting to communication::bolt::Value.
-/// @param msgs::ShardRequestManagerInterface *shard_request_manager ToBoltVertex and ToBoltEdge.
+/// @param storage::v3::Storage for ToBoltVertex and ToBoltEdge.
 /// @param storage::v3::View for ToBoltVertex and ToBoltEdge.
 ///
 /// @throw std::bad_alloc
-storage::v3::Result<communication::bolt::Value> ToBoltValue(
-    const query::v2::TypedValue &value, const msgs::ShardRequestManagerInterface *shard_request_manager,
-    storage::v3::View view);
+storage::v3::Result<communication::bolt::Value> ToBoltValue(const query::v2::TypedValue &value,
+                                                            const storage::v3::Storage &db, storage::v3::View view);
 
 query::v2::TypedValue ToTypedValue(const communication::bolt::Value &value);
 
@@ -72,10 +65,4 @@ communication::bolt::Value ToBoltValue(const storage::v3::PropertyValue &value);
 
 storage::v3::PropertyValue ToPropertyValue(const communication::bolt::Value &value);
 
-communication::bolt::Value ToBoltValue(msgs::Value value);
-
-communication::bolt::Value ToBoltValue(msgs::Value value,
-                                       const msgs::ShardRequestManagerInterface *shard_request_manager,
-                                       storage::v3::View view);
-
 }  // namespace memgraph::glue::v2

src/interface/.gitignore

@@ -0,0 +1 @@
+gen-cpp2

src/interface/CMakeLists.txt

@@ -0,0 +1,43 @@
+include(MgThrift)
+
+set(MG_INTERFACE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+
+mg_thrift_library(
+  "storage" #file_name
+  "Storage" #services
+  "${MG_INTERFACE_PATH}" #file_path
+  "${MG_INTERFACE_PATH}" #output_path
+  "interface" #include_prefix
+)
+
+mg_thrift_library(
+  "meta" #file_name
+  "Meta" #services
+  "${MG_INTERFACE_PATH}" #file_path
+  "${MG_INTERFACE_PATH}" #output_path
+  "interface" #include_prefix
+)
+
+mg_thrift_library(
+  "trial" #file_name
+  "PingPong" #services
+  "${MG_INTERFACE_PATH}" #file_path
+  "${MG_INTERFACE_PATH}" #output_path
+  "interface" #include_prefix
+)
+
+mg_thrift_library(
+  "echo" #file_name
+  "Echo" #services
+  "${MG_INTERFACE_PATH}" #file_path
+  "${MG_INTERFACE_PATH}" #output_path
+  "interface" #include_prefix
+)
+
+mg_thrift_library(
+  "ubermessage" #file_name
+  "UberServer" #services
+  "${MG_INTERFACE_PATH}" #file_path
+  "${MG_INTERFACE_PATH}" #output_path
+  "interface" #include_prefix
+)

src/interface/address.thrift

@@ -0,0 +1,5 @@
+struct Address{
+    1: string unique_id;
+    2: string last_known_ip;
+    3: i32 last_known_port;
+}

src/interface/counter.thrift

@@ -0,0 +1,22 @@
+namespace cpp2 interface.counter
+// https://stackoverflow.com/a/34234874/6639989
+
+struct GetLatestReqeuest {
+  1: optional i64 proposed_value;
+}
+
+struct GetLatestResponse {
+  1: i64 value;
+}
+
+union CounterRequest {
+  1: GetLatestReqeuest get_latest;
+}
+
+union CounterResponse {
+  1: GetLatestResponse get_latest;
+}
+
+service Counter {
+  CounterResponse Request(1: CounterRequest req)
+}

src/interface/echo.thrift

@@ -0,0 +1,20 @@
+struct EchoMessage {
+    1: binary message;
+}
+
+//struct Address{
+//    1: string unique_id;
+//    2: string last_known_ip;
+//    3: i32 last_known_port;
+//}
+
+struct CompoundMessage{
+//    1: Address to_address
+//    2: Address from_address
+    3: binary message
+}
+
+service Echo {
+    oneway void ReceiveSend(1: EchoMessage m)
+    oneway void RecieveCompoundThriftMessage(1: CompoundMessage m)
+}

src/interface/echo_trial.thrift

@@ -0,0 +1,7 @@
+struct EchoMessage {
+    1: binary message;
+}
+
+service Echo {
+    oneway void ReceiveSend(1: EchoMessage m)
+}

src/interface/meta.thrift

@@ -0,0 +1,74 @@
+namespace cpp2 interface.meta
+
+typedef i64 LabelId
+typedef i64 IndexId
+
+struct Result {
+    1: bool success;
+}
+
+struct CreatePrimaryLabelRequest {
+    1: binary name;
+    2: list<binary> primary_keys;
+}
+
+struct CreateLabelResponse {
+    1: Result result;
+    2: LabelId label_id;
+}
+
+struct GetLabelInfosRequest {
+    //  The empty list means return all of the label infos
+    1: list<binary> label_names;
+}
+
+struct LabelInfo {
+    1: binary name;
+    2: LabelId label_id;
+    3: list<binary> primary_keys;
+}
+
+struct GetLabelInfoResponse {
+    1: Result result;
+    2: LabelInfo label_info;
+}
+
+struct GetLabelInfosResponse {
+    1: Result result;
+    2: list<LabelInfo> label_infos;
+}
+
+struct CreateIndexRequest {
+    1: LabelId label_id;
+    2: list<binary> property_names;
+}
+
+struct CreateIndexResponse {
+    1: Result result;
+    2: IndexId index_id;
+}
+
+struct IndexInfo {
+    1: LabelId label_id;
+    2: list<binary> property_names;
+}
+
+struct GetIndexInfosResponse {
+    1: Result result;
+    2: list<IndexInfo> index_infos;
+}
+
+
+service Meta {
+    CreateLabelResponse createPrimaryLabel(1: CreatePrimaryLabelRequest req);
+    CreateLabelResponse createSecondaryLabel(1: binary label_name);
+    Result dropLabel(1: binary label_name);
+    GetLabelInfoResponse getLabelInfo(1:binary label_name);
+    GetLabelInfosResponse getLabelInfos(1: list<binary> label_names);
+
+    CreateIndexResponse createIndex(1: CreateIndexRequest req);
+    // Don't have index names, and the label doesn't identify the index uniquely, therefore
+    Result dropIndex(1: IndexId index_id);
+    GetIndexInfosResponse getIndexInfos();
+    GetIndexInfosResponse getIndexInfosForLabel(1: LabelId label_id);
+}

src/interface/storage.thrift

@@ -0,0 +1,273 @@
+namespace cpp2 interface.storage
+// https://stackoverflow.com/a/34234874/6639989
+
+cpp_include "storage/v2/view.hpp"
+
+typedef i64 VertexId
+typedef i64 Gid
+
+// TODO(antaljanosbenjamin): Use this after introducing 128 bit vertex ids
+// struct VertexId {
+//     1: i64 upper_half;
+//     2: i64 lower_half;
+// }
+
+struct Label {
+    1: i64 id;
+}
+
+struct EdgeType {
+    1: binary name;
+}
+
+struct EdgeId {
+    1: VertexId src;
+    // QUESTION(antaljanosbenjamin): is it okay to have vertex based (edge id = vertex id + edge id inside vertex)?
+    2: Gid gid;
+}
+
+struct Date {
+    1: i16 year;
+    2: byte month;
+    3: byte day;
+}
+
+struct LocalTime {
+    1: byte hour;
+    2: byte minute;
+    3: byte second;
+    4: i16 millisecond;
+    5: i16 microsecond;
+}
+
+struct LocalDateTime {
+    1: Date date;
+    2: LocalTime local_time;
+}
+
+struct Duration {
+    1: i64 milliseconds;
+}
+
+union Value {
+    1: Null null_v;
+    2: bool bool_v;
+    3: i64 int_v;
+    4: double double_v;
+    5: binary string_v;
+    6: list<Value> list_v;
+    7: map<binary, Value> (cpp.template = "std::unordered_map") map_v (cpp2.ref_type = "unique");
+    8: Vertex vertex_v (cpp2.ref_type = "unique");
+    9: Edge edge_v (cpp2.ref_type = "unique");
+    10: Path path_v (cpp2.ref_type = "unique");
+    11: Date date_v;
+    12: LocalTime local_time_v;
+    13: LocalDateTime local_date_time_v;
+    14: Duration duration_v;
+}
+
+struct Null {
+}
+
+struct Vertex {
+    1: VertexId id;
+    // TODO(antaljanosbenjamin): Change to sperate primary and secondary labels when schema is implemented
+    2: list<Label> labels;
+}
+
+struct Edge {
+    1: VertexId src;
+    2: VertexId dst;
+    3: EdgeType type;
+}
+
+struct PathPart {
+    1: Vertex dst;
+    2: Edge edge;
+}
+
+struct Path {
+    1: Vertex src;
+    2: list<PathPart> parts;
+}
+
+struct ValuesMap {
+    1: map<i64, Value> (cpp.template = "std::unordered_map") values_map;
+}
+
+struct MappedValues {
+    1: list<ValuesMap> properties;
+}
+
+struct ListedValues {
+    1: list<list<Value>> properties;
+}
+
+union Values {
+    // This struct is necessary because depending on the request the response
+    // has two different formats:
+    // 1. When the request specifies the returned properties, then they are
+    //    returned in that order, therefore no extra mapping is necessary.
+    // 2. When the request doesn't specify the returned properties, then all
+    //    of the properties are returned. In this case the `mapped` field is
+    //    used. To extract the <key,value> pairs from this struct the
+    //    mapping of i64 -> property name has to be used.
+    1: ListedValues listed;
+    2: MappedValues mapped;
+}
+
+struct Expression {
+    1: binary alias;
+    2: binary expression;
+}
+
+struct Filter {
+    1: binary filter_expression;
+}
+
+enum OrderingDirection {
+    ASCENDING = 1;
+    DESCENDING = 2;
+}
+
+struct OrderBy {
+    1: Expression expression;
+    2: OrderingDirection direction;
+}
+
+struct Result {
+    // Just placeholder data for now
+    1: bool success;
+}
+
+enum View {
+    OLD = 0,
+    NEW = 1
+}  (cpp.enum_strict, cpp.type = "memgraph::storage::View")
+
+struct ScanVerticesRequest {
+    1: i64 transaction_id;
+    2: optional i64 start_id;
+    // Special values are accepted:
+    // * __mg__id (Vertex, but without labels)
+    // * __mg__labels (Vertex, but without the id)
+    // If both of them is specified, then it will result in a single, fully populated vertex
+    // QUESTION(antaljanosbenjamin): Does the `__mg__labels` is necessary? What about passing the `labels` function
+    //                               as an expression? Maybe it is an optimization. For communicating the vertex id
+    //                               the Vertex struct is really handy.
+    3: optional list<binary> props_to_return;
+    4: list<Expression> expressions;
+    5: optional i64 limit;
+    6: View view;
+    7: optional Filter filter;
+}
+
+struct ScanVerticesResponse {
+    1: Result result;
+    2: Values values;
+    3: optional map<i64, binary> (cpp.template = "std::unordered_map") property_name_map;
+    // contains the next start_id if there is any
+    4: optional VertexId next_start_id;
+}
+
+union VertexOrEdgeIds {
+    1: list<VertexId> vertex_ids;
+    2: list<EdgeId> edge_ids;
+}
+
+struct GetPropertiesRequest {
+    1:  i64 transaction_id;
+    2:  VertexOrEdgeIds vertex_or_edge_ids;
+    3:  list<binary> property_names;
+    4:  list<Expression> expressions;
+    5:  bool only_unique = false;
+    6:  optional list<OrderBy> order_by;
+    7:  optional i64 limit;
+    8:  optional Filter filter;
+}
+
+struct GetPropertiesResponse {
+    1: Values values;
+    2: optional map<i64, binary> (cpp.template = "std::unordered_map") property_name_map;
+}
+
+enum EdgeDirection {
+    OUT = 1;
+    IN = 2;
+    BOTH = 3;
+}
+
+struct ExpandOneRequest {
+    1:  i64 transaction_id;
+    2:  list<VertexId> src_vertices;
+    3:  list<EdgeType> edge_types;
+    4:  EdgeDirection direction;
+    5:  bool only_unique_neighbor_rows = false;
+    //  The empty optional means return all of the properties, while an empty
+    //  list means do not return any properties
+    //  TODO(antaljanosbenjamin): All of the special values should be communicated through a single vertex object
+    //                            after schema is implemented
+    //  Special values are accepted:
+    //  * __mg__labels
+    6:  optional list<binary> src_vertex_properties;
+    //  TODO(antaljanosbenjamin): All of the special values should be communicated through a single vertex object
+    //                            after schema is implemented
+    //  Special values are accepted:
+    //  * __mg__dst_id (Vertex, but without labels)
+    //  * __mg__type (binary)
+    7:  optional list<binary> edge_properties;
+    //  QUESTION(antaljanosbenjamin): Maybe also add possibility to expressions evaluated on the source vertex?
+    //  List of expressions evaluated on edges
+    8:  list<Expression> expressions;
+    9:  optional list<OrderBy> order_by;
+    10:  optional i64 limit;
+    11: optional Filter filter;
+}
+
+struct ExpandOneResultRow {
+    // NOTE: This struct could be a single Values with columns something like this:
+    // src_vertex(Vertex), vertex_prop1(Value), vertex_prop2(Value), edges(list<Value>)
+    // where edges might be a list of:
+    // 1. list<Value> if only a defined list of edge properties are returned
+    // 2. map<binary, Value> if all of the edge properties are returned
+    // The drawback of this is currently the key of the map is always interpreted as a string in Value, not as an
+    // integer, which should be in case of mapped properties.
+    1: Vertex src_vertex;
+    2: optional Values src_vertex_properties;
+    3: Values edges;
+}
+
+struct ExpandOneResponse {
+    // This approach might not suit the expand with per shard parrallelization,
+    // because the property_name_map has to be accessed from multiple threads
+    // in order to avoid duplicated keys (two threads might map the same
+    // property with different numbers) and multiple passes (to unify the
+    // mapping amond result returned from different shards).
+    1: list<ExpandOneResultRow> result;
+    2: optional map<i64, binary>  (cpp.template = "std::unordered_map") property_name_map;
+}
+
+struct NewVertex {
+    1: list<i64> label_ids;
+    2: map<i64, Value> properties;
+}
+
+struct CreateVerticesRequest {
+    1: required i64 transaction_id;
+    2: map<i64, binary> (cpp.template = "std::unordered_map") labels_name_map;
+    3: map<i64, binary> (cpp.template = "std::unordered_map") property_name_map;
+    4: list<NewVertex> new_vertices;
+}
+
+
+service Storage {
+    i64 startTransaction()
+    Result commitTransaction(1: i64 transaction_id)
+    void abortTransaction(1: i64 transaction_id)
+
+    Result createVertices(1: CreateVerticesRequest req)
+    ScanVerticesResponse scanVertices(1: ScanVerticesRequest req)
+    GetPropertiesResponse getProperties(1: GetPropertiesRequest req)
+    ExpandOneResponse expandOne(1: ExpandOneRequest req)
+
+}

src/interface/trial.thrift

@@ -0,0 +1,20 @@
+struct Ping {
+    1: binary message;
+}
+
+struct Pong{
+    1: binary message;
+}
+
+struct ValueToAdd{
+    1:  i64 val;
+}
+
+struct ValueToAddResopnse{
+    1:  i64 new_val;
+}
+
+service PingPong {
+    Pong ping(1: Ping req)
+    ValueToAddResopnse AddValue(1: ValueToAdd req)
+}

src/interface/ubermessage.thrift

@@ -0,0 +1,56 @@
+//include "address.thrift"
+
+// TODO(gvolfing) remove this once the include problem is resolved
+struct Address{
+    1: string unique_id;
+    2: string last_known_ip;
+    3: i32 last_known_port;
+}
+
+struct HeartbeatRequest {
+  1: bool test;
+}
+
+struct HeartbeatResponse {
+  1: bool test;
+}
+
+struct ScanAllRequest{
+  1: bool test;
+}
+
+struct ScanAllResponse {
+  1: bool test;
+}
+
+union ToStorageEngine{
+  1: ScanAllRequest scan_all_request;
+  2: HeartbeatRequest heartbeat_request;
+}
+
+union ToQueryEngine {
+  1: ScanAllResponse scan_all_response;
+}
+
+union ToCoordinator {
+  1: HeartbeatResponse heartbeat_response;
+}
+
+union HighLevelUnion {
+    1: ToStorageEngine to_storage_engine;
+    2: ToQueryEngine to_query_engine;
+    3: ToCoordinator to_coordinator;
+}
+
+struct UberMessage {
+    //1: address.Address to_address;
+    //2: address.Address from_address;
+    1: Address to_address;
+    2: Address from_address;
+    3: i64 request_id;
+    4: HighLevelUnion high_level_union;
+}
+
+service UberServer {
+    oneway void ReceiveUberMessage(1: UberMessage uber_message)
+}

src/io/CMakeLists.txt

@@ -1,3 +1,5 @@
+include(MgThrift)
+
 set(io_src_files
     network/addrinfo.cpp
     network/endpoint.cpp
@@ -8,4 +10,4 @@ find_package(fmt REQUIRED)
 find_package(Threads REQUIRED)
 
 add_library(mg-io STATIC ${io_src_files})
-target_link_libraries(mg-io stdc++fs Threads::Threads fmt::fmt mg-utils)
+target_link_libraries(mg-io stdc++fs Threads::Threads fmt::fmt mg-utils FBThrift::thriftcpp2 mg-interface-ubermessage-cpp2)

src/io/address.hpp

@@ -15,36 +15,10 @@
 
 #include <fmt/format.h>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/functional/hash.hpp>
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
 #include <boost/uuid/uuid_io.hpp>
 
 namespace memgraph::io {
-
-struct PartialAddress {
-  boost::asio::ip::address ip;
-  uint16_t port;
-
-  friend bool operator==(const PartialAddress &lhs, const PartialAddress &rhs) = default;
-
-  /// unique_id is most dominant for ordering, then ip, then port
-  friend bool operator<(const PartialAddress &lhs, const PartialAddress &rhs) {
-    if (lhs.ip != rhs.ip) {
-      return lhs.ip < rhs.ip;
-    }
-
-    return lhs.port < rhs.port;
-  }
-
-  std::string ToString() const { return fmt::format("PartialAddress {{ ip: {}, port: {} }}", ip.to_string(), port); }
-
-  friend std::ostream &operator<<(std::ostream &in, const PartialAddress &partial_address) {
-    in << partial_address.ToString();
-    return in;
-  }
-};
-
 struct Address {
   // It's important for all participants to have a
   // unique identifier - IP and port alone are not
@@ -58,32 +32,9 @@ struct Address {
   uint16_t last_known_port;
 
   static Address TestAddress(uint16_t port) {
-    return Address{
-        .unique_id = boost::uuids::uuid{boost::uuids::random_generator()()},
-        .last_known_port = port,
-    };
-  }
-
-  static Address UniqueLocalAddress() {
-    return Address{
-        .unique_id = boost::uuids::uuid{boost::uuids::random_generator()()},
-    };
-  }
-
-  /// Returns a new ID with the same IP and port but a unique UUID.
-  Address ForkUniqueAddress() {
-    return Address{
-        .unique_id = boost::uuids::uuid{boost::uuids::random_generator()()},
-        .last_known_ip = last_known_ip,
-        .last_known_port = last_known_port,
-    };
-  }
-
-  PartialAddress ToPartialAddress() const {
-    return PartialAddress{
-        .ip = last_known_ip,
-        .port = last_known_port,
-    };
+    Address ret;
+    ret.last_known_port = port;
+    return ret;
   }
 
   friend bool operator==(const Address &lhs, const Address &rhs) = default;
@@ -105,36 +56,5 @@ struct Address {
     return fmt::format("Address {{ unique_id: {}, last_known_ip: {}, last_known_port: {} }}",
                        boost::uuids::to_string(unique_id), last_known_ip.to_string(), last_known_port);
   }
-
-  friend std::ostream &operator<<(std::ostream &in, const Address &address) {
-    in << address.ToString();
-    return in;
-  }
 };
-
 };  // namespace memgraph::io
-
-namespace std {
-template <>
-struct hash<memgraph::io::PartialAddress> {
-  size_t operator()(const memgraph::io::PartialAddress &pa) const {
-    using boost::hash_combine;
-    using boost::hash_value;
-
-    // Start with a hash value of 0    .
-    std::size_t seed = 0;
-
-    if (pa.ip.is_v4()) {
-      auto h = std::hash<boost::asio::ip::address_v4>()(pa.ip.to_v4());
-      hash_combine(seed, h);
-    } else {
-      auto h = std::hash<boost::asio::ip::address_v6>()(pa.ip.to_v6());
-      hash_combine(seed, h);
-    }
-    hash_combine(seed, hash_value(pa.port));
-
-    // Return the result.
-    return seed;
-  }
-};
-}  // namespace std

src/io/future.hpp

@@ -99,7 +99,7 @@ class Shared {
 
   bool IsReady() const {
     std::unique_lock<std::mutex> lock(mu_);
-    return item_.has_value();
+    return item_;
   }
 
   std::optional<T> TryGet() {
@@ -151,9 +151,7 @@ class Future {
   Future &operator=(Future &&old) noexcept {
     MG_ASSERT(!old.consumed_or_moved_, "Future moved from after already being moved from or consumed.");
     shared_ = std::move(old.shared_);
-    consumed_or_moved_ = old.consumed_or_moved_;
     old.consumed_or_moved_ = true;
-    return *this;
   }
 
   Future(const Future &) = delete;
@@ -200,7 +198,7 @@ class Future {
 template <typename T>
 class Promise {
   std::shared_ptr<details::Shared<T>> shared_;
-  bool filled_or_moved_{false};
+  bool filled_or_moved_ = false;
 
  public:
   explicit Promise(std::shared_ptr<details::Shared<T>> shared) : shared_(shared) {}
@@ -220,7 +218,6 @@ class Promise {
   Promise(const Promise &) = delete;
   Promise &operator=(const Promise &) = delete;
 
-  // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.Branch)
   ~Promise() { MG_ASSERT(filled_or_moved_, "Promise destroyed before its associated Future was filled!"); }
 
   // Fill the expected item into the Future.

src/io/local_transport/local_system.hpp

@@ -1,35 +0,0 @@
-// 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 <random>
-
-#include "io/address.hpp"
-#include "io/local_transport/local_transport.hpp"
-#include "io/local_transport/local_transport_handle.hpp"
-#include "io/transport.hpp"
-
-namespace memgraph::io::local_transport {
-
-class LocalSystem {
-  std::shared_ptr<LocalTransportHandle> local_transport_handle_ = std::make_shared<LocalTransportHandle>();
-
- public:
-  Io<LocalTransport> Register(Address address) {
-    LocalTransport local_transport(local_transport_handle_);
-    return Io{local_transport, address};
-  }
-
-  void ShutDown() { local_transport_handle_->ShutDown(); }
-};
-
-}  // namespace memgraph::io::local_transport

src/io/local_transport/local_transport.hpp

@@ -1,61 +0,0 @@
-// 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 <memory>
-#include <random>
-#include <utility>
-
-#include "io/address.hpp"
-#include "io/local_transport/local_transport_handle.hpp"
-#include "io/time.hpp"
-#include "io/transport.hpp"
-
-namespace memgraph::io::local_transport {
-
-class LocalTransport {
-  std::shared_ptr<LocalTransportHandle> local_transport_handle_;
-
- public:
-  explicit LocalTransport(std::shared_ptr<LocalTransportHandle> local_transport_handle)
-      : local_transport_handle_(std::move(local_transport_handle)) {}
-
-  template <Message RequestT, Message ResponseT>
-  ResponseFuture<ResponseT> Request(Address to_address, Address from_address, RequestT request, Duration timeout) {
-    return local_transport_handle_->template SubmitRequest<RequestT, ResponseT>(to_address, from_address,
-                                                                                std::move(request), timeout);
-  }
-
-  template <Message... Ms>
-  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Address receiver_address, Duration timeout) {
-    return local_transport_handle_->template Receive<Ms...>(receiver_address, timeout);
-  }
-
-  template <Message M>
-  void Send(Address to_address, Address from_address, RequestId request_id, M &&message) {
-    return local_transport_handle_->template Send<M>(to_address, from_address, request_id, std::forward<M>(message));
-  }
-
-  Time Now() const { return local_transport_handle_->Now(); }
-
-  bool ShouldShutDown() const { return local_transport_handle_->ShouldShutDown(); }
-
-  template <class D = std::poisson_distribution<>, class Return = uint64_t>
-  Return Rand(D distrib) {
-    std::random_device rng;
-    return distrib(rng);
-  }
-
-  LatencyHistogramSummaries ResponseLatencies() { return local_transport_handle_->ResponseLatencies(); }
-};
-};  // namespace memgraph::io::local_transport

src/io/local_transport/local_transport_handle.hpp

@@ -1,173 +0,0 @@
-// 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 <condition_variable>
-#include <iostream>
-#include <map>
-#include <mutex>
-
-#include "io/errors.hpp"
-#include "io/message_conversion.hpp"
-#include "io/message_histogram_collector.hpp"
-#include "io/time.hpp"
-#include "io/transport.hpp"
-
-namespace memgraph::io::local_transport {
-
-class LocalTransportHandle {
-  mutable std::mutex mu_{};
-  mutable std::condition_variable cv_;
-  bool should_shut_down_ = false;
-  MessageHistogramCollector histograms_;
-  RequestId request_id_counter_ = 0;
-
-  // the responses to requests that are being waited on
-  std::map<PromiseKey, DeadlineAndOpaquePromise> promises_;
-
-  // messages that are sent to servers that may later receive them
-  std::vector<OpaqueMessage> can_receive_;
-
- public:
-  ~LocalTransportHandle() {
-    for (auto &&[pk, promise] : promises_) {
-      std::move(promise.promise).TimeOut();
-    }
-    promises_.clear();
-  }
-
-  void ShutDown() {
-    std::unique_lock<std::mutex> lock(mu_);
-    should_shut_down_ = true;
-    cv_.notify_all();
-  }
-
-  bool ShouldShutDown() const {
-    std::unique_lock<std::mutex> lock(mu_);
-    return should_shut_down_;
-  }
-
-  LatencyHistogramSummaries ResponseLatencies() {
-    std::unique_lock<std::mutex> lock(mu_);
-    return histograms_.ResponseLatencies();
-  }
-
-  static Time Now() {
-    auto nano_time = std::chrono::system_clock::now();
-    return std::chrono::time_point_cast<std::chrono::microseconds>(nano_time);
-  }
-
-  template <Message... Ms>
-  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Address /* receiver_address */, Duration timeout) {
-    std::unique_lock lock(mu_);
-
-    Time before = Now();
-
-    spdlog::info("can_receive_ size: {}", can_receive_.size());
-
-    while (can_receive_.empty()) {
-      Time now = Now();
-
-      // protection against non-monotonic timesources
-      auto maxed_now = std::max(now, before);
-      auto elapsed = maxed_now - before;
-
-      if (timeout < elapsed) {
-        return TimedOut{};
-      }
-
-      Duration relative_timeout = timeout - elapsed;
-
-      std::cv_status cv_status_value = cv_.wait_for(lock, relative_timeout);
-
-      if (cv_status_value == std::cv_status::timeout) {
-        return TimedOut{};
-      }
-    }
-
-    auto current_message = std::move(can_receive_.back());
-    can_receive_.pop_back();
-
-    auto m_opt = std::move(current_message).Take<Ms...>();
-
-    return std::move(m_opt).value();
-  }
-
-  template <Message M>
-  void Send(Address to_address, Address from_address, RequestId request_id, M &&message) {
-    auto type_info = TypeInfoFor(message);
-
-    std::any message_any(std::forward<M>(message));
-    OpaqueMessage opaque_message{.to_address = to_address,
-                                 .from_address = from_address,
-                                 .request_id = request_id,
-                                 .message = std::move(message_any),
-                                 .type_info = type_info};
-
-    PromiseKey promise_key{.requester_address = to_address, .request_id = opaque_message.request_id};
-
-    {
-      std::unique_lock<std::mutex> lock(mu_);
-
-      if (promises_.contains(promise_key)) {
-        spdlog::info("using message to fill promise");
-        // complete waiting promise if it's there
-        DeadlineAndOpaquePromise dop = std::move(promises_.at(promise_key));
-        promises_.erase(promise_key);
-
-        Duration response_latency = Now() - dop.requested_at;
-
-        dop.promise.Fill(std::move(opaque_message), response_latency);
-        histograms_.Measure(type_info, response_latency);
-      } else {
-        spdlog::info("placing message in can_receive_");
-        can_receive_.emplace_back(std::move(opaque_message));
-      }
-    }  // lock dropped
-
-    cv_.notify_all();
-  }
-
-  template <Message RequestT, Message ResponseT>
-  ResponseFuture<ResponseT> SubmitRequest(Address to_address, Address from_address, RequestT &&request,
-                                          Duration timeout) {
-    auto [future, promise] = memgraph::io::FuturePromisePair<ResponseResult<ResponseT>>();
-
-    const bool port_matches = to_address.last_known_port == from_address.last_known_port;
-    const bool ip_matches = to_address.last_known_ip == from_address.last_known_ip;
-
-    MG_ASSERT(port_matches && ip_matches);
-
-    const auto now = Now();
-    const Time deadline = now + timeout;
-
-    RequestId request_id = 0;
-    {
-      std::unique_lock<std::mutex> lock(mu_);
-
-      request_id = ++request_id_counter_;
-      PromiseKey promise_key{.requester_address = from_address, .request_id = request_id};
-      OpaquePromise opaque_promise(std::move(promise).ToUnique());
-      DeadlineAndOpaquePromise dop{.requested_at = now, .deadline = deadline, .promise = std::move(opaque_promise)};
-
-      MG_ASSERT(!promises_.contains(promise_key));
-      promises_.emplace(std::move(promise_key), std::move(dop));
-    }  // lock dropped
-
-    Send(to_address, from_address, request_id, std::forward<RequestT>(request));
-
-    return std::move(future);
-  }
-};
-
-}  // namespace memgraph::io::local_transport

src/io/message_conversion.hpp

@@ -11,16 +11,16 @@
 
 #pragma once
 
-#include <boost/core/demangle.hpp>
-
 #include "io/transport.hpp"
-#include "utils/type_info_ref.hpp"
 
 namespace memgraph::io {
 
 struct PromiseKey {
   Address requester_address;
   uint64_t request_id;
+  // TODO(tyler) possibly remove replier_address from promise key
+  // once we want to support DSR.
+  Address replier_address;
 
  public:
   friend bool operator<(const PromiseKey &lhs, const PromiseKey &rhs) {
@@ -28,16 +28,19 @@ struct PromiseKey {
       return lhs.requester_address < rhs.requester_address;
     }
 
-    return lhs.request_id < rhs.request_id;
+    if (lhs.request_id != rhs.request_id) {
+      return lhs.request_id < rhs.request_id;
+    }
+
+    return lhs.replier_address < rhs.replier_address;
   }
 };
 
 struct OpaqueMessage {
-  Address to_address;
   Address from_address;
+  Address to_address;
   uint64_t request_id;
   std::any message;
-  utils::TypeInfoRef type_info;
 
   /// Recursively tries to match a specific type from the outer
   /// variant's parameter pack against the type of the std::any,
@@ -80,15 +83,10 @@ struct OpaqueMessage {
       return RequestEnvelope<Ms...>{
           .message = std::move(*m_opt),
           .request_id = request_id,
-          .to_address = to_address,
           .from_address = from_address,
       };
     }
 
-    std::string demangled_name = "\"" + boost::core::demangle(message.type().name()) + "\"";
-    spdlog::error("failed to cast message of type {} to expected request type (probably in Receive argument types)",
-                  demangled_name);
-
     return std::nullopt;
   }
 };
@@ -97,7 +95,7 @@ class OpaquePromiseTraitBase {
  public:
   virtual const std::type_info *TypeInfo() const = 0;
   virtual bool IsAwaited(void *ptr) const = 0;
-  virtual void Fill(void *ptr, OpaqueMessage &&, Duration) const = 0;
+  virtual void Fill(void *ptr, OpaqueMessage &&) const = 0;
   virtual void TimeOut(void *ptr) const = 0;
 
   virtual ~OpaquePromiseTraitBase() = default;
@@ -115,13 +113,11 @@ class OpaquePromiseTrait : public OpaquePromiseTraitBase {
 
   bool IsAwaited(void *ptr) const override { return static_cast<ResponsePromise<T> *>(ptr)->IsAwaited(); };
 
-  void Fill(void *ptr, OpaqueMessage &&opaque_message, Duration response_latency) const override {
+  void Fill(void *ptr, OpaqueMessage &&opaque_message) const override {
     T message = std::any_cast<T>(std::move(opaque_message.message));
     auto response_envelope = ResponseEnvelope<T>{.message = std::move(message),
                                                  .request_id = opaque_message.request_id,
-                                                 .to_address = opaque_message.to_address,
-                                                 .from_address = opaque_message.from_address,
-                                                 .response_latency = response_latency};
+                                                 .from_address = opaque_message.from_address};
     auto promise = static_cast<ResponsePromise<T> *>(ptr);
     auto unique_promise = std::unique_ptr<ResponsePromise<T>>(promise);
     unique_promise->Fill(std::move(response_envelope));
@@ -185,9 +181,9 @@ class OpaquePromise {
     ptr_ = nullptr;
   }
 
-  void Fill(OpaqueMessage &&opaque_message, Duration response_latency) {
+  void Fill(OpaqueMessage &&opaque_message) {
     MG_ASSERT(ptr_ != nullptr);
-    trait_->Fill(ptr_, std::move(opaque_message), response_latency);
+    trait_->Fill(ptr_, std::move(opaque_message));
     ptr_ = nullptr;
   }
 
@@ -197,40 +193,8 @@ class OpaquePromise {
 };
 
 struct DeadlineAndOpaquePromise {
-  Time requested_at;
   Time deadline;
   OpaquePromise promise;
 };
 
-template <class From>
-std::type_info const &TypeInfoForVariant(From const &from) {
-  return std::visit([](auto &&x) -> decltype(auto) { return typeid(x); }, from);
-}
-
-template <class T>
-utils::TypeInfoRef TypeInfoFor(const T & /* t */) {
-  return typeid(T);
-}
-
-template <typename From, typename Return, typename Head, typename... Rest>
-std::optional<Return> ConvertVariantInner(From &&a) {
-  if (typeid(Head) == TypeInfoForVariant(a)) {
-    Head concrete = std::get<Head>(std::forward<From>(a));
-    return concrete;
-  }
-
-  if constexpr (sizeof...(Rest) > 0) {
-    return ConvertVariantInner<From, Return, Rest...>(std::forward<From>(a));
-  } else {
-    return std::nullopt;
-  }
-}
-
-/// This function converts a variant to another variant holding a subset OR superset of
-/// possible types.
-template <class From, class... Ms>
-requires(sizeof...(Ms) > 0) std::optional<std::variant<Ms...>> ConvertVariant(From &&from) {
-  return ConvertVariantInner<From, std::variant<Ms...>, Ms...>(std::forward<From>(from));
-}
-
 }  // namespace memgraph::io

src/io/message_histogram_collector.hpp

@@ -1,127 +0,0 @@
-// 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 <cmath>
-#include <unordered_map>
-
-#include <boost/core/demangle.hpp>
-
-#include "io/time.hpp"
-#include "utils/histogram.hpp"
-#include "utils/logging.hpp"
-#include "utils/print_helpers.hpp"
-#include "utils/type_info_ref.hpp"
-
-namespace memgraph::io {
-
-struct LatencyHistogramSummary {
-  uint64_t count;
-  Duration p0;
-  Duration p50;
-  Duration p75;
-  Duration p90;
-  Duration p95;
-  Duration p975;
-  Duration p99;
-  Duration p999;
-  Duration p9999;
-  Duration p100;
-  Duration sum;
-
-  friend std::ostream &operator<<(std::ostream &in, const LatencyHistogramSummary &histo) {
-    in << "{ \"count\": " << histo.count;
-    in << ", \"p0\": " << histo.p0.count();
-    in << ", \"p50\": " << histo.p50.count();
-    in << ", \"p75\": " << histo.p75.count();
-    in << ", \"p90\": " << histo.p90.count();
-    in << ", \"p95\": " << histo.p95.count();
-    in << ", \"p975\": " << histo.p975.count();
-    in << ", \"p99\": " << histo.p99.count();
-    in << ", \"p999\": " << histo.p999.count();
-    in << ", \"p9999\": " << histo.p9999.count();
-    in << ", \"p100\": " << histo.p100.count();
-    in << ", \"sum\": " << histo.sum.count();
-    in << " }";
-
-    return in;
-  }
-};
-
-struct LatencyHistogramSummaries {
-  std::unordered_map<std::string, LatencyHistogramSummary> latencies;
-
-  std::string SummaryTable() {
-    std::string output;
-
-    const auto row = [&output](const auto &c1, const auto &c2, const auto &c3, const auto &c4, const auto &c5,
-                               const auto &c6, const auto &c7) {
-      output +=
-          fmt::format("{: >50} | {: >8} | {: >8} | {: >8} | {: >8} | {: >8} | {: >8}\n", c1, c2, c3, c4, c5, c6, c7);
-    };
-    row("name", "count", "min (μs)", "med (μs)", "p99 (μs)", "max (μs)", "sum (ms)");
-
-    for (const auto &[name, histo] : latencies) {
-      row(name, histo.count, histo.p0.count(), histo.p50.count(), histo.p99.count(), histo.p100.count(),
-          histo.sum.count() / 1000);
-    }
-
-    output += "\n";
-    return output;
-  }
-
-  friend std::ostream &operator<<(std::ostream &in, const LatencyHistogramSummaries &histo) {
-    using memgraph::utils::print_helpers::operator<<;
-    in << histo.latencies;
-    return in;
-  }
-};
-
-class MessageHistogramCollector {
-  std::unordered_map<utils::TypeInfoRef, utils::Histogram, utils::TypeInfoHasher, utils::TypeInfoEqualTo> histograms_;
-
- public:
-  void Measure(const std::type_info &type_info, const Duration &duration) {
-    auto &histo = histograms_[type_info];
-    histo.Measure(duration.count());
-  }
-
-  LatencyHistogramSummaries ResponseLatencies() {
-    std::unordered_map<std::string, LatencyHistogramSummary> ret{};
-
-    for (const auto &[type_id, histo] : histograms_) {
-      std::string demangled_name = "\"" + boost::core::demangle(type_id.get().name()) + "\"";
-
-      LatencyHistogramSummary latency_histogram_summary{
-          .count = histo.Count(),
-          .p0 = Duration(static_cast<int64_t>(histo.Percentile(0.0))),
-          .p50 = Duration(static_cast<int64_t>(histo.Percentile(50.0))),
-          .p75 = Duration(static_cast<int64_t>(histo.Percentile(75.0))),
-          .p90 = Duration(static_cast<int64_t>(histo.Percentile(90.0))),
-          .p95 = Duration(static_cast<int64_t>(histo.Percentile(95.0))),
-          .p975 = Duration(static_cast<int64_t>(histo.Percentile(97.5))),
-          .p99 = Duration(static_cast<int64_t>(histo.Percentile(99.0))),
-          .p999 = Duration(static_cast<int64_t>(histo.Percentile(99.9))),
-          .p9999 = Duration(static_cast<int64_t>(histo.Percentile(99.99))),
-          .p100 = Duration(static_cast<int64_t>(histo.Percentile(100.0))),
-          .sum = Duration(histo.Sum()),
-      };
-
-      ret.emplace(demangled_name, latency_histogram_summary);
-    }
-
-    return LatencyHistogramSummaries{.latencies = ret};
-  }
-};
-
-}  // namespace memgraph::io

src/io/messages.hpp

@@ -1,46 +0,0 @@
-// 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 <variant>
-
-#include <coordinator/coordinator.hpp>
-#include <io/rsm/raft.hpp>
-#include "query/v2/requests.hpp"
-#include "utils/concepts.hpp"
-
-namespace memgraph::io::messages {
-
-using memgraph::coordinator::CoordinatorReadRequests;
-using memgraph::coordinator::CoordinatorWriteRequests;
-using memgraph::coordinator::CoordinatorWriteResponses;
-using StorageReadRequest = msgs::ReadRequests;
-using StorageWriteRequest = msgs::WriteRequests;
-
-using memgraph::io::rsm::AppendRequest;
-using memgraph::io::rsm::AppendResponse;
-using memgraph::io::rsm::ReadRequest;
-using memgraph::io::rsm::VoteRequest;
-using memgraph::io::rsm::VoteResponse;
-using memgraph::io::rsm::WriteRequest;
-using memgraph::io::rsm::WriteResponse;
-
-using CoordinatorMessages =
-    std::variant<ReadRequest<CoordinatorReadRequests>, AppendRequest<CoordinatorWriteRequests>, AppendResponse,
-                 WriteRequest<CoordinatorWriteRequests>, VoteRequest, VoteResponse>;
-
-using ShardMessages = std::variant<ReadRequest<StorageReadRequest>, AppendRequest<StorageWriteRequest>, AppendResponse,
-                                   WriteRequest<StorageWriteRequest>, VoteRequest, VoteResponse>;
-
-using ShardManagerMessages = std::variant<WriteResponse<CoordinatorWriteResponses>>;
-
-}  // namespace memgraph::io::messages

src/io/rsm/coordinator_rsm.hpp

@@ -14,10 +14,12 @@
 #include "coordinator/coordinator.hpp"
 #include "io/rsm/raft.hpp"
 
-namespace memgraph::coordinator {
+namespace memgraph::io::rsm {
+
+// TODO(tyler) don't
+using namespace memgraph::coordinator;
 
 template <typename IoImpl>
-using CoordinatorRsm = memgraph::io::rsm::Raft<IoImpl, Coordinator, CoordinatorWriteRequests, CoordinatorWriteResponses,
-                                               CoordinatorReadRequests, CoordinatorReadResponses>;
+using CoordinatorRsm = io::rsm::Raft<IoImpl, Coordinator, WriteRequests, WriteResponses, ReadRequests, ReadResponses>;
 
-}  // namespace memgraph::coordinator
+}  // namespace memgraph::io::rsm

src/io/rsm/raft.hpp

@@ -22,40 +22,21 @@
 #include <unordered_map>
 #include <vector>
 
-#include <boost/core/demangle.hpp>
-
-#include "io/message_conversion.hpp"
 #include "io/simulator/simulator.hpp"
 #include "io/transport.hpp"
-#include "utils/concepts.hpp"
 
 namespace memgraph::io::rsm {
 
-/// Timeout and replication tunables
-using namespace std::chrono_literals;
-static constexpr auto kMinimumElectionTimeout = 100ms;
-static constexpr auto kMaximumElectionTimeout = 200ms;
-static constexpr auto kMinimumBroadcastTimeout = 40ms;
-static constexpr auto kMaximumBroadcastTimeout = 60ms;
-static constexpr auto kMinimumCronInterval = 1ms;
-static constexpr auto kMaximumCronInterval = 2ms;
-static constexpr auto kMinimumReceiveTimeout = 40ms;
-static constexpr auto kMaximumReceiveTimeout = 60ms;
-static_assert(kMinimumElectionTimeout > kMaximumBroadcastTimeout,
-              "The broadcast timeout has to be smaller than the election timeout!");
-static_assert(kMinimumElectionTimeout < kMaximumElectionTimeout,
-              "The minimum election timeout has to be smaller than the maximum election timeout!");
-static_assert(kMinimumBroadcastTimeout < kMaximumBroadcastTimeout,
-              "The minimum broadcast timeout has to be smaller than the maximum broadcast timeout!");
-static_assert(kMinimumCronInterval < kMaximumCronInterval,
-              "The minimum cron interval has to be smaller than the maximum cron interval!");
-static_assert(kMinimumReceiveTimeout < kMaximumReceiveTimeout,
-              "The minimum receive timeout has to be smaller than the maximum receive timeout!");
-static constexpr size_t kMaximumAppendBatchSize = 1024;
+using memgraph::io::Address;
+using memgraph::io::Duration;
+using memgraph::io::Io;
+using memgraph::io::ResponseFuture;
+using memgraph::io::ResponseResult;
+using memgraph::io::Time;
 
 using Term = uint64_t;
 using LogIndex = uint64_t;
-using LogSize = uint64_t;
+using RequestId = uint64_t;
 
 template <typename WriteOperation>
 struct WriteRequest {
@@ -76,7 +57,6 @@ struct WriteResponse {
   bool success;
   WriteReturn write_return;
   std::optional<Address> retry_leader;
-  LogIndex raft_index;
 };
 
 template <typename ReadOperation>
@@ -91,36 +71,6 @@ struct ReadResponse {
   std::optional<Address> retry_leader;
 };
 
-template <class... ReadReturn>
-utils::TypeInfoRef TypeInfoFor(const ReadResponse<std::variant<ReadReturn...>> &read_response) {
-  return TypeInfoForVariant(read_response.read_return);
-}
-
-template <class ReadReturn>
-utils::TypeInfoRef TypeInfoFor(const ReadResponse<ReadReturn> & /* read_response */) {
-  return typeid(ReadReturn);
-}
-
-template <class... WriteReturn>
-utils::TypeInfoRef TypeInfoFor(const WriteResponse<std::variant<WriteReturn...>> &write_response) {
-  return TypeInfoForVariant(write_response.write_return);
-}
-
-template <class WriteReturn>
-utils::TypeInfoRef TypeInfoFor(const WriteResponse<WriteReturn> & /* write_response */) {
-  return typeid(WriteReturn);
-}
-
-template <class WriteOperation>
-utils::TypeInfoRef TypeInfoFor(const WriteRequest<WriteOperation> & /* write_request */) {
-  return typeid(WriteOperation);
-}
-
-template <class... WriteOperations>
-utils::TypeInfoRef TypeInfoFor(const WriteRequest<std::variant<WriteOperations...>> &write_request) {
-  return TypeInfoForVariant(write_request.operation);
-}
-
 /// AppendRequest is a raft-level message that the Leader
 /// periodically broadcasts to all Follower peers. This
 /// serves three main roles:
@@ -132,10 +82,10 @@ utils::TypeInfoRef TypeInfoFor(const WriteRequest<std::variant<WriteOperations..
 template <typename WriteRequest>
 struct AppendRequest {
   Term term = 0;
-  LogIndex batch_start_log_index;
+  LogIndex last_log_index;
   Term last_log_term;
   std::vector<std::pair<Term, WriteRequest>> entries;
-  LogSize leader_commit;
+  LogIndex leader_commit;
 };
 
 struct AppendResponse {
@@ -146,18 +96,18 @@ struct AppendResponse {
   // the leader the offset that we are interested in
   // to send log offsets from for us. This will only
   // be useful at the beginning of a leader's term.
-  LogSize log_size;
+  LogIndex last_log_index;
 };
 
 struct VoteRequest {
   Term term = 0;
-  LogSize log_size;
+  LogIndex last_log_index;
   Term last_log_term;
 };
 
 struct VoteResponse {
   Term term = 0;
-  LogSize committed_log_size;
+  LogIndex committed_log_size;
   bool vote_granted = false;
 };
 
@@ -165,13 +115,13 @@ template <typename WriteRequest>
 struct CommonState {
   Term term = 0;
   std::vector<std::pair<Term, WriteRequest>> log;
-  LogSize committed_log_size = 0;
-  LogSize applied_size = 0;
+  LogIndex committed_log_size = 0;
+  LogIndex applied_size = 0;
 };
 
 struct FollowerTracker {
   LogIndex next_index = 0;
-  LogSize confirmed_log_size = 0;
+  LogIndex confirmed_contiguous_index = 0;
 };
 
 struct PendingClientRequest {
@@ -185,35 +135,26 @@ struct Leader {
   std::unordered_map<LogIndex, PendingClientRequest> pending_client_requests;
   Time last_broadcast = Time::min();
 
-  std::string static ToString() { return "\tLeader   \t"; }
+  std::string ToString() { return "\tLeader   \t"; }
 };
 
 struct Candidate {
-  std::map<Address, LogSize> successful_votes;
+  std::map<Address, LogIndex> successful_votes;
   Time election_began = Time::min();
   std::set<Address> outstanding_votes;
 
-  std::string static ToString() { return "\tCandidate\t"; }
+  std::string ToString() { return "\tCandidate\t"; }
 };
 
 struct Follower {
   Time last_received_append_entries_timestamp;
   Address leader_address;
 
-  std::string static ToString() { return "\tFollower \t"; }
+  std::string ToString() { return "\tFollower \t"; }
 };
 
 using Role = std::variant<Candidate, Leader, Follower>;
 
-template <typename Role>
-concept AllRoles = memgraph::utils::SameAsAnyOf<Role, Leader, Follower, Candidate>;
-
-template <typename Role>
-concept LeaderOrFollower = memgraph::utils::SameAsAnyOf<Role, Leader, Follower>;
-
-template <typename Role>
-concept FollowerOrCandidate = memgraph::utils::SameAsAnyOf<Role, Follower, Candidate>;
-
 /*
 all ReplicatedState classes should have an Apply method
 that returns our WriteResponseValue after consensus, and
@@ -262,70 +203,23 @@ class Raft {
   Io<IoImpl> io_;
   std::vector<Address> peers_;
   ReplicatedState replicated_state_;
-  Time next_cron_;
 
  public:
   Raft(Io<IoImpl> &&io, std::vector<Address> peers, ReplicatedState &&replicated_state)
-      : io_(std::forward<Io<IoImpl>>(io)),
-        peers_(peers),
-        replicated_state_(std::forward<ReplicatedState>(replicated_state)) {
-    if (peers.empty()) {
-      role_ = Leader{};
-    }
-  }
-
-  /// Periodic protocol maintenance. Returns the time that Cron should be called again
-  /// in the future.
-  Time Cron() {
-    // dispatch periodic logic based on our role to a specific Cron method.
-    std::optional<Role> new_role = std::visit([&](auto &role) { return Cron(role); }, role_);
-
-    if (new_role) {
-      role_ = std::move(new_role).value();
-    }
-    const Duration random_cron_interval = RandomTimeout(kMinimumCronInterval, kMaximumCronInterval);
-
-    return io_.Now() + random_cron_interval;
-  }
-
-  /// Returns the Address for our underlying Io implementation
-  Address GetAddress() { return io_.GetAddress(); }
-
-  using ReceiveVariant = std::variant<ReadRequest<ReadOperation>, AppendRequest<WriteOperation>, AppendResponse,
-                                      WriteRequest<WriteOperation>, VoteRequest, VoteResponse>;
-
-  void Handle(ReceiveVariant &&message_variant, RequestId request_id, Address from_address) {
-    // dispatch the message to a handler based on our role,
-    // which can be specified in the Handle first argument,
-    // or it can be `auto` if it's a handler for several roles
-    // or messages.
-    std::optional<Role> new_role = std::visit(
-        [&](auto &&msg, auto &role) mutable {
-          return Handle(role, std::forward<decltype(msg)>(msg), request_id, from_address);
-        },
-        std::forward<ReceiveVariant>(message_variant), role_);
-
-    // TODO(tyler) (M3) maybe replace std::visit with get_if for explicit prioritized matching, [[likely]] etc...
-    if (new_role) {
-      role_ = std::move(new_role).value();
-    }
-  }
+      : io_(std::move(io)), peers_(peers), replicated_state_(std::move(replicated_state)) {}
 
   void Run() {
-    // debug - gvolfing
-    uint64_t tick_count = 0;
+    Time last_cron = io_.Now();
 
     while (!io_.ShouldShutDown()) {
       const auto now = io_.Now();
-      if (now >= next_cron_) {
-        next_cron_ = Cron();
+      const Duration random_cron_interval = RandomTimeout(1000, 2000);
+      if (now - last_cron > random_cron_interval) {
+        Cron();
+        last_cron = now;
       }
 
-      // debug - gvolfing
-      spdlog::info("Raft::Run() awakened on thread {}, Cron tick: {}", std::this_thread::get_id(), tick_count);
-      tick_count++;
-
-      const Duration receive_timeout = RandomTimeout(kMinimumReceiveTimeout, kMaximumReceiveTimeout);
+      Duration receive_timeout = RandomTimeout(10000, 50000);
 
       auto request_result =
           io_.template ReceiveWithTimeout<ReadRequest<ReadOperation>, AppendRequest<WriteOperation>, AppendResponse,
@@ -349,64 +243,58 @@ class Raft {
   // "Safely replicated" is defined as being known to be present
   // on at least a majority of all peers (inclusive of the Leader).
   void BumpCommitIndexAndReplyToClients(Leader &leader) {
-    auto confirmed_log_sizes = std::vector<LogSize>{};
+    auto indices = std::vector<LogIndex>{};
 
     // We include our own log size in the calculation of the log
-    // confirmed log size that is present on at least a majority of all peers.
-    confirmed_log_sizes.push_back(state_.log.size());
+    // index that is present on at least a majority of all peers.
+    indices.push_back(state_.log.size());
 
     for (const auto &[addr, f] : leader.followers) {
-      confirmed_log_sizes.push_back(f.confirmed_log_size);
-      Log("Follower at port ", addr.last_known_port, " has confirmed log size of: ", f.confirmed_log_size);
+      indices.push_back(f.confirmed_contiguous_index);
+      Log("at port ", addr.last_known_port, " has confirmed contiguous index of: ", f.confirmed_contiguous_index);
     }
 
     // reverse sort from highest to lowest (using std::ranges::greater)
-    std::ranges::sort(confirmed_log_sizes, std::ranges::greater());
+    std::ranges::sort(indices, std::ranges::greater());
 
     // This is a particularly correctness-critical calculation because it
-    // determines the committed log size that will be broadcast in
-    // the next AppendRequest.
+    // determines which index we will consider to be the committed index.
     //
-    // If the following sizes are recorded for clusters of different numbers of peers,
-    // these are the expected sizes that are considered to have reached consensus:
-    //
-    // state           | expected value | (confirmed_log_sizes.size() / 2)
+    // If the following indexes are recorded for clusters of different sizes,
+    // these are the expected indexes that are considered to have reached
+    // consensus:
+    // state           | expected value | (indices.size() / 2)
     // [1]              1                 (1 / 2) => 0
     // [2, 1]           1                 (2 / 2) => 1
     // [3, 2, 1]        2                 (3 / 2) => 1
     // [4, 3, 2, 1]     2                 (4 / 2) => 2
     // [5, 4, 3, 2, 1]  3                 (5 / 2) => 2
-    const size_t majority_index = confirmed_log_sizes.size() / 2;
-    const LogSize new_committed_log_size = confirmed_log_sizes[majority_index];
+    size_t index_present_on_majority = indices.size() / 2;
+    LogIndex new_committed_log_size = indices[index_present_on_majority];
 
     // We never go backwards in history.
-    MG_ASSERT(state_.committed_log_size <= new_committed_log_size,
-              "as a Leader, we have previously set our committed_log_size to {}, but our Followers have a majority "
-              "committed_log_size of {}",
-              state_.committed_log_size, new_committed_log_size);
+    MG_ASSERT(state_.committed_log_size <= new_committed_log_size);
 
     state_.committed_log_size = new_committed_log_size;
 
-    // For each size between the old size and the new one (inclusive),
+    // For each index between the old index and the new one (inclusive),
     // Apply that log's WriteOperation to our replicated_state_,
     // and use the specific return value of the ReplicatedState::Apply
     // method (WriteResponseValue) to respond to the requester.
     for (; state_.applied_size < state_.committed_log_size; state_.applied_size++) {
       const LogIndex apply_index = state_.applied_size;
       const auto &write_request = state_.log[apply_index].second;
-      const WriteResponseValue write_return = replicated_state_.Apply(write_request);
+      WriteResponseValue write_return = replicated_state_.Apply(write_request);
 
       if (leader.pending_client_requests.contains(apply_index)) {
-        const PendingClientRequest client_request = std::move(leader.pending_client_requests.at(apply_index));
-        leader.pending_client_requests.erase(apply_index);
+        PendingClientRequest client_request = std::move(leader.pending_client_requests.at(apply_index));
 
-        const WriteResponse<WriteResponseValue> resp{
-            .success = true,
-            .write_return = std::move(write_return),
-            .raft_index = apply_index,
-        };
+        WriteResponse<WriteResponseValue> resp;
+        resp.success = true;
+        resp.write_return = std::move(write_return);
 
         io_.Send(client_request.address, client_request.request_id, std::move(resp));
+        leader.pending_client_requests.erase(apply_index);
       }
     }
 
@@ -417,37 +305,31 @@ class Raft {
   // AppendEntries RPCs are initiated by leaders to replicate log entries and to provide a form of heartbeat
   void BroadcastAppendEntries(std::map<Address, FollowerTracker> &followers) {
     for (auto &[address, follower] : followers) {
-      const LogIndex next_index = follower.next_index;
-
-      const auto missing = state_.log.size() - next_index;
-      const auto batch_size = std::min(missing, kMaximumAppendBatchSize);
-      const auto start_index = next_index;
-      const auto end_index = start_index + batch_size;
-
-      // advance follower's next index
-      follower.next_index += batch_size;
+      const LogIndex index = follower.confirmed_contiguous_index;
 
       std::vector<std::pair<Term, WriteOperation>> entries;
 
-      entries.insert(entries.begin(), state_.log.begin() + start_index, state_.log.begin() + end_index);
+      if (state_.log.size() > index) {
+        entries.insert(entries.begin(), state_.log.begin() + index, state_.log.end());
+      }
 
-      const Term previous_term_from_index = PreviousTermFromIndex(start_index);
+      const Term previous_term_from_index = PreviousTermFromIndex(index);
 
       Log("sending ", entries.size(), " entries to Follower ", address.last_known_port,
-          " which are above its next_index of ", next_index);
+          " which are above its known index of ", index);
 
       AppendRequest<WriteOperation> ar{
           .term = state_.term,
-          .batch_start_log_index = start_index,
+          .last_log_index = index,
           .last_log_term = previous_term_from_index,
-          .entries = std::move(entries),
+          .entries = entries,
           .leader_commit = state_.committed_log_size,
       };
 
       // request_id not necessary to set because it's not a Future-backed Request.
       static constexpr RequestId request_id = 0;
 
-      io_.Send(address, request_id, std::move(ar));
+      io_.Send(address, request_id, ar);
     }
   }
 
@@ -456,15 +338,15 @@ class Raft {
   Duration RandomTimeout(Duration min, Duration max) {
     std::uniform_int_distribution time_distrib(min.count(), max.count());
 
-    const auto rand_micros = io_.Rand(time_distrib);
+    auto rand_micros = io_.Rand(time_distrib);
 
-    return Duration{rand_micros};
+    return std::chrono::microseconds{rand_micros};
   }
 
   Duration RandomTimeout(int min_micros, int max_micros) {
     std::uniform_int_distribution time_distrib(min_micros, max_micros);
 
-    const int rand_micros = io_.Rand(time_distrib);
+    int rand_micros = io_.Rand(time_distrib);
 
     return std::chrono::microseconds{rand_micros};
   }
@@ -478,16 +360,20 @@ class Raft {
     return term;
   }
 
+  LogIndex CommittedLogIndex() { return state_.committed_log_size; }
+
   Term CommittedLogTerm() {
     MG_ASSERT(state_.log.size() >= state_.committed_log_size);
     if (state_.log.empty() || state_.committed_log_size == 0) {
       return 0;
     }
 
-    const auto &[term, data] = state_.log.at(state_.committed_log_size - 1);
+    auto &[term, data] = state_.log.at(state_.committed_log_size - 1);
     return term;
   }
 
+  LogIndex LastLogIndex() { return state_.log.size(); }
+
   Term LastLogTerm() const {
     if (state_.log.empty()) {
       return 0;
@@ -500,19 +386,21 @@ class Raft {
   template <typename... Ts>
   void Log(Ts &&...args) {
     const Time now = io_.Now();
-    const auto micros = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
+    auto micros = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()).count();
+
     const Term term = state_.term;
-    const std::string role_string = std::visit([&](const auto &role) { return role.ToString(); }, role_);
 
     std::ostringstream out;
 
-    out << '\t' << static_cast<int>(micros) << "\t" << term << "\t" << io_.GetAddress().last_known_port;
+    out << '\t' << (int)micros << "\t" << term << "\t" << io_.GetAddress().last_known_port;
+
+    std::string role_string = std::visit([&](auto &&role) { return role.ToString(); }, role_);
 
     out << role_string;
 
     (out << ... << args);
 
-    spdlog::info(out.str());
+    spdlog::debug(out.str());
   }
 
   /////////////////////////////////////////////////////////////
@@ -526,6 +414,16 @@ class Raft {
   /// been received.
   /////////////////////////////////////////////////////////////
 
+  /// Periodic protocol maintenance.
+  void Cron() {
+    // dispatch periodic logic based on our role to a specific Cron method.
+    std::optional<Role> new_role = std::visit([&](auto &&role) { return Cron(role); }, role_);
+
+    if (new_role) {
+      role_ = std::move(new_role).value();
+    }
+  }
+
   // Raft paper - 5.2
   // Candidates keep sending Vote to peers until:
   // 1. receiving Append with a higher term (become Follower)
@@ -533,17 +431,17 @@ class Raft {
   // 3. receiving a quorum of responses to our last batch of Vote (become a Leader)
   std::optional<Role> Cron(Candidate &candidate) {
     const auto now = io_.Now();
-    const Duration election_timeout = RandomTimeout(kMinimumElectionTimeout, kMaximumElectionTimeout);
+    const Duration election_timeout = RandomTimeout(100000, 200000);
     const auto election_timeout_us = std::chrono::duration_cast<std::chrono::milliseconds>(election_timeout).count();
 
     if (now - candidate.election_began > election_timeout) {
       state_.term++;
       Log("becoming Candidate for term ", state_.term, " after leader timeout of ", election_timeout_us,
-          "ms elapsed since last election attempt");
+          " elapsed since last election attempt");
 
       const VoteRequest request{
           .term = state_.term,
-          .log_size = state_.log.size(),
+          .last_log_index = LastLogIndex(),
           .last_log_term = LastLogTerm(),
       };
 
@@ -571,10 +469,9 @@ class Raft {
   std::optional<Role> Cron(Follower &follower) {
     const auto now = io_.Now();
     const auto time_since_last_append_entries = now - follower.last_received_append_entries_timestamp;
+    Duration election_timeout = RandomTimeout(100000, 200000);
 
-    // randomized follower timeout
-    const Duration election_timeout = RandomTimeout(kMinimumElectionTimeout, kMaximumElectionTimeout);
-
+    // randomized follower timeout with a range of 100-150ms.
     if (time_since_last_append_entries > election_timeout) {
       // become a Candidate if we haven't heard from the Leader after this timeout
       return Candidate{};
@@ -586,9 +483,9 @@ class Raft {
   // Leaders (re)send AppendRequest to followers.
   std::optional<Role> Cron(Leader &leader) {
     const Time now = io_.Now();
-    const Duration broadcast_timeout = RandomTimeout(kMinimumBroadcastTimeout, kMaximumBroadcastTimeout);
+    const Duration broadcast_timeout = RandomTimeout(40000, 60000);
 
-    if (now > leader.last_broadcast + broadcast_timeout) {
+    if (now - leader.last_broadcast > broadcast_timeout) {
       BroadcastAppendEntries(leader.followers);
       leader.last_broadcast = now;
     }
@@ -608,14 +505,31 @@ class Raft {
   /// message that has been received.
   /////////////////////////////////////////////////////////////
 
+  void Handle(std::variant<ReadRequest<ReadOperation>, AppendRequest<WriteOperation>, AppendResponse,
+                           WriteRequest<WriteOperation>, VoteRequest, VoteResponse> &&message_variant,
+              RequestId request_id, Address from_address) {
+    // dispatch the message to a handler based on our role,
+    // which can be specified in the Handle first argument,
+    // or it can be `auto` if it's a handler for several roles
+    // or messages.
+    std::optional<Role> new_role =
+        std::visit([&](auto &&msg, auto &&role) { return Handle(role, std::move(msg), request_id, from_address); },
+                   std::move(message_variant), role_);
+
+    // TODO(tyler) (M3) maybe replace std::visit with get_if for explicit prioritized matching, [[likely]] etc...
+    if (new_role) {
+      role_ = std::move(new_role).value();
+    }
+  }
+
   // all roles can receive Vote and possibly become a follower
-  template <AllRoles ALL>
-  std::optional<Role> Handle(ALL & /* variable */, VoteRequest &&req, RequestId request_id, Address from_address) {
-    Log("received VoteRequest from ", from_address.last_known_port, " with term ", req.term);
+  template <typename AllRoles>
+  std::optional<Role> Handle(AllRoles &, VoteRequest &&req, RequestId request_id, Address from_address) {
+    Log("received Vote from ", from_address.last_known_port, " with term ", req.term);
     const bool last_log_term_dominates = req.last_log_term >= LastLogTerm();
     const bool term_dominates = req.term > state_.term;
-    const bool log_size_dominates = req.log_size >= state_.log.size();
-    const bool new_leader = last_log_term_dominates && term_dominates && log_size_dominates;
+    const bool last_log_index_dominates = req.last_log_index >= LastLogIndex();
+    const bool new_leader = last_log_term_dominates && term_dominates && last_log_index_dominates;
 
     if (new_leader) {
       MG_ASSERT(req.term > state_.term);
@@ -637,9 +551,7 @@ class Raft {
           .last_received_append_entries_timestamp = io_.Now(),
           .leader_address = from_address,
       };
-    }
-
-    if (term_dominates) {
+    } else if (term_dominates) {
       Log("received a vote from an inferior candidate. Becoming Candidate");
       state_.term = std::max(state_.term, req.term) + 1;
       return Candidate{};
@@ -648,7 +560,7 @@ class Raft {
     return std::nullopt;
   }
 
-  std::optional<Role> Handle(Candidate &candidate, VoteResponse &&res, RequestId /* variable */, Address from_address) {
+  std::optional<Role> Handle(Candidate &candidate, VoteResponse &&res, RequestId, Address from_address) {
     Log("received VoteResponse");
 
     if (!res.vote_granted || res.term != state_.term) {
@@ -672,14 +584,14 @@ class Raft {
       for (const auto &[address, committed_log_size] : candidate.successful_votes) {
         FollowerTracker follower{
             .next_index = committed_log_size,
-            .confirmed_log_size = committed_log_size,
+            .confirmed_contiguous_index = committed_log_size,
         };
         followers.insert({address, follower});
       }
       for (const auto &address : candidate.outstanding_votes) {
         FollowerTracker follower{
             .next_index = state_.log.size(),
-            .confirmed_log_size = 0,
+            .confirmed_contiguous_index = 0,
         };
         followers.insert({address, follower});
       }
@@ -697,30 +609,27 @@ class Raft {
     return std::nullopt;
   }
 
-  template <LeaderOrFollower LOF>
-  std::optional<Role> Handle(LOF & /* variable */, VoteResponse && /* variable */, RequestId /* variable */,
-                             Address /* variable */) {
+  template <typename AllRoles>
+  std::optional<Role> Handle(AllRoles &, VoteResponse &&, RequestId, Address) {
     Log("non-Candidate received VoteResponse");
     return std::nullopt;
   }
 
-  template <AllRoles ALL>
-  std::optional<Role> Handle(ALL &role, AppendRequest<WriteOperation> &&req, RequestId request_id,
+  template <typename AllRoles>
+  std::optional<Role> Handle(AllRoles &role, AppendRequest<WriteOperation> &&req, RequestId request_id,
                              Address from_address) {
-    // log size starts out as state_.committed_log_size and only if everything is successful do we
-    // switch it to the log length.
     AppendResponse res{
         .success = false,
         .term = state_.term,
         .last_log_term = CommittedLogTerm(),
-        .log_size = state_.log.size(),
+        .last_log_index = CommittedLogIndex(),
     };
 
-    if constexpr (std::is_same<ALL, Leader>()) {
+    if constexpr (std::is_same<AllRoles, Leader>()) {
       MG_ASSERT(req.term != state_.term, "Multiple leaders are acting under the term ", req.term);
     }
 
-    const bool is_candidate = std::is_same<ALL, Candidate>();
+    const bool is_candidate = std::is_same<AllRoles, Candidate>();
     const bool is_failed_competitor = is_candidate && req.term == state_.term;
     const Time now = io_.Now();
 
@@ -741,9 +650,7 @@ class Raft {
           .last_received_append_entries_timestamp = now,
           .leader_address = from_address,
       };
-    }
-
-    if (req.term < state_.term) {
+    } else if (req.term < state_.term) {
       // nack this request from an old leader
       io_.Send(from_address, request_id, res);
 
@@ -751,7 +658,7 @@ class Raft {
     }
 
     // at this point, we're dealing with our own leader
-    if constexpr (std::is_same<ALL, Follower>()) {
+    if constexpr (std::is_same<AllRoles, Follower>()) {
       // small specialization for when we're already a Follower
       MG_ASSERT(role.leader_address == from_address, "Multiple Leaders are acting under the same term number!");
       role.last_received_append_entries_timestamp = now;
@@ -760,38 +667,33 @@ class Raft {
       MG_ASSERT(false, "Somehow entered Follower-specific logic as a non-Follower");
     }
 
+    res.last_log_term = LastLogTerm();
+    res.last_log_index = LastLogIndex();
+
+    Log("returning last_log_index of ", res.last_log_index);
+
     // Handle steady-state conditions.
-    if (req.batch_start_log_index != state_.log.size()) {
-      Log("req.batch_start_log_index of ", req.batch_start_log_index, " does not match our log size of ",
-          state_.log.size());
+    if (req.last_log_index != LastLogIndex()) {
+      Log("req.last_log_index is above our last applied log index");
     } else if (req.last_log_term != LastLogTerm()) {
       Log("req.last_log_term differs from our leader term at that slot, expected: ", LastLogTerm(), " but got ",
           req.last_log_term);
     } else {
       // happy path - Apply log
-      Log("applying batch of ", req.entries.size(), " entries to our log starting at index ",
-          req.batch_start_log_index);
+      Log("applying batch of entries to log of size ", req.entries.size());
 
-      const auto resize_length = req.batch_start_log_index;
-
-      MG_ASSERT(resize_length >= state_.committed_log_size,
+      MG_ASSERT(req.last_log_index >= state_.committed_log_size,
                 "Applied history from Leader which goes back in time from our commit_index");
 
       // possibly chop-off stuff that was replaced by
       // things with different terms (we got data that
       // hasn't reached consensus yet, which is normal)
-      state_.log.resize(resize_length);
+      state_.log.resize(req.last_log_index);
 
-      if (req.entries.size() > 0) {
-        auto &[first_term, op] = req.entries.at(0);
-        MG_ASSERT(LastLogTerm() <= first_term);
-      }
-
-      state_.log.insert(state_.log.end(), std::make_move_iterator(req.entries.begin()),
-                        std::make_move_iterator(req.entries.end()));
+      state_.log.insert(state_.log.end(), req.entries.begin(), req.entries.end());
 
       MG_ASSERT(req.leader_commit >= state_.committed_log_size);
-      state_.committed_log_size = std::min(req.leader_commit, state_.log.size());
+      state_.committed_log_size = std::min(req.leader_commit, LastLogIndex());
 
       for (; state_.applied_size < state_.committed_log_size; state_.applied_size++) {
         const auto &write_request = state_.log[state_.applied_size].second;
@@ -801,48 +703,35 @@ class Raft {
       res.success = true;
     }
 
-    res.last_log_term = LastLogTerm();
-    res.log_size = state_.log.size();
-
-    Log("returning log_size of ", res.log_size);
-
     io_.Send(from_address, request_id, res);
 
     return std::nullopt;
   }
 
-  std::optional<Role> Handle(Leader &leader, AppendResponse &&res, RequestId /* variable */, Address from_address) {
+  std::optional<Role> Handle(Leader &leader, AppendResponse &&res, RequestId, Address from_address) {
     if (res.term != state_.term) {
-      Log("received AppendResponse related to a previous term when we (presumably) were the leader");
-      return std::nullopt;
-    }
-
-    // TODO(tyler) when we have dynamic membership, this assert will become incorrect, but we should
-    // keep it in-place until then because it has bug finding value.
-    MG_ASSERT(leader.followers.contains(from_address), "received AppendResponse from unknown Follower");
-
-    // at this point, we know the term matches and we know this Follower
-
-    FollowerTracker &follower = leader.followers.at(from_address);
-
-    if (res.success) {
-      Log("got successful AppendResponse from ", from_address.last_known_port, " with log_size of ", res.log_size);
-      follower.next_index = std::max(follower.next_index, res.log_size);
+    } else if (!leader.followers.contains(from_address)) {
+      Log("received AppendResponse from unknown Follower");
+      MG_ASSERT(false, "received AppendResponse from unknown Follower");
     } else {
-      Log("got unsuccessful AppendResponse from ", from_address.last_known_port, " with log_size of ", res.log_size);
-      follower.next_index = res.log_size;
+      if (res.success) {
+        Log("got successful AppendResponse from ", from_address.last_known_port, " with last_log_index of ",
+            res.last_log_index);
+      } else {
+        Log("got unsuccessful AppendResponse from ", from_address.last_known_port, " with last_log_index of ",
+            res.last_log_index);
+      }
+      FollowerTracker &follower = leader.followers.at(from_address);
+      follower.next_index = std::max(follower.next_index, res.last_log_index);
+      follower.confirmed_contiguous_index = std::max(follower.confirmed_contiguous_index, res.last_log_index);
+
+      BumpCommitIndexAndReplyToClients(leader);
     }
-
-    follower.confirmed_log_size = std::max(follower.confirmed_log_size, res.log_size);
-
-    BumpCommitIndexAndReplyToClients(leader);
-
     return std::nullopt;
   }
 
-  template <FollowerOrCandidate FOC>
-  std::optional<Role> Handle(FOC & /* variable */, AppendResponse && /* variable */, RequestId /* variable */,
-                             Address /* variable */) {
+  template <typename AllRoles>
+  std::optional<Role> Handle(AllRoles &, AppendResponse &&, RequestId, Address) {
     // we used to be the leader, and are getting old delayed responses
     return std::nullopt;
   }
@@ -852,14 +741,13 @@ class Raft {
   /////////////////////////////////////////////////////////////
 
   // Leaders are able to immediately respond to the requester (with a ReadResponseValue) applied to the ReplicatedState
-  std::optional<Role> Handle(Leader & /* variable */, ReadRequest<ReadOperation> &&req, RequestId request_id,
-                             Address from_address) {
+  std::optional<Role> Handle(Leader &, ReadRequest<ReadOperation> &&req, RequestId request_id, Address from_address) {
     Log("handling ReadOperation");
     ReadOperation read_operation = req.operation;
 
     ReadResponseValue read_return = replicated_state_.Read(read_operation);
 
-    const ReadResponse<ReadResponseValue> resp{
+    ReadResponse<ReadResponseValue> resp{
         .success = true,
         .read_return = std::move(read_return),
         .retry_leader = std::nullopt,
@@ -871,29 +759,27 @@ class Raft {
   }
 
   // Candidates should respond with a failure, similar to the Candidate + WriteRequest failure below
-  std::optional<Role> Handle(Candidate & /* variable */, ReadRequest<ReadOperation> && /* variable */,
-                             RequestId request_id, Address from_address) {
+  std::optional<Role> Handle(Candidate &, ReadRequest<ReadOperation> &&, RequestId request_id, Address from_address) {
     Log("received ReadOperation - not redirecting because no Leader is known");
-    const ReadResponse<ReadResponseValue> res{
-        .success = false,
-    };
+    auto res = ReadResponse<ReadResponseValue>{};
 
-    io_.Send(from_address, request_id, res);
+    res.success = false;
 
     Cron();
 
+    io_.Send(from_address, request_id, res);
+
     return std::nullopt;
   }
 
   // Followers should respond with a redirection, similar to the Follower + WriteRequest response below
-  std::optional<Role> Handle(Follower &follower, ReadRequest<ReadOperation> && /* variable */, RequestId request_id,
+  std::optional<Role> Handle(Follower &follower, ReadRequest<ReadOperation> &&, RequestId request_id,
                              Address from_address) {
-    Log("redirecting client to known Leader with port ", follower.leader_address.last_known_port);
+    auto res = ReadResponse<ReadResponseValue>{};
 
-    const ReadResponse<ReadResponseValue> res{
-        .success = false,
-        .retry_leader = follower.leader_address,
-    };
+    res.success = false;
+    Log("redirecting client to known Leader with port ", follower.leader_address.last_known_port);
+    res.retry_leader = follower.leader_address;
 
     io_.Send(from_address, request_id, res);
 
@@ -905,44 +791,38 @@ class Raft {
   // server. If the client’s first choice is not the leader, that
   // server will reject the client’s request and supply information
   // about the most recent leader it has heard from.
-  std::optional<Role> Handle(Follower &follower, WriteRequest<WriteOperation> && /* variable */, RequestId request_id,
+  std::optional<Role> Handle(Follower &follower, WriteRequest<WriteOperation> &&, RequestId request_id,
                              Address from_address) {
-    Log("redirecting client to known Leader with port ", follower.leader_address.last_known_port);
+    auto res = WriteResponse<WriteResponseValue>{};
 
-    const WriteResponse<WriteResponseValue> res{
-        .success = false,
-        .retry_leader = follower.leader_address,
-    };
+    res.success = false;
+    Log("redirecting client to known Leader with port ", follower.leader_address.last_known_port);
+    res.retry_leader = follower.leader_address;
 
     io_.Send(from_address, request_id, res);
 
     return std::nullopt;
   }
 
-  std::optional<Role> Handle(Candidate & /* variable */, WriteRequest<WriteOperation> && /* variable */,
-                             RequestId request_id, Address from_address) {
+  std::optional<Role> Handle(Candidate &, WriteRequest<WriteOperation> &&, RequestId request_id, Address from_address) {
     Log("received WriteRequest - not redirecting because no Leader is known");
+    auto res = WriteResponse<WriteResponseValue>{};
 
-    const WriteResponse<WriteResponseValue> res{
-        .success = false,
-    };
-
-    io_.Send(from_address, request_id, res);
+    res.success = false;
 
     Cron();
 
+    io_.Send(from_address, request_id, res);
+
     return std::nullopt;
   }
 
   // only leaders actually handle replication requests from clients
   std::optional<Role> Handle(Leader &leader, WriteRequest<WriteOperation> &&req, RequestId request_id,
                              Address from_address) {
-    auto type_info = TypeInfoFor(req);
-    std::string demangled_name = boost::core::demangle(type_info.get().name());
-    Log("handling WriteRequest<" + demangled_name + ">");
+    Log("handling WriteRequest");
 
     // we are the leader. add item to log and send Append to peers
-    MG_ASSERT(state_.term >= LastLogTerm());
     state_.log.emplace_back(std::pair(state_.term, std::move(req.operation)));
 
     LogIndex log_index = state_.log.size() - 1;
@@ -955,11 +835,7 @@ class Raft {
 
     leader.pending_client_requests.emplace(log_index, pcr);
 
-    if (peers_.empty()) {
-      BumpCommitIndexAndReplyToClients(leader);
-    } else {
-      BroadcastAppendEntries(leader.followers);
-    }
+    BroadcastAppendEntries(leader.followers);
 
     return std::nullopt;
   }

src/io/rsm/rsm_client.hpp

@@ -9,15 +9,11 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#pragma once
-
 #include <iostream>
 #include <optional>
-#include <type_traits>
 #include <vector>
 
 #include "io/address.hpp"
-#include "io/errors.hpp"
 #include "io/rsm/raft.hpp"
 #include "utils/result.hpp"
 
@@ -41,54 +37,35 @@ template <typename IoImpl, typename WriteRequestT, typename WriteResponseT, type
 class RsmClient {
   using ServerPool = std::vector<Address>;
 
-  Io<IoImpl> io_;
+  IoImpl io_;
   Address leader_;
+
+  std::mt19937 cli_rng_{0};
   ServerPool server_addrs_;
 
-  /// State for single async read/write operations. In the future this could become a map
-  /// of async operations that can be accessed via an ID etc...
-  std::optional<Time> async_read_before_;
-  std::optional<ResponseFuture<ReadResponse<ReadResponseT>>> async_read_;
-  ReadRequestT current_read_request_;
-
-  std::optional<Time> async_write_before_;
-  std::optional<ResponseFuture<WriteResponse<WriteResponseT>>> async_write_;
-  WriteRequestT current_write_request_;
-
-  void SelectRandomLeader() {
-    std::uniform_int_distribution<size_t> addr_distrib(0, (server_addrs_.size() - 1));
-    size_t addr_index = io_.Rand(addr_distrib);
-    leader_ = server_addrs_[addr_index];
-
-    spdlog::debug(
-        "client NOT redirected to leader server despite our success failing to be processed (it probably was sent to "
-        "a RSM Candidate) trying a random one at index {} with address {}",
-        addr_index, leader_.ToString());
-  }
-
   template <typename ResponseT>
   void PossiblyRedirectLeader(const ResponseT &response) {
     if (response.retry_leader) {
       MG_ASSERT(!response.success, "retry_leader should never be set for successful responses");
       leader_ = response.retry_leader.value();
       spdlog::debug("client redirected to leader server {}", leader_.ToString());
-    }
-    if (!response.success) {
-      SelectRandomLeader();
+    } else if (!response.success) {
+      std::uniform_int_distribution<size_t> addr_distrib(0, (server_addrs_.size() - 1));
+      size_t addr_index = addr_distrib(cli_rng_);
+      leader_ = server_addrs_[addr_index];
+
+      spdlog::debug(
+          "client NOT redirected to leader server despite our success failing to be processed (it probably was sent to "
+          "a RSM Candidate) trying a random one at index {} with address {}",
+          addr_index, leader_.ToString());
     }
   }
 
  public:
-  RsmClient(Io<IoImpl> io, Address leader, ServerPool server_addrs)
+  RsmClient(IoImpl io, Address leader, ServerPool server_addrs)
       : io_{io}, leader_{leader}, server_addrs_{server_addrs} {}
 
-  RsmClient(const RsmClient &) = delete;
-  RsmClient &operator=(const RsmClient &) = delete;
-  RsmClient(RsmClient &&) noexcept = default;
-  RsmClient &operator=(RsmClient &&) noexcept = default;
-
   RsmClient() = delete;
-  ~RsmClient() = default;
 
   BasicResult<TimedOut, WriteResponseT> SendWriteRequest(WriteRequestT req) {
     WriteRequest<WriteRequestT> client_req;
@@ -105,6 +82,7 @@ class RsmClient {
 
       if (response_result.HasError()) {
         spdlog::debug("client timed out while trying to communicate with leader server {}", leader_.ToString());
+        // continue;
         return response_result.GetError();
       }
 
@@ -154,117 +132,6 @@ class RsmClient {
 
     return TimedOut{};
   }
-
-  /// AsyncRead methods
-  void SendAsyncReadRequest(const ReadRequestT &req) {
-    MG_ASSERT(!async_read_);
-
-    ReadRequest<ReadRequestT> read_req = {.operation = req};
-
-    if (!async_read_before_) {
-      async_read_before_ = io_.Now();
-    }
-    current_read_request_ = std::move(req);
-    async_read_ = io_.template Request<ReadRequest<ReadRequestT>, ReadResponse<ReadResponseT>>(leader_, read_req);
-  }
-
-  std::optional<BasicResult<TimedOut, ReadResponseT>> PollAsyncReadRequest() {
-    MG_ASSERT(async_read_);
-
-    if (!async_read_->IsReady()) {
-      return std::nullopt;
-    }
-
-    return AwaitAsyncReadRequest();
-  }
-
-  std::optional<BasicResult<TimedOut, ReadResponseT>> AwaitAsyncReadRequest() {
-    ResponseResult<ReadResponse<ReadResponseT>> get_response_result = std::move(*async_read_).Wait();
-    async_read_.reset();
-
-    const Duration overall_timeout = io_.GetDefaultTimeout();
-    const bool past_time_out = io_.Now() < *async_read_before_ + overall_timeout;
-    const bool result_has_error = get_response_result.HasError();
-
-    if (result_has_error && past_time_out) {
-      // TODO static assert the exact type of error.
-      spdlog::debug("client timed out while trying to communicate with leader server {}", leader_.ToString());
-      async_read_before_ = std::nullopt;
-      return TimedOut{};
-    }
-    if (!result_has_error) {
-      ResponseEnvelope<ReadResponse<ReadResponseT>> &&get_response_envelope = std::move(get_response_result.GetValue());
-      ReadResponse<ReadResponseT> &&read_get_response = std::move(get_response_envelope.message);
-
-      PossiblyRedirectLeader(read_get_response);
-
-      if (read_get_response.success) {
-        async_read_before_ = std::nullopt;
-        return std::move(read_get_response.read_return);
-      }
-      SendAsyncReadRequest(current_read_request_);
-    } else if (result_has_error) {
-      SelectRandomLeader();
-      SendAsyncReadRequest(current_read_request_);
-    }
-    return std::nullopt;
-  }
-
-  /// AsyncWrite methods
-  void SendAsyncWriteRequest(const WriteRequestT &req) {
-    MG_ASSERT(!async_write_);
-
-    WriteRequest<WriteRequestT> write_req = {.operation = req};
-
-    if (!async_write_before_) {
-      async_write_before_ = io_.Now();
-    }
-    current_write_request_ = std::move(req);
-    async_write_ = io_.template Request<WriteRequest<WriteRequestT>, WriteResponse<WriteResponseT>>(leader_, write_req);
-  }
-
-  std::optional<BasicResult<TimedOut, WriteResponseT>> PollAsyncWriteRequest() {
-    MG_ASSERT(async_write_);
-
-    if (!async_write_->IsReady()) {
-      return std::nullopt;
-    }
-
-    return AwaitAsyncWriteRequest();
-  }
-
-  std::optional<BasicResult<TimedOut, WriteResponseT>> AwaitAsyncWriteRequest() {
-    ResponseResult<WriteResponse<WriteResponseT>> get_response_result = std::move(*async_write_).Wait();
-    async_write_.reset();
-
-    const Duration overall_timeout = io_.GetDefaultTimeout();
-    const bool past_time_out = io_.Now() < *async_write_before_ + overall_timeout;
-    const bool result_has_error = get_response_result.HasError();
-
-    if (result_has_error && past_time_out) {
-      // TODO static assert the exact type of error.
-      spdlog::debug("client timed out while trying to communicate with leader server {}", leader_.ToString());
-      async_write_before_ = std::nullopt;
-      return TimedOut{};
-    }
-    if (!result_has_error) {
-      ResponseEnvelope<WriteResponse<WriteResponseT>> &&get_response_envelope =
-          std::move(get_response_result.GetValue());
-      WriteResponse<WriteResponseT> &&write_get_response = std::move(get_response_envelope.message);
-
-      PossiblyRedirectLeader(write_get_response);
-
-      if (write_get_response.success) {
-        async_write_before_ = std::nullopt;
-        return std::move(write_get_response.write_return);
-      }
-      SendAsyncWriteRequest(current_write_request_);
-    } else if (result_has_error) {
-      SelectRandomLeader();
-      SendAsyncWriteRequest(current_write_request_);
-    }
-    return std::nullopt;
-  }
 };
 
 }  // namespace memgraph::io::rsm

src/io/rsm/shard_rsm.hpp

@@ -11,15 +11,15 @@
 
 #pragma once
 
-/// The ShardRsm is a simple in-memory raft-backed kv store that can be used for simple testing
+/// The StorageRsm is a simple in-memory raft-backed kv store that can be used for simple testing
 /// and implementation of some query engine logic before storage engines are fully implemented.
 ///
 /// To implement multiple read and write commands, change the StorageRead* and StorageWrite* requests
 /// and responses to a std::variant of the different options, and route them to specific handlers in
-/// the ShardRsm's Read and Apply methods. Remember that Read is called immediately when the Raft
+/// the StorageRsm's Read and Apply methods. Remember that Read is called immediately when the Raft
 /// leader receives the request, and does not replicate anything over Raft. Apply is called only
 /// AFTER the StorageWriteRequest is replicated to a majority of Raft peers, and the result of calling
-/// ShardRsm::Apply(StorageWriteRequest) is returned to the client that submitted the request.
+/// StorageRsm::Apply(StorageWriteRequest) is returned to the client that submitted the request.
 
 #include <deque>
 #include <iostream>
@@ -32,21 +32,33 @@
 #include "coordinator/hybrid_logical_clock.hpp"
 #include "io/address.hpp"
 #include "io/rsm/raft.hpp"
-#include "storage/v3/id_types.hpp"
-#include "storage/v3/property_value.hpp"
+#include "io/simulator/simulator.hpp"
+#include "io/simulator/simulator_transport.hpp"
+#include "storage/v2/property_value.hpp"
 #include "utils/logging.hpp"
 
-namespace memgraph::io::rsm {
-
 using memgraph::coordinator::Hlc;
-using memgraph::storage::v3::LabelId;
-using memgraph::storage::v3::PropertyValue;
+using memgraph::io::Address;
+using memgraph::io::Io;
+using memgraph::io::ResponseEnvelope;
+using memgraph::io::ResponseFuture;
+using memgraph::io::ResponseResult;
+using memgraph::io::rsm::Raft;
+using memgraph::io::rsm::ReadRequest;
+using memgraph::io::rsm::ReadResponse;
+using memgraph::io::rsm::WriteRequest;
+using memgraph::io::rsm::WriteResponse;
+using memgraph::io::simulator::Simulator;
+using memgraph::io::simulator::SimulatorConfig;
+using memgraph::io::simulator::SimulatorStats;
+using memgraph::io::simulator::SimulatorTransport;
+using memgraph::storage::PropertyValue;
+
+namespace memgraph::io::rsm {
 
 using ShardRsmKey = std::vector<PropertyValue>;
 
 struct StorageWriteRequest {
-  LabelId label_id;
-  Hlc transaction_id;
   ShardRsmKey key;
   std::optional<int> value;
 };
@@ -59,8 +71,6 @@ struct StorageWriteResponse {
 };
 
 struct StorageReadRequest {
-  LabelId label_id;
-  Hlc transaction_id;
   ShardRsmKey key;
 };
 
@@ -71,14 +81,14 @@ struct StorageReadResponse {
   std::optional<Hlc> latest_known_shard_map_version{std::nullopt};
 };
 
-class ShardRsm {
+class StorageRsm {
   std::map<ShardRsmKey, int> state_;
   ShardRsmKey minimum_key_;
   std::optional<ShardRsmKey> maximum_key_{std::nullopt};
   Hlc shard_map_version_;
 
   // The key is not located in this shard
-  bool IsKeyInRange(const ShardRsmKey &key) const {
+  bool IsKeyInRange(const ShardRsmKey &key) {
     if (maximum_key_) [[likely]] {
       return (key >= minimum_key_ && key <= maximum_key_);
     }
@@ -86,14 +96,14 @@ class ShardRsm {
   }
 
  public:
-  StorageReadResponse Read(StorageReadRequest request) const {
+  StorageReadResponse Read(StorageReadRequest request) {
     StorageReadResponse ret;
 
     if (!IsKeyInRange(request.key)) {
       ret.latest_known_shard_map_version = shard_map_version_;
       ret.shard_rsm_success = false;
     } else if (state_.contains(request.key)) {
-      ret.value = state_.at(request.key);
+      ret.value = state_[request.key];
       ret.shard_rsm_success = true;
     } else {
       ret.shard_rsm_success = false;
@@ -145,7 +155,7 @@ class ShardRsm {
       ret.last_value = std::nullopt;
       ret.shard_rsm_success = true;
 
-      state_.emplace(request.key, request.value.value());
+      state_.emplace(request.key, std::move(request.value).value());
     }
 
     return ret;

src/io/simulator/simulator.hpp

@@ -29,8 +29,6 @@ class Simulator {
   explicit Simulator(SimulatorConfig config)
       : rng_(std::mt19937{config.rng_seed}), simulator_handle_{std::make_shared<SimulatorHandle>(config)} {}
 
-  ~Simulator() { ShutDown(); }
-
   void ShutDown() { simulator_handle_->ShutDown(); }
 
   Io<SimulatorTransport> RegisterNew() {

src/io/simulator/simulator_handle.cpp

@@ -16,10 +16,12 @@
 #include "io/simulator/simulator_stats.hpp"
 #include "io/time.hpp"
 #include "io/transport.hpp"
-#include "utils/exceptions.hpp"
 
 namespace memgraph::io::simulator {
 
+using memgraph::io::Duration;
+using memgraph::io::Time;
+
 void SimulatorHandle::ShutDown() {
   std::unique_lock<std::mutex> lock(mu_);
   should_shut_down_ = true;
@@ -31,17 +33,12 @@ bool SimulatorHandle::ShouldShutDown() const {
   return should_shut_down_;
 }
 
-LatencyHistogramSummaries SimulatorHandle::ResponseLatencies() {
-  std::unique_lock<std::mutex> lock(mu_);
-  return histograms_.ResponseLatencies();
-}
-
 void SimulatorHandle::IncrementServerCountAndWaitForQuiescentState(Address address) {
   std::unique_lock<std::mutex> lock(mu_);
   server_addresses_.insert(address);
 
   while (true) {
-    const size_t blocked_servers = blocked_on_receive_.size();
+    const size_t blocked_servers = BlockedServers();
 
     const bool all_servers_blocked = blocked_servers == server_addresses_.size();
 
@@ -53,25 +50,23 @@ void SimulatorHandle::IncrementServerCountAndWaitForQuiescentState(Address addre
   }
 }
 
+size_t SimulatorHandle::BlockedServers() {
+  size_t blocked_servers = blocked_on_receive_;
+
+  for (auto &[promise_key, opaque_promise] : promises_) {
+    if (opaque_promise.promise.IsAwaited() && server_addresses_.contains(promise_key.requester_address)) {
+      blocked_servers++;
+    }
+  }
+
+  return blocked_servers;
+}
+
 bool SimulatorHandle::MaybeTickSimulator() {
   std::unique_lock<std::mutex> lock(mu_);
 
-  const size_t blocked_servers = blocked_on_receive_.size();
+  const size_t blocked_servers = BlockedServers();
 
-  // Don't judge, this is a workaround for poc. gvolfing
-  server_count_++;
-  if (server_count_ == 3) {
-    is_quiescent_state_achieved_ = true;
-  }
-
-  // if (!is_quiescent_state_achieved_) {
-  if (!is_quiescent_state_achieved_) {
-    // return SimulatorProgression::DidSetUpOneServer;
-    cv_.notify_all();  // -> deadlock
-    // return false;// -> deadlock
-    return true;  // -> deadlock
-  }
-  // if (blocked_servers < server_addresses_.size() && is_quiescent_state_achieved_) {
   if (blocked_servers < server_addresses_.size()) {
     // we only need to advance the simulator when all
     // servers have reached a quiescent state, blocked
@@ -85,63 +80,44 @@ bool SimulatorHandle::MaybeTickSimulator() {
 
   TimeoutPromisesPastDeadline();
 
-  auto sort_based_on_message_id = [](const std::pair<Address, OpaqueMessage> &lhs,
-                                     const std::pair<Address, OpaqueMessage> &rhs) {
-    // return a.second.request_id < b.second.request_id;
-    if (lhs.second.from_address != rhs.second.from_address) {
-      return lhs.second.from_address < rhs.second.from_address;
-    }
-
-    return lhs.second.request_id < rhs.second.request_id;
-  };
-  std::sort(in_flight_.begin(), in_flight_.end(), sort_based_on_message_id);
-
   if (in_flight_.empty()) {
     // return early here because there are no messages to schedule
 
     // We tick the clock forward when all servers are blocked but
     // there are no in-flight messages to schedule delivery of.
-    // const Duration clock_advance = std::chrono::microseconds{Rand(time_distrib_)};
-    // cluster_wide_time_microseconds_ += clock_advance;
+    std::poisson_distribution<> time_distrib(50);
+    Duration clock_advance = std::chrono::microseconds{time_distrib(rng_)};
+    cluster_wide_time_microseconds_ += clock_advance;
 
-    if (cluster_wide_time_microseconds_ >= config_.abort_time) {
-      if (should_shut_down_) {
-        return false;
-      }
-      spdlog::error(
-          "Cluster has executed beyond its configured abort_time, and something may be failing to make progress "
-          "in an expected amount of time.");
-      throw utils::BasicException{"Cluster has executed beyond its configured abort_time"};
-    }
-    // spdlog::info(
-    //     "Time increased with {} to {}", clock_advance.count(),
-    //     std::chrono::duration_cast<std::chrono::milliseconds>(cluster_wide_time_microseconds_.time_since_epoch())
-    //         .count());
+    MG_ASSERT(cluster_wide_time_microseconds_ < config_.abort_time,
+              "Cluster has executed beyond its configured abort_time, and something may be failing to make progress "
+              "in an expected amount of time.");
     return true;
   }
 
   if (config_.scramble_messages) {
     // scramble messages
     std::uniform_int_distribution<size_t> swap_distrib(0, in_flight_.size() - 1);
-    const size_t swap_index = RandLocked(swap_distrib);
+    const size_t swap_index = swap_distrib(rng_);
     std::swap(in_flight_[swap_index], in_flight_.back());
   }
 
   auto [to_address, opaque_message] = std::move(in_flight_.back());
   in_flight_.pop_back();
-  event_log_.AddAndLog(opaque_message, "Handle ");
 
-  const int drop_threshold = RandLocked(drop_distrib_);
+  std::uniform_int_distribution<int> drop_distrib(0, 99);
+  const int drop_threshold = drop_distrib(rng_);
   const bool should_drop = drop_threshold < config_.drop_percent;
 
   if (should_drop) {
     stats_.dropped_messages++;
   }
 
-  PromiseKey promise_key{.requester_address = to_address, .request_id = opaque_message.request_id};
+  PromiseKey promise_key{.requester_address = to_address,
+                         .request_id = opaque_message.request_id,
+                         .replier_address = opaque_message.from_address};
 
   if (promises_.contains(promise_key)) {
-    event_log_.AddAndLog(opaque_message, "Promise contains");
     // complete waiting promise if it's there
     DeadlineAndOpaquePromise dop = std::move(promises_.at(promise_key));
     promises_.erase(promise_key);
@@ -153,24 +129,13 @@ bool SimulatorHandle::MaybeTickSimulator() {
       dop.promise.TimeOut();
     } else {
       stats_.total_responses++;
-      Duration response_latency = cluster_wide_time_microseconds_ - dop.requested_at;
-      auto type_info = opaque_message.type_info;
-      dop.promise.Fill(std::move(opaque_message), response_latency);
-      histograms_.Measure(type_info, response_latency);
+      dop.promise.Fill(std::move(opaque_message));
     }
   } else if (should_drop) {
-    event_log_.AddAndLog(opaque_message, "Dropped");
     // don't add it anywhere, let it drop
   } else {
-    event_log_.AddAndLog(opaque_message, "To can_receive");
     // add to can_receive_ if not
-    // This might be needed I am not sure, it can cause deadlock if you uncomment. Didn't find the issue yet.
-    // MG_ASSERT(server_addresses_.contains(to_address));
-    // MG_ASSERT(blocked_on_receive_.contains(to_address));
-    // blocked_on_receive_.erase(to_address);
-
-    const auto &[om_vec, inserted] =
-        can_receive_.try_emplace(to_address.ToPartialAddress(), std::vector<OpaqueMessage>());
+    const auto &[om_vec, inserted] = can_receive_.try_emplace(to_address, std::vector<OpaqueMessage>());
     om_vec->second.emplace_back(std::move(opaque_message));
   }
 
@@ -182,11 +147,6 @@ Time SimulatorHandle::Now() const {
   return cluster_wide_time_microseconds_;
 }
 
-Time SimulatorHandle::NowLocked() const {
-  // std::unique_lock<std::mutex> lock(mu_);
-  return cluster_wide_time_microseconds_;
-}
-
 SimulatorStats SimulatorHandle::Stats() {
   std::unique_lock<std::mutex> lock(mu_);
   return stats_;

src/io/simulator/simulator_handle.hpp

@@ -17,71 +17,26 @@
 #include <map>
 #include <memory>
 #include <optional>
-#include <queue>
 #include <set>
-#include <string>
 #include <utility>
 #include <variant>
 #include <vector>
 
-#include <sstream>
-
-#include <boost/lexical_cast.hpp>
-#include <boost/stacktrace.hpp>
-#include <boost/uuid/uuid_io.hpp>
-
-#include "fmt/format.h"
 #include "io/address.hpp"
 #include "io/errors.hpp"
 #include "io/message_conversion.hpp"
-#include "io/message_histogram_collector.hpp"
 #include "io/simulator/simulator_config.hpp"
 #include "io/simulator/simulator_stats.hpp"
 #include "io/time.hpp"
 #include "io/transport.hpp"
-#include "spdlog/spdlog.h"
 
 namespace memgraph::io::simulator {
 
-struct EventDescriptor {
-  boost::asio::ip::address from_address_ip;
-  uint16_t from_address_port;
-  boost::asio::ip::address to_address_ip;
-  uint16_t to_address_port;
-  uint64_t request_id;
-  std::string_view caller;
-  utils::TypeInfoRef type_info;
-  uint64_t event_id;
-  Time time;
-};
-
-class SimulatorHandle;
-class EventLog {
-  std::vector<EventDescriptor> event_log_;
-  static constexpr const char *eventlog_signal_string_ = "EVENTLOG_UPDATE";
-
-  void LogEvent(const EventDescriptor &event) const {
-    spdlog::info(
-        fmt::format("{} ({})-> caller: {}, from_address: {}:{}, to_address: {}:{}, request_id: {}, type: {}, event_id: "
-                    "{}, thread_id: {}",
-                    eventlog_signal_string_,
-                    std::chrono::duration_cast<std::chrono::milliseconds>(event.time.time_since_epoch()).count(),
-                    event.caller, event.from_address_ip.to_string(), event.from_address_port,
-                    event.to_address_ip.to_string(), event.to_address_port, event.request_id,
-                    event.type_info.get().name(), event.event_id, std::this_thread::get_id()));
-  }
-
- public:
-  SimulatorHandle *handle{nullptr};
-
-  void AddAndLog(const OpaqueMessage &message, std::string_view caller);
-
-  void LogAllEvents() const {
-    for (const auto &event : event_log_) {
-      LogEvent(event);
-    }
-  }
-};
+using memgraph::io::Duration;
+using memgraph::io::OpaqueMessage;
+using memgraph::io::OpaquePromise;
+using memgraph::io::Time;
+using memgraph::io::TimedOut;
 
 class SimulatorHandle {
   mutable std::mutex mu_{};
@@ -94,60 +49,42 @@ class SimulatorHandle {
   std::map<PromiseKey, DeadlineAndOpaquePromise> promises_;
 
   // messages that are sent to servers that may later receive them
-  std::map<PartialAddress, std::vector<OpaqueMessage>> can_receive_;
-
-  // maybe a boolean here
-  bool is_quiescent_state_achieved_ = false;
-  std::atomic<int> server_count_;
+  std::map<Address, std::vector<OpaqueMessage>> can_receive_;
 
   Time cluster_wide_time_microseconds_;
   bool should_shut_down_ = false;
   SimulatorStats stats_;
-  std::set<Address> blocked_on_receive_;
+  size_t blocked_on_receive_ = 0;
   std::set<Address> server_addresses_;
   std::mt19937 rng_;
-  std::uniform_int_distribution<int> time_distrib_{5, 50};
-  std::uniform_int_distribution<int> drop_distrib_{0, 99};
   SimulatorConfig config_;
-  MessageHistogramCollector histograms_;
-  RequestId request_id_counter_{0};
-  EventLog event_log_;
+
+  /// Returns the number of servers currently blocked on Receive, plus
+  /// the servers that are blocked on Futures that were created through
+  /// SimulatorTransport::Request.
+  ///
+  /// TODO(tyler) investigate whether avoiding consideration of Futures
+  /// increases determinism.
+  size_t BlockedServers();
 
   void TimeoutPromisesPastDeadline() {
     const Time now = cluster_wide_time_microseconds_;
-    for (auto it = promises_.begin(); it != promises_.end();) {
-      auto &[promise_key, dop] = *it;
-      const bool timed_out = dop.deadline < now;
-      if (timed_out && config_.perform_timeouts) {
-        // spdlog::info("timing out request from requester {}.", promise_key.requester_address.ToString());
-        spdlog::info("timing out request from requester {}. bool timed_out: {}",
-                     promise_key.requester_address.ToString(), timed_out);
+
+    for (auto &[promise_key, dop] : promises_) {
+      if (dop.deadline < now) {
+        spdlog::debug("timing out request from requester {} to replier {}.", promise_key.requester_address.ToString(),
+                      promise_key.replier_address.ToString());
         std::move(dop).promise.TimeOut();
-        it = promises_.erase(it);
+        promises_.erase(promise_key);
 
         stats_.timed_out_requests++;
-      } else {
-        ++it;
       }
     }
   }
 
  public:
   explicit SimulatorHandle(SimulatorConfig config)
-      : server_count_(0), cluster_wide_time_microseconds_(config.start_time), rng_(config.rng_seed), config_(config) {
-    spdlog::info("SimulatorHandle constructed.");
-    event_log_.handle = this;
-  }
-
-  LatencyHistogramSummaries ResponseLatencies();
-
-  ~SimulatorHandle() {
-    for (auto it = promises_.begin(); it != promises_.end();) {
-      auto &[promise_key, dop] = *it;
-      std::move(dop).promise.TimeOut();
-      it = promises_.erase(it);
-    }
-  }
+      : cluster_wide_time_microseconds_(config.start_time), rng_(config.rng_seed), config_(config) {}
 
   void IncrementServerCountAndWaitForQuiescentState(Address address);
 
@@ -162,102 +99,70 @@ class SimulatorHandle {
   bool ShouldShutDown() const;
 
   template <Message Request, Message Response>
-  ResponseFuture<Response> SubmitRequest(Address to_address, Address from_address, Request &&request, Duration timeout,
-                                         std::function<bool()> &&maybe_tick_simulator) {
-    auto type_info = TypeInfoFor(request);
-
-    auto [future, promise] = memgraph::io::FuturePromisePairWithNotifier<ResponseResult<Response>>(
-        std::forward<std::function<bool()>>(maybe_tick_simulator));
-
+  void SubmitRequest(Address to_address, Address from_address, uint64_t request_id, Request &&request, Duration timeout,
+                     ResponsePromise<Response> &&promise) {
     std::unique_lock<std::mutex> lock(mu_);
 
-    RequestId request_id = ++request_id_counter_;
-
     const Time deadline = cluster_wide_time_microseconds_ + timeout;
 
     std::any message(request);
-    OpaqueMessage om{.to_address = to_address,
-                     .from_address = from_address,
-                     .request_id = request_id,
-                     .message = std::move(message),
-                     .type_info = type_info};
-    event_log_.AddAndLog(om, "SubmitRequest");
+    OpaqueMessage om{.from_address = from_address, .request_id = request_id, .message = std::move(message)};
     in_flight_.emplace_back(std::make_pair(to_address, std::move(om)));
 
-    PromiseKey promise_key{.requester_address = from_address, .request_id = request_id};
+    PromiseKey promise_key{.requester_address = from_address, .request_id = request_id, .replier_address = to_address};
     OpaquePromise opaque_promise(std::move(promise).ToUnique());
-    DeadlineAndOpaquePromise dop{
-        .requested_at = cluster_wide_time_microseconds_,
-        .deadline = deadline,
-        .promise = std::move(opaque_promise),
-    };
-
-    MG_ASSERT(!promises_.contains(promise_key));
-
+    DeadlineAndOpaquePromise dop{.deadline = deadline, .promise = std::move(opaque_promise)};
     promises_.emplace(std::move(promise_key), std::move(dop));
 
     stats_.total_messages++;
     stats_.total_requests++;
 
     cv_.notify_all();
-
-    return std::move(future);
   }
 
   template <Message... Ms>
   requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(const Address &receiver, Duration timeout) {
     std::unique_lock<std::mutex> lock(mu_);
 
-    blocked_on_receive_.emplace(receiver);
+    blocked_on_receive_ += 1;
 
     const Time deadline = cluster_wide_time_microseconds_ + timeout;
 
-    auto partial_address = receiver.ToPartialAddress();
-
     while (!should_shut_down_ && (cluster_wide_time_microseconds_ < deadline)) {
-      if (can_receive_.contains(partial_address)) {
-        std::vector<OpaqueMessage> &can_rx = can_receive_.at(partial_address);
+      if (can_receive_.contains(receiver)) {
+        std::vector<OpaqueMessage> &can_rx = can_receive_.at(receiver);
         if (!can_rx.empty()) {
           OpaqueMessage message = std::move(can_rx.back());
           can_rx.pop_back();
 
-          event_log_.AddAndLog(message, "Receivexxxxxx");
-
           // TODO(tyler) search for item in can_receive_ that matches the desired types, rather
           // than asserting that the last item in can_rx matches.
           auto m_opt = std::move(message).Take<Ms...>();
-          MG_ASSERT(m_opt.has_value(), "Wrong message type received compared to the expected type");
 
-          blocked_on_receive_.erase(receiver);
+          blocked_on_receive_ -= 1;
 
           return std::move(m_opt).value();
         }
       }
 
       lock.unlock();
-      auto simulator_progress = MaybeTickSimulator();
+      bool made_progress = MaybeTickSimulator();
       lock.lock();
-      if (!should_shut_down_ && !simulator_progress) {
+      if (!should_shut_down_ && !made_progress) {
         cv_.wait(lock);
       }
     }
 
-    blocked_on_receive_.erase(receiver);
+    blocked_on_receive_ -= 1;
 
     return TimedOut{};
   }
 
   template <Message M>
-  void Send(Address to_address, Address from_address, RequestId request_id, M message) {
-    auto type_info = TypeInfoFor(message);
+  void Send(Address to_address, Address from_address, uint64_t request_id, M message) {
     std::unique_lock<std::mutex> lock(mu_);
     std::any message_any(std::move(message));
-    OpaqueMessage om{.to_address = to_address,
-                     .from_address = from_address,
-                     .request_id = request_id,
-                     .message = std::move(message_any),
-                     .type_info = type_info};
-    event_log_.AddAndLog(om, "Sendxxxxxxxxx");
+    OpaqueMessage om{.from_address = from_address, .request_id = request_id, .message = std::move(message_any)};
     in_flight_.emplace_back(std::make_pair(std::move(to_address), std::move(om)));
 
     stats_.total_messages++;
@@ -267,37 +172,12 @@ class SimulatorHandle {
 
   Time Now() const;
 
-  Time NowLocked() const;
-
   template <class D = std::poisson_distribution<>, class Return = uint64_t>
   Return Rand(D distrib) {
     std::unique_lock<std::mutex> lock(mu_);
-    return RandLocked<D, Return>(std::forward<D>(distrib));
-  }
-
-  template <class D = std::poisson_distribution<>, class Return = uint64_t>
-  Return RandLocked(D distrib) {
-    Return res = distrib(rng_);
-    spdlog::info("Getting random value from thread {}: {}. Stacktrace:\n{}", std::this_thread::get_id(), res,
-                 boost::stacktrace::stacktrace());
-    return res;
+    return distrib(rng_);
   }
 
   SimulatorStats Stats();
 };
-
-inline void EventLog::AddAndLog(const OpaqueMessage &message, std::string_view caller) {
-  EventDescriptor event{.from_address_ip = message.from_address.last_known_ip,
-                        .from_address_port = message.from_address.last_known_port,
-                        .to_address_ip = message.to_address.last_known_ip,
-                        .to_address_port = message.to_address.last_known_port,
-                        .request_id = message.request_id,
-                        .caller = caller,
-                        .type_info = message.type_info,
-                        .event_id = event_log_.size(),
-                        .time = handle->NowLocked()};
-
-  event_log_.push_back(event);
-  LogEvent(event);
-}
 };  // namespace memgraph::io::simulator

src/io/simulator/simulator_transport.hpp

@@ -32,35 +32,34 @@ class SimulatorTransport {
   SimulatorTransport(std::shared_ptr<SimulatorHandle> simulator_handle, Address address, uint64_t seed)
       : simulator_handle_(simulator_handle), address_(address), rng_(std::mt19937{seed}) {}
 
-  template <Message RequestT, Message ResponseT>
-  ResponseFuture<ResponseT> Request(Address to_address, Address from_address, RequestT request, Duration timeout) {
+  template <Message Request, Message Response>
+  ResponseFuture<Response> Request(Address address, uint64_t request_id, Request request, Duration timeout) {
     std::function<bool()> maybe_tick_simulator = [this] { return simulator_handle_->MaybeTickSimulator(); };
+    auto [future, promise] =
+        memgraph::io::FuturePromisePairWithNotifier<ResponseResult<Response>>(maybe_tick_simulator);
 
-    return simulator_handle_->template SubmitRequest<RequestT, ResponseT>(to_address, from_address, std::move(request),
-                                                                          timeout, std::move(maybe_tick_simulator));
+    simulator_handle_->SubmitRequest(address, address_, request_id, std::move(request), timeout, std::move(promise));
+
+    return std::move(future);
   }
 
   template <Message... Ms>
-  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Address receiver_address, Duration timeout) {
-    return simulator_handle_->template Receive<Ms...>(receiver_address, timeout);
+  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Duration timeout) {
+    return simulator_handle_->template Receive<Ms...>(address_, timeout);
   }
 
   template <Message M>
-  void Send(Address to_address, Address from_address, uint64_t request_id, M message) {
-    return simulator_handle_->template Send<M>(to_address, from_address, request_id, message);
+  void Send(Address address, uint64_t request_id, M message) {
+    return simulator_handle_->template Send<M>(address, address_, request_id, message);
   }
 
   Time Now() const { return simulator_handle_->Now(); }
 
   bool ShouldShutDown() const { return simulator_handle_->ShouldShutDown(); }
 
-  template <class D = std::poisson_distribution<uint64_t>, class Return = uint64_t>
+  template <class D = std::poisson_distribution<>, class Return = uint64_t>
   Return Rand(D distrib) {
-    // debug - gvolfing
-    auto ret = distrib(rng_);
-    return ret;
+    return distrib(rng_);
   }
-
-  LatencyHistogramSummaries ResponseLatencies() { return simulator_handle_->ResponseLatencies(); }
 };
 };  // namespace memgraph::io::simulator

src/io/thrift/thrift_handle.hpp

@@ -0,0 +1,249 @@
+// 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 <condition_variable>
+#include <map>
+#include <memory>
+#include <mutex>
+
+#include <boost/asio/ip/tcp.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <folly/init/Init.h>
+#include <folly/io/SocketOptionMap.h>
+#include <folly/io/async/AsyncServerSocket.h>
+#include <folly/net/NetworkSocket.h>
+#include <thrift/lib/cpp2/async/HeaderClientChannel.h>
+#include <thrift/lib/cpp2/server/ThriftServer.h>
+
+// From generated code
+#include "interface/gen-cpp2/UberServer.h"
+#include "interface/gen-cpp2/UberServerAsyncClient.h"
+
+#include "io/errors.hpp"
+#include "io/message_conversion.hpp"
+#include "io/transport.hpp"
+
+namespace memgraph::io::thrift {
+
+using namespace apache::thrift;
+using namespace folly;
+
+using memgraph::io::Address;
+using memgraph::io::OpaqueMessage;
+using memgraph::io::OpaquePromise;
+using memgraph::io::TimedOut;
+using RequestId = uint64_t;
+class ThriftHandle {
+  mutable std::mutex mu_{};
+  mutable std::condition_variable cv_;
+  const Address address_ = Address::TestAddress(0);
+
+  EventBase base_;
+
+  // the responses to requests that are being waited on
+  std::map<PromiseKey, DeadlineAndOpaquePromise> promises_;
+
+  // messages that are sent to servers that may later receive them
+  std::vector<OpaqueMessage> can_receive_;
+
+  // TODO(tyler) thrift clients for each outbound address combination
+  // AsyncClient does not offer default init so they are optional atm.
+  std::map<Address, std::optional<cpp2::UberServerAsyncClient>> clients_;
+
+  // TODO(gabor) make this to a threadpool
+  // uuid of the address -> port number where the given rsm is residing.
+  // TODO(gabor) The RSM map should not be a part of this class.
+  // std::map<boost::uuids::uuid, uint16_t /*this should be the actual RSM*/> rsm_map_;
+
+  cpp2::Address convertToUberAddress(const memgraph::io::Address &address) {
+    cpp2::Address ret_address;
+    ret_address.unique_id_ref() = boost::uuids::to_string(address.unique_id);
+    ret_address.last_known_ip_ref() = address.last_known_ip.to_string();
+    ret_address.last_known_port_ref() = static_cast<int32_t>(address.last_known_port);
+    return ret_address;
+  }
+
+ public:
+  explicit ThriftHandle(Address our_address) : address_(our_address) {}
+
+  Time Now() const {
+    auto nano_time = std::chrono::system_clock::now();
+    return std::chrono::time_point_cast<std::chrono::microseconds>(nano_time);
+  }
+
+  template <Message M>
+  void DeliverMessage(Address to_address, Address from_address, RequestId request_id, M &&message) {
+    std::any message_any(std::move(message));
+    OpaqueMessage opaque_message{
+        .from_address = from_address, .request_id = request_id, .message = std::move(message_any)};
+
+    PromiseKey promise_key{.requester_address = to_address,
+                           .request_id = opaque_message.request_id,
+                           .replier_address = opaque_message.from_address};
+
+    {
+      std::unique_lock<std::mutex> lock(mu_);
+
+      if (promises_.contains(promise_key)) {
+        // complete waiting promise if it's there
+        DeadlineAndOpaquePromise dop = std::move(promises_.at(promise_key));
+        promises_.erase(promise_key);
+
+        dop.promise.Fill(std::move(opaque_message));
+      } else {
+        can_receive_.emplace_back(std::move(opaque_message));
+      }
+    }  // lock dropped
+
+    cv_.notify_all();
+  }
+
+  template <Message Request, Message Response>
+  void SubmitRequest(Address to_address, Address from_address, RequestId request_id, Request &&request,
+                     Duration timeout, ResponsePromise<Response> &&promise) {
+    const Time deadline = Now() + timeout;
+    Address our_address = address_;
+
+    PromiseKey promise_key{.requester_address = from_address, .request_id = request_id, .replier_address = to_address};
+    OpaquePromise opaque_promise(std::move(promise).ToUnique());
+    DeadlineAndOpaquePromise dop{.deadline = deadline, .promise = std::move(opaque_promise)};
+    promises_.emplace(std::move(promise_key), std::move(dop));
+
+    cv_.notify_all();
+
+    bool port_matches = to_address.last_known_port == our_address.last_known_port;
+    bool ip_matches = to_address.last_known_ip == our_address.last_known_ip;
+
+    if (port_matches && ip_matches) {
+      // hairpin routing optimization
+      DeliverMessage(to_address, from_address, request_id, std::move(request));
+    } else {
+      // send using a thrift client to remove service
+      Send(to_address, from_address, request_id, request);
+    }
+  }
+
+  template <Message... Ms>
+  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Duration timeout) {
+    // TODO(tyler) block for the specified duration on the Inbox's receipt of a message of this type.
+    std::unique_lock lock(mu_);
+
+    Time before = Now();
+
+    while (can_receive_.empty()) {
+      Time now = Now();
+
+      // protection against non-monotonic timesources
+      auto maxed_now = std::max(now, before);
+      auto elapsed = maxed_now - before;
+
+      if (timeout < elapsed) {
+        return TimedOut{};
+      }
+
+      Duration relative_timeout = timeout - elapsed;
+
+      auto cv_status_value = cv_.wait_for(lock, relative_timeout);
+
+      if (cv_status_value == std::cv_status::timeout) {
+        return TimedOut{};
+      }
+    }
+
+    auto current_message = std::move(can_receive_.back());
+    can_receive_.pop_back();
+
+    auto m_opt = std::move(current_message).Take<Ms...>();
+
+    return std::move(m_opt).value();
+  }
+
+  // This method is used for communication for in-between different
+  // machines and processes, its exact functionality will be
+  // implemented later after the shape of the Thrift generated
+  // UberMessage is specified as this is not needed for M1.
+  template <Message M>
+  void Send(Address to_address, Address from_address, RequestId request_id, M message) {
+    MG_ASSERT(false, "Communication in-between different machines and processes is not yet implemented!");
+
+    //   // TODO(tyler) call thrift client for address (or create one if it doesn't exist yet)
+    //   cpp2::UberMessage uber_message;
+
+    //   uber_message.to_address_ref() = convertToUberAddress(to_address);
+    //   uber_message.from_address_ref() = convertToUberAddress(from_address);
+    //   uber_message.request_id_ref() = static_cast<int64_t>(request_id);
+    //   uber_message.high_level_union_ref() = message;
+
+    //   // cpp2::UberMessage uber_message = {
+    //   //   .to_address = convertToUberAddress(to_address),
+    //   //   .from_address = convertToUberAddress(from_address),
+    //   //   .request_id = static_cast<int64_t>(request_id),
+    //   //   .high_level_union = message
+    //   // };
+
+    //   if (clients_.contains(to_address)) {
+    //     auto &client = clients_[to_address];
+    //     client->sync_ReceiveUberMessage(uber_message);
+    //   } else {
+    //     // maybe make this into a member var
+    //     const auto &other_ip = to_address.last_known_ip.to_string();
+    //     const auto &other_port = to_address.last_known_port;
+    //     auto socket(folly::AsyncSocket::newSocket(&base_, other_ip, other_port));
+    //     auto client_channel = HeaderClientChannel::newChannel(std::move(socket));
+    //     // Create a client object
+    //     cpp2::UberServerAsyncClient client(std::move(client_channel));
+
+    //     client.sync_ReceiveUberMessage(uber_message);
+    //   }
+  }
+};
+
+class UberMessageService final : cpp2::UberServerSvIf {
+  std::shared_ptr<ThriftHandle> handle_;
+
+  memgraph::io::Address convertToMgAddress(const cpp2::Address &address) {
+    memgraph::io::Address ret_address;
+    ret_address = {.unique_id{boost::lexical_cast<boost::uuids::uuid>(address.get_unique_id())},
+                   .last_known_ip{boost::asio::ip::make_address(address.get_last_known_ip())},
+                   .last_known_port = static_cast<uint16_t>(address.get_last_known_port())};
+    return ret_address;
+  }
+
+ public:
+  explicit UberMessageService(std::shared_ptr<ThriftHandle> handle) : handle_{handle} {}
+
+  void ReceiveUberMessage(const cpp2::UberMessage &uber_message) override {
+    const auto &to_address = uber_message.get_to_address();
+    const auto &from_address = uber_message.get_from_address();
+    const auto &request_id = uber_message.get_request_id();
+    auto message = uber_message.get_high_level_union();
+
+    const auto mg_to_address = convertToMgAddress(to_address);
+    const auto mg_from_address = convertToMgAddress(from_address);
+    // Castint int64_t -> uint64_t
+    // FBThrift only provides us with signed integers. If someone
+    // wishes to use signed integers then the go to solution seems to
+    // be to use the one-bigger signed version. Unfortunately FBThrift
+    // does not provide a uint128_t so we have to use the 64 bit one
+    // for now.
+    // TODO(gvolfing) Investigate and try to get around this problem
+    // with Varint or some other Thrift type.
+    const auto mg_request_id = static_cast<uint64_t>(request_id);
+
+    // Transform high_level_union into something usable if needed(?).
+    handle_->DeliverMessage(mg_to_address, mg_from_address, mg_request_id, std::move(message));
+  }
+};
+
+}  // namespace memgraph::io::thrift

src/io/thrift/thrift_transport.hpp

@@ -0,0 +1,66 @@
+// 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 <memory>
+#include <random>
+#include <utility>
+
+#include "io/address.hpp"
+#include "io/thrift/thrift_handle.hpp"
+#include "io/time.hpp"
+#include "io/transport.hpp"
+
+namespace memgraph::io::thrift {
+
+using memgraph::io::Duration;
+using memgraph::io::Time;
+
+class ThriftTransport {
+  std::shared_ptr<ThriftHandle> thrift_handle_;
+  const Address address_;
+  std::random_device rng_;
+
+ public:
+  ThriftTransport(std::shared_ptr<ThriftHandle> thrift_handle, Address address)
+      : thrift_handle_(thrift_handle), address_(address) {}
+
+  template <Message Request, Message Response>
+  ResponseFuture<Response> Request(Address address, uint64_t request_id, Request request, Duration timeout) {
+    auto [future, promise] = memgraph::io::FuturePromisePair<ResponseResult<Response>>();
+
+    thrift_handle_->SubmitRequest(address, address_, request_id, std::move(request), timeout, std::move(promise));
+
+    return std::move(future);
+  }
+
+  template <Message... Ms>
+  requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive(Duration timeout) {
+    return thrift_handle_->template Receive<Ms...>(address_, timeout);
+  }
+
+  template <Message M>
+  void Send(Address address, uint64_t request_id, M message) {
+    return thrift_handle_->template Send<M>(address, address_, request_id, message);
+  }
+
+  Time Now() const { return thrift_handle_->Now(); }
+
+  bool ShouldShutDown() const { return false; }
+
+  template <class D = std::poisson_distribution<>, class Return = uint64_t>
+  Return Rand(D distrib) {
+    return distrib(rng_);
+  }
+};
+};  // namespace memgraph::io::thrift

src/io/transport.hpp

@@ -19,7 +19,6 @@
 #include "io/address.hpp"
 #include "io/errors.hpp"
 #include "io/future.hpp"
-#include "io/message_histogram_collector.hpp"
 #include "io/time.hpp"
 #include "utils/result.hpp"
 
@@ -33,15 +32,11 @@ using memgraph::utils::BasicResult;
 template <typename T>
 concept Message = std::same_as<T, std::decay_t<T>>;
 
-using RequestId = uint64_t;
-
 template <Message M>
 struct ResponseEnvelope {
   M message;
-  RequestId request_id;
-  Address to_address;
+  uint64_t request_id;
   Address from_address;
-  Duration response_latency;
 };
 
 template <Message M>
@@ -56,8 +51,7 @@ using ResponsePromise = memgraph::io::Promise<ResponseResult<M>>;
 template <Message... Ms>
 struct RequestEnvelope {
   std::variant<Ms...> message;
-  RequestId request_id;
-  Address to_address;
+  uint64_t request_id;
   Address from_address;
 };
 
@@ -68,7 +62,8 @@ template <typename I>
 class Io {
   I implementation_;
   Address address_;
-  Duration default_timeout_ = std::chrono::microseconds{100000};
+  uint64_t request_id_counter_ = 0;
+  Duration default_timeout_ = std::chrono::microseconds{50000};
 
  public:
   Io(I io, Address address) : implementation_(io), address_(address) {}
@@ -81,26 +76,26 @@ class Io {
   Duration GetDefaultTimeout() { return default_timeout_; }
 
   /// Issue a request with an explicit timeout in microseconds provided. This tends to be used by clients.
-  template <Message RequestT, Message ResponseT>
-  ResponseFuture<ResponseT> RequestWithTimeout(Address address, RequestT request, Duration timeout) {
-    const Address from_address = address_;
-    return implementation_.template Request<RequestT, ResponseT>(address, from_address, request, timeout);
+  template <Message Request, Message Response>
+  ResponseFuture<Response> RequestWithTimeout(Address address, Request request, Duration timeout) {
+    const uint64_t request_id = ++request_id_counter_;
+    return implementation_.template Request<Request, Response>(address, request_id, request, timeout);
   }
 
   /// Issue a request that times out after the default timeout. This tends
   /// to be used by clients.
-  template <Message RequestT, Message ResponseT>
-  ResponseFuture<ResponseT> Request(Address to_address, RequestT request) {
+  template <Message Request, Message Response>
+  ResponseFuture<Response> Request(Address address, Request request) {
+    const uint64_t request_id = ++request_id_counter_;
     const Duration timeout = default_timeout_;
-    const Address from_address = address_;
-    return implementation_.template Request<RequestT, ResponseT>(to_address, from_address, std::move(request), timeout);
+    return implementation_.template Request<Request, Response>(address, request_id, std::move(request), timeout);
   }
 
   /// Wait for an explicit number of microseconds for a request of one of the
   /// provided types to arrive. This tends to be used by servers.
   template <Message... Ms>
   RequestResult<Ms...> ReceiveWithTimeout(Duration timeout) {
-    return implementation_.template Receive<Ms...>(address_, timeout);
+    return implementation_.template Receive<Ms...>(timeout);
   }
 
   /// Wait the default number of microseconds for a request of one of the
@@ -108,16 +103,15 @@ class Io {
   template <Message... Ms>
   requires(sizeof...(Ms) > 0) RequestResult<Ms...> Receive() {
     const Duration timeout = default_timeout_;
-    return implementation_.template Receive<Ms...>(address_, timeout);
+    return implementation_.template Receive<Ms...>(timeout);
   }
 
   /// Send a message in a best-effort fashion. This is used for messaging where
   /// responses are not necessarily expected, and for servers to respond to requests.
   /// If you need reliable delivery, this must be built on-top. TCP is not enough for most use cases.
   template <Message M>
-  void Send(Address to_address, RequestId request_id, M message) {
-    Address from_address = address_;
-    return implementation_.template Send<M>(to_address, from_address, request_id, std::move(message));
+  void Send(Address address, uint64_t request_id, M message) {
+    return implementation_.template Send<M>(address, request_id, std::move(message));
   }
 
   /// The current system time. This time source should be preferred over any other,
@@ -135,10 +129,5 @@ class Io {
   }
 
   Address GetAddress() { return address_; }
-  void SetAddress(Address address) { address_ = address; }
-
-  Io<I> ForkLocal() { return Io(implementation_, address_.ForkUniqueAddress()); }
-
-  LatencyHistogramSummaries ResponseLatencies() { return implementation_.ResponseLatencies(); }
 };
 };  // namespace memgraph::io

src/machine_manager/machine_config.hpp

@@ -1,47 +0,0 @@
-// 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 <algorithm>
-#include <thread>
-
-#include <boost/asio/ip/tcp.hpp>
-
-#include "io/address.hpp"
-#include "storage/v3/property_value.hpp"
-#include "storage/v3/schemas.hpp"
-
-namespace memgraph::machine_manager {
-
-using memgraph::io::Address;
-using memgraph::storage::v3::SchemaProperty;
-using CompoundKey = std::vector<memgraph::storage::v3::PropertyValue>;
-
-struct InitialLabelSpace {
-  std::string label_name;
-  std::vector<SchemaProperty> schema;
-  size_t replication_factor;
-  std::vector<CompoundKey> split_points;
-};
-
-struct MachineConfig {
-  std::vector<InitialLabelSpace> initial_label_spaces;
-  std::vector<Address> coordinator_addresses;
-  bool is_storage;
-  bool is_coordinator;
-  bool is_query_engine;
-  boost::asio::ip::address listen_ip;
-  uint16_t listen_port;
-  size_t shard_worker_threads = std::max(static_cast<unsigned int>(1), std::thread::hardware_concurrency());
-};
-
-}  // namespace memgraph::machine_manager

src/machine_manager/machine_manager.hpp

@@ -1,204 +0,0 @@
-// 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 "coordinator/coordinator_rsm.hpp"
-#include "coordinator/coordinator_worker.hpp"
-#include "io/message_conversion.hpp"
-#include "io/messages.hpp"
-#include "io/rsm/rsm_client.hpp"
-#include "io/time.hpp"
-#include "machine_manager/machine_config.hpp"
-#include "storage/v3/shard_manager.hpp"
-
-namespace memgraph::machine_manager {
-
-using coordinator::Coordinator;
-using coordinator::CoordinatorReadRequests;
-using coordinator::CoordinatorReadResponses;
-using coordinator::CoordinatorRsm;
-using coordinator::CoordinatorWriteRequests;
-using coordinator::CoordinatorWriteResponses;
-using coordinator::coordinator_worker::CoordinatorWorker;
-using CoordinatorRouteMessage = coordinator::coordinator_worker::RouteMessage;
-using CoordinatorQueue = coordinator::coordinator_worker::Queue;
-using io::ConvertVariant;
-using io::Duration;
-using io::RequestId;
-using io::Time;
-using io::messages::CoordinatorMessages;
-using io::messages::ShardManagerMessages;
-using io::messages::ShardMessages;
-using io::messages::StorageReadRequest;
-using io::messages::StorageWriteRequest;
-using io::rsm::AppendRequest;
-using io::rsm::AppendResponse;
-using io::rsm::ReadRequest;
-using io::rsm::VoteRequest;
-using io::rsm::VoteResponse;
-using io::rsm::WriteRequest;
-using io::rsm::WriteResponse;
-using storage::v3::ShardManager;
-
-/// The MachineManager is responsible for:
-/// * starting the entire system and ensuring that high-level
-///   operational requirements continue to be met
-/// * acting as a machine's single caller of Io::Receive
-/// * routing incoming messages from the Io interface to the
-///   appropriate Coordinator or to the StorageManager
-///   (it's not necessary to route anything in this layer
-///   to the query engine because the query engine only
-///   communicates using higher-level Futures that will
-///   be filled immediately when the response comes in
-///   at the lower-level transport layer.
-///
-/// Every storage engine has exactly one RsmEngine.
-template <typename IoImpl>
-class MachineManager {
-  io::Io<IoImpl> io_;
-  MachineConfig config_;
-  Address coordinator_address_;
-  CoordinatorQueue coordinator_queue_;
-  std::jthread coordinator_handle_;
-  ShardManager<IoImpl> shard_manager_;
-  Time next_cron_ = Time::min();
-
- public:
-  // TODO initialize ShardManager with "real" coordinator addresses instead of io.GetAddress
-  // which is only true for single-machine config.
-  MachineManager(io::Io<IoImpl> io, MachineConfig config, Coordinator coordinator)
-      : io_(io),
-        config_(config),
-        coordinator_address_(io.GetAddress().ForkUniqueAddress()),
-        shard_manager_{io.ForkLocal(), config.shard_worker_threads, coordinator_address_} {
-    auto coordinator_io = io.ForkLocal();
-    coordinator_io.SetAddress(coordinator_address_);
-    CoordinatorWorker coordinator_worker{coordinator_io, coordinator_queue_, coordinator};
-    coordinator_handle_ = std::jthread([coordinator = std::move(coordinator_worker)]() mutable { coordinator.Run(); });
-  }
-
-  MachineManager(MachineManager &&) noexcept = default;
-  MachineManager &operator=(MachineManager &&) noexcept = default;
-  MachineManager(const MachineManager &) = delete;
-  MachineManager &operator=(const MachineManager &) = delete;
-
-  ~MachineManager() {
-    if (coordinator_handle_.joinable()) {
-      coordinator_queue_.Push(coordinator::coordinator_worker::ShutDown{});
-      coordinator_handle_.join();
-    }
-  }
-
-  Address CoordinatorAddress() { return coordinator_address_; }
-
-  void Run() {
-    while (!io_.ShouldShutDown()) {
-      const auto now = io_.Now();
-
-      if (now >= next_cron_) {
-        next_cron_ = Cron();
-      }
-
-      Duration receive_timeout = std::max(next_cron_, now) - now;
-
-      // Note: this parameter pack must be kept in-sync with the ReceiveWithTimeout parameter pack below
-      using AllMessages =
-          std::variant<ReadRequest<CoordinatorReadRequests>, AppendRequest<CoordinatorWriteRequests>, AppendResponse,
-                       WriteRequest<CoordinatorWriteRequests>, VoteRequest, VoteResponse,
-                       WriteResponse<CoordinatorWriteResponses>, ReadRequest<StorageReadRequest>,
-                       AppendRequest<StorageWriteRequest>, WriteRequest<StorageWriteRequest>>;
-
-      spdlog::info("MM waiting on Receive on address {}", io_.GetAddress().ToString());
-
-      // Note: this parameter pack must be kept in-sync with the AllMessages parameter pack above
-      auto request_result = io_.template ReceiveWithTimeout<
-          ReadRequest<CoordinatorReadRequests>, AppendRequest<CoordinatorWriteRequests>, AppendResponse,
-          WriteRequest<CoordinatorWriteRequests>, VoteRequest, VoteResponse, WriteResponse<CoordinatorWriteResponses>,
-          ReadRequest<StorageReadRequest>, AppendRequest<StorageWriteRequest>, WriteRequest<StorageWriteRequest>>(
-          receive_timeout);
-
-      if (request_result.HasError()) {
-        // time to do Cron
-        continue;
-      }
-
-      auto &&request_envelope = std::move(request_result.GetValue());
-
-      spdlog::info("MM got message to {}", request_envelope.to_address.ToString());
-
-      // If message is for the coordinator, cast it to subset and pass it to the coordinator
-      bool to_coordinator = coordinator_address_ == request_envelope.to_address;
-      if (to_coordinator) {
-        std::optional<CoordinatorMessages> conversion_attempt =
-            ConvertVariant<AllMessages, ReadRequest<CoordinatorReadRequests>, AppendRequest<CoordinatorWriteRequests>,
-                           AppendResponse, WriteRequest<CoordinatorWriteRequests>, VoteRequest, VoteResponse>(
-                std::move(request_envelope.message));
-
-        MG_ASSERT(conversion_attempt.has_value(), "coordinator message conversion failed");
-
-        spdlog::info("got coordinator message");
-
-        CoordinatorMessages &&cm = std::move(conversion_attempt.value());
-
-        CoordinatorRouteMessage route_message{
-            .message = std::move(cm),
-            .request_id = request_envelope.request_id,
-            .to = request_envelope.to_address,
-            .from = request_envelope.from_address,
-        };
-        coordinator_queue_.Push(std::move(route_message));
-        continue;
-      }
-
-      bool to_sm = shard_manager_.GetAddress() == request_envelope.to_address;
-      spdlog::info("smm: {}", shard_manager_.GetAddress().ToString());
-      if (to_sm) {
-        std::optional<ShardManagerMessages> conversion_attempt =
-            ConvertVariant<AllMessages, WriteResponse<CoordinatorWriteResponses>>(std::move(request_envelope.message));
-
-        MG_ASSERT(conversion_attempt.has_value(), "shard manager message conversion failed");
-
-        spdlog::info("got shard manager message");
-
-        ShardManagerMessages &&smm = std::move(conversion_attempt.value());
-        shard_manager_.Receive(std::forward<ShardManagerMessages>(smm), request_envelope.request_id,
-                               request_envelope.from_address);
-        continue;
-      }
-
-      // treat this as a message to a specific shard rsm and cast it accordingly
-
-      std::optional<ShardMessages> conversion_attempt =
-          ConvertVariant<AllMessages, ReadRequest<StorageReadRequest>, AppendRequest<StorageWriteRequest>,
-                         AppendResponse, WriteRequest<StorageWriteRequest>, VoteRequest, VoteResponse>(
-              std::move(request_envelope.message));
-
-      MG_ASSERT(conversion_attempt.has_value(), "shard rsm message conversion failed for {} - incorrect message type",
-                request_envelope.to_address.ToString());
-
-      spdlog::info("got shard rsm message");
-
-      ShardMessages &&sm = std::move(conversion_attempt.value());
-      shard_manager_.Route(std::forward<ShardMessages>(sm), request_envelope.request_id, request_envelope.to_address,
-                           request_envelope.from_address);
-    }
-  }
-
- private:
-  Time Cron() {
-    spdlog::info("running MachineManager::Cron, address {}", io_.GetAddress().ToString());
-    coordinator_queue_.Push(coordinator::coordinator_worker::Cron{});
-    return shard_manager_.Cron();
-  }
-};
-
-}  // namespace memgraph::machine_manager

src/parser/CMakeLists.txt

@@ -1,41 +0,0 @@
-## Generate Antlr openCypher parser
-
-set(opencypher_frontend ${CMAKE_CURRENT_SOURCE_DIR}/opencypher)
-set(opencypher_generated ${opencypher_frontend}/generated)
-set(opencypher_lexer_grammar ${opencypher_frontend}/grammar/MemgraphCypherLexer.g4)
-set(opencypher_parser_grammar ${opencypher_frontend}/grammar/MemgraphCypher.g4)
-
-set(antlr_opencypher_generated_src
-    ${opencypher_generated}/MemgraphCypherLexer.cpp
-    ${opencypher_generated}/MemgraphCypher.cpp
-    ${opencypher_generated}/MemgraphCypherBaseVisitor.cpp
-    ${opencypher_generated}/MemgraphCypherVisitor.cpp
-)
-set(antlr_opencypher_generated_include
-    ${opencypher_generated}/MemgraphCypherLexer.h
-    ${opencypher_generated}/MemgraphCypher.h
-    ${opencypher_generated}/MemgraphCypherBaseVisitor.h
-    ${opencypher_generated}/MemgraphCypherVisitor.h
-)
-
-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.10.1-complete.jar
-            -Dlanguage=Cpp -visitor -package antlropencypher
-            -o ${opencypher_generated}
-            ${opencypher_lexer_grammar} ${opencypher_parser_grammar}
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
-    DEPENDS
-        ${opencypher_lexer_grammar} ${opencypher_parser_grammar}
-        ${opencypher_frontend}/grammar/CypherLexer.g4
-        ${opencypher_frontend}/grammar/Cypher.g4)
-
-add_custom_target(generated_opencypher_parser
-    DEPENDS ${antlr_opencypher_generated_src} ${antlr_opencypher_generated_include})
-
-add_library(mg-parser STATIC ${antlr_opencypher_generated_src})
-add_dependencies(mg-parser generated_opencypher_parser)
-target_include_directories(mg-parser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_link_libraries(mg-parser antlr4)

src/query/v2/CMakeLists.txt

@@ -1,6 +1,7 @@
 define_add_lcp(add_lcp_query lcp_query_v2_cpp_files generated_lcp_query_v2_files)
 
 add_lcp_query(frontend/ast/ast.lcp)
+add_lcp_query(frontend/semantic/symbol.lcp)
 add_lcp_query(plan/operator.lcp)
 
 add_custom_target(generate_lcp_query_v2 DEPENDS ${generated_lcp_query_v2_files})
@@ -9,9 +10,15 @@ set(mg_query_v2_sources
     ${lcp_query_v2_cpp_files}
     common.cpp
     cypher_query_interpreter.cpp
+    dump.cpp
+    frontend/ast/cypher_main_visitor.cpp
+    frontend/ast/pretty_print.cpp
+    frontend/parsing.cpp
     frontend/semantic/required_privileges.cpp
+    frontend/semantic/symbol_generator.cpp
     frontend/stripped.cpp
     interpret/awesome_memgraph_functions.cpp
+    interpret/eval.cpp
     interpreter.cpp
     metadata.cpp
     plan/operator.cpp
@@ -22,19 +29,25 @@ set(mg_query_v2_sources
     plan/rewrite/index_lookup.cpp
     plan/rule_based_planner.cpp
     plan/variable_start_planner.cpp
+    procedure/mg_procedure_impl.cpp
+    procedure/mg_procedure_helpers.cpp
+    procedure/module.cpp
+    procedure/py_module.cpp
     serialization/property_value.cpp
-    bindings/typed_value.cpp
-    accessors.cpp)
+    stream/streams.cpp
+    stream/sources.cpp
+    stream/common.cpp
+    trigger.cpp
+    trigger_context.cpp
+    typed_value.cpp)
 
 find_package(Boost REQUIRED)
 
 add_library(mg-query-v2 STATIC ${mg_query_v2_sources})
 add_dependencies(mg-query-v2 generate_lcp_query_v2)
 target_include_directories(mg-query-v2 PUBLIC ${CMAKE_SOURCE_DIR}/include)
-target_include_directories(mg-query-v2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bindings)
 target_link_libraries(mg-query-v2 dl cppitertools Boost::headers)
-target_link_libraries(mg-query-v2 mg-integrations-pulsar mg-integrations-kafka mg-storage-v3 mg-license mg-utils mg-kvstore mg-memory mg-coordinator)
-target_link_libraries(mg-query-v2 mg-expr)
+target_link_libraries(mg-query-v2 mg-integrations-pulsar mg-integrations-kafka mg-storage-v3 mg-license mg-utils mg-kvstore mg-memory)
 
 if(NOT "${MG_PYTHON_PATH}" STREQUAL "")
     set(Python3_ROOT_DIR "${MG_PYTHON_PATH}")
@@ -47,3 +60,45 @@ else()
 endif()
 
 target_link_libraries(mg-query-v2 Python3::Python)
+
+# Generate Antlr openCypher parser
+set(opencypher_frontend ${CMAKE_CURRENT_SOURCE_DIR}/frontend/opencypher)
+set(opencypher_generated ${opencypher_frontend}/generated)
+set(opencypher_lexer_grammar ${opencypher_frontend}/grammar/MemgraphCypherLexer.g4)
+set(opencypher_parser_grammar ${opencypher_frontend}/grammar/MemgraphCypher.g4)
+
+set(antlr_opencypher_generated_src
+    ${opencypher_generated}/MemgraphCypherLexer.cpp
+    ${opencypher_generated}/MemgraphCypher.cpp
+    ${opencypher_generated}/MemgraphCypherBaseVisitor.cpp
+    ${opencypher_generated}/MemgraphCypherVisitor.cpp
+)
+set(antlr_opencypher_generated_include
+    ${opencypher_generated}/MemgraphCypherLexer.h
+    ${opencypher_generated}/MemgraphCypher.h
+    ${opencypher_generated}/MemgraphCypherBaseVisitor.h
+    ${opencypher_generated}/MemgraphCypherVisitor.h
+)
+
+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.10.1-complete.jar
+    -Dlanguage=Cpp -visitor -package antlropencypher
+    -o ${opencypher_generated}
+    ${opencypher_lexer_grammar} ${opencypher_parser_grammar}
+    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+    DEPENDS
+    ${opencypher_lexer_grammar} ${opencypher_parser_grammar}
+    ${opencypher_frontend}/grammar/CypherLexer.g4
+    ${opencypher_frontend}/grammar/Cypher.g4)
+
+add_custom_target(generate_opencypher_parser_v2
+    DEPENDS ${antlr_opencypher_generated_src} ${antlr_opencypher_generated_include})
+
+add_library(antlr_opencypher_parser_lib_v2 STATIC ${antlr_opencypher_generated_src})
+add_dependencies(antlr_opencypher_parser_lib_v2 generate_opencypher_parser_v2)
+target_link_libraries(antlr_opencypher_parser_lib_v2 antlr4)
+
+target_link_libraries(mg-query-v2 antlr_opencypher_parser_lib_v2)

src/query/v2/accessors.cpp

@@ -1,96 +0,0 @@
-// 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 "query/v2/accessors.hpp"
-#include "query/v2/requests.hpp"
-#include "query/v2/shard_request_manager.hpp"
-#include "storage/v3/id_types.hpp"
-
-namespace memgraph::query::v2::accessors {
-EdgeAccessor::EdgeAccessor(Edge edge, const msgs::ShardRequestManagerInterface *manager)
-    : edge(std::move(edge)), manager_(manager) {}
-
-EdgeTypeId EdgeAccessor::EdgeType() const { return edge.type.id; }
-
-const std::vector<std::pair<PropertyId, Value>> &EdgeAccessor::Properties() const { return edge.properties; }
-
-Value EdgeAccessor::GetProperty(const std::string &prop_name) const {
-  auto prop_id = manager_->NameToProperty(prop_name);
-  auto it = std::find_if(edge.properties.begin(), edge.properties.end(), [&](auto &pr) { return prop_id == pr.first; });
-  if (it == edge.properties.end()) {
-    return {};
-  }
-  return it->second;
-}
-
-const Edge &EdgeAccessor::GetEdge() const { return edge; }
-
-bool EdgeAccessor::IsCycle() const { return edge.src == edge.dst; };
-
-VertexAccessor EdgeAccessor::To() const {
-  return VertexAccessor(Vertex{edge.dst}, std::vector<std::pair<PropertyId, msgs::Value>>{}, manager_);
-}
-
-VertexAccessor EdgeAccessor::From() const {
-  return VertexAccessor(Vertex{edge.src}, std::vector<std::pair<PropertyId, msgs::Value>>{}, manager_);
-}
-
-VertexAccessor::VertexAccessor(Vertex v, std::vector<std::pair<PropertyId, Value>> props,
-                               const msgs::ShardRequestManagerInterface *manager)
-    : vertex(std::move(v)), properties(std::move(props)), manager_(manager) {}
-
-VertexAccessor::VertexAccessor(Vertex v, std::map<PropertyId, Value> &&props,
-                               const msgs::ShardRequestManagerInterface *manager)
-    : vertex(std::move(v)), manager_(manager) {
-  properties.reserve(props.size());
-  for (auto &[id, value] : props) {
-    properties.emplace_back(std::make_pair(id, std::move(value)));
-  }
-}
-
-VertexAccessor::VertexAccessor(Vertex v, const std::map<PropertyId, Value> &props,
-                               const msgs::ShardRequestManagerInterface *manager)
-    : vertex(std::move(v)), manager_(manager) {
-  properties.reserve(props.size());
-  for (const auto &[id, value] : props) {
-    properties.emplace_back(std::make_pair(id, value));
-  }
-}
-
-Label VertexAccessor::PrimaryLabel() const { return vertex.id.first; }
-
-const msgs::VertexId &VertexAccessor::Id() const { return vertex.id; }
-
-std::vector<Label> VertexAccessor::Labels() const { return vertex.labels; }
-
-bool VertexAccessor::HasLabel(Label &label) const {
-  return std::find_if(vertex.labels.begin(), vertex.labels.end(),
-                      [label](const auto &l) { return l.id == label.id; }) != vertex.labels.end();
-}
-
-const std::vector<std::pair<PropertyId, Value>> &VertexAccessor::Properties() const { return properties; }
-
-Value VertexAccessor::GetProperty(PropertyId prop_id) const {
-  auto it = std::find_if(properties.begin(), properties.end(), [&](auto &pr) { return prop_id == pr.first; });
-  if (it == properties.end()) {
-    return {};
-  }
-  return it->second;
-}
-
-// NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-Value VertexAccessor::GetProperty(const std::string &prop_name) const {
-  return GetProperty(manager_->NameToProperty(prop_name));
-}
-
-msgs::Vertex VertexAccessor::GetVertex() const { return vertex; }
-
-}  // namespace memgraph::query::v2::accessors

src/query/v2/accessors.hpp

@@ -1,203 +0,0 @@
-// 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 <map>
-#include <optional>
-#include <utility>
-#include <vector>
-
-#include "query/exceptions.hpp"
-#include "query/v2/requests.hpp"
-#include "storage/v3/view.hpp"
-#include "utils/bound.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/memory.hpp"
-#include "utils/memory_tracker.hpp"
-
-namespace memgraph::msgs {
-class ShardRequestManagerInterface;
-}  // namespace memgraph::msgs
-
-namespace memgraph::query::v2::accessors {
-
-using Value = memgraph::msgs::Value;
-using Edge = memgraph::msgs::Edge;
-using Vertex = memgraph::msgs::Vertex;
-using Label = memgraph::msgs::Label;
-using PropertyId = memgraph::msgs::PropertyId;
-using EdgeTypeId = memgraph::msgs::EdgeTypeId;
-
-class VertexAccessor;
-
-class EdgeAccessor final {
- public:
-  explicit EdgeAccessor(Edge edge, const msgs::ShardRequestManagerInterface *manager);
-
-  [[nodiscard]] EdgeTypeId EdgeType() const;
-
-  [[nodiscard]] const std::vector<std::pair<PropertyId, Value>> &Properties() const;
-
-  [[nodiscard]] Value GetProperty(const std::string &prop_name) const;
-
-  [[nodiscard]] const Edge &GetEdge() const;
-
-  [[nodiscard]] bool IsCycle() const;
-
-  // Dummy function
-  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-  [[nodiscard]] size_t CypherId() const { return 10; }
-
-  //  bool HasSrcAccessor const { return src == nullptr; }
-  //  bool HasDstAccessor const { return dst == nullptr; }
-
-  [[nodiscard]] VertexAccessor To() const;
-  [[nodiscard]] VertexAccessor From() const;
-
-  friend bool operator==(const EdgeAccessor &lhs, const EdgeAccessor &rhs) { return lhs.edge == rhs.edge; }
-
-  friend bool operator!=(const EdgeAccessor &lhs, const EdgeAccessor &rhs) { return !(lhs == rhs); }
-
- private:
-  Edge edge;
-  const msgs::ShardRequestManagerInterface *manager_;
-};
-
-class VertexAccessor final {
- public:
-  using PropertyId = msgs::PropertyId;
-  using Label = msgs::Label;
-  using VertexId = msgs::VertexId;
-  VertexAccessor(Vertex v, std::vector<std::pair<PropertyId, Value>> props,
-                 const msgs::ShardRequestManagerInterface *manager);
-
-  VertexAccessor(Vertex v, std::map<PropertyId, Value> &&props, const msgs::ShardRequestManagerInterface *manager);
-  VertexAccessor(Vertex v, const std::map<PropertyId, Value> &props, const msgs::ShardRequestManagerInterface *manager);
-
-  [[nodiscard]] Label PrimaryLabel() const;
-
-  [[nodiscard]] const msgs::VertexId &Id() const;
-
-  [[nodiscard]] std::vector<Label> Labels() const;
-
-  [[nodiscard]] bool HasLabel(Label &label) const;
-
-  [[nodiscard]] const std::vector<std::pair<PropertyId, Value>> &Properties() const;
-
-  [[nodiscard]] Value GetProperty(PropertyId prop_id) const;
-  [[nodiscard]] Value GetProperty(const std::string &prop_name) const;
-
-  [[nodiscard]] msgs::Vertex GetVertex() const;
-
-  // Dummy function
-  // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-  [[nodiscard]] size_t CypherId() const { return 10; }
-
-  //  auto InEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types) const
-  //      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.InEdges(view)))> {
-  //    auto maybe_edges = impl_.InEdges(view, edge_types);
-  //    if (maybe_edges.HasError()) return maybe_edges.GetError();
-  //    return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
-  //  }
-  //
-  //  auto InEdges(storage::View view) const { return InEdges(view, {}); }
-  //
-  //  auto InEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types, const VertexAccessor &dest)
-  //  const
-  //      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.InEdges(view)))> {
-  //    auto maybe_edges = impl_.InEdges(view, edge_types, &dest.impl_);
-  //    if (maybe_edges.HasError()) return maybe_edges.GetError();
-  //    return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
-  //  }
-  //
-  //  auto OutEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types) const
-  //      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.OutEdges(view)))> {
-  //    auto maybe_edges = impl_.OutEdges(view, edge_types);
-  //    if (maybe_edges.HasError()) return maybe_edges.GetError();
-  //    return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
-  //  }
-  //
-  //  auto OutEdges(storage::View view) const { return OutEdges(view, {}); }
-  //
-  //  auto OutEdges(storage::View view, const std::vector<storage::EdgeTypeId> &edge_types,
-  //                const VertexAccessor &dest) const
-  //      -> storage::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.OutEdges(view)))> {
-  //    auto maybe_edges = impl_.OutEdges(view, edge_types, &dest.impl_);
-  //    if (maybe_edges.HasError()) return maybe_edges.GetError();
-  //    return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
-  //  }
-
-  //  storage::Result<size_t> InDegree(storage::View view) const { return impl_.InDegree(view); }
-  //
-  //  storage::Result<size_t> OutDegree(storage::View view) const { return impl_.OutDegree(view); }
-  //
-
-  friend bool operator==(const VertexAccessor &lhs, const VertexAccessor &rhs) {
-    return lhs.vertex == rhs.vertex && lhs.properties == rhs.properties;
-  }
-
-  friend bool operator!=(const VertexAccessor &lhs, const VertexAccessor &rhs) { return !(lhs == rhs); }
-
- private:
-  Vertex vertex;
-  std::vector<std::pair<PropertyId, Value>> properties;
-  const msgs::ShardRequestManagerInterface *manager_;
-};
-
-// inline VertexAccessor EdgeAccessor::To() const { return VertexAccessor(impl_.ToVertex()); }
-
-// inline VertexAccessor EdgeAccessor::From() const { return VertexAccessor(impl_.FromVertex()); }
-
-// Highly mocked interface. Won't work if used.
-class Path {
- public:
-  // Empty for now
-  explicit Path(const VertexAccessor & /*vertex*/, utils::MemoryResource *memory = utils::NewDeleteResource())
-      : mem(memory) {}
-
-  template <typename... TOthers>
-  explicit Path(const VertexAccessor &vertex, const TOthers &...others) {}
-
-  template <typename... TOthers>
-  Path(std::allocator_arg_t /*unused*/, utils::MemoryResource *memory, const VertexAccessor &vertex,
-       const TOthers &...others) {}
-
-  Path(const Path & /*other*/) {}
-
-  Path(const Path & /*other*/, utils::MemoryResource *memory) : mem(memory) {}
-
-  Path(Path && /*other*/) noexcept {}
-
-  Path(Path && /*other*/, utils::MemoryResource *memory) : mem(memory) {}
-  Path &operator=(const Path &path) {
-    if (this == &path) {
-      return *this;
-    }
-    return *this;
-  }
-
-  Path &operator=(Path &&path) noexcept {
-    if (this == &path) {
-      return *this;
-    }
-    return *this;
-  }
-
-  ~Path() {}
-
-  friend bool operator==(const Path & /*lhs*/, const Path & /*rhs*/) { return true; };
-  utils::MemoryResource *GetMemoryResource() { return mem; }
-
- private:
-  utils::MemoryResource *mem = utils::NewDeleteResource();
-};
-}  // namespace memgraph::query::v2::accessors

src/query/v2/bindings/bindings.hpp

@@ -1,19 +0,0 @@
-// 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
-
-#ifdef MG_AST_INCLUDE_PATH
-#error You are probably trying to include files from expr from both the storage and query engines! You will have a rough time kid!
-#endif
-
-#define MG_AST_INCLUDE_PATH "query/v2/frontend/ast/ast.hpp"  // NOLINT(cppcoreguidelines-macro-usage)
-#define MG_INJECTED_NAMESPACE_NAME memgraph::query::v2       // NOLINT(cppcoreguidelines-macro-usage)

src/query/v2/bindings/cypher_main_visitor.hpp

@@ -1,20 +0,0 @@
-// 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 "query/v2/bindings/bindings.hpp"
-
-#include "expr/ast/cypher_main_visitor.hpp"
-
-namespace memgraph::query::v2 {
-using CypherMainVisitor = memgraph::expr::CypherMainVisitor;
-}  // namespace memgraph::query::v2

src/query/v2/bindings/eval.hpp

@@ -1,49 +0,0 @@
-// 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 "query/v2/bindings/bindings.hpp"
-
-#include "expr/interpret/eval.hpp"
-#include "query/v2/bindings/typed_value.hpp"
-#include "query/v2/context.hpp"
-#include "query/v2/conversions.hpp"
-#include "query/v2/db_accessor.hpp"
-#include "query/v2/requests.hpp"
-#include "storage/v3/conversions.hpp"
-#include "storage/v3/property_value.hpp"
-#include "storage/v3/view.hpp"
-
-namespace memgraph::msgs {
-class ShardRequestManagerInterface;
-} // namespace memgraph::msgs
-
-namespace memgraph::query::v2 {
-
-inline const auto lam = [](const auto &val) { return ValueToTypedValue(val); };
-namespace detail {
-class Callable {
- public:
-  auto operator()(const memgraph::storage::v3::PropertyValue &val) const {
-    return memgraph::storage::v3::PropertyToTypedValue<TypedValue>(val);
-  };
-  auto operator()(const msgs::Value &val, memgraph::msgs::ShardRequestManagerInterface *manager) const {
-    return ValueToTypedValue(val, manager);
-  };
-};
-
-}  // namespace detail
-using ExpressionEvaluator = memgraph::expr::ExpressionEvaluator<
-    TypedValue, memgraph::query::v2::EvaluationContext, memgraph::msgs::ShardRequestManagerInterface, storage::v3::View,
-    storage::v3::LabelId, msgs::Value, detail::Callable, memgraph::storage::v3::Error, memgraph::expr::QueryEngineTag>;
-
-}  // namespace memgraph::query::v2

src/query/v2/bindings/symbol_generator.hpp

@@ -1,16 +0,0 @@
-// 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 "query/v2/bindings/bindings.hpp"
-
-#include "expr/semantic/symbol_generator.hpp"

src/query/v2/bindings/symbol_table.hpp

@@ -1,20 +0,0 @@
-// 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 "query/v2/bindings/bindings.hpp"
-
-#include "expr/semantic/symbol_table.hpp"
-
-namespace memgraph::query::v2 {
-using SymbolTable = memgraph::expr::SymbolTable;
-} // namespace memgraph::query::v2

src/query/v2/bindings/typed_value.cpp

@@ -1,19 +0,0 @@
-// 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 "expr/typed_value.hpp"
-#include "query/v2/accessors.hpp"
-#include "query/v2/path.hpp"
-
-namespace memgraph::expr {
-namespace v2 = memgraph::query::v2;
-template class TypedValueT<v2::accessors::VertexAccessor, v2::accessors::EdgeAccessor, v2::accessors::Path>;
-}  // namespace memgraph::expr

src/query/v2/bindings/typed_value.hpp

@@ -1,27 +0,0 @@
-// 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 "query/v2/bindings/bindings.hpp"
-
-#include "expr/typed_value.hpp"
-#include "query/v2/accessors.hpp"
-
-namespace memgraph::expr {
-namespace v2 = memgraph::query::v2;
-extern template class memgraph::expr::TypedValueT<v2::accessors::VertexAccessor, v2::accessors::EdgeAccessor,
-                                                  v2::accessors::Path>;
-}  // namespace memgraph::expr
-namespace memgraph::query::v2 {
-using TypedValue =
-    memgraph::expr::TypedValueT<v2::accessors::VertexAccessor, v2::accessors::EdgeAccessor, v2::accessors::Path>;
-}  // namespace memgraph::query::v2

src/query/v2/common.hpp

@@ -18,17 +18,15 @@
 #include <string_view>
 #include <type_traits>
 
-#include "query/v2/bindings/symbol.hpp"
-#include "query/v2/bindings/typed_value.hpp"
 #include "query/v2/db_accessor.hpp"
 #include "query/v2/exceptions.hpp"
 #include "query/v2/frontend/ast/ast.hpp"
-#include "query/v2/path.hpp"
-#include "storage/v3/conversions.hpp"
+#include "query/v2/frontend/semantic/symbol.hpp"
+#include "query/v2/typed_value.hpp"
 #include "storage/v3/id_types.hpp"
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/result.hpp"
-#include "storage/v3/shard_operation_result.hpp"
+#include "storage/v3/schema_validator.hpp"
 #include "storage/v3/view.hpp"
 #include "utils/exceptions.hpp"
 #include "utils/logging.hpp"
@@ -88,17 +86,39 @@ concept AccessorWithSetProperty = requires(T accessor, const storage::v3::Proper
   { accessor.SetProperty(key, new_value) } -> std::same_as<storage::v3::Result<storage::v3::PropertyValue>>;
 };
 
-template <typename T>
-concept AccessorWithSetPropertyAndValidate = requires(T accessor, const storage::v3::PropertyId key,
-                                                      const storage::v3::PropertyValue new_value) {
-  {
-    accessor.SetPropertyAndValidate(key, new_value)
-    } -> std::same_as<storage::v3::ShardOperationResult<storage::v3::PropertyValue>>;
-};
-
-template <typename TRecordAccessor>
-concept RecordAccessor =
-    AccessorWithSetProperty<TRecordAccessor> || AccessorWithSetPropertyAndValidate<TRecordAccessor>;
+inline void HandleSchemaViolation(const storage::v3::SchemaViolation &schema_violation, const DbAccessor &dba) {
+  switch (schema_violation.status) {
+    case storage::v3::SchemaViolation::ValidationStatus::VERTEX_HAS_NO_PRIMARY_PROPERTY: {
+      throw SchemaViolationException(
+          fmt::format("Primary key {} not defined on label :{}",
+                      storage::v3::SchemaTypeToString(schema_violation.violated_schema_property->type),
+                      dba.LabelToName(schema_violation.label)));
+    }
+    case storage::v3::SchemaViolation::ValidationStatus::NO_SCHEMA_DEFINED_FOR_LABEL: {
+      throw SchemaViolationException(
+          fmt::format("Label :{} is not a primary label", dba.LabelToName(schema_violation.label)));
+    }
+    case storage::v3::SchemaViolation::ValidationStatus::VERTEX_PROPERTY_WRONG_TYPE: {
+      throw SchemaViolationException(
+          fmt::format("Wrong type of property {} in schema :{}, should be of type {}",
+                      *schema_violation.violated_property_value, dba.LabelToName(schema_violation.label),
+                      storage::v3::SchemaTypeToString(schema_violation.violated_schema_property->type)));
+    }
+    case storage::v3::SchemaViolation::ValidationStatus::VERTEX_UPDATE_PRIMARY_KEY: {
+      throw SchemaViolationException(fmt::format("Updating of primary key {} on schema :{} not supported",
+                                                 *schema_violation.violated_property_value,
+                                                 dba.LabelToName(schema_violation.label)));
+    }
+    case storage::v3::SchemaViolation::ValidationStatus::VERTEX_MODIFY_PRIMARY_LABEL: {
+      throw SchemaViolationException(fmt::format("Cannot add or remove label :{} since it is a primary label",
+                                                 dba.LabelToName(schema_violation.label)));
+    }
+    case storage::v3::SchemaViolation::ValidationStatus::VERTEX_SECONDARY_LABEL_IS_PRIMARY: {
+      throw SchemaViolationException(
+          fmt::format("Cannot create vertex with secondary label :{}", dba.LabelToName(schema_violation.label)));
+    }
+  }
+}
 
 inline void HandleErrorOnPropertyUpdate(const storage::v3::Error error) {
   switch (error) {
@@ -110,11 +130,39 @@ inline void HandleErrorOnPropertyUpdate(const storage::v3::Error error) {
       throw QueryRuntimeException("Can't set property because properties on edges are disabled.");
     case storage::v3::Error::VERTEX_HAS_EDGES:
     case storage::v3::Error::NONEXISTENT_OBJECT:
-    case storage::v3::Error::VERTEX_ALREADY_INSERTED:
-
       throw QueryRuntimeException("Unexpected error when setting a property.");
   }
 }
 
+/// Set a property `value` mapped with given `key` on a `record`.
+///
+/// @throw QueryRuntimeException if value cannot be set as a property value
+template <AccessorWithSetProperty T>
+storage::v3::PropertyValue PropsSetChecked(T *record, const DbAccessor &dba, const storage::v3::PropertyId &key,
+                                           const TypedValue &value) {
+  try {
+    if constexpr (std::is_same_v<T, VertexAccessor>) {
+      const auto maybe_old_value = record->SetPropertyAndValidate(key, storage::v3::PropertyValue(value));
+      if (maybe_old_value.HasError()) {
+        std::visit(utils::Overloaded{[](const storage::v3::Error error) { HandleErrorOnPropertyUpdate(error); },
+                                     [&dba](const storage::v3::SchemaViolation &schema_violation) {
+                                       HandleSchemaViolation(schema_violation, dba);
+                                     }},
+                   maybe_old_value.GetError());
+      }
+      return std::move(*maybe_old_value);
+    } else {
+      // No validation on edge properties
+      const auto maybe_old_value = record->SetProperty(key, storage::v3::PropertyValue(value));
+      if (maybe_old_value.HasError()) {
+        HandleErrorOnPropertyUpdate(maybe_old_value.GetError());
+      }
+      return std::move(*maybe_old_value);
+    }
+  } catch (const TypedValueException &) {
+    throw QueryRuntimeException("'{}' cannot be used as a property value.", value.type());
+  }
+}
+
 int64_t QueryTimestamp();
 }  // namespace memgraph::query::v2

src/query/v2/context.hpp

@@ -13,35 +13,16 @@
 
 #include <type_traits>
 
-#include "io/local_transport/local_transport.hpp"
-#include "query/v2/bindings/symbol_table.hpp"
 #include "query/v2/common.hpp"
+#include "query/v2/frontend/semantic/symbol_table.hpp"
 #include "query/v2/metadata.hpp"
 #include "query/v2/parameters.hpp"
 #include "query/v2/plan/profile.hpp"
-//#include "query/v2/trigger.hpp"
-#include "query/v2/shard_request_manager.hpp"
+#include "query/v2/trigger.hpp"
 #include "utils/async_timer.hpp"
 
 namespace memgraph::query::v2 {
 
-// Used to store range of ids that are available
-// Used for edge id assignment
-class IdAllocator {
- public:
-  IdAllocator() = default;
-  IdAllocator(uint64_t low, uint64_t high) : current_edge_id_{low}, max_id_{high} {};
-
-  uint64_t AllocateId() {
-    MG_ASSERT(current_edge_id_ < max_id_, "Current Edge Id went above max id");
-    return current_edge_id_++;
-  }
-
- private:
-  uint64_t current_edge_id_;
-  uint64_t max_id_;
-};
-
 struct EvaluationContext {
   /// Memory for allocations during evaluation of a *single* Pull call.
   ///
@@ -60,28 +41,21 @@ struct EvaluationContext {
   mutable std::unordered_map<std::string, int64_t> counters;
 };
 
-inline std::vector<storage::v3::PropertyId> NamesToProperties(
-    const std::vector<std::string> &property_names, msgs::ShardRequestManagerInterface *shard_request_manager) {
+inline std::vector<storage::v3::PropertyId> NamesToProperties(const std::vector<std::string> &property_names,
+                                                              DbAccessor *dba) {
   std::vector<storage::v3::PropertyId> properties;
-  // TODO Fix by using reference
   properties.reserve(property_names.size());
-  if (shard_request_manager != nullptr) {
-    for (const auto &name : property_names) {
-      properties.push_back(shard_request_manager->NameToProperty(name));
-    }
+  for (const auto &name : property_names) {
+    properties.push_back(dba->NameToProperty(name));
   }
   return properties;
 }
 
-inline std::vector<storage::v3::LabelId> NamesToLabels(const std::vector<std::string> &label_names,
-                                                       msgs::ShardRequestManagerInterface *shard_request_manager) {
+inline std::vector<storage::v3::LabelId> NamesToLabels(const std::vector<std::string> &label_names, DbAccessor *dba) {
   std::vector<storage::v3::LabelId> labels;
   labels.reserve(label_names.size());
-  // TODO Fix by using reference
-  if (shard_request_manager != nullptr) {
-    for (const auto &name : label_names) {
-      labels.push_back(shard_request_manager->NameToLabel(name));
-    }
+  for (const auto &name : label_names) {
+    labels.push_back(dba->NameToLabel(name));
   }
   return labels;
 }
@@ -96,9 +70,8 @@ struct ExecutionContext {
   plan::ProfilingStats stats;
   plan::ProfilingStats *stats_root{nullptr};
   ExecutionStats execution_stats;
+  TriggerContextCollector *trigger_context_collector{nullptr};
   utils::AsyncTimer timer;
-  msgs::ShardRequestManagerInterface *shard_request_manager{nullptr};
-  IdAllocator *edge_ids_alloc;
 };
 
 static_assert(std::is_move_assignable_v<ExecutionContext>, "ExecutionContext must be move assignable!");

src/query/v2/conversions.hpp

@@ -1,103 +0,0 @@
-// 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 "bindings/typed_value.hpp"
-#include "query/v2/accessors.hpp"
-#include "query/v2/requests.hpp"
-#include "query/v2/shard_request_manager.hpp"
-
-namespace memgraph::query::v2 {
-
-inline TypedValue ValueToTypedValue(const msgs::Value &value, msgs::ShardRequestManagerInterface *manager) {
-  using Value = msgs::Value;
-  switch (value.type) {
-    case Value::Type::Null:
-      return {};
-    case Value::Type::Bool:
-      return TypedValue(value.bool_v);
-    case Value::Type::Int64:
-      return TypedValue(value.int_v);
-    case Value::Type::Double:
-      return TypedValue(value.double_v);
-    case Value::Type::String:
-      return TypedValue(value.string_v);
-    case Value::Type::List: {
-      const auto &lst = value.list_v;
-      std::vector<TypedValue> dst;
-      dst.reserve(lst.size());
-      for (const auto &elem : lst) {
-        dst.push_back(ValueToTypedValue(elem, manager));
-      }
-      return TypedValue(std::move(dst));
-    }
-    case Value::Type::Map: {
-      const auto &value_map = value.map_v;
-      std::map<std::string, TypedValue> dst;
-      for (const auto &[key, val] : value_map) {
-        dst[key] = ValueToTypedValue(val, manager);
-      }
-      return TypedValue(std::move(dst));
-    }
-    case Value::Type::Vertex:
-      return TypedValue(accessors::VertexAccessor(
-          value.vertex_v, std::vector<std::pair<storage::v3::PropertyId, msgs::Value>>{}, manager));
-    case Value::Type::Edge:
-      return TypedValue(accessors::EdgeAccessor(value.edge_v, manager));
-  }
-  throw std::runtime_error("Incorrect type in conversion");
-}
-
-inline msgs::Value TypedValueToValue(const TypedValue &value) {
-  using Value = msgs::Value;
-  switch (value.type()) {
-    case TypedValue::Type::Null:
-      return {};
-    case TypedValue::Type::Bool:
-      return Value(value.ValueBool());
-    case TypedValue::Type::Int:
-      return Value(value.ValueInt());
-    case TypedValue::Type::Double:
-      return Value(value.ValueDouble());
-    case TypedValue::Type::String:
-      return Value(std::string(value.ValueString()));
-    case TypedValue::Type::List: {
-      const auto &lst = value.ValueList();
-      std::vector<Value> dst;
-      dst.reserve(lst.size());
-      for (const auto &elem : lst) {
-        dst.push_back(TypedValueToValue(elem));
-      }
-      return Value(std::move(dst));
-    }
-    case TypedValue::Type::Map: {
-      const auto &value_map = value.ValueMap();
-      std::map<std::string, Value> dst;
-      for (const auto &[key, val] : value_map) {
-        dst[std::string(key)] = TypedValueToValue(val);
-      }
-      return Value(std::move(dst));
-    }
-    case TypedValue::Type::Vertex:
-      return Value(value.ValueVertex().GetVertex());
-    case TypedValue::Type::Edge:
-      return Value(value.ValueEdge().GetEdge());
-    case TypedValue::Type::Path:
-    case TypedValue::Type::LocalTime:
-    case TypedValue::Type::LocalDateTime:
-    case TypedValue::Type::Date:
-    case TypedValue::Type::Duration:
-      break;
-  }
-  throw std::runtime_error("Incorrect type in conversion");
-}
-
-}  // namespace memgraph::query::v2

src/query/v2/cypher_query_interpreter.cpp

@@ -10,8 +10,6 @@
 // licenses/APL.txt.
 
 #include "query/v2/cypher_query_interpreter.hpp"
-#include "query/v2/bindings/symbol_generator.hpp"
-#include "query/v2/shard_request_manager.hpp"
 
 // NOLINTNEXTLINE (cppcoreguidelines-avoid-non-const-global-variables)
 DEFINE_HIDDEN_bool(query_cost_planner, true, "Use the cost-estimating query planner.");
@@ -48,7 +46,7 @@ ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::stri
   auto hash = stripped_query.hash();
   auto accessor = cache->access();
   auto it = accessor.find(hash);
-  std::unique_ptr<memgraph::frontend::opencypher::Parser<>> parser;
+  std::unique_ptr<frontend::opencypher::Parser> parser;
 
   // Return a copy of both the AST storage and the query.
   CachedQuery result;
@@ -65,11 +63,11 @@ ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::stri
 
   if (it == accessor.end()) {
     try {
-      parser = std::make_unique<memgraph::frontend::opencypher::Parser<>>(stripped_query.query());
+      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<memgraph::frontend::opencypher::Parser<>>(query_string);
+      parser = std::make_unique<frontend::opencypher::Parser>(query_string);
 
       // If an exception was not thrown here, the stripper messed something
       // up.
@@ -78,8 +76,8 @@ ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::stri
 
     // Convert the ANTLR4 parse tree into an AST.
     AstStorage ast_storage;
-    expr::ParsingContext context{true};
-    memgraph::expr::CypherMainVisitor visitor(context, &ast_storage);
+    frontend::ParsingContext context{true};
+    frontend::CypherMainVisitor visitor(context, &ast_storage);
 
     visitor.visit(parser->tree());
 
@@ -118,10 +116,10 @@ ParsedQuery ParseQuery(const std::string &query_string, const std::map<std::stri
 }
 
 std::unique_ptr<LogicalPlan> MakeLogicalPlan(AstStorage ast_storage, CypherQuery *query, const Parameters &parameters,
-                                             msgs::ShardRequestManagerInterface *shard_manager,
+                                             DbAccessor *db_accessor,
                                              const std::vector<Identifier *> &predefined_identifiers) {
-  auto vertex_counts = plan::MakeVertexCountCache(shard_manager);
-  auto symbol_table = expr::MakeSymbolTable(query, predefined_identifiers);
+  auto vertex_counts = plan::MakeVertexCountCache(db_accessor);
+  auto symbol_table = MakeSymbolTable(query, predefined_identifiers);
   auto planning_context = plan::MakePlanningContext(&ast_storage, &symbol_table, query, &vertex_counts);
   auto [root, cost] = plan::MakeLogicalPlan(&planning_context, parameters, FLAGS_query_cost_planner);
   return std::make_unique<SingleNodeLogicalPlan>(std::move(root), cost, std::move(ast_storage),
@@ -130,7 +128,7 @@ std::unique_ptr<LogicalPlan> MakeLogicalPlan(AstStorage ast_storage, CypherQuery
 
 std::shared_ptr<CachedPlan> CypherQueryToPlan(uint64_t hash, AstStorage ast_storage, CypherQuery *query,
                                               const Parameters &parameters, utils::SkipList<PlanCacheEntry> *plan_cache,
-                                              msgs::ShardRequestManagerInterface *shard_manager,
+                                              DbAccessor *db_accessor,
                                               const std::vector<Identifier *> &predefined_identifiers) {
   std::optional<utils::SkipList<PlanCacheEntry>::Accessor> plan_cache_access;
   if (plan_cache) {
@@ -146,7 +144,7 @@ std::shared_ptr<CachedPlan> CypherQueryToPlan(uint64_t hash, AstStorage ast_stor
   }
 
   auto plan = std::make_shared<CachedPlan>(
-      MakeLogicalPlan(std::move(ast_storage), query, parameters, shard_manager, predefined_identifiers));
+      MakeLogicalPlan(std::move(ast_storage), query, parameters, db_accessor, predefined_identifiers));
   if (plan_cache_access) {
     plan_cache_access->insert({hash, plan});
   }

src/query/v2/cypher_query_interpreter.hpp

@@ -11,11 +11,11 @@
 
 #pragma once
 
-#include "parser/opencypher/parser.hpp"
-#include "query/v2/bindings/cypher_main_visitor.hpp"
-#include "query/v2/bindings/symbol_table.hpp"
 #include "query/v2/config.hpp"
+#include "query/v2/frontend/ast/cypher_main_visitor.hpp"
+#include "query/v2/frontend/opencypher/parser.hpp"
 #include "query/v2/frontend/semantic/required_privileges.hpp"
+#include "query/v2/frontend/semantic/symbol_generator.hpp"
 #include "query/v2/frontend/stripped.hpp"
 #include "query/v2/plan/planner.hpp"
 #include "utils/flag_validation.hpp"
@@ -132,7 +132,7 @@ class SingleNodeLogicalPlan final : public LogicalPlan {
 };
 
 std::unique_ptr<LogicalPlan> MakeLogicalPlan(AstStorage ast_storage, CypherQuery *query, const Parameters &parameters,
-                                             msgs::ShardRequestManagerInterface *shard_manager,
+                                             DbAccessor *db_accessor,
                                              const std::vector<Identifier *> &predefined_identifiers);
 
 /**
@@ -145,7 +145,7 @@ std::unique_ptr<LogicalPlan> MakeLogicalPlan(AstStorage ast_storage, CypherQuery
  */
 std::shared_ptr<CachedPlan> CypherQueryToPlan(uint64_t hash, AstStorage ast_storage, CypherQuery *query,
                                               const Parameters &parameters, utils::SkipList<PlanCacheEntry> *plan_cache,
-                                              msgs::ShardRequestManagerInterface *shard_manager,
+                                              DbAccessor *db_accessor,
                                               const std::vector<Identifier *> &predefined_identifiers = {});
 
 }  // namespace memgraph::query::v2

src/query/v2/db_accessor.hpp

@@ -11,7 +11,6 @@
 
 #pragma once
 
-#include <cstdint>
 #include <optional>
 #include <vector>
 
@@ -20,10 +19,8 @@
 
 #include "query/v2/exceptions.hpp"
 #include "storage/v3/id_types.hpp"
-#include "storage/v3/key_store.hpp"
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/result.hpp"
-#include "storage/v3/shard_operation_result.hpp"
 
 ///////////////////////////////////////////////////////////
 // Our communication layer and query engine don't mix
@@ -112,21 +109,15 @@ class VertexAccessor final {
 
   auto PrimaryLabel(storage::v3::View view) const { return impl_.PrimaryLabel(view); }
 
-  auto PrimaryKey(storage::v3::View view) const { return impl_.PrimaryKey(view); }
+  storage::v3::Result<bool> AddLabel(storage::v3::LabelId label) { return impl_.AddLabel(label); }
 
-  storage::v3::ShardOperationResult<bool> AddLabel(storage::v3::LabelId label) {
+  storage::v3::ResultSchema<bool> AddLabelAndValidate(storage::v3::LabelId label) {
     return impl_.AddLabelAndValidate(label);
   }
 
-  storage::v3::ShardOperationResult<bool> AddLabelAndValidate(storage::v3::LabelId label) {
-    return impl_.AddLabelAndValidate(label);
-  }
+  storage::v3::Result<bool> RemoveLabel(storage::v3::LabelId label) { return impl_.RemoveLabel(label); }
 
-  storage::v3::ShardOperationResult<bool> RemoveLabel(storage::v3::LabelId label) {
-    return impl_.RemoveLabelAndValidate(label);
-  }
-
-  storage::v3::ShardOperationResult<bool> RemoveLabelAndValidate(storage::v3::LabelId label) {
+  storage::v3::ResultSchema<bool> RemoveLabelAndValidate(storage::v3::LabelId label) {
     return impl_.RemoveLabelAndValidate(label);
   }
 
@@ -141,17 +132,17 @@ class VertexAccessor final {
     return impl_.GetProperty(key, view);
   }
 
-  storage::v3::ShardOperationResult<storage::v3::PropertyValue> SetProperty(storage::v3::PropertyId key,
-                                                                            const storage::v3::PropertyValue &value) {
-    return impl_.SetPropertyAndValidate(key, value);
+  storage::v3::Result<storage::v3::PropertyValue> SetProperty(storage::v3::PropertyId key,
+                                                              const storage::v3::PropertyValue &value) {
+    return impl_.SetProperty(key, value);
   }
 
-  storage::v3::ShardOperationResult<storage::v3::PropertyValue> SetPropertyAndValidate(
+  storage::v3::ResultSchema<storage::v3::PropertyValue> SetPropertyAndValidate(
       storage::v3::PropertyId key, const storage::v3::PropertyValue &value) {
     return impl_.SetPropertyAndValidate(key, value);
   }
 
-  storage::v3::ShardOperationResult<storage::v3::PropertyValue> RemovePropertyAndValidate(storage::v3::PropertyId key) {
+  storage::v3::ResultSchema<storage::v3::PropertyValue> RemovePropertyAndValidate(storage::v3::PropertyId key) {
     return SetPropertyAndValidate(key, storage::v3::PropertyValue{});
   }
 
@@ -171,8 +162,7 @@ class VertexAccessor final {
   auto InEdges(storage::v3::View view, const std::vector<storage::v3::EdgeTypeId> &edge_types,
                const VertexAccessor &dest) const
       -> storage::v3::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.InEdges(view)))> {
-    const auto dest_id = dest.impl_.Id(view).GetValue();
-    auto maybe_edges = impl_.InEdges(view, edge_types, &dest_id);
+    auto maybe_edges = impl_.InEdges(view, edge_types, &dest.impl_);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
@@ -189,8 +179,7 @@ class VertexAccessor final {
   auto OutEdges(storage::v3::View view, const std::vector<storage::v3::EdgeTypeId> &edge_types,
                 const VertexAccessor &dest) const
       -> storage::v3::Result<decltype(iter::imap(MakeEdgeAccessor, *impl_.OutEdges(view)))> {
-    const auto dest_id = dest.impl_.Id(view).GetValue();
-    auto maybe_edges = impl_.OutEdges(view, edge_types, &dest_id);
+    auto maybe_edges = impl_.OutEdges(view, edge_types, &dest.impl_);
     if (maybe_edges.HasError()) return maybe_edges.GetError();
     return iter::imap(MakeEdgeAccessor, std::move(*maybe_edges));
   }
@@ -199,8 +188,9 @@ class VertexAccessor final {
 
   storage::v3::Result<size_t> OutDegree(storage::v3::View view) const { return impl_.OutDegree(view); }
 
-  // TODO(jbajic) Fix Remove Gid
-  static int64_t CypherId() { return 1; }
+  int64_t CypherId() const { return impl_.Gid().AsInt(); }
+
+  storage::v3::Gid Gid() const noexcept { return impl_.Gid(); }
 
   bool operator==(const VertexAccessor &v) const noexcept {
     static_assert(noexcept(impl_ == v.impl_));
@@ -210,19 +200,198 @@ class VertexAccessor final {
   bool operator!=(const VertexAccessor &v) const noexcept { return !(*this == v); }
 };
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnull-dereference"
-// NOLINTNEXTLINE(readability-convert-member-functions-to-static,clang-analyzer-core.NonNullParamChecker)
-inline VertexAccessor EdgeAccessor::To() const { return *static_cast<VertexAccessor *>(nullptr); }
+inline VertexAccessor EdgeAccessor::To() const { return VertexAccessor(impl_.ToVertex()); }
 
-// NOLINTNEXTLINE(readability-convert-member-functions-to-static,clang-analyzer-core.NonNullParamChecker)
-inline VertexAccessor EdgeAccessor::From() const { return *static_cast<VertexAccessor *>(nullptr); }
-#pragma clang diagnostic pop
+inline VertexAccessor EdgeAccessor::From() const { return VertexAccessor(impl_.FromVertex()); }
 
 inline bool EdgeAccessor::IsCycle() const { return To() == From(); }
 
 class DbAccessor final {
+  storage::v3::Storage::Accessor *accessor_;
+
+  class VerticesIterable final {
+    storage::v3::VerticesIterable iterable_;
+
+   public:
+    class Iterator final {
+      storage::v3::VerticesIterable::Iterator it_;
+
+     public:
+      explicit Iterator(storage::v3::VerticesIterable::Iterator it) : it_(it) {}
+
+      VertexAccessor operator*() const { return VertexAccessor(*it_); }
+
+      Iterator &operator++() {
+        ++it_;
+        return *this;
+      }
+
+      bool operator==(const Iterator &other) const { return it_ == other.it_; }
+
+      bool operator!=(const Iterator &other) const { return !(other == *this); }
+    };
+
+    explicit VerticesIterable(storage::v3::VerticesIterable iterable) : iterable_(std::move(iterable)) {}
+
+    Iterator begin() { return Iterator(iterable_.begin()); }
+
+    Iterator end() { return Iterator(iterable_.end()); }
+  };
+
  public:
+  explicit DbAccessor(storage::v3::Storage::Accessor *accessor) : accessor_(accessor) {}
+
+  std::optional<VertexAccessor> FindVertex(storage::v3::Gid gid, storage::v3::View view) {
+    auto maybe_vertex = accessor_->FindVertex(gid, view);
+    if (maybe_vertex) return VertexAccessor(*maybe_vertex);
+    return std::nullopt;
+  }
+
+  void FinalizeTransaction() { accessor_->FinalizeTransaction(); }
+
+  VerticesIterable Vertices(storage::v3::View view) { return VerticesIterable(accessor_->Vertices(view)); }
+
+  VerticesIterable Vertices(storage::v3::View view, storage::v3::LabelId label) {
+    return VerticesIterable(accessor_->Vertices(label, view));
+  }
+
+  VerticesIterable Vertices(storage::v3::View view, storage::v3::LabelId label, storage::v3::PropertyId property) {
+    return VerticesIterable(accessor_->Vertices(label, property, view));
+  }
+
+  VerticesIterable Vertices(storage::v3::View view, storage::v3::LabelId label, storage::v3::PropertyId property,
+                            const storage::v3::PropertyValue &value) {
+    return VerticesIterable(accessor_->Vertices(label, property, value, view));
+  }
+
+  VerticesIterable Vertices(storage::v3::View view, storage::v3::LabelId label, storage::v3::PropertyId property,
+                            const std::optional<utils::Bound<storage::v3::PropertyValue>> &lower,
+                            const std::optional<utils::Bound<storage::v3::PropertyValue>> &upper) {
+    return VerticesIterable(accessor_->Vertices(label, property, lower, upper, view));
+  }
+
+  // TODO Remove when query modules have been fixed
+  [[deprecated]] VertexAccessor InsertVertex() { return VertexAccessor(accessor_->CreateVertex()); }
+
+  storage::v3::ResultSchema<VertexAccessor> InsertVertexAndValidate(
+      const storage::v3::LabelId primary_label, const std::vector<storage::v3::LabelId> &labels,
+      const std::vector<std::pair<storage::v3::PropertyId, storage::v3::PropertyValue>> &properties) {
+    auto maybe_vertex_acc = accessor_->CreateVertexAndValidate(primary_label, labels, properties);
+    if (maybe_vertex_acc.HasError()) {
+      return {std::move(maybe_vertex_acc.GetError())};
+    }
+    return VertexAccessor{maybe_vertex_acc.GetValue()};
+  }
+
+  storage::v3::Result<EdgeAccessor> InsertEdge(VertexAccessor *from, VertexAccessor *to,
+                                               const storage::v3::EdgeTypeId &edge_type) {
+    auto maybe_edge = accessor_->CreateEdge(&from->impl_, &to->impl_, edge_type);
+    if (maybe_edge.HasError()) return storage::v3::Result<EdgeAccessor>(maybe_edge.GetError());
+    return EdgeAccessor(*maybe_edge);
+  }
+
+  storage::v3::Result<std::optional<EdgeAccessor>> RemoveEdge(EdgeAccessor *edge) {
+    auto res = accessor_->DeleteEdge(&edge->impl_);
+    if (res.HasError()) {
+      return res.GetError();
+    }
+
+    const auto &value = res.GetValue();
+    if (!value) {
+      return std::optional<EdgeAccessor>{};
+    }
+
+    return std::make_optional<EdgeAccessor>(*value);
+  }
+
+  storage::v3::Result<std::optional<std::pair<VertexAccessor, std::vector<EdgeAccessor>>>> DetachRemoveVertex(
+      VertexAccessor *vertex_accessor) {
+    using ReturnType = std::pair<VertexAccessor, std::vector<EdgeAccessor>>;
+
+    auto res = accessor_->DetachDeleteVertex(&vertex_accessor->impl_);
+    if (res.HasError()) {
+      return res.GetError();
+    }
+
+    const auto &value = res.GetValue();
+    if (!value) {
+      return std::optional<ReturnType>{};
+    }
+
+    const auto &[vertex, edges] = *value;
+
+    std::vector<EdgeAccessor> deleted_edges;
+    deleted_edges.reserve(edges.size());
+    std::transform(edges.begin(), edges.end(), std::back_inserter(deleted_edges),
+                   [](const auto &deleted_edge) { return EdgeAccessor{deleted_edge}; });
+
+    return std::make_optional<ReturnType>(vertex, std::move(deleted_edges));
+  }
+
+  storage::v3::Result<std::optional<VertexAccessor>> RemoveVertex(VertexAccessor *vertex_accessor) {
+    auto res = accessor_->DeleteVertex(&vertex_accessor->impl_);
+    if (res.HasError()) {
+      return res.GetError();
+    }
+
+    const auto &value = res.GetValue();
+    if (!value) {
+      return std::optional<VertexAccessor>{};
+    }
+
+    return {std::make_optional<VertexAccessor>(*value)};
+  }
+
+  storage::v3::PropertyId NameToProperty(const std::string_view name) { return accessor_->NameToProperty(name); }
+
+  storage::v3::LabelId NameToLabel(const std::string_view name) { return accessor_->NameToLabel(name); }
+
+  storage::v3::EdgeTypeId NameToEdgeType(const std::string_view name) { return accessor_->NameToEdgeType(name); }
+
+  const std::string &PropertyToName(storage::v3::PropertyId prop) const { return accessor_->PropertyToName(prop); }
+
+  const std::string &LabelToName(storage::v3::LabelId label) const { return accessor_->LabelToName(label); }
+
+  const std::string &EdgeTypeToName(storage::v3::EdgeTypeId type) const { return accessor_->EdgeTypeToName(type); }
+
+  void AdvanceCommand() { accessor_->AdvanceCommand(); }
+
+  utils::BasicResult<storage::v3::ConstraintViolation, void> Commit() { return accessor_->Commit(); }
+
+  void Abort() { accessor_->Abort(); }
+
+  bool LabelIndexExists(storage::v3::LabelId label) const { return accessor_->LabelIndexExists(label); }
+
+  bool LabelPropertyIndexExists(storage::v3::LabelId label, storage::v3::PropertyId prop) const {
+    return accessor_->LabelPropertyIndexExists(label, prop);
+  }
+
+  int64_t VerticesCount() const { return accessor_->ApproximateVertexCount(); }
+
+  int64_t VerticesCount(storage::v3::LabelId label) const { return accessor_->ApproximateVertexCount(label); }
+
+  int64_t VerticesCount(storage::v3::LabelId label, storage::v3::PropertyId property) const {
+    return accessor_->ApproximateVertexCount(label, property);
+  }
+
+  int64_t VerticesCount(storage::v3::LabelId label, storage::v3::PropertyId property,
+                        const storage::v3::PropertyValue &value) const {
+    return accessor_->ApproximateVertexCount(label, property, value);
+  }
+
+  int64_t VerticesCount(storage::v3::LabelId label, storage::v3::PropertyId property,
+                        const std::optional<utils::Bound<storage::v3::PropertyValue>> &lower,
+                        const std::optional<utils::Bound<storage::v3::PropertyValue>> &upper) const {
+    return accessor_->ApproximateVertexCount(label, property, lower, upper);
+  }
+
+  storage::v3::IndicesInfo ListAllIndices() const { return accessor_->ListAllIndices(); }
+
+  storage::v3::ConstraintsInfo ListAllConstraints() const { return accessor_->ListAllConstraints(); }
+
+  const storage::v3::SchemaValidator &GetSchemaValidator() const { return accessor_->GetSchemaValidator(); }
+
+  storage::v3::SchemasInfo ListAllSchemas() const { return accessor_->ListAllSchemas(); }
 };
 
 }  // namespace memgraph::query::v2

src/query/v2/discard_value_stream.hpp

@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include "query/v2/bindings/typed_value.hpp"
+#include "query/v2/typed_value.hpp"
 
 namespace memgraph::query::v2 {
 struct DiscardValueResultStream final {

src/query/v2/dump.cpp

@@ -0,0 +1,541 @@
+// 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 "query/v2/dump.hpp"
+
+#include <iomanip>
+#include <limits>
+#include <map>
+#include <optional>
+#include <ostream>
+#include <utility>
+#include <vector>
+
+#include <fmt/format.h>
+
+#include "query/v2/db_accessor.hpp"
+#include "query/v2/exceptions.hpp"
+#include "query/v2/stream.hpp"
+#include "query/v2/typed_value.hpp"
+#include "storage/v3/property_value.hpp"
+#include "storage/v3/storage.hpp"
+#include "utils/algorithm.hpp"
+#include "utils/logging.hpp"
+#include "utils/string.hpp"
+#include "utils/temporal.hpp"
+
+namespace memgraph::query::v2 {
+
+namespace {
+
+// Property that is used to make a difference among vertices. It is added to
+// property set of vertices to match edges and removed after the entire graph
+// is built.
+const char *kInternalPropertyId = "__mg_id__";
+
+// Label that is attached to each vertex and is used for easier creation of
+// index on internal property id.
+const char *kInternalVertexLabel = "__mg_vertex__";
+
+/// A helper function that escapes label, edge type and property names.
+std::string EscapeName(const std::string_view value) {
+  std::string out;
+  out.reserve(value.size() + 2);
+  out.append(1, '`');
+  for (auto c : value) {
+    if (c == '`') {
+      out.append("``");
+    } else {
+      out.append(1, c);
+    }
+  }
+  out.append(1, '`');
+  return out;
+}
+
+void DumpPreciseDouble(std::ostream *os, double value) {
+  // A temporary stream is used to keep precision of the original output
+  // stream unchanged.
+  std::ostringstream temp_oss;
+  temp_oss << std::setprecision(std::numeric_limits<double>::max_digits10) << value;
+  *os << temp_oss.str();
+}
+
+namespace {
+void DumpDate(std::ostream &os, const storage::v3::TemporalData &value) {
+  utils::Date date(value.microseconds);
+  os << "DATE(\"" << date << "\")";
+}
+
+void DumpLocalTime(std::ostream &os, const storage::v3::TemporalData &value) {
+  utils::LocalTime lt(value.microseconds);
+  os << "LOCALTIME(\"" << lt << "\")";
+}
+
+void DumpLocalDateTime(std::ostream &os, const storage::v3::TemporalData &value) {
+  utils::LocalDateTime ldt(value.microseconds);
+  os << "LOCALDATETIME(\"" << ldt << "\")";
+}
+
+void DumpDuration(std::ostream &os, const storage::v3::TemporalData &value) {
+  utils::Duration dur(value.microseconds);
+  os << "DURATION(\"" << dur << "\")";
+}
+
+void DumpTemporalData(std::ostream &os, const storage::v3::TemporalData &value) {
+  switch (value.type) {
+    case storage::v3::TemporalType::Date: {
+      DumpDate(os, value);
+      return;
+    }
+    case storage::v3::TemporalType::LocalTime: {
+      DumpLocalTime(os, value);
+      return;
+    }
+    case storage::v3::TemporalType::LocalDateTime: {
+      DumpLocalDateTime(os, value);
+      return;
+    }
+    case storage::v3::TemporalType::Duration: {
+      DumpDuration(os, value);
+      return;
+    }
+  }
+}
+}  // namespace
+
+void DumpPropertyValue(std::ostream *os, const storage::v3::PropertyValue &value) {
+  switch (value.type()) {
+    case storage::v3::PropertyValue::Type::Null:
+      *os << "Null";
+      return;
+    case storage::v3::PropertyValue::Type::Bool:
+      *os << (value.ValueBool() ? "true" : "false");
+      return;
+    case storage::v3::PropertyValue::Type::String:
+      *os << utils::Escape(value.ValueString());
+      return;
+    case storage::v3::PropertyValue::Type::Int:
+      *os << value.ValueInt();
+      return;
+    case storage::v3::PropertyValue::Type::Double:
+      DumpPreciseDouble(os, value.ValueDouble());
+      return;
+    case storage::v3::PropertyValue::Type::List: {
+      *os << "[";
+      const auto &list = value.ValueList();
+      utils::PrintIterable(*os, list, ", ", [](auto &os, const auto &item) { DumpPropertyValue(&os, item); });
+      *os << "]";
+      return;
+    }
+    case storage::v3::PropertyValue::Type::Map: {
+      *os << "{";
+      const auto &map = value.ValueMap();
+      utils::PrintIterable(*os, map, ", ", [](auto &os, const auto &kv) {
+        os << EscapeName(kv.first) << ": ";
+        DumpPropertyValue(&os, kv.second);
+      });
+      *os << "}";
+      return;
+    }
+    case storage::v3::PropertyValue::Type::TemporalData: {
+      DumpTemporalData(*os, value.ValueTemporalData());
+      return;
+    }
+  }
+}
+
+void DumpProperties(std::ostream *os, query::v2::DbAccessor *dba,
+                    const std::map<storage::v3::PropertyId, storage::v3::PropertyValue> &store,
+                    std::optional<int64_t> property_id = std::nullopt) {
+  *os << "{";
+  if (property_id) {
+    *os << kInternalPropertyId << ": " << *property_id;
+    if (store.size() > 0) *os << ", ";
+  }
+  utils::PrintIterable(*os, store, ", ", [&dba](auto &os, const auto &kv) {
+    os << EscapeName(dba->PropertyToName(kv.first)) << ": ";
+    DumpPropertyValue(&os, kv.second);
+  });
+  *os << "}";
+}
+
+void DumpVertex(std::ostream *os, query::v2::DbAccessor *dba, const query::v2::VertexAccessor &vertex) {
+  *os << "CREATE (";
+  *os << ":" << kInternalVertexLabel;
+  auto maybe_labels = vertex.Labels(storage::v3::View::OLD);
+  if (maybe_labels.HasError()) {
+    switch (maybe_labels.GetError()) {
+      case storage::v3::Error::DELETED_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get labels from a deleted node.");
+      case storage::v3::Error::NONEXISTENT_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get labels from a node that doesn't exist.");
+      case storage::v3::Error::SERIALIZATION_ERROR:
+      case storage::v3::Error::VERTEX_HAS_EDGES:
+      case storage::v3::Error::PROPERTIES_DISABLED:
+        throw query::v2::QueryRuntimeException("Unexpected error when getting labels.");
+    }
+  }
+  for (const auto &label : *maybe_labels) {
+    *os << ":" << EscapeName(dba->LabelToName(label));
+  }
+  *os << " ";
+  auto maybe_props = vertex.Properties(storage::v3::View::OLD);
+  if (maybe_props.HasError()) {
+    switch (maybe_props.GetError()) {
+      case storage::v3::Error::DELETED_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get properties from a deleted object.");
+      case storage::v3::Error::NONEXISTENT_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get properties from a node that doesn't exist.");
+      case storage::v3::Error::SERIALIZATION_ERROR:
+      case storage::v3::Error::VERTEX_HAS_EDGES:
+      case storage::v3::Error::PROPERTIES_DISABLED:
+        throw query::v2::QueryRuntimeException("Unexpected error when getting properties.");
+    }
+  }
+  DumpProperties(os, dba, *maybe_props, vertex.CypherId());
+  *os << ");";
+}
+
+void DumpEdge(std::ostream *os, query::v2::DbAccessor *dba, const query::v2::EdgeAccessor &edge) {
+  *os << "MATCH ";
+  *os << "(u:" << kInternalVertexLabel << "), ";
+  *os << "(v:" << kInternalVertexLabel << ")";
+  *os << " WHERE ";
+  *os << "u." << kInternalPropertyId << " = " << edge.From().CypherId();
+  *os << " AND ";
+  *os << "v." << kInternalPropertyId << " = " << edge.To().CypherId() << " ";
+  *os << "CREATE (u)-[";
+  *os << ":" << EscapeName(dba->EdgeTypeToName(edge.EdgeType()));
+  auto maybe_props = edge.Properties(storage::v3::View::OLD);
+  if (maybe_props.HasError()) {
+    switch (maybe_props.GetError()) {
+      case storage::v3::Error::DELETED_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get properties from a deleted object.");
+      case storage::v3::Error::NONEXISTENT_OBJECT:
+        throw query::v2::QueryRuntimeException("Trying to get properties from an edge that doesn't exist.");
+      case storage::v3::Error::SERIALIZATION_ERROR:
+      case storage::v3::Error::VERTEX_HAS_EDGES:
+      case storage::v3::Error::PROPERTIES_DISABLED:
+        throw query::v2::QueryRuntimeException("Unexpected error when getting properties.");
+    }
+  }
+  if (maybe_props->size() > 0) {
+    *os << " ";
+    DumpProperties(os, dba, *maybe_props);
+  }
+  *os << "]->(v);";
+}
+
+void DumpLabelIndex(std::ostream *os, query::v2::DbAccessor *dba, const storage::v3::LabelId label) {
+  *os << "CREATE INDEX ON :" << EscapeName(dba->LabelToName(label)) << ";";
+}
+
+void DumpLabelPropertyIndex(std::ostream *os, query::v2::DbAccessor *dba, storage::v3::LabelId label,
+                            storage::v3::PropertyId property) {
+  *os << "CREATE INDEX ON :" << EscapeName(dba->LabelToName(label)) << "(" << EscapeName(dba->PropertyToName(property))
+      << ");";
+}
+
+void DumpExistenceConstraint(std::ostream *os, query::v2::DbAccessor *dba, storage::v3::LabelId label,
+                             storage::v3::PropertyId property) {
+  *os << "CREATE CONSTRAINT ON (u:" << EscapeName(dba->LabelToName(label)) << ") ASSERT EXISTS (u."
+      << EscapeName(dba->PropertyToName(property)) << ");";
+}
+
+void DumpUniqueConstraint(std::ostream *os, query::v2::DbAccessor *dba, storage::v3::LabelId label,
+                          const std::set<storage::v3::PropertyId> &properties) {
+  *os << "CREATE CONSTRAINT ON (u:" << EscapeName(dba->LabelToName(label)) << ") ASSERT ";
+  utils::PrintIterable(*os, properties, ", ", [&dba](auto &stream, const auto &property) {
+    stream << "u." << EscapeName(dba->PropertyToName(property));
+  });
+  *os << " IS UNIQUE;";
+}
+
+}  // namespace
+
+PullPlanDump::PullPlanDump(DbAccessor *dba)
+    : dba_(dba),
+      vertices_iterable_(dba->Vertices(storage::v3::View::OLD)),
+      pull_chunks_{// Dump all label indices
+                   CreateLabelIndicesPullChunk(),
+                   // Dump all label property indices
+                   CreateLabelPropertyIndicesPullChunk(),
+                   // Dump all existence constraints
+                   CreateExistenceConstraintsPullChunk(),
+                   // Dump all unique constraints
+                   CreateUniqueConstraintsPullChunk(),
+                   // Create internal index for faster edge creation
+                   CreateInternalIndexPullChunk(),
+                   // Dump all vertices
+                   CreateVertexPullChunk(),
+                   // Dump all edges
+                   CreateEdgePullChunk(),
+                   // Drop the internal index
+                   CreateDropInternalIndexPullChunk(),
+                   // Internal index cleanup
+                   CreateInternalIndexCleanupPullChunk()} {}
+
+bool PullPlanDump::Pull(AnyStream *stream, std::optional<int> n) {
+  // Iterate all functions that stream some results.
+  // Each function should return number of results it streamed after it
+  // finishes. If the function did not finish streaming all the results,
+  // std::nullopt should be returned because n results have already been sent.
+  while (current_chunk_index_ < pull_chunks_.size() && (!n || *n > 0)) {
+    const auto maybe_streamed_count = pull_chunks_[current_chunk_index_](stream, n);
+
+    if (!maybe_streamed_count) {
+      // n wasn't large enough to stream all the results from the current chunk
+      break;
+    }
+
+    if (n) {
+      // chunk finished streaming its results
+      // subtract number of results streamed in current pull
+      // so we know how many results we need to stream from future
+      // chunks.
+      *n -= *maybe_streamed_count;
+    }
+
+    ++current_chunk_index_;
+  }
+  return current_chunk_index_ == pull_chunks_.size();
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateLabelIndicesPullChunk() {
+  // Dump all label indices
+  return [this, global_index = 0U](AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the construction of indices vectors
+    if (!indices_info_) {
+      indices_info_.emplace(dba_->ListAllIndices());
+    }
+    const auto &label = indices_info_->label;
+
+    size_t local_counter = 0;
+    while (global_index < label.size() && (!n || local_counter < *n)) {
+      std::ostringstream os;
+      DumpLabelIndex(&os, dba_, label[global_index]);
+      stream->Result({TypedValue(os.str())});
+
+      ++global_index;
+      ++local_counter;
+    }
+
+    if (global_index == label.size()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateLabelPropertyIndicesPullChunk() {
+  return [this, global_index = 0U](AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the construction of indices vectors
+    if (!indices_info_) {
+      indices_info_.emplace(dba_->ListAllIndices());
+    }
+    const auto &label_property = indices_info_->label_property;
+
+    size_t local_counter = 0;
+    while (global_index < label_property.size() && (!n || local_counter < *n)) {
+      std::ostringstream os;
+      const auto &label_property_index = label_property[global_index];
+      DumpLabelPropertyIndex(&os, dba_, label_property_index.first, label_property_index.second);
+      stream->Result({TypedValue(os.str())});
+
+      ++global_index;
+      ++local_counter;
+    }
+
+    if (global_index == label_property.size()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateExistenceConstraintsPullChunk() {
+  return [this, global_index = 0U](AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the construction of constraint vectors
+    if (!constraints_info_) {
+      constraints_info_.emplace(dba_->ListAllConstraints());
+    }
+
+    const auto &existence = constraints_info_->existence;
+    size_t local_counter = 0;
+    while (global_index < existence.size() && (!n || local_counter < *n)) {
+      const auto &constraint = existence[global_index];
+      std::ostringstream os;
+      DumpExistenceConstraint(&os, dba_, constraint.first, constraint.second);
+      stream->Result({TypedValue(os.str())});
+
+      ++global_index;
+      ++local_counter;
+    }
+
+    if (global_index == existence.size()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateUniqueConstraintsPullChunk() {
+  return [this, global_index = 0U](AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the construction of constraint vectors
+    if (!constraints_info_) {
+      constraints_info_.emplace(dba_->ListAllConstraints());
+    }
+
+    const auto &unique = constraints_info_->unique;
+    size_t local_counter = 0;
+    while (global_index < unique.size() && (!n || local_counter < *n)) {
+      const auto &constraint = unique[global_index];
+      std::ostringstream os;
+      DumpUniqueConstraint(&os, dba_, constraint.first, constraint.second);
+      stream->Result({TypedValue(os.str())});
+
+      ++global_index;
+      ++local_counter;
+    }
+
+    if (global_index == unique.size()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateInternalIndexPullChunk() {
+  return [this](AnyStream *stream, std::optional<int>) mutable -> std::optional<size_t> {
+    if (vertices_iterable_.begin() != vertices_iterable_.end()) {
+      std::ostringstream os;
+      os << "CREATE INDEX ON :" << kInternalVertexLabel << "(" << kInternalPropertyId << ");";
+      stream->Result({TypedValue(os.str())});
+      internal_index_created_ = true;
+      return 1;
+    }
+    return 0;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateVertexPullChunk() {
+  return [this, maybe_current_iter = std::optional<VertexAccessorIterableIterator>{}](
+             AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the call of begin() function
+    // If multiple begins are called before an iteration,
+    // one iteration will make the rest of iterators be in undefined
+    // states.
+    if (!maybe_current_iter) {
+      maybe_current_iter.emplace(vertices_iterable_.begin());
+    }
+
+    auto &current_iter{*maybe_current_iter};
+
+    size_t local_counter = 0;
+    while (current_iter != vertices_iterable_.end() && (!n || local_counter < *n)) {
+      std::ostringstream os;
+      DumpVertex(&os, dba_, *current_iter);
+      stream->Result({TypedValue(os.str())});
+      ++local_counter;
+      ++current_iter;
+    }
+    if (current_iter == vertices_iterable_.end()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateEdgePullChunk() {
+  return [this, maybe_current_vertex_iter = std::optional<VertexAccessorIterableIterator>{},
+          // we need to save the iterable which contains list of accessor so
+          // our saved iterator is valid in the next run
+          maybe_edge_iterable = std::shared_ptr<EdgeAccessorIterable>{nullptr},
+          maybe_current_edge_iter = std::optional<EdgeAccessorIterableIterator>{}](
+             AnyStream *stream, std::optional<int> n) mutable -> std::optional<size_t> {
+    // Delay the call of begin() function
+    // If multiple begins are called before an iteration,
+    // one iteration will make the rest of iterators be in undefined
+    // states.
+    if (!maybe_current_vertex_iter) {
+      maybe_current_vertex_iter.emplace(vertices_iterable_.begin());
+    }
+
+    auto &current_vertex_iter{*maybe_current_vertex_iter};
+    size_t local_counter = 0U;
+    for (; current_vertex_iter != vertices_iterable_.end() && (!n || local_counter < *n); ++current_vertex_iter) {
+      const auto &vertex = *current_vertex_iter;
+      // If we have a saved iterable from a previous pull
+      // we need to use the same iterable
+      if (!maybe_edge_iterable) {
+        maybe_edge_iterable = std::make_shared<EdgeAccessorIterable>(vertex.OutEdges(storage::v3::View::OLD));
+      }
+      auto &maybe_edges = *maybe_edge_iterable;
+      MG_ASSERT(maybe_edges.HasValue(), "Invalid database state!");
+      auto current_edge_iter = maybe_current_edge_iter ? *maybe_current_edge_iter : maybe_edges->begin();
+      for (; current_edge_iter != maybe_edges->end() && (!n || local_counter < *n); ++current_edge_iter) {
+        std::ostringstream os;
+        DumpEdge(&os, dba_, *current_edge_iter);
+        stream->Result({TypedValue(os.str())});
+
+        ++local_counter;
+      }
+
+      if (current_edge_iter != maybe_edges->end()) {
+        maybe_current_edge_iter.emplace(current_edge_iter);
+        return std::nullopt;
+      }
+
+      maybe_current_edge_iter = std::nullopt;
+      maybe_edge_iterable = nullptr;
+    }
+
+    if (current_vertex_iter == vertices_iterable_.end()) {
+      return local_counter;
+    }
+
+    return std::nullopt;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateDropInternalIndexPullChunk() {
+  return [this](AnyStream *stream, std::optional<int>) {
+    if (internal_index_created_) {
+      std::ostringstream os;
+      os << "DROP INDEX ON :" << kInternalVertexLabel << "(" << kInternalPropertyId << ");";
+      stream->Result({TypedValue(os.str())});
+      return 1;
+    }
+    return 0;
+  };
+}
+
+PullPlanDump::PullChunk PullPlanDump::CreateInternalIndexCleanupPullChunk() {
+  return [this](AnyStream *stream, std::optional<int>) {
+    if (internal_index_created_) {
+      std::ostringstream os;
+      os << "MATCH (u) REMOVE u:" << kInternalVertexLabel << ", u." << kInternalPropertyId << ";";
+      stream->Result({TypedValue(os.str())});
+      return 1;
+    }
+    return 0;
+  };
+}
+
+void DumpDatabaseToCypherQueries(query::v2::DbAccessor *dba, AnyStream *stream) { PullPlanDump(dba).Pull(stream, {}); }
+
+}  // namespace memgraph::query::v2

src/query/v2/dump.hpp

@@ -0,0 +1,66 @@
+// 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 <ostream>
+
+#include "query/v2/db_accessor.hpp"
+#include "query/v2/stream.hpp"
+#include "storage/v3/storage.hpp"
+
+namespace memgraph::query::v2 {
+
+void DumpDatabaseToCypherQueries(query::v2::DbAccessor *dba, AnyStream *stream);
+
+struct PullPlanDump {
+  explicit PullPlanDump(query::v2::DbAccessor *dba);
+
+  /// Pull the dump results lazily
+  /// @return true if all results were returned, false otherwise
+  bool Pull(AnyStream *stream, std::optional<int> n);
+
+ private:
+  query::v2::DbAccessor *dba_ = nullptr;
+
+  std::optional<storage::v3::IndicesInfo> indices_info_ = std::nullopt;
+  std::optional<storage::v3::ConstraintsInfo> constraints_info_ = std::nullopt;
+
+  using VertexAccessorIterable = decltype(std::declval<query::v2::DbAccessor>().Vertices(storage::v3::View::OLD));
+  using VertexAccessorIterableIterator = decltype(std::declval<VertexAccessorIterable>().begin());
+
+  using EdgeAccessorIterable = decltype(std::declval<VertexAccessor>().OutEdges(storage::v3::View::OLD));
+  using EdgeAccessorIterableIterator = decltype(std::declval<EdgeAccessorIterable>().GetValue().begin());
+
+  VertexAccessorIterable vertices_iterable_;
+  bool internal_index_created_ = false;
+
+  size_t current_chunk_index_ = 0;
+
+  using PullChunk = std::function<std::optional<size_t>(AnyStream *stream, std::optional<int> n)>;
+  // We define every part of the dump query in a self contained function.
+  // Each functions is responsible of keeping track of its execution status.
+  // If a function did finish its execution, it should return number of results
+  // it streamed so we know how many rows should be pulled from the next
+  // function, otherwise std::nullopt is returned.
+  std::vector<PullChunk> pull_chunks_;
+
+  PullChunk CreateLabelIndicesPullChunk();
+  PullChunk CreateLabelPropertyIndicesPullChunk();
+  PullChunk CreateExistenceConstraintsPullChunk();
+  PullChunk CreateUniqueConstraintsPullChunk();
+  PullChunk CreateInternalIndexPullChunk();
+  PullChunk CreateVertexPullChunk();
+  PullChunk CreateEdgePullChunk();
+  PullChunk CreateDropInternalIndexPullChunk();
+  PullChunk CreateInternalIndexCleanupPullChunk();
+};
+}  // namespace memgraph::query::v2

src/query/v2/frontend/ast/ast.lcp

@@ -17,13 +17,11 @@
 #include <variant>
 #include <vector>
 
-#include "query/v2/bindings/ast_visitor.hpp"
-#include "common/types.hpp"
-#include "query/v2/bindings/symbol.hpp"
+#include "query/v2/frontend/ast/ast_visitor.hpp"
+#include "query/v2/frontend/semantic/symbol.hpp"
 #include "query/v2/interpret/awesome_memgraph_functions.hpp"
-#include "query/v2/bindings/typed_value.hpp"
-#include "query/v2/db_accessor.hpp"
-#include "query/v2/path.hpp"
+#include "query/v2/typed_value.hpp"
+#include "storage/v3/property_value.hpp"
 #include "utils/typeinfo.hpp"
 
 cpp<#
@@ -632,7 +630,7 @@ cpp<#
   (:clone))
 
 (lcp:define-class primitive-literal (base-literal)
-  ((value "TypedValue" :scope :public)
+  ((value "::storage::v3::PropertyValue" :scope :public)
    (token-position :int32_t :scope :public :initval -1
                    :documentation "This field contains token position of literal used to create PrimitiveLiteral object. If PrimitiveLiteral object is not created from query, leave its value at -1."))
   (:public

src/query/v2/frontend/ast/ast_visitor.hpp

@@ -13,7 +13,7 @@
 
 #include "utils/visitor.hpp"
 
-namespace MG_INJECTED_NAMESPACE_NAME {
+namespace memgraph::query::v2 {
 
 // Forward declares for Tree visitors.
 class CypherQuery;
@@ -96,7 +96,7 @@ class VersionQuery;
 class Foreach;
 class SchemaQuery;
 
-using TreeCompositeVisitor = memgraph::utils::CompositeVisitor<
+using TreeCompositeVisitor = utils::CompositeVisitor<
     SingleQuery, CypherUnion, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator, AdditionOperator,
     SubtractionOperator, MultiplicationOperator, DivisionOperator, ModOperator, NotEqualOperator, EqualOperator,
     LessOperator, GreaterOperator, LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
@@ -105,7 +105,7 @@ using TreeCompositeVisitor = memgraph::utils::CompositeVisitor<
     Create, Match, Return, With, Pattern, NodeAtom, EdgeAtom, Delete, Where, SetProperty, SetProperties, SetLabels,
     RemoveProperty, RemoveLabels, Merge, Unwind, RegexMatch, LoadCsv, Foreach>;
 
-using TreeLeafVisitor = memgraph::utils::LeafVisitor<Identifier, PrimitiveLiteral, ParameterLookup>;
+using TreeLeafVisitor = utils::LeafVisitor<Identifier, PrimitiveLiteral, ParameterLookup>;
 
 class HierarchicalTreeVisitor : public TreeCompositeVisitor, public TreeLeafVisitor {
  public:
@@ -117,7 +117,7 @@ class HierarchicalTreeVisitor : public TreeCompositeVisitor, public TreeLeafVisi
 
 template <class TResult>
 class ExpressionVisitor
-    : public memgraph::utils::Visitor<
+    : public utils::Visitor<
           TResult, NamedExpression, OrOperator, XorOperator, AndOperator, NotOperator, AdditionOperator,
           SubtractionOperator, MultiplicationOperator, DivisionOperator, ModOperator, NotEqualOperator, EqualOperator,
           LessOperator, GreaterOperator, LessEqualOperator, GreaterEqualOperator, InListOperator, SubscriptOperator,
@@ -126,10 +126,9 @@ class ExpressionVisitor
           None, ParameterLookup, Identifier, PrimitiveLiteral, RegexMatch> {};
 
 template <class TResult>
-class QueryVisitor
-    : public memgraph::utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery,
-                                      InfoQuery, ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery,
-                                      FreeMemoryQuery, TriggerQuery, IsolationLevelQuery, CreateSnapshotQuery,
-                                      StreamQuery, SettingQuery, VersionQuery, SchemaQuery> {};
+class QueryVisitor : public utils::Visitor<TResult, CypherQuery, ExplainQuery, ProfileQuery, IndexQuery, AuthQuery,
+                                           InfoQuery, ConstraintQuery, DumpQuery, ReplicationQuery, LockPathQuery,
+                                           FreeMemoryQuery, TriggerQuery, IsolationLevelQuery, CreateSnapshotQuery,
+                                           StreamQuery, SettingQuery, VersionQuery, SchemaQuery> {};
 
-}  // namespace MG_INJECTED_NAMESPACE_NAME
+}  // namespace memgraph::query::v2

src/query/v2/frontend/ast/cypher_main_visitor.hpp

@@ -0,0 +1,921 @@
+// 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 <string>
+#include <unordered_set>
+#include <utility>
+
+#include <antlr4-runtime.h>
+
+#include "query/v2/frontend/ast/ast.hpp"
+#include "query/v2/frontend/opencypher/generated/MemgraphCypherBaseVisitor.h"
+#include "utils/exceptions.hpp"
+#include "utils/logging.hpp"
+
+namespace memgraph::query::v2::frontend {
+
+using antlropencypher::MemgraphCypher;
+
+struct ParsingContext {
+  bool is_query_cached = false;
+};
+
+class CypherMainVisitor : public antlropencypher::MemgraphCypherBaseVisitor {
+ public:
+  explicit CypherMainVisitor(ParsingContext context, AstStorage *storage) : context_(context), storage_(storage) {}
+
+ private:
+  Expression *CreateBinaryOperatorByToken(size_t token, Expression *e1, Expression *e2) {
+    switch (token) {
+      case MemgraphCypher::OR:
+        return storage_->Create<OrOperator>(e1, e2);
+      case MemgraphCypher::XOR:
+        return storage_->Create<XorOperator>(e1, e2);
+      case MemgraphCypher::AND:
+        return storage_->Create<AndOperator>(e1, e2);
+      case MemgraphCypher::PLUS:
+        return storage_->Create<AdditionOperator>(e1, e2);
+      case MemgraphCypher::MINUS:
+        return storage_->Create<SubtractionOperator>(e1, e2);
+      case MemgraphCypher::ASTERISK:
+        return storage_->Create<MultiplicationOperator>(e1, e2);
+      case MemgraphCypher::SLASH:
+        return storage_->Create<DivisionOperator>(e1, e2);
+      case MemgraphCypher::PERCENT:
+        return storage_->Create<ModOperator>(e1, e2);
+      case MemgraphCypher::EQ:
+        return storage_->Create<EqualOperator>(e1, e2);
+      case MemgraphCypher::NEQ1:
+      case MemgraphCypher::NEQ2:
+        return storage_->Create<NotEqualOperator>(e1, e2);
+      case MemgraphCypher::LT:
+        return storage_->Create<LessOperator>(e1, e2);
+      case MemgraphCypher::GT:
+        return storage_->Create<GreaterOperator>(e1, e2);
+      case MemgraphCypher::LTE:
+        return storage_->Create<LessEqualOperator>(e1, e2);
+      case MemgraphCypher::GTE:
+        return storage_->Create<GreaterEqualOperator>(e1, e2);
+      default:
+        throw utils::NotYetImplemented("binary operator");
+    }
+  }
+
+  Expression *CreateUnaryOperatorByToken(size_t token, Expression *e) {
+    switch (token) {
+      case MemgraphCypher::NOT:
+        return storage_->Create<NotOperator>(e);
+      case MemgraphCypher::PLUS:
+        return storage_->Create<UnaryPlusOperator>(e);
+      case MemgraphCypher::MINUS:
+        return storage_->Create<UnaryMinusOperator>(e);
+      default:
+        throw utils::NotYetImplemented("unary operator");
+    }
+  }
+
+  auto ExtractOperators(std::vector<antlr4::tree::ParseTree *> &all_children,
+                        const std::vector<size_t> &allowed_operators) {
+    std::vector<size_t> operators;
+    for (auto *child : all_children) {
+      antlr4::tree::TerminalNode *operator_node = nullptr;
+      if ((operator_node = dynamic_cast<antlr4::tree::TerminalNode *>(child))) {
+        if (std::find(allowed_operators.begin(), allowed_operators.end(), operator_node->getSymbol()->getType()) !=
+            allowed_operators.end()) {
+          operators.push_back(operator_node->getSymbol()->getType());
+        }
+      }
+    }
+    return operators;
+  }
+
+  /**
+   * Convert opencypher's n-ary production to ast binary operators.
+   *
+   * @param _expressions Subexpressions of child for which we construct ast
+   * operators, for example expression6 if we want to create ast nodes for
+   * expression7.
+   */
+  template <typename TExpression>
+  Expression *LeftAssociativeOperatorExpression(std::vector<TExpression *> _expressions,
+                                                std::vector<antlr4::tree::ParseTree *> all_children,
+                                                const std::vector<size_t> &allowed_operators) {
+    DMG_ASSERT(_expressions.size(), "can't happen");
+    std::vector<Expression *> expressions;
+    auto operators = ExtractOperators(all_children, allowed_operators);
+
+    for (auto *expression : _expressions) {
+      expressions.push_back(std::any_cast<Expression *>(expression->accept(this)));
+    }
+
+    Expression *first_operand = expressions[0];
+    for (int i = 1; i < (int)expressions.size(); ++i) {
+      first_operand = CreateBinaryOperatorByToken(operators[i - 1], first_operand, expressions[i]);
+    }
+    return first_operand;
+  }
+
+  template <typename TExpression>
+  Expression *PrefixUnaryOperator(TExpression *_expression, std::vector<antlr4::tree::ParseTree *> all_children,
+                                  const std::vector<size_t> &allowed_operators) {
+    DMG_ASSERT(_expression, "can't happen");
+    auto operators = ExtractOperators(all_children, allowed_operators);
+
+    Expression *expression = std::any_cast<Expression *>(_expression->accept(this));
+    for (int i = (int)operators.size() - 1; i >= 0; --i) {
+      expression = CreateUnaryOperatorByToken(operators[i], expression);
+    }
+    return expression;
+  }
+
+  /**
+   * @return CypherQuery*
+   */
+  antlrcpp::Any visitCypherQuery(MemgraphCypher::CypherQueryContext *ctx) override;
+
+  /**
+   * @return IndexQuery*
+   */
+  antlrcpp::Any visitIndexQuery(MemgraphCypher::IndexQueryContext *ctx) override;
+
+  /**
+   * @return ExplainQuery*
+   */
+  antlrcpp::Any visitExplainQuery(MemgraphCypher::ExplainQueryContext *ctx) override;
+
+  /**
+   * @return ProfileQuery*
+   */
+  antlrcpp::Any visitProfileQuery(MemgraphCypher::ProfileQueryContext *ctx) override;
+
+  /**
+   * @return InfoQuery*
+   */
+  antlrcpp::Any visitInfoQuery(MemgraphCypher::InfoQueryContext *ctx) override;
+
+  /**
+   * @return Constraint
+   */
+  antlrcpp::Any visitConstraint(MemgraphCypher::ConstraintContext *ctx) override;
+
+  /**
+   * @return ConstraintQuery*
+   */
+  antlrcpp::Any visitConstraintQuery(MemgraphCypher::ConstraintQueryContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitAuthQuery(MemgraphCypher::AuthQueryContext *ctx) override;
+
+  /**
+   * @return DumpQuery*
+   */
+  antlrcpp::Any visitDumpQuery(MemgraphCypher::DumpQueryContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitReplicationQuery(MemgraphCypher::ReplicationQueryContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitSetReplicationRole(MemgraphCypher::SetReplicationRoleContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitShowReplicationRole(MemgraphCypher::ShowReplicationRoleContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitRegisterReplica(MemgraphCypher::RegisterReplicaContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitDropReplica(MemgraphCypher::DropReplicaContext *ctx) override;
+
+  /**
+   * @return ReplicationQuery*
+   */
+  antlrcpp::Any visitShowReplicas(MemgraphCypher::ShowReplicasContext *ctx) override;
+
+  /**
+   * @return LockPathQuery*
+   */
+  antlrcpp::Any visitLockPathQuery(MemgraphCypher::LockPathQueryContext *ctx) override;
+
+  /**
+   * @return LoadCsvQuery*
+   */
+  antlrcpp::Any visitLoadCsv(MemgraphCypher::LoadCsvContext *ctx) override;
+
+  /**
+   * @return FreeMemoryQuery*
+   */
+  antlrcpp::Any visitFreeMemoryQuery(MemgraphCypher::FreeMemoryQueryContext *ctx) override;
+
+  /**
+   * @return TriggerQuery*
+   */
+  antlrcpp::Any visitTriggerQuery(MemgraphCypher::TriggerQueryContext *ctx) override;
+
+  /**
+   * @return CreateTrigger*
+   */
+  antlrcpp::Any visitCreateTrigger(MemgraphCypher::CreateTriggerContext *ctx) override;
+
+  /**
+   * @return DropTrigger*
+   */
+  antlrcpp::Any visitDropTrigger(MemgraphCypher::DropTriggerContext *ctx) override;
+
+  /**
+   * @return ShowTriggers*
+   */
+  antlrcpp::Any visitShowTriggers(MemgraphCypher::ShowTriggersContext *ctx) override;
+
+  /**
+   * @return IsolationLevelQuery*
+   */
+  antlrcpp::Any visitIsolationLevelQuery(MemgraphCypher::IsolationLevelQueryContext *ctx) override;
+
+  /**
+   * @return CreateSnapshotQuery*
+   */
+  antlrcpp::Any visitCreateSnapshotQuery(MemgraphCypher::CreateSnapshotQueryContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitStreamQuery(MemgraphCypher::StreamQueryContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitCreateStream(MemgraphCypher::CreateStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitConfigKeyValuePair(MemgraphCypher::ConfigKeyValuePairContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitConfigMap(MemgraphCypher::ConfigMapContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitKafkaCreateStream(MemgraphCypher::KafkaCreateStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitKafkaCreateStreamConfig(MemgraphCypher::KafkaCreateStreamConfigContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitPulsarCreateStreamConfig(MemgraphCypher::PulsarCreateStreamConfigContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitPulsarCreateStream(MemgraphCypher::PulsarCreateStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitCommonCreateStreamConfig(MemgraphCypher::CommonCreateStreamConfigContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitDropStream(MemgraphCypher::DropStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitStartStream(MemgraphCypher::StartStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitStartAllStreams(MemgraphCypher::StartAllStreamsContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitStopStream(MemgraphCypher::StopStreamContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitStopAllStreams(MemgraphCypher::StopAllStreamsContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitShowStreams(MemgraphCypher::ShowStreamsContext *ctx) override;
+
+  /**
+   * @return StreamQuery*
+   */
+  antlrcpp::Any visitCheckStream(MemgraphCypher::CheckStreamContext *ctx) override;
+
+  /**
+   * @return SettingQuery*
+   */
+  antlrcpp::Any visitSettingQuery(MemgraphCypher::SettingQueryContext *ctx) override;
+
+  /**
+   * @return SetSetting*
+   */
+  antlrcpp::Any visitSetSetting(MemgraphCypher::SetSettingContext *ctx) override;
+
+  /**
+   * @return ShowSetting*
+   */
+  antlrcpp::Any visitShowSetting(MemgraphCypher::ShowSettingContext *ctx) override;
+
+  /**
+   * @return ShowSettings*
+   */
+  antlrcpp::Any visitShowSettings(MemgraphCypher::ShowSettingsContext *ctx) override;
+
+  /**
+   * @return VersionQuery*
+   */
+  antlrcpp::Any visitVersionQuery(MemgraphCypher::VersionQueryContext *ctx) override;
+
+  /**
+   * @return CypherUnion*
+   */
+  antlrcpp::Any visitCypherUnion(MemgraphCypher::CypherUnionContext *ctx) override;
+
+  /**
+   * @return SingleQuery*
+   */
+  antlrcpp::Any visitSingleQuery(MemgraphCypher::SingleQueryContext *ctx) override;
+
+  /**
+   * @return Clause* or vector<Clause*>!!!
+   */
+  antlrcpp::Any visitClause(MemgraphCypher::ClauseContext *ctx) override;
+
+  /**
+   * @return Match*
+   */
+  antlrcpp::Any visitCypherMatch(MemgraphCypher::CypherMatchContext *ctx) override;
+
+  /**
+   * @return Create*
+   */
+  antlrcpp::Any visitCreate(MemgraphCypher::CreateContext *ctx) override;
+
+  /**
+   * @return CallProcedure*
+   */
+  antlrcpp::Any visitCallProcedure(MemgraphCypher::CallProcedureContext *ctx) override;
+
+  /**
+   * @return std::string
+   */
+  antlrcpp::Any visitUserOrRoleName(MemgraphCypher::UserOrRoleNameContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitCreateRole(MemgraphCypher::CreateRoleContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitDropRole(MemgraphCypher::DropRoleContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitShowRoles(MemgraphCypher::ShowRolesContext *ctx) override;
+
+  /**
+   * @return IndexQuery*
+   */
+  antlrcpp::Any visitCreateIndex(MemgraphCypher::CreateIndexContext *ctx) override;
+
+  /**
+   * @return DropIndex*
+   */
+  antlrcpp::Any visitDropIndex(MemgraphCypher::DropIndexContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitCreateUser(MemgraphCypher::CreateUserContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitSetPassword(MemgraphCypher::SetPasswordContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitDropUser(MemgraphCypher::DropUserContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitShowUsers(MemgraphCypher::ShowUsersContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitSetRole(MemgraphCypher::SetRoleContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitClearRole(MemgraphCypher::ClearRoleContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitGrantPrivilege(MemgraphCypher::GrantPrivilegeContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitDenyPrivilege(MemgraphCypher::DenyPrivilegeContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitRevokePrivilege(MemgraphCypher::RevokePrivilegeContext *ctx) override;
+
+  /**
+   * @return AuthQuery::Privilege
+   */
+  antlrcpp::Any visitPrivilege(MemgraphCypher::PrivilegeContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitShowPrivileges(MemgraphCypher::ShowPrivilegesContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitShowRoleForUser(MemgraphCypher::ShowRoleForUserContext *ctx) override;
+
+  /**
+   * @return AuthQuery*
+   */
+  antlrcpp::Any visitShowUsersForRole(MemgraphCypher::ShowUsersForRoleContext *ctx) override;
+
+  /**
+   * @return Return*
+   */
+  antlrcpp::Any visitCypherReturn(MemgraphCypher::CypherReturnContext *ctx) override;
+
+  /**
+   * @return Return*
+   */
+  antlrcpp::Any visitReturnBody(MemgraphCypher::ReturnBodyContext *ctx) override;
+
+  /**
+   * @return pair<bool, vector<NamedExpression*>> first member is true if
+   * asterisk was found in return
+   * expressions.
+   */
+  antlrcpp::Any visitReturnItems(MemgraphCypher::ReturnItemsContext *ctx) override;
+
+  /**
+   * @return vector<NamedExpression*>
+   */
+  antlrcpp::Any visitReturnItem(MemgraphCypher::ReturnItemContext *ctx) override;
+
+  /**
+   * @return vector<SortItem>
+   */
+  antlrcpp::Any visitOrder(MemgraphCypher::OrderContext *ctx) override;
+
+  /**
+   * @return SortItem
+   */
+  antlrcpp::Any visitSortItem(MemgraphCypher::SortItemContext *ctx) override;
+
+  /**
+   * @return NodeAtom*
+   */
+  antlrcpp::Any visitNodePattern(MemgraphCypher::NodePatternContext *ctx) override;
+
+  /**
+   * @return vector<LabelIx>
+   */
+  antlrcpp::Any visitNodeLabels(MemgraphCypher::NodeLabelsContext *ctx) override;
+
+  /**
+   * @return unordered_map<PropertyIx, Expression*>
+   */
+  antlrcpp::Any visitProperties(MemgraphCypher::PropertiesContext *ctx) override;
+
+  /**
+   * @return map<std::string, Expression*>
+   */
+  antlrcpp::Any visitMapLiteral(MemgraphCypher::MapLiteralContext *ctx) override;
+
+  /**
+   * @return vector<Expression*>
+   */
+  antlrcpp::Any visitListLiteral(MemgraphCypher::ListLiteralContext *ctx) override;
+
+  /**
+   * @return PropertyIx
+   */
+  antlrcpp::Any visitPropertyKeyName(MemgraphCypher::PropertyKeyNameContext *ctx) override;
+
+  /**
+   * @return string
+   */
+  antlrcpp::Any visitSymbolicName(MemgraphCypher::SymbolicNameContext *ctx) override;
+
+  /**
+   * @return vector<Pattern*>
+   */
+  antlrcpp::Any visitPattern(MemgraphCypher::PatternContext *ctx) override;
+
+  /**
+   * @return Pattern*
+   */
+  antlrcpp::Any visitPatternPart(MemgraphCypher::PatternPartContext *ctx) override;
+
+  /**
+   * @return Pattern*
+   */
+  antlrcpp::Any visitPatternElement(MemgraphCypher::PatternElementContext *ctx) override;
+
+  /**
+   * @return vector<pair<EdgeAtom*, NodeAtom*>>
+   */
+  antlrcpp::Any visitPatternElementChain(MemgraphCypher::PatternElementChainContext *ctx) override;
+
+  /**
+   *@return EdgeAtom*
+   */
+  antlrcpp::Any visitRelationshipPattern(MemgraphCypher::RelationshipPatternContext *ctx) override;
+
+  /**
+   * This should never be called. Everything is done directly in
+   * visitRelationshipPattern.
+   */
+  antlrcpp::Any visitRelationshipDetail(MemgraphCypher::RelationshipDetailContext *ctx) override;
+
+  /**
+   * This should never be called. Everything is done directly in
+   * visitRelationshipPattern.
+   */
+  antlrcpp::Any visitRelationshipLambda(MemgraphCypher::RelationshipLambdaContext *ctx) override;
+
+  /**
+   * @return vector<EdgeTypeIx>
+   */
+  antlrcpp::Any visitRelationshipTypes(MemgraphCypher::RelationshipTypesContext *ctx) override;
+
+  /**
+   * @return std::tuple<EdgeAtom::Type, int64_t, int64_t>.
+   */
+  antlrcpp::Any visitVariableExpansion(MemgraphCypher::VariableExpansionContext *ctx) override;
+
+  /**
+   * Top level expression, does nothing.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression(MemgraphCypher::ExpressionContext *ctx) override;
+
+  /**
+   * OR.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression12(MemgraphCypher::Expression12Context *ctx) override;
+
+  /**
+   * XOR.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression11(MemgraphCypher::Expression11Context *ctx) override;
+
+  /**
+   * AND.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression10(MemgraphCypher::Expression10Context *ctx) override;
+
+  /**
+   * NOT.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression9(MemgraphCypher::Expression9Context *ctx) override;
+
+  /**
+   * Comparisons.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression8(MemgraphCypher::Expression8Context *ctx) override;
+
+  /**
+   * Never call this. Everything related to generating code for comparison
+   * operators should be done in visitExpression8.
+   */
+  antlrcpp::Any visitPartialComparisonExpression(MemgraphCypher::PartialComparisonExpressionContext *ctx) override;
+
+  /**
+   * Addition and subtraction.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression7(MemgraphCypher::Expression7Context *ctx) override;
+
+  /**
+   * Multiplication, division, modding.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression6(MemgraphCypher::Expression6Context *ctx) override;
+
+  /**
+   * Power.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression5(MemgraphCypher::Expression5Context *ctx) override;
+
+  /**
+   * Unary minus and plus.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression4(MemgraphCypher::Expression4Context *ctx) override;
+
+  /**
+   * IS NULL, IS NOT NULL, STARTS WITH, END WITH, =~, ...
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression3a(MemgraphCypher::Expression3aContext *ctx) override;
+
+  /**
+   * Does nothing, everything is done in visitExpression3a.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitStringAndNullOperators(MemgraphCypher::StringAndNullOperatorsContext *ctx) override;
+
+  /**
+   * List indexing and slicing.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression3b(MemgraphCypher::Expression3bContext *ctx) override;
+
+  /**
+   * Does nothing, everything is done in visitExpression3b.
+   */
+  antlrcpp::Any visitListIndexingOrSlicing(MemgraphCypher::ListIndexingOrSlicingContext *ctx) override;
+
+  /**
+   * Node labels test.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression2a(MemgraphCypher::Expression2aContext *ctx) override;
+
+  /**
+   * Property lookup.
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitExpression2b(MemgraphCypher::Expression2bContext *ctx) override;
+
+  /**
+   * Literals, params, list comprehension...
+   *
+   * @return Expression*
+   */
+  antlrcpp::Any visitAtom(MemgraphCypher::AtomContext *ctx) override;
+
+  /**
+   * @return ParameterLookup*
+   */
+  antlrcpp::Any visitParameter(MemgraphCypher::ParameterContext *ctx) override;
+
+  /**
+   * @return Expression*
+   */
+  antlrcpp::Any visitParenthesizedExpression(MemgraphCypher::ParenthesizedExpressionContext *ctx) override;
+
+  /**
+   * @return Expression*
+   */
+  antlrcpp::Any visitFunctionInvocation(MemgraphCypher::FunctionInvocationContext *ctx) override;
+
+  /**
+   * @return string - uppercased
+   */
+  antlrcpp::Any visitFunctionName(MemgraphCypher::FunctionNameContext *ctx) override;
+
+  /**
+   * @return Expression*
+   */
+  antlrcpp::Any visitLiteral(MemgraphCypher::LiteralContext *ctx) override;
+
+  /**
+   * Convert escaped string from a query to unescaped utf8 string.
+   *
+   * @return string
+   */
+  antlrcpp::Any visitStringLiteral(const std::string &escaped);
+
+  /**
+   * @return bool
+   */
+  antlrcpp::Any visitBooleanLiteral(MemgraphCypher::BooleanLiteralContext *ctx) override;
+
+  /**
+   * @return TypedValue with either double or int
+   */
+  antlrcpp::Any visitNumberLiteral(MemgraphCypher::NumberLiteralContext *ctx) override;
+
+  /**
+   * @return int64_t
+   */
+  antlrcpp::Any visitIntegerLiteral(MemgraphCypher::IntegerLiteralContext *ctx) override;
+
+  /**
+   * @return double
+   */
+  antlrcpp::Any visitDoubleLiteral(MemgraphCypher::DoubleLiteralContext *ctx) override;
+
+  /**
+   * @return Delete*
+   */
+  antlrcpp::Any visitCypherDelete(MemgraphCypher::CypherDeleteContext *ctx) override;
+
+  /**
+   * @return Where*
+   */
+  antlrcpp::Any visitWhere(MemgraphCypher::WhereContext *ctx) override;
+
+  /**
+   * return vector<Clause*>
+   */
+  antlrcpp::Any visitSet(MemgraphCypher::SetContext *ctx) override;
+
+  /**
+   * @return Clause*
+   */
+  antlrcpp::Any visitSetItem(MemgraphCypher::SetItemContext *ctx) override;
+
+  /**
+   * return vector<Clause*>
+   */
+  antlrcpp::Any visitRemove(MemgraphCypher::RemoveContext *ctx) override;
+
+  /**
+   * @return Clause*
+   */
+  antlrcpp::Any visitRemoveItem(MemgraphCypher::RemoveItemContext *ctx) override;
+
+  /**
+   * @return PropertyLookup*
+   */
+  antlrcpp::Any visitPropertyExpression(MemgraphCypher::PropertyExpressionContext *ctx) override;
+
+  /**
+   * @return IfOperator*
+   */
+  antlrcpp::Any visitCaseExpression(MemgraphCypher::CaseExpressionContext *ctx) override;
+
+  /**
+   * Never call this. Ast generation for this production is done in
+   * @c visitCaseExpression.
+   */
+  antlrcpp::Any visitCaseAlternatives(MemgraphCypher::CaseAlternativesContext *ctx) override;
+
+  /**
+   * @return With*
+   */
+  antlrcpp::Any visitWith(MemgraphCypher::WithContext *ctx) override;
+
+  /**
+   * @return Merge*
+   */
+  antlrcpp::Any visitMerge(MemgraphCypher::MergeContext *ctx) override;
+
+  /**
+   * @return Unwind*
+   */
+  antlrcpp::Any visitUnwind(MemgraphCypher::UnwindContext *ctx) override;
+
+  /**
+   * Never call this. Ast generation for these expressions should be done by
+   * explicitly visiting the members of @c FilterExpressionContext.
+   */
+  antlrcpp::Any visitFilterExpression(MemgraphCypher::FilterExpressionContext *) override;
+
+  /**
+   * @return Foreach*
+   */
+  antlrcpp::Any visitForeach(MemgraphCypher::ForeachContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitPropertyType(MemgraphCypher::PropertyTypeContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitSchemaPropertyMap(MemgraphCypher::SchemaPropertyMapContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitSchemaQuery(MemgraphCypher::SchemaQueryContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitShowSchema(MemgraphCypher::ShowSchemaContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitShowSchemas(MemgraphCypher::ShowSchemasContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitCreateSchema(MemgraphCypher::CreateSchemaContext *ctx) override;
+
+  /**
+   * @return Schema*
+   */
+  antlrcpp::Any visitDropSchema(MemgraphCypher::DropSchemaContext *ctx) override;
+
+ public:
+  Query *query() { return query_; }
+  const static std::string kAnonPrefix;
+
+  struct QueryInfo {
+    bool is_cacheable{true};
+    bool has_load_csv{false};
+  };
+
+  const auto &GetQueryInfo() const { return query_info_; }
+
+ private:
+  LabelIx AddLabel(const std::string &name);
+  PropertyIx AddProperty(const std::string &name);
+  EdgeTypeIx AddEdgeType(const std::string &name);
+
+  ParsingContext context_;
+  AstStorage *storage_;
+
+  std::unordered_map<uint8_t, std::variant<Expression *, std::string, std::vector<std::string>,
+                                           std::unordered_map<Expression *, Expression *>>>
+      memory_;
+  // Set of identifiers from queries.
+  std::unordered_set<std::string> users_identifiers;
+  // Identifiers that user didn't name.
+  std::vector<Identifier **> anonymous_identifiers;
+  Query *query_ = nullptr;
+  // All return items which are not variables must be aliased in with.
+  // We use this variable in visitReturnItem to check if we are in with or
+  // return.
+  bool in_with_ = false;
+
+  QueryInfo query_info_;
+};
+}  // namespace memgraph::query::v2::frontend

src/query/v2/frontend/ast/pretty_print.cpp

@@ -0,0 +1,311 @@
+// 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 "query/v2/frontend/ast/pretty_print.hpp"
+
+#include <type_traits>
+
+#include "query/v2/frontend/ast/ast.hpp"
+#include "utils/algorithm.hpp"
+#include "utils/string.hpp"
+
+namespace memgraph::query::v2 {
+
+namespace {
+
+class ExpressionPrettyPrinter : public ExpressionVisitor<void> {
+ public:
+  explicit ExpressionPrettyPrinter(std::ostream *out);
+
+  // Unary operators
+  void Visit(NotOperator &op) override;
+  void Visit(UnaryPlusOperator &op) override;
+  void Visit(UnaryMinusOperator &op) override;
+  void Visit(IsNullOperator &op) override;
+
+  // Binary operators
+  void Visit(OrOperator &op) override;
+  void Visit(XorOperator &op) override;
+  void Visit(AndOperator &op) override;
+  void Visit(AdditionOperator &op) override;
+  void Visit(SubtractionOperator &op) override;
+  void Visit(MultiplicationOperator &op) override;
+  void Visit(DivisionOperator &op) override;
+  void Visit(ModOperator &op) override;
+  void Visit(NotEqualOperator &op) override;
+  void Visit(EqualOperator &op) override;
+  void Visit(LessOperator &op) override;
+  void Visit(GreaterOperator &op) override;
+  void Visit(LessEqualOperator &op) override;
+  void Visit(GreaterEqualOperator &op) override;
+  void Visit(InListOperator &op) override;
+  void Visit(SubscriptOperator &op) override;
+
+  // Other
+  void Visit(ListSlicingOperator &op) override;
+  void Visit(IfOperator &op) override;
+  void Visit(ListLiteral &op) override;
+  void Visit(MapLiteral &op) override;
+  void Visit(LabelsTest &op) override;
+  void Visit(Aggregation &op) override;
+  void Visit(Function &op) override;
+  void Visit(Reduce &op) override;
+  void Visit(Coalesce &op) override;
+  void Visit(Extract &op) override;
+  void Visit(All &op) override;
+  void Visit(Single &op) override;
+  void Visit(Any &op) override;
+  void Visit(None &op) override;
+  void Visit(Identifier &op) override;
+  void Visit(PrimitiveLiteral &op) override;
+  void Visit(PropertyLookup &op) override;
+  void Visit(ParameterLookup &op) override;
+  void Visit(NamedExpression &op) override;
+  void Visit(RegexMatch &op) override;
+
+ private:
+  std::ostream *out_;
+};
+
+// Declare all of the different `PrintObject` overloads upfront since they're
+// mutually recursive. Without this, overload resolution depends on the ordering
+// of the overloads within the source, which is quite fragile.
+
+template <typename T>
+void PrintObject(std::ostream *out, const T &arg);
+
+void PrintObject(std::ostream *out, const std::string &str);
+
+void PrintObject(std::ostream *out, Aggregation::Op op);
+
+void PrintObject(std::ostream *out, Expression *expr);
+
+void PrintObject(std::ostream *out, Identifier *expr);
+
+void PrintObject(std::ostream *out, const storage::v3::PropertyValue &value);
+
+template <typename T>
+void PrintObject(std::ostream *out, const std::vector<T> &vec);
+
+template <typename K, typename V>
+void PrintObject(std::ostream *out, const std::map<K, V> &map);
+
+template <typename T>
+void PrintObject(std::ostream *out, const T &arg) {
+  static_assert(!std::is_convertible<T, Expression *>::value,
+                "This overload shouldn't be called with pointers convertible "
+                "to Expression *. This means your other PrintObject overloads aren't "
+                "being called for certain AST nodes when they should (or perhaps such "
+                "overloads don't exist yet).");
+  *out << arg;
+}
+
+void PrintObject(std::ostream *out, const std::string &str) { *out << utils::Escape(str); }
+
+void PrintObject(std::ostream *out, Aggregation::Op op) { *out << Aggregation::OpToString(op); }
+
+void PrintObject(std::ostream *out, Expression *expr) {
+  if (expr) {
+    ExpressionPrettyPrinter printer{out};
+    expr->Accept(printer);
+  } else {
+    *out << "<null>";
+  }
+}
+
+void PrintObject(std::ostream *out, Identifier *expr) { PrintObject(out, static_cast<Expression *>(expr)); }
+
+void PrintObject(std::ostream *out, const storage::v3::PropertyValue &value) {
+  switch (value.type()) {
+    case storage::v3::PropertyValue::Type::Null:
+      *out << "null";
+      break;
+
+    case storage::v3::PropertyValue::Type::String:
+      PrintObject(out, value.ValueString());
+      break;
+
+    case storage::v3::PropertyValue::Type::Bool:
+      *out << (value.ValueBool() ? "true" : "false");
+      break;
+
+    case storage::v3::PropertyValue::Type::Int:
+      PrintObject(out, value.ValueInt());
+      break;
+
+    case storage::v3::PropertyValue::Type::Double:
+      PrintObject(out, value.ValueDouble());
+      break;
+
+    case storage::v3::PropertyValue::Type::List:
+      PrintObject(out, value.ValueList());
+      break;
+
+    case storage::v3::PropertyValue::Type::Map:
+      PrintObject(out, value.ValueMap());
+      break;
+    case storage::v3::PropertyValue::Type::TemporalData:
+      PrintObject(out, value.ValueTemporalData());
+      break;
+  }
+}
+
+template <typename T>
+void PrintObject(std::ostream *out, const std::vector<T> &vec) {
+  *out << "[";
+  utils::PrintIterable(*out, vec, ", ", [](auto &stream, const auto &item) { PrintObject(&stream, item); });
+  *out << "]";
+}
+
+template <typename K, typename V>
+void PrintObject(std::ostream *out, const std::map<K, V> &map) {
+  *out << "{";
+  utils::PrintIterable(*out, map, ", ", [](auto &stream, const auto &item) {
+    PrintObject(&stream, item.first);
+    stream << ": ";
+    PrintObject(&stream, item.second);
+  });
+  *out << "}";
+}
+
+template <typename T>
+void PrintOperatorArgs(std::ostream *out, const T &arg) {
+  *out << " ";
+  PrintObject(out, arg);
+  *out << ")";
+}
+
+template <typename T, typename... Ts>
+void PrintOperatorArgs(std::ostream *out, const T &arg, const Ts &...args) {
+  *out << " ";
+  PrintObject(out, arg);
+  PrintOperatorArgs(out, args...);
+}
+
+template <typename... Ts>
+void PrintOperator(std::ostream *out, const std::string &name, const Ts &...args) {
+  *out << "(" << name;
+  PrintOperatorArgs(out, args...);
+}
+
+ExpressionPrettyPrinter::ExpressionPrettyPrinter(std::ostream *out) : out_(out) {}
+
+#define UNARY_OPERATOR_VISIT(OP_NODE, OP_STR) \
+  void ExpressionPrettyPrinter::Visit(OP_NODE &op) { PrintOperator(out_, OP_STR, op.expression_); }
+
+UNARY_OPERATOR_VISIT(NotOperator, "Not");
+UNARY_OPERATOR_VISIT(UnaryPlusOperator, "+");
+UNARY_OPERATOR_VISIT(UnaryMinusOperator, "-");
+UNARY_OPERATOR_VISIT(IsNullOperator, "IsNull");
+
+#undef UNARY_OPERATOR_VISIT
+
+#define BINARY_OPERATOR_VISIT(OP_NODE, OP_STR) \
+  void ExpressionPrettyPrinter::Visit(OP_NODE &op) { PrintOperator(out_, OP_STR, op.expression1_, op.expression2_); }
+
+BINARY_OPERATOR_VISIT(OrOperator, "Or");
+BINARY_OPERATOR_VISIT(XorOperator, "Xor");
+BINARY_OPERATOR_VISIT(AndOperator, "And");
+BINARY_OPERATOR_VISIT(AdditionOperator, "+");
+BINARY_OPERATOR_VISIT(SubtractionOperator, "-");
+BINARY_OPERATOR_VISIT(MultiplicationOperator, "*");
+BINARY_OPERATOR_VISIT(DivisionOperator, "/");
+BINARY_OPERATOR_VISIT(ModOperator, "%");
+BINARY_OPERATOR_VISIT(NotEqualOperator, "!=");
+BINARY_OPERATOR_VISIT(EqualOperator, "==");
+BINARY_OPERATOR_VISIT(LessOperator, "<");
+BINARY_OPERATOR_VISIT(GreaterOperator, ">");
+BINARY_OPERATOR_VISIT(LessEqualOperator, "<=");
+BINARY_OPERATOR_VISIT(GreaterEqualOperator, ">=");
+BINARY_OPERATOR_VISIT(InListOperator, "In");
+BINARY_OPERATOR_VISIT(SubscriptOperator, "Subscript");
+
+#undef BINARY_OPERATOR_VISIT
+
+void ExpressionPrettyPrinter::Visit(ListSlicingOperator &op) {
+  PrintOperator(out_, "ListSlicing", op.list_, op.lower_bound_, op.upper_bound_);
+}
+
+void ExpressionPrettyPrinter::Visit(IfOperator &op) {
+  PrintOperator(out_, "If", op.condition_, op.then_expression_, op.else_expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(ListLiteral &op) { PrintOperator(out_, "ListLiteral", op.elements_); }
+
+void ExpressionPrettyPrinter::Visit(MapLiteral &op) {
+  std::map<std::string, Expression *> map;
+  for (const auto &kv : op.elements_) {
+    map[kv.first.name] = kv.second;
+  }
+  PrintObject(out_, map);
+}
+
+void ExpressionPrettyPrinter::Visit(LabelsTest &op) { PrintOperator(out_, "LabelsTest", op.expression_); }
+
+void ExpressionPrettyPrinter::Visit(Aggregation &op) { PrintOperator(out_, "Aggregation", op.op_); }
+
+void ExpressionPrettyPrinter::Visit(Function &op) { PrintOperator(out_, "Function", op.function_name_, op.arguments_); }
+
+void ExpressionPrettyPrinter::Visit(Reduce &op) {
+  PrintOperator(out_, "Reduce", op.accumulator_, op.initializer_, op.identifier_, op.list_, op.expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(Coalesce &op) { PrintOperator(out_, "Coalesce", op.expressions_); }
+
+void ExpressionPrettyPrinter::Visit(Extract &op) {
+  PrintOperator(out_, "Extract", op.identifier_, op.list_, op.expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(All &op) {
+  PrintOperator(out_, "All", op.identifier_, op.list_expression_, op.where_->expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(Single &op) {
+  PrintOperator(out_, "Single", op.identifier_, op.list_expression_, op.where_->expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(Any &op) {
+  PrintOperator(out_, "Any", op.identifier_, op.list_expression_, op.where_->expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(None &op) {
+  PrintOperator(out_, "None", op.identifier_, op.list_expression_, op.where_->expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(Identifier &op) { PrintOperator(out_, "Identifier", op.name_); }
+
+void ExpressionPrettyPrinter::Visit(PrimitiveLiteral &op) { PrintObject(out_, op.value_); }
+
+void ExpressionPrettyPrinter::Visit(PropertyLookup &op) {
+  PrintOperator(out_, "PropertyLookup", op.expression_, op.property_.name);
+}
+
+void ExpressionPrettyPrinter::Visit(ParameterLookup &op) { PrintOperator(out_, "ParameterLookup", op.token_position_); }
+
+void ExpressionPrettyPrinter::Visit(NamedExpression &op) {
+  PrintOperator(out_, "NamedExpression", op.name_, op.expression_);
+}
+
+void ExpressionPrettyPrinter::Visit(RegexMatch &op) { PrintOperator(out_, "=~", op.string_expr_, op.regex_); }
+
+}  // namespace
+
+void PrintExpression(Expression *expr, std::ostream *out) {
+  ExpressionPrettyPrinter printer{out};
+  expr->Accept(printer);
+}
+
+void PrintExpression(NamedExpression *expr, std::ostream *out) {
+  ExpressionPrettyPrinter printer{out};
+  expr->Accept(printer);
+}
+
+}  // namespace memgraph::query::v2

src/query/v2/frontend/ast/pretty_print.hpp

@@ -11,9 +11,13 @@
 
 #pragma once
 
-#include "query/v2/bindings/bindings.hpp"
+#include <iostream>
 
-#include "expr/ast/pretty_print.hpp"
+#include "query/v2/frontend/ast/ast.hpp"
 
 namespace memgraph::query::v2 {
+
+void PrintExpression(Expression *expr, std::ostream *out);
+void PrintExpression(NamedExpression *expr, std::ostream *out);
+
 }  // namespace memgraph::query::v2