Merge branch 'project-pineapples' into T1083-MG-limit-and-order-expand-one_v3

src/query/v2/db_accessor.hpp

@@ -37,7 +37,7 @@
 // This cannot be avoided by simple include orderings so we
 // simply undefine those macros as we're sure that libkrb5
 // won't and can't be used anywhere in the query engine.
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "utils/logging.hpp"
 #include "utils/result.hpp"
 

src/query/v2/interpreter.cpp

@@ -47,7 +47,6 @@
 #include "query/v2/shard_request_manager.hpp"
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/shard.hpp"
-#include "storage/v3/storage.hpp"
 #include "utils/algorithm.hpp"
 #include "utils/csv_parsing.hpp"
 #include "utils/event_counter.hpp"

src/storage/v3/CMakeLists.txt

@@ -16,12 +16,10 @@ set(storage_v3_src_files
     schemas.cpp
     schema_validator.cpp
     shard.cpp
-    storage.cpp
     shard_rsm.cpp
     bindings/typed_value.cpp
     expr.cpp
-    request_helper.cpp
-    storage.cpp)
+    request_helper.cpp)
 
 # ######################
 find_package(gflags REQUIRED)

src/storage/v3/shard_rsm.cpp

@@ -37,7 +37,6 @@
 #include "storage/v3/schemas.hpp"
 #include "storage/v3/shard.hpp"
 #include "storage/v3/shard_rsm.hpp"
-#include "storage/v3/storage.hpp"
 #include "storage/v3/value_conversions.hpp"
 #include "storage/v3/vertex_accessor.hpp"
 #include "storage/v3/vertex_id.hpp"

src/storage/v3/storage.cpp

@@ -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.
-
-#include "storage/v3/storage.hpp"
-
-#include "storage/v3/config.hpp"
-
-namespace memgraph::storage::v3 {
-
-Storage::Storage(Config config) : config_{config} {}
-
-}  // namespace memgraph::storage::v3

src/storage/v3/storage.hpp

@@ -1,34 +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 <vector>
-
-#include <boost/asio/thread_pool.hpp>
-
-#include "storage/v3/shard.hpp"
-
-namespace memgraph::storage::v3 {
-
-class Storage {
- public:
-  explicit Storage(Config config);
-  // Interface toward shard manipulation
-  // Shard handler -> will use rsm client
-
- private:
-  std::vector<Shard> shards_;
-  boost::asio::thread_pool shard_handlers_;
-  Config config_;
-};
-
-}  // namespace memgraph::storage::v3

tests/unit/query_v2_query_plan_common.hpp

@@ -21,7 +21,7 @@
 #include "query/v2/context.hpp"
 #include "query/v2/db_accessor.hpp"
 #include "query/v2/plan/operator.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "utils/logging.hpp"
 
 #include "query_v2_query_common.hpp"

tests/unit/query_v2_query_plan_create_set_remove_delete.cpp

@@ -30,7 +30,7 @@
 #include "storage/v3/id_types.hpp"
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/schemas.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "storage/v3/vertex.hpp"
 #include "storage/v3/view.hpp"
 

tests/unit/query_v2_query_plan_edge_cases.cpp

@@ -21,7 +21,7 @@
 
 #include "query/v2/interpreter.hpp"
 #include "result_stream_faker.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 
 DECLARE_bool(query_cost_planner);
 

tests/unit/query_v2_query_plan_v2_create_set_remove_delete.cpp

@@ -15,7 +15,7 @@
 #include "query/v2/plan/operator.hpp"
 #include "query_v2_query_plan_common.hpp"
 #include "storage/v3/property_value.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 
 namespace memgraph::query::v2::tests {
 

tests/unit/result_stream_faker.hpp

@@ -16,7 +16,7 @@
 #include "glue/v2/communication.hpp"
 #include "query/v2/bindings/typed_value.hpp"
 
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "utils/algorithm.hpp"
 
 /**

tests/unit/storage_v3_indices.cpp

@@ -18,7 +18,7 @@
 #include "storage/v3/id_types.hpp"
 #include "storage/v3/name_id_mapper.hpp"
 #include "storage/v3/property_value.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "storage/v3/temporal.hpp"
 #include "storage/v3/view.hpp"
 

tests/unit/storage_v3_isolation_level.cpp

@@ -13,7 +13,7 @@
 
 #include "storage/v3/isolation_level.hpp"
 #include "storage/v3/property_value.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 
 namespace memgraph::storage::v3::tests {
 int64_t VerticesCount(Shard::Accessor &accessor) {

tests/unit/storage_v3_schema.cpp

@@ -23,7 +23,7 @@
 #include "storage/v3/property_value.hpp"
 #include "storage/v3/schema_validator.hpp"
 #include "storage/v3/schemas.hpp"
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "storage/v3/temporal.hpp"
 
 using testing::Pair;

tests/unit/storage_v3_test_utils.hpp

@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "storage/v3/storage.hpp"
+#include "storage/v3/shard.hpp"
 #include "storage/v3/view.hpp"
 
 namespace memgraph::storage::v3::tests {