Add patch

This reverts commit 5780ee6c5b.

cmake/FindSodium.cmake

@@ -0,0 +1,297 @@
+# 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,169 @@
+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()

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);
+           }
+         });
+   }

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 # CMake configuration for the main memgraph library and executable
 
 # add memgraph sub libraries, ordered by dependency
+add_subdirectory(interface)
 add_subdirectory(lisp)
 add_subdirectory(utils)
 add_subdirectory(requests)
@@ -37,7 +38,7 @@ set(mg_single_node_v2_sources
 )
 
 set(mg_single_node_v2_libs stdc++fs Threads::Threads
-    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings)
+    telemetry_lib mg-query mg-communication mg-memory mg-utils mg-auth mg-license mg-settings mg-interface-storage-cpp2)
 if (MG_ENTERPRISE)
   # These are enterprise subsystems
   set(mg_single_node_v2_libs ${mg_single_node_v2_libs} mg-audit)

src/communication/bolt/v1/session.hpp

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

src/communication/bolt/v1/states/error.hpp

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

src/communication/bolt/v1/states/executing.hpp

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

src/communication/bolt/v1/states/handshake.hpp

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

src/communication/bolt/v1/states/init.hpp

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

src/interface/.gitignore

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

src/interface/CMakeLists.txt

@@ -0,0 +1,27 @@
+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
+)

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,11 @@
+struct Ping {
+    1: binary message;
+}
+
+struct Pong{
+    1: binary message;
+}
+
+service PingPong {
+    Pong ping(1: Ping req)
+}

src/io/network/epoll.hpp

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

src/io/network/socket.cpp

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

src/memgraph.cpp

@@ -26,16 +26,22 @@
 #include <thread>
 
 #include <fmt/format.h>
+#include <folly/init/Init.h>
+#include <folly/io/async/AsyncSocket.h>
+#include <folly/io/async/AsyncTransport.h>
+#include <folly/io/async/EventBase.h>
 #include <gflags/gflags.h>
 #include <spdlog/common.h>
 #include <spdlog/sinks/daily_file_sink.h>
 #include <spdlog/sinks/dist_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
+#include <thrift/lib/cpp2/async/HeaderClientChannel.h>
 
 #include "communication/bolt/v1/constants.hpp"
 #include "communication/websocket/auth.hpp"
 #include "communication/websocket/server.hpp"
 #include "helpers.hpp"
+#include "interface/gen-cpp2/Storage.h"
 #include "py/py.hpp"
 #include "query/auth_checker.hpp"
 #include "query/discard_value_stream.hpp"
@@ -1313,8 +1319,19 @@ int main(int argc, char **argv) {
   MG_ASSERT(server.Start(), "Couldn't start the Bolt server!");
   websocket_server.Start();
 
-  server.AwaitShutdown();
-  websocket_server.AwaitShutdown();
+  folly::init(&argc, &argv);
+  folly::EventBase base;
+  int port = 7779;  // The port on which server is listening
+
+  // Create a async client socket and connect it. Change
+  // the ip address to where the server is listening
+  auto socket(folly::AsyncSocket::newSocket(&base, "127.0.0.1", port));
+
+  // Create a HeaderClientChannel object which is used in creating
+  // client object
+  auto client_channel = apache::thrift::HeaderClientChannel::newChannel(std::move(socket));
+  // Create a client object
+  interface::storage::StorageAsyncClient client(std::move(client_channel));
 
   memgraph::query::procedure::gModuleRegistry.UnloadAllModules();
 

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

@@ -17,8 +17,6 @@
 
 parser grammar Cypher;
 
-options { tokenVocab=CypherLexer; }
-
 cypher : statement ';'? EOF ;
 
 statement : query ;

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

@@ -30,7 +30,7 @@ memgraphCypherKeyword : cypherKeyword
                       | BATCH_SIZE
                       | BEFORE
                       | BOOTSTRAP_SERVERS
-                      | CHECK
+                      | CHECK_
                       | CLEAR
                       | COMMIT
                       | COMMITTED
@@ -361,7 +361,7 @@ stopAllStreams : STOP ALL STREAMS ;
 
 showStreams : SHOW STREAMS ;
 
-checkStream : CHECK STREAM streamName ( BATCH_LIMIT batchLimit=literal ) ? ( TIMEOUT timeout=literal ) ? ;
+checkStream : CHECK_ STREAM streamName ( BATCH_LIMIT batchLimit=literal ) ? ( TIMEOUT timeout=literal ) ? ;
 
 settingName : literal ;
 

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

@@ -35,7 +35,8 @@ BATCH_LIMIT         : B A T C H UNDERSCORE L I M I T ;
 BATCH_SIZE          : B A T C H UNDERSCORE S I Z E ;
 BEFORE              : B E F O R E ;
 BOOTSTRAP_SERVERS   : B O O T S T R A P UNDERSCORE S E R V E R S ;
-CHECK               : C H E C K ;
+/* This is a workaround to make sure the generated C++ function doesn't conlift with the CHECK macro from glog */
+CHECK_              : C H E C K ;
 CLEAR               : C L E A R ;
 COMMIT              : C O M M I T ;
 COMMITTED           : C O M M I T T E D ;

src/query/plan/operator.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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
@@ -2109,7 +2109,7 @@ template <typename T>
 concept AccessorWithProperties = requires(T value, storage::PropertyId property_id,
                                           storage::PropertyValue property_value) {
   { value.ClearProperties() } -> std::same_as<storage::Result<std::map<storage::PropertyId, storage::PropertyValue>>>;
-  {value.SetProperty(property_id, property_value)};
+  { value.SetProperty(property_id, property_value) };
 };
 
 /// Helper function that sets the given values on either a Vertex or an Edge.

src/query/plan/profile.cpp

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

src/query/plan/scoped_profile.hpp

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

src/query/procedure/mg_procedure_impl.cpp

@@ -43,6 +43,17 @@
 // NOLINTNEXTLINE(google-build-using-namespace)
 using namespace memgraph::query::procedure;
 
+#define MG_STATIC_ASSERT_NOEXCEPT(x)                                  \
+  do {                                                                \
+    _Pragma("clang diagnostic push");                                 \
+    _Pragma("clang diagnostic ignored \"-Wunevaluated-expression\""); \
+    static_assert(noexcept(x));                                       \
+    _Pragma("clang diagnostic pop");                                  \
+  } while (false)
+
+#define MG_EXECUTE_NOEXCEPT(x)  \
+  MG_STATIC_ASSERT_NOEXCEPT(x); \
+  x
 namespace {
 
 void *MgpAlignedAllocImpl(memgraph::utils::MemoryResource &memory, const size_t size_in_bytes, const size_t alignment) {
@@ -823,7 +834,6 @@ DEFINE_MGP_VALUE_MAKE_WITH_MEMORY(int, int64_t);
 DEFINE_MGP_VALUE_MAKE_WITH_MEMORY(double, double);
 DEFINE_MGP_VALUE_MAKE_WITH_MEMORY(string, const char *);
 
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define DEFINE_MGP_VALUE_MAKE(type)                                                                             \
   mgp_error mgp_value_make_##type(mgp_##type *val, mgp_value **result) {                                        \
     return WrapExceptions([val] { return NewRawMgpObject<mgp_value>(val->GetMemoryResource(), val); }, result); \
@@ -1687,9 +1697,7 @@ mgp_error mgp_vertex_copy(mgp_vertex *v, mgp_memory *memory, mgp_vertex **result
 void mgp_vertex_destroy(mgp_vertex *v) { DeleteRawMgpObject(v); }
 
 mgp_error mgp_vertex_equal(mgp_vertex *v1, mgp_vertex *v2, int *result) {
-  // NOLINTNEXTLINE(clang-diagnostic-unevaluated-expression)
-  static_assert(noexcept(*result = *v1 == *v2 ? 1 : 0));
-  *result = *v1 == *v2 ? 1 : 0;
+  MG_EXECUTE_NOEXCEPT(*result = *v1 == *v2 ? 1 : 0);
   return mgp_error::MGP_ERROR_NO_ERROR;
 }
 
@@ -1947,9 +1955,7 @@ mgp_error mgp_edge_copy(mgp_edge *e, mgp_memory *memory, mgp_edge **result) {
 void mgp_edge_destroy(mgp_edge *e) { DeleteRawMgpObject(e); }
 
 mgp_error mgp_edge_equal(mgp_edge *e1, mgp_edge *e2, int *result) {
-  // NOLINTNEXTLINE(clang-diagnostic-unevaluated-expression)
-  static_assert(noexcept(*result = *e1 == *e2 ? 1 : 0));
-  *result = *e1 == *e2 ? 1 : 0;
+  MG_EXECUTE_NOEXCEPT(*result = *e1 == *e2 ? 1 : 0);
   return mgp_error::MGP_ERROR_NO_ERROR;
 }
 

src/storage/v2/indices.hpp

@@ -97,6 +97,10 @@ class LabelIndex {
     Iterator begin() { return Iterator(this, index_accessor_.begin()); }
     Iterator end() { return Iterator(this, index_accessor_.end()); }
 
+    Iterator IterateFrom(Vertex *vertex) {
+      return Iterator(this, index_accessor_.find_equal_or_greater(Entry{vertex, 0}));
+    }
+
    private:
     utils::SkipList<Entry>::Accessor index_accessor_;
     LabelId label_;

src/storage/v2/storage.cpp

@@ -85,6 +85,7 @@ VerticesIterable::VerticesIterable(AllVerticesIterable vertices) : type_(Type::A
 }
 
 VerticesIterable::VerticesIterable(LabelIndex::Iterable vertices) : type_(Type::BY_LABEL) {
+  // TODO(antaljanosbenjamin): vertices_accessor_ should be initialized here
   new (&vertices_by_label_) LabelIndex::Iterable(std::move(vertices));
 }
 
@@ -169,6 +170,22 @@ VerticesIterable::Iterator VerticesIterable::end() {
   }
 }
 
+VerticesIterable::Iterator VerticesIterable::IterateFrom(const Gid vertex_id) {
+  switch (type_) {
+    case Type::ALL:
+      return Iterator(all_vertices_.IterateFrom(vertex_id));
+    case Type::BY_LABEL: {
+      auto vertex_it = vertices_accessor_.find_equal_or_greater(vertex_id);
+      if (vertex_it == vertices_accessor_.end()) {
+        return end();
+      }
+      return Iterator(vertices_by_label_.IterateFrom(&(*vertex_it)));
+    }
+    case Type::BY_LABEL_PROPERTY:
+      LOG_FATAL("IterateFrom is not supported for label property indices!");
+  }
+}
+
 VerticesIterable::Iterator::Iterator(AllVerticesIterable::Iterator it) : type_(Type::ALL) {
   new (&all_it_) AllVerticesIterable::Iterator(std::move(it));
 }

src/storage/v2/storage.hpp

@@ -94,8 +94,10 @@ class AllVerticesIterable final {
         constraints_(constraints),
         config_(config) {}
 
-  Iterator begin() { return Iterator(this, vertices_accessor_.begin()); }
-  Iterator end() { return Iterator(this, vertices_accessor_.end()); }
+  Iterator begin() { return Iterator{this, vertices_accessor_.begin()}; }
+  Iterator end() { return Iterator{this, vertices_accessor_.end()}; }
+
+  Iterator IterateFrom(Gid vertex_id) { return Iterator{this, vertices_accessor_.find_equal_or_greater(vertex_id)}; }
 };
 
 /// Generic access to different kinds of vertex iterations.
@@ -108,8 +110,13 @@ class VerticesIterable final {
   Type type_;
   union {
     AllVerticesIterable all_vertices_;
-    LabelIndex::Iterable vertices_by_label_;
-    LabelPropertyIndex::Iterable vertices_by_label_property_;
+    struct {
+      utils::SkipList<Vertex>::Accessor vertices_accessor_;
+      union {
+        LabelIndex::Iterable vertices_by_label_;
+        LabelPropertyIndex::Iterable vertices_by_label_property_;
+      };
+    };
   };
 
  public:
@@ -158,6 +165,9 @@ class VerticesIterable final {
 
   Iterator begin();
   Iterator end();
+
+  // TODO(antaljanosbenjamin): write tests for this
+  Iterator IterateFrom(Gid vertex_id);
 };
 
 /// Structure used to return information about existing indices in the storage.

src/storage/v2/view.hpp

@@ -15,8 +15,8 @@ namespace memgraph::storage {
 
 /// Indicator for obtaining the state before or after a transaction & command.
 enum class View {
-  OLD,
-  NEW,
+  OLD = 0,
+  NEW = 1,
 };
 
 }  // namespace memgraph::storage

src/utils/memory_tracker.cpp

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

src/utils/small_vector.hpp

@@ -1,4 +1,4 @@
-// Copyright 2022 Memgraph Ltd.
+// Copyright 2021 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

tests/manual/CMakeLists.txt

@@ -55,3 +55,14 @@ target_link_libraries(${test_prefix}ssl_client mg-communication)
 
 add_manual_test(ssl_server.cpp)
 target_link_libraries(${test_prefix}ssl_server mg-communication)
+
+add_manual_test(storage_server.cpp storage_service.cpp storage_service.hpp)
+target_link_libraries(${test_prefix}storage_server mg-query mg-interface-storage-cpp2)
+
+add_manual_test(storage_client_demo.cpp)
+target_link_libraries(${test_prefix}storage_client_demo mg-interface-storage-cpp2 mg-utils)
+
+add_manual_test(trial_server.cpp)
+target_link_libraries(${test_prefix}trial_server mg-interface-trial-cpp2)
+add_manual_test(trial_client.cpp)
+target_link_libraries(${test_prefix}trial_client mg-interface-trial-cpp2)

tests/manual/storage_client_demo.cpp

@@ -0,0 +1,228 @@
+// 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 <chrono>
+#include <iostream>
+#include <optional>
+#include <ratio>
+#include <thread>
+
+#include <folly/Executor.h>
+#include <folly/Unit.h>
+#include <folly/executors/IOThreadPoolExecutor.h>
+#include <folly/executors/ThreadedExecutor.h>
+#include <folly/executors/thread_factory/NamedThreadFactory.h>
+#include <folly/init/Init.h>
+#include <folly/io/async/AsyncSocket.h>
+#include <folly/io/async/EventBase.h>
+#include <folly/io/async/ScopedEventBaseThread.h>
+#include <thrift/lib/cpp2/async/ClientStreamBridge.h>
+#include <thrift/lib/cpp2/async/HeaderClientChannel.h>
+#include <thrift/lib/cpp2/async/RocketClientChannel.h>
+
+#include "interface/gen-cpp2/StorageAsyncClient.h"
+#include "interface/gen-cpp2/storage_types.h"
+#include "storage/v2/view.hpp"
+#include "utils/logging.hpp"
+
+DEFINE_string(host, "127.0.0.1", "Storage Server host");
+DEFINE_int32(port, 7779, "Storage Server port");
+
+using interface::storage::CreateVerticesRequest;
+using interface::storage::StorageAsyncClient;
+using interface::storage::Value;
+using interface::storage::Vertex;
+
+void Print(std::ostream &os, const Value &value) {
+  switch (value.getType()) {
+    case Value::Type::null_v:
+      os << "<null>";
+      break;
+    case Value::Type::bool_v:
+      os << value.get_bool_v();
+      break;
+    case Value::Type::int_v:
+      os << value.get_int_v();
+      break;
+    case Value::Type::string_v:
+      os << value.get_string_v();
+      break;
+    default:
+      os << "UNKNOWN TYPE";
+      break;
+  }
+}
+
+std::optional<int64_t> ScanVertices(const std::shared_ptr<StorageAsyncClient> &client, int64_t transaction_id,
+                                    const std::optional<int64_t> &start_id,
+                                    const std::optional<std::vector<std::string>> &props_to_return,
+                                    const std::optional<int64_t> &limit,
+                                    const memgraph::storage::View view = memgraph::storage::View::NEW) {
+  interface::storage::ScanVerticesRequest req;
+  req.transaction_id_ref() = transaction_id;
+  req.view_ref() = view;
+  if (limit.has_value()) {
+    req.limit_ref() = limit.value();
+  }
+  if (start_id.has_value()) {
+    req.start_id_ref() = start_id.value();
+  }
+
+  if (props_to_return.has_value()) {
+    req.props_to_return_ref() = props_to_return.value();
+  }
+
+  return client->future_scanVertices(req)
+      .then(
+          [&props_to_return](folly::Try<interface::storage::ScanVerticesResponse> &&result) -> std::optional<int64_t> {
+            if (result.hasException()) {
+              LOG(INFO) << "FAILED: " << result.exception().get_exception()->what() << std::endl;
+              return std::nullopt;
+            }
+            if (!*result->result_ref()->success()) {
+              throw std::runtime_error("scan vertices failed");
+            }
+
+            const auto &response = result.value();
+            MG_ASSERT(props_to_return.has_value() != response.property_name_map_ref().has_value());
+            if (props_to_return.has_value()) {
+              const auto values_list_ref = response.values_ref()->listed_ref()->properties_ref();
+              const auto &prop_names = props_to_return.value();
+              if (values_list_ref->empty()) {
+                return std::nullopt;
+              }
+              MG_ASSERT(values_list_ref->at(0).size() == prop_names.size() + 1UL);
+
+              for (const auto &values : *values_list_ref) {
+                auto value_it = values.begin();
+                std::cout << "Vertex(";
+                Print(std::cout, *value_it++);
+                std::cout << ')';
+                auto name_it = prop_names.begin();
+                while (value_it != values.end()) {
+                  std::cout << "\n\t" << *name_it << ": ";
+                  Print(std::cout, *value_it);
+                  ++value_it;
+                  ++name_it;
+                }
+                std::cout << std::endl;
+              }
+            } else {
+              const auto values_list_ref = response.values_ref()->mapped_ref()->properties();
+              const auto mapped_prop_names_ref = response.property_name_map_ref();
+
+              for (const auto &values_map : *values_list_ref) {
+                const auto inner_values_map_ref = values_map.values_map_ref();
+                std::cout << "Vertex(";
+                Print(std::cout, inner_values_map_ref->at(1));
+                std ::cout << ')';
+                for (const auto &[prop_id, value] : *inner_values_map_ref) {
+                  if (prop_id != 1) {
+                    std::cout << "\n\t" << mapped_prop_names_ref->at(prop_id) << ": ";
+                    Print(std::cout, value);
+                  }
+                }
+                std::cout << std::endl;
+              }
+            }
+
+            if (response.next_start_id_ref().has_value()) {
+              return *response.get_next_start_id();
+            }
+            return std::nullopt;
+          })
+      .get();
+}
+
+void CreateVertex(const std::shared_ptr<StorageAsyncClient> &client, std::vector<std::string_view> labels,
+                  std::vector<std::string_view> property_names) {
+  interface::storage::CreateVerticesRequest request {};
+  auto &new_vertex = request.new_vertices_ref()->emplace_back();
+
+  int prop_count = 1;
+  for (const auto prop : property_names) {
+    request.property_name_map()->emplace(prop_count, prop);
+    interface::storage::Value prop_value {};
+    prop_value.set_int_v(prop_count);
+    new_vertex.properties_ref()->emplace(prop_count, std::move(prop_value));
+    prop_count++;
+  }
+  int label_count = 1;
+  for (const auto label : labels) {
+    request.labels_name_map_ref()->emplace(label_count, label);
+    new_vertex.label_ids_ref()->push_back(label_count);
+    label_count++;
+  }
+  LOG(INFO) << "Starting transaction...";
+  client->future_startTransaction()
+      .then([client, request = std::move(request)](folly::Try<int64_t> &&result) mutable {
+        if (result.hasException()) {
+          LOG(INFO) << "FAILED1: " << result.exception().get_exception()->what() << std::endl;
+          return folly::makeFuture<interface::storage::Result>(std::runtime_error("failed to start transaction"));
+        }
+        const auto transaction_id = result.value();
+        request.transaction_id_ref() = transaction_id;
+        LOG(INFO) << "Sending create vertex...";
+        return client->future_createVertices(request) /*.via(evb)*/.then(
+            [transaction_id, client](folly::Try<interface::storage::Result> &&reply) {
+              if (reply.hasException()) {
+                LOG(INFO) << "FAILED2: " << reply.exception().get_exception()->what() << std::endl;
+                return client->future_abortTransaction(transaction_id).then([](folly::Try<void> &&reply) {
+                  return folly::makeFuture<interface::storage::Result>(std::runtime_error("vertex creation failed"));
+                });
+              } else {
+                LOG(INFO) << "SUCCESS\n";
+                return client->future_commitTransaction(transaction_id);
+              }
+            });
+      })
+      .get();
+  LOG(INFO) << "TRANSACTION IS DONE\n\n\n";
+}
+
+int main(int argc, char *argv[]) {
+  FLAGS_logtostderr = true;
+  folly::init(&argc, &argv);
+  auto threadFactory = std::make_shared<folly::NamedThreadFactory>("io-thread");
+  auto ioThreadPool = std::make_shared<folly::IOThreadPoolExecutor>(8, std::move(threadFactory));
+  auto *evb = ioThreadPool->getEventBase();
+
+  folly::AsyncSocket::UniquePtr socket_ptr;
+  evb->runImmediatelyOrRunInEventBaseThreadAndWait(
+      [&socket_ptr, evb]() { socket_ptr = folly::AsyncSocket::newSocket(evb, FLAGS_host, FLAGS_port); });
+  auto headerClientChannel = apache::thrift::HeaderClientChannel::newChannel(std::move(socket_ptr));
+
+  std::shared_ptr<StorageAsyncClient> client(
+      new StorageAsyncClient(std::move(headerClientChannel)),
+      [evb](StorageAsyncClient *p) { evb->runImmediatelyOrRunInEventBaseThreadAndWait([p] { delete p; }); });
+  LOG(INFO) << "Start... ";
+
+  CreateVertex(client, {"label1", "label2"}, {"proop", "prooop2"});
+  CreateVertex(client, {"label1", "label2"}, {"proop", "prooop3"});
+  CreateVertex(client, {"label1", "label2"}, {"proop", "prooop4"});
+
+  CreateVertex(client, {"label1", "label3"}, {"proop", "prooop2"});
+  CreateVertex(client, {"label1", "label4"}, {"proop", "prooop3"});
+  CreateVertex(client, {"label1", "label5"}, {"proop", "prooop4"});
+
+  // const auto transaction_id = client->future_startTransaction().get();
+  // std::vector<std::string> props{"proop", "prooop2"};
+  // auto res = ScanVertices(client, transaction_id, std::nullopt, props, 3);
+  // std::cout << "RES:" << res.value() << std::endl;
+  // res = ScanVertices(client, transaction_id, *res, props, 3);
+  // std::cout << "RES:" << res.value_or(-1) << std::endl;
+  // res = ScanVertices(client, transaction_id, std::nullopt, std::nullopt, 3);
+  // std::cout << "RES:" << res.value() << std::endl;
+  // res = ScanVertices(client, transaction_id, *res, std::nullopt, 3);
+  // std::cout << "RES:" << res.value_or(-1) << std::endl;
+
+  return 1;
+}

tests/manual/storage_server.cpp

@@ -0,0 +1,94 @@
+// 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 <chrono>
+#include <string>
+
+#include <folly/init/Init.h>
+#include <folly/portability/GFlags.h>
+#include <proxygen/httpserver/HTTPServerOptions.h>
+#include <spdlog/common.h>
+#include <thrift/lib/cpp/concurrency/ThreadManager.h>
+#include <thrift/lib/cpp/thrift_config.h>
+#include <thrift/lib/cpp2/server/ThriftProcessor.h>
+#include <thrift/lib/cpp2/server/ThriftServer.h>
+#include <thrift/lib/cpp2/transport/rocket/server/RocketRoutingHandler.h>
+
+#include "query/exceptions.hpp"
+#include "query/frontend/opencypher/generated/MemgraphCypher.h"
+#include "query/frontend/opencypher/generated/MemgraphCypherLexer.h"
+#include "query/interpret/eval.hpp"
+#include "storage_service.hpp"
+
+using apache::thrift::RocketRoutingHandler;
+using apache::thrift::ThriftServer;
+using apache::thrift::ThriftServerAsyncProcessorFactory;
+using manual::storage::StorageServiceHandler;
+
+std::unique_ptr<RocketRoutingHandler> createRoutingHandler(std::shared_ptr<ThriftServer> server) {
+  return std::make_unique<RocketRoutingHandler>(*server);
+}
+
+template <typename ServiceHandler>
+std::shared_ptr<ThriftServer> createServer(
+    memgraph::storage::Storage &db, const int32_t port,
+    const std::shared_ptr<folly::IOThreadPoolExecutor> &ioThreadPool,
+    const std::shared_ptr<apache::thrift::concurrency::ThreadManager> &threadManager) {
+  auto handler = std::make_shared<ServiceHandler>(db);
+  auto proc_factory = std::make_shared<ThriftServerAsyncProcessorFactory<ServiceHandler>>(handler);
+  auto server = std::make_shared<ThriftServer>();
+  server->setPort(port);
+  server->setIOThreadPool(ioThreadPool);
+  server->setInterface(handler);
+  server->setReusePort(true);
+  server->setIdleTimeout(std::chrono::hours(1));
+  server->setNumAcceptThreads(1);
+  server->setListenBacklog(1024);
+  server->setThreadManager(threadManager);
+  return server;
+}
+
+int main(int argc, char **argv) {
+  spdlog::set_level(spdlog::level::trace);
+  // Main storage and execution engines initialization
+  memgraph::storage::Config db_config{
+      .gc = {.type = memgraph::storage::Config::Gc::Type::PERIODIC, .interval = std::chrono::seconds(1000)},
+      .items = {.properties_on_edges = true},
+      .durability = {.storage_directory = "data",
+                     .recover_on_startup = false,
+                     .snapshot_wal_mode = memgraph::storage::Config::Durability::SnapshotWalMode::PERIODIC_SNAPSHOT,
+                     .snapshot_interval = std::chrono::seconds(15),
+                     .snapshot_retention_count = 2,
+                     .wal_file_size_kibibytes = 20480,
+                     .wal_file_flush_every_n_tx = 1,
+                     .snapshot_on_exit = true},
+      .transaction = {.isolation_level = memgraph::storage::IsolationLevel::SNAPSHOT_ISOLATION}};
+
+  memgraph::storage::Storage db(db_config);
+
+  folly::init(&argc, &argv);
+
+  static constexpr auto kNumberOfIoThreads{4};
+  auto threadFactory = std::make_shared<folly::NamedThreadFactory>("io-thread");
+  auto ioThreadPool = std::make_shared<folly::IOThreadPoolExecutor>(kNumberOfIoThreads, std::move(threadFactory));
+  std::shared_ptr<apache::thrift::concurrency::ThreadManager> threadManager(
+      PriorityThreadManager::newPriorityThreadManager(kNumberOfIoThreads));
+
+  auto storage_server = createServer<StorageServiceHandler>(db, 7779, ioThreadPool, threadManager);
+  threadManager->setNamePrefix("executor");
+  threadManager->start();
+
+  std::cout << "alma\n";
+  LOG(ERROR) << "Storage Server running on port: " << 7779;
+  storage_server->serve();
+
+  return 0;
+}

tests/manual/storage_service.cpp

@@ -0,0 +1,316 @@
+// Copyright 2022 Memgraph Ltd.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt; by using this file, you agree to be bound by the terms of the Business Source
+// License, and you may not use this file except in compliance with the Business Source License.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+#include "storage_service.hpp"
+
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <stdexcept>
+
+#include "interface/gen-cpp2/storage_types.h"
+#include "spdlog/spdlog.h"
+#include "storage/v2/id_types.hpp"
+#include "storage/v2/property_value.hpp"
+#include "storage/v2/result.hpp"
+#include "storage/v2/storage.hpp"
+#include "storage/v2/vertex_accessor.hpp"
+#include "storage/v2/view.hpp"
+#include "utils/result.hpp"
+
+namespace {
+// The response in the handler functions are const, so we cannot move out from them
+memgraph::storage::PropertyValue ThriftValueToPropertyValue(const interface::storage::Value &value) {
+  using Type = interface::storage::Value::Type;
+  using PropertyValue = memgraph::storage::PropertyValue;
+  using ThriftValue = interface::storage::Value;
+  switch (value.getType()) {
+    case Type::null_v:
+      return PropertyValue{};
+    case Type::bool_v:
+      return PropertyValue{value.get_bool_v()};
+    case Type::int_v:
+      return PropertyValue{value.get_int_v()};
+    case Type::double_v:
+      return PropertyValue{value.get_double_v()};
+    case Type::string_v:
+      return PropertyValue{value.get_string_v()};
+    case Type::list_v: {
+      std::vector<PropertyValue> result;
+      const auto &list = value.get_list_v();
+      result.resize(list.size());
+      std::transform(list.begin(), list.end(), std::back_insert_iterator(result), ThriftValueToPropertyValue);
+      return PropertyValue{std::move(result)};
+    }
+    case Type::map_v: {
+      std::map<std::string, PropertyValue> result;
+      const auto &map = value.get_map_v();
+      std::transform(map->begin(), map->end(), std::inserter(result, result.end()),
+                     [](const std::pair<std::string, ThriftValue> &p) -> decltype(result)::value_type {
+                       return {std::move(p.first), ThriftValueToPropertyValue(p.second)};
+                     });
+      return PropertyValue{std::move(result)};
+    }
+    case Type::date_v:
+    case Type::local_time_v:
+    case Type::local_date_time_v:
+    case Type::duration_v:
+    case Type::__EMPTY__:
+    case Type::vertex_v:
+    case Type::edge_v:
+    case Type::path_v:
+      // TODO(antaljanosbenjamin): Handle temporal types, assert on entities
+      return PropertyValue{};
+  }
+}
+
+interface::storage::Value PropertyValueToThriftValue(memgraph::storage::PropertyValue &&value) {
+  using Type = memgraph::storage::PropertyValue::Type;
+  using PropertyValue = memgraph::storage::PropertyValue;
+  using ThriftValue = interface::storage::Value;
+  interface::storage::Value thrift_value {};
+
+  switch (value.type()) {
+    case Type::Null:
+      thrift_value.set_null_v();
+      break;
+    case Type::Bool:
+      thrift_value.set_bool_v(value.ValueBool());
+      break;
+    case Type::Int:
+      thrift_value.set_int_v(value.ValueInt());
+      break;
+    case Type::Double:
+      thrift_value.set_double_v(value.ValueDouble());
+      break;
+    case Type::String:
+      thrift_value.set_string_v(std::move(value.ValueString()));
+      break;
+    case Type::List: {
+      std::vector<ThriftValue> result;
+      auto list = std::move(value.ValueList());
+      result.resize(list.size());
+      std::transform(std::make_move_iterator(list.begin()), std::make_move_iterator(list.end()),
+                     std::back_insert_iterator(result), PropertyValueToThriftValue);
+      thrift_value.set_list_v(std::move(result));
+      break;
+    }
+    case Type::Map: {
+      std::unordered_map<std::string, ThriftValue> result{};
+      auto map = std::move(value.ValueMap());
+      std::transform(std::make_move_iterator(map.begin()), std::make_move_iterator(map.end()),
+                     std::inserter(result, result.end()),
+                     [](std::pair<std::string, PropertyValue> &&p) -> decltype(result)::value_type {
+                       return {std::move(p.first), PropertyValueToThriftValue(std::move(p.second))};
+                     });
+      thrift_value.set_map_v(std::move(result));
+    }
+    case Type::TemporalData:
+      // TODO(antaljanosbenjamin): Handle temporal types, assert on entities
+      break;
+  }
+  return thrift_value;
+}
+static const interface::storage::Value kNullValue = std::invoke([] {
+  interface::storage::Value value;
+  value.set_null_v();
+  return value;
+});
+
+}  // namespace
+
+namespace manual::storage {
+int64_t StorageServiceHandler::startTransaction() {
+  spdlog::info("Starting transaction");
+  static std::atomic<int64_t> counter{0};
+  const auto transaction_id = ++counter;
+  active_transactions_.insert(transaction_id, std::make_shared<memgraph::storage::Storage::Accessor>(db_.Access()));
+  return transaction_id;
+};
+
+void StorageServiceHandler::commitTransaction(::interface::storage::Result &result, int64_t transaction_id) {
+  spdlog::info("Commiting transaction");
+  if (auto accessor_it = active_transactions_.find(transaction_id); accessor_it != active_transactions_.end()) {
+    result.success_ref() = accessor_it->second->Commit().HasError();
+  } else {
+    result.success_ref() = false;
+  }
+};
+
+void StorageServiceHandler::abortTransaction(int64_t transaction_id) {
+  spdlog::info("Aborting transaction");
+  if (auto accessor_it = active_transactions_.find(transaction_id); accessor_it != active_transactions_.end()) {
+    accessor_it->second->Abort();
+  }
+};
+
+void StorageServiceHandler::createVertices(::interface::storage::Result &result,
+                                           const ::interface::storage::CreateVerticesRequest &req) {
+  spdlog::info("Creating vertex...");
+  result.success_ref() = false;
+  auto accessor = active_transactions_.at(req.get_transaction_id());
+  const auto &labels_map = req.get_labels_name_map();
+  const auto &property_names_map = req.get_property_name_map();
+  // auto accessor = db_.Access();
+
+  for (auto &new_vertex : *req.new_vertices_ref()) {
+    auto vertex = accessor->CreateVertex();
+    for (const auto label_id : new_vertex.get_label_ids()) {
+      if (const auto result = vertex.AddLabel(accessor->NameToLabel(labels_map.at(label_id))); result.HasError()) {
+        return;
+      }
+    }
+
+    for (auto &[prop_id, prop] : *new_vertex.properties_ref()) {
+      if (const auto result = vertex.SetProperty(accessor->NameToProperty(property_names_map.at(prop_id)),
+                                                 ThriftValueToPropertyValue(prop));
+          result.HasError()) {
+        return;
+      }
+    }
+  }
+
+  spdlog::info("Vertex creation done!");
+}
+
+static_assert(sizeof(apache::thrift::optional_field_ref<interface::storage::Values &>) > 16);
+
+std::function<memgraph::utils::BasicResult<std::string>(memgraph::storage::VertexAccessor)> CreateVertexProcessor(
+    memgraph::storage::Storage::Accessor &db_accessor, interface::storage::Values &values,
+    apache::thrift::optional_field_ref<std::unordered_map<int64_t, std::string> &> property_name_map_ref,
+    const apache::thrift::optional_field_ref<const std::vector<::std::string> &> &props_to_return_ref,
+    const memgraph::storage::View view) {
+  if (!props_to_return_ref.has_value()) {
+    values.set_mapped();
+
+    auto &mapped_values = values.mutable_mapped();
+    auto result_props_ref = mapped_values.properties_ref();
+    property_name_map_ref.ensure();
+    auto &property_name_map = *property_name_map_ref;
+
+    static constexpr auto vertex_id_id = 1L;
+    auto internal_id_to_thrift_id = [&db_accessor, &property_name_map,
+                                     cache = std::unordered_map<memgraph::storage::PropertyId, int64_t>{},
+                                     next_id = vertex_id_id + 1l](memgraph::storage::PropertyId prop_id) mutable {
+      if (const auto it = cache.find(prop_id); it != cache.end()) {
+        return it->second;
+      }
+
+      const auto &name = db_accessor.PropertyToName(prop_id);
+      property_name_map.emplace(next_id, name);
+      cache.emplace(prop_id, next_id);
+      return next_id++;
+    };
+    return [result_props_ref = std::move(result_props_ref), view,
+            internal_id_to_thrift_id = std::move(internal_id_to_thrift_id)](
+               memgraph::storage::VertexAccessor vertex_acc) mutable -> memgraph::utils::BasicResult<std::string> {
+      auto props_res = vertex_acc.Properties(view);
+      if (props_res.HasError()) {
+        // TODO(antaljanosbenjamin): More fine grained error handling
+        return std::string{"Vertex deleted"};
+      }
+      interface::storage::ValuesMap values_map;
+      auto row_ref = values_map.values_map_ref();
+      interface::storage::Value vertex_id;
+      vertex_id.set_int_v(vertex_acc.Gid().AsInt());
+      row_ref->reserve(props_res->size() + 1);
+      row_ref->emplace(vertex_id_id, std::move(vertex_id));
+      for (auto &[prop_id, prop] : *props_res) {
+        const auto thrift_id = internal_id_to_thrift_id(prop_id);
+        row_ref->emplace(thrift_id, PropertyValueToThriftValue(std::move(prop)));
+      }
+      result_props_ref->push_back(std::move(values_map));
+      return {};
+    };
+  }
+  values.set_listed({});
+  auto &listed_values = values.mutable_listed();
+  auto result_props_ref = listed_values.properties_ref();
+  if (props_to_return_ref->empty()) {
+    // Return only the vertex ids
+    return [result_props_ref = std::move(result_props_ref),
+            view](memgraph::storage::VertexAccessor vertex_acc) mutable -> memgraph::utils::BasicResult<std::string> {
+      if (!vertex_acc.IsVisible(view)) {
+        return {};
+      }
+      auto &values_list = result_props_ref->emplace_back();
+      auto &value = values_list.emplace_back();
+      value.set_int_v(vertex_acc.Gid().AsInt());
+      return {};
+    };
+  }
+
+  // Return properties in order
+  std::vector<memgraph::storage::PropertyId> prop_ids_to_return{};
+  prop_ids_to_return.reserve(props_to_return_ref->size());
+  std::transform(props_to_return_ref->begin(), props_to_return_ref->end(), std::back_inserter(prop_ids_to_return),
+                 std::bind_front(&memgraph::storage::Storage::Accessor::NameToProperty, &db_accessor));
+
+  return [result_props_ref = std::move(result_props_ref), prop_ids_to_return = std::move(prop_ids_to_return),
+          view](memgraph::storage::VertexAccessor vertex_acc) mutable -> memgraph::utils::BasicResult<std::string> {
+    if (!vertex_acc.IsVisible(view)) {
+      return {};
+    }
+    std::vector<interface::storage::Value> row{};
+    row.reserve(prop_ids_to_return.size() + 1);
+    {
+      interface::storage::Value vertex_id;
+      vertex_id.set_int_v(vertex_acc.Gid().AsInt());
+      row.push_back(std::move(vertex_id));
+    }
+    for (const auto &prop_id : prop_ids_to_return) {
+      auto property_result = vertex_acc.GetProperty(prop_id, view);
+      if (property_result.HasError()) {
+        // TODO(antaljanosbenjamin): More fine grained error handling
+        return std::string{"Vertex deleted"};
+      }
+      row.push_back(PropertyValueToThriftValue(std::move(property_result.GetValue())));
+    }
+    result_props_ref->push_back(std::move(row));
+    return {};
+  };
+}
+
+void StorageServiceHandler::scanVertices(::interface::storage::ScanVerticesResponse &resp,
+                                         const ::interface::storage::ScanVerticesRequest &req) {
+  resp.result_ref()->success_ref() = false;
+  auto accessor = active_transactions_.at(req.get_transaction_id());
+  // TODO(antaljanosbenjamin): handle filter
+  const auto view = req.get_view();
+  auto vertices = accessor->Vertices(view);
+  auto it = vertices.begin();
+  if (const auto *start_id = req.get_start_id(); start_id != nullptr) {
+    it = vertices.IterateFrom(memgraph::storage::Gid::FromInt(*start_id));
+  }
+  auto count = 0;
+  auto vertex_processor = CreateVertexProcessor(*accessor, *resp.values(), resp.property_name_map_ref(),
+                                                req.props_to_return_ref(), req.get_view());
+
+  const auto limit = std::invoke([&]() -> int64_t {
+    if (req.limit_ref().has_value()) {
+      return *req.limit_ref();
+    }
+    return 50;
+  });
+
+  while (count < limit && it != vertices.end()) {
+    if (const auto res = vertex_processor(*it); res.HasError()) {
+      throw std::runtime_error{res.GetError()};
+    };
+    ++it;
+    ++count;
+  }
+  if (it != vertices.end()) {
+    resp.next_start_id_ref() = (*it).Gid().AsInt();
+  }
+  resp.result_ref()->success_ref() = true;
+}
+}  // namespace manual::storage

tests/manual/storage_service.hpp

@@ -0,0 +1,43 @@
+// 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 <vector>
+
+#include <folly/concurrency/ConcurrentHashMap.h>
+
+#include "interface/gen-cpp2/Storage.h"
+#include "interface/gen-cpp2/storage_types.h"
+#include "storage/v2/storage.hpp"
+
+namespace manual::storage {
+// TODO(antaljanosbenjamin):
+// - Check out different approaches of how Thrift message members can be read/write
+class StorageServiceHandler final : public interface::storage::StorageSvIf {
+ public:
+  explicit StorageServiceHandler(memgraph::storage::Storage &db) : db_{db} {}
+
+  int64_t startTransaction() override;
+  void commitTransaction(::interface::storage::Result &result, int64_t transaction_id) override;
+  void abortTransaction(int64_t transaction_id) override;
+
+  void createVertices(::interface::storage::Result &result,
+                      const ::interface::storage::CreateVerticesRequest &req) override;
+
+  void scanVertices(::interface::storage::ScanVerticesResponse &resp,
+                    const ::interface::storage::ScanVerticesRequest &req) override;
+
+ private:
+  memgraph::storage::Storage &db_;
+  folly::ConcurrentHashMap<int64_t, std::shared_ptr<memgraph::storage::Storage::Accessor>> active_transactions_;
+};
+}  // namespace manual::storage

tests/manual/trial_client.cpp

@@ -0,0 +1,49 @@
+// 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 <iostream>
+
+#include <folly/init/Init.h>
+#include <thrift/lib/cpp2/async/HeaderClientChannel.h>
+#include "interface/gen-cpp2/PingPong.h"  // From generated code
+#include "interface/gen-cpp2/PingPongAsyncClient.h"
+
+using namespace apache::thrift;
+using namespace cpp2;
+using namespace folly;
+
+int main(int argc, char **argv) {
+  EventBase base;
+  static constexpr int port = 6666;  // The port on which server is listening
+  folly::init(&argc, &argv);
+
+  // Create a async client socket and connect it. Change
+  // the ip address to where the server is listening
+
+  auto socket(folly::AsyncSocket::newSocket(&base, "127.0.0.1", port));
+
+  // Create a HeaderClientChannel object which is used in creating
+  // client object
+  auto client_channel = HeaderClientChannel::newChannel(std::move(socket));
+  // Create a client object
+  PingPongAsyncClient client(std::move(client_channel));
+  // Invoke the add function on the server. As we are doing async
+  // invocation of the function, we do not immediately get
+  // the result. Instead we get a future object.
+  Ping req{};
+  req.message_ref() = "I am here!";
+  Pong result{};
+  LOG(ERROR) << "Sending...";
+  client.sync_ping(result, req);
+  LOG(ERROR) << result.get_message();
+
+  return 0;
+}

tests/manual/trial_server.cpp

@@ -0,0 +1,56 @@
+// 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 <iostream>
+
+#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/server/ThriftServer.h>
+#include "interface/gen-cpp2/PingPong.h"  // This is included from generated code
+
+using namespace apache::thrift;
+using namespace cpp2;
+
+const std::string prefix{"Prefix"};
+
+// The thrift has generated service interface with name CalculatorSvIf
+// At server side we have to implement this interface
+class PingPongSvc : public PingPongSvIf {
+ public:
+  virtual ~PingPongSvc() {}
+  // We have to implement async_tm_add to implement the add function
+  // of the Calculator service which we defined in calculator.thrift file
+  void ping(Pong &res, const Ping &req) {
+    LOG(ERROR) << "Received\n";
+    res.message_ref() = prefix + req.get_message();
+    LOG(ERROR) << "Sent\n";
+  }
+};
+
+int main(int argc, char **argv) {
+  folly::init(&argc, &argv);
+  // To create a server, we need to first create server handler object.
+  // The server handler object contains the implementation of the service.
+  std::shared_ptr<PingPongSvc> ptr(new PingPongSvc());
+  // Create a thrift server
+  ThriftServer *s = new ThriftServer();
+
+  // Set server handler object
+  s->setInterface(ptr);
+  // Set the server port
+  s->setPort(6666);
+  // Start the server to serve!!
+  s->serve();
+
+  return 0;
+}