From c8d7bb743d28ffd0b470c6c98c6e33321c8da4cf Mon Sep 17 00:00:00 2001
From: Andi Skrgat <andi8647@gmail.com>
Date: Wed, 17 May 2023 12:20:25 +0200
Subject: [PATCH] Imports cleared in mg-storage

---
 src/query/interpreter.cpp                     |  1 +
 src/storage/v2/disk/storage.cpp               | 50 -------------------
 src/storage/v2/disk/storage.hpp               | 44 ----------------
 src/storage/v2/inmemory/storage.cpp           | 33 ++----------
 src/storage/v2/inmemory/storage.hpp           | 40 +--------------
 .../v2/replication/replication_server.cpp     |  3 +-
 .../v2/replication/replication_server.hpp     |  3 ++
 src/storage/v2/storage.hpp                    | 14 +-----
 8 files changed, 12 insertions(+), 176 deletions(-)

diff --git a/src/query/interpreter.cpp b/src/query/interpreter.cpp
index 569ccdd23..d4a7cd292 100644
--- a/src/query/interpreter.cpp
+++ b/src/query/interpreter.cpp
@@ -64,6 +64,7 @@
 #include "utils/logging.hpp"
 #include "utils/memory.hpp"
 #include "utils/memory_tracker.hpp"
+#include "utils/message.hpp"
 #include "utils/on_scope_exit.hpp"
 #include "utils/readable_size.hpp"
 #include "utils/settings.hpp"
diff --git a/src/storage/v2/disk/storage.cpp b/src/storage/v2/disk/storage.cpp
index cf7f33436..7f90979aa 100644
--- a/src/storage/v2/disk/storage.cpp
+++ b/src/storage/v2/disk/storage.cpp
@@ -9,65 +9,15 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include "storage/v2/storage.hpp"
-#include <algorithm>
-#include <atomic>
-#include <boost/exception/exception.hpp>
-#include <cstdint>
-#include <iterator>
-#include <limits>
-#include <memory>
-#include <mutex>
-#include <stop_token>
-#include <string_view>
-#include <variant>
-#include <vector>
-#include "storage/v2/delta.hpp"
-#include "storage/v2/edge.hpp"
-#include "storage/v2/id_types.hpp"
-#include "storage/v2/isolation_level.hpp"
-#include "storage/v2/mvcc.hpp"
-#include "storage/v2/property_store.hpp"
-#include "storage/v2/result.hpp"
-
-#include <gflags/gflags.h>
-#include <spdlog/spdlog.h>
-
-#include "io/network/endpoint.hpp"
-#include "storage/v2/disk/indices.hpp"
 #include "storage/v2/disk/storage.hpp"
 #include "storage/v2/durability/durability.hpp"
 #include "storage/v2/durability/metadata.hpp"
 #include "storage/v2/durability/paths.hpp"
 #include "storage/v2/durability/snapshot.hpp"
 #include "storage/v2/durability/wal.hpp"
-#include "storage/v2/edge_accessor.hpp"
-#include "storage/v2/mvcc.hpp"
-#include "storage/v2/replication/config.hpp"
-#include "storage/v2/replication/enums.hpp"
-#include "storage/v2/replication/replication_persistence_helper.hpp"
-#include "storage/v2/storage_mode.hpp"
-#include "storage/v2/transaction.hpp"
-#include "storage/v2/vertex_accessor.hpp"
-#include "storage/v2/view.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/file.hpp"
-#include "utils/logging.hpp"
-#include "utils/memory_tracker.hpp"
 #include "utils/message.hpp"
 #include "utils/rocksdb.hpp"
-#include "utils/rw_lock.hpp"
-#include "utils/spin_lock.hpp"
 #include "utils/stat.hpp"
-#include "utils/uuid.hpp"
-
-/// REPLICATION ///
-#include "storage/v2/replication/replication_client.hpp"
-#include "storage/v2/replication/replication_server.hpp"
-#include "storage/v2/replication/rpc.hpp"
-#include "storage/v2/storage_error.hpp"
-
-#include "storage/v2/disk/rocksdb_storage.hpp"
 
 namespace memgraph::storage {
 
diff --git a/src/storage/v2/disk/storage.hpp b/src/storage/v2/disk/storage.hpp
index 9874f7272..92ff269cb 100644
--- a/src/storage/v2/disk/storage.hpp
+++ b/src/storage/v2/disk/storage.hpp
@@ -11,52 +11,8 @@
 
 #pragma once
 
-#include <atomic>
-#include <cstdint>
-#include <filesystem>
-#include <optional>
-#include <shared_mutex>
-#include <span>
-#include <variant>
-
-#include "io/network/endpoint.hpp"
-#include "kvstore/kvstore.hpp"
-#include "storage/v2/commit_log.hpp"
-#include "storage/v2/config.hpp"
-#include "storage/v2/constraints.hpp"
-#include "storage/v2/disk/indices.hpp"
 #include "storage/v2/disk/rocksdb_storage.hpp"
-#include "storage/v2/durability/metadata.hpp"
-#include "storage/v2/durability/wal.hpp"
-#include "storage/v2/edge.hpp"
-#include "storage/v2/edge_accessor.hpp"
-#include "storage/v2/id_types.hpp"
-#include "storage/v2/isolation_level.hpp"
-#include "storage/v2/mvcc.hpp"
-#include "storage/v2/name_id_mapper.hpp"
-#include "storage/v2/property_store.hpp"
-#include "storage/v2/result.hpp"
 #include "storage/v2/storage.hpp"
-#include "storage/v2/storage_mode.hpp"
-#include "storage/v2/transaction.hpp"
-#include "storage/v2/vertex.hpp"
-#include "storage/v2/vertex_accessor.hpp"
-#include "utils/exceptions.hpp"
-#include "utils/file_locker.hpp"
-#include "utils/on_scope_exit.hpp"
-#include "utils/rw_lock.hpp"
-#include "utils/scheduler.hpp"
-#include "utils/skip_list.hpp"
-#include "utils/synchronized.hpp"
-#include "utils/uuid.hpp"
-
-/// REPLICATION ///
-#include "rpc/server.hpp"
-#include "storage/v2/replication/config.hpp"
-#include "storage/v2/replication/enums.hpp"
-#include "storage/v2/replication/rpc.hpp"
-#include "storage/v2/replication/serialization.hpp"
-#include "storage/v2/storage_error.hpp"
 
 /// ROCKSDB
 #include <rocksdb/db.h>
diff --git a/src/storage/v2/inmemory/storage.cpp b/src/storage/v2/inmemory/storage.cpp
index d7d72b690..9fdfef3f8 100644
--- a/src/storage/v2/inmemory/storage.cpp
+++ b/src/storage/v2/inmemory/storage.cpp
@@ -9,44 +9,17 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include "storage/v2/storage.hpp"
-#include <algorithm>
-#include <atomic>
-#include <memory>
-#include <mutex>
-#include <variant>
-
-#include <gflags/gflags.h>
-#include <spdlog/spdlog.h>
-
-#include "io/network/endpoint.hpp"
+#include "storage/v2/inmemory/storage.hpp"
 #include "storage/v2/durability/durability.hpp"
-#include "storage/v2/durability/metadata.hpp"
-#include "storage/v2/durability/paths.hpp"
 #include "storage/v2/durability/snapshot.hpp"
 #include "storage/v2/durability/wal.hpp"
 #include "storage/v2/edge_accessor.hpp"
-#include "storage/v2/inmemory/storage.hpp"
-#include "storage/v2/mvcc.hpp"
 #include "storage/v2/replication/config.hpp"
 #include "storage/v2/replication/enums.hpp"
-#include "storage/v2/replication/replication_persistence_helper.hpp"
-#include "storage/v2/transaction.hpp"
-#include "storage/v2/vertex_accessor.hpp"
-#include "utils/file.hpp"
-#include "utils/logging.hpp"
-#include "utils/memory_tracker.hpp"
-#include "utils/message.hpp"
-#include "utils/rw_lock.hpp"
-#include "utils/spin_lock.hpp"
-#include "utils/stat.hpp"
-#include "utils/uuid.hpp"
-
-/// REPLICATION ///
 #include "storage/v2/replication/replication_client.hpp"
+#include "storage/v2/replication/replication_persistence_helper.hpp"
 #include "storage/v2/replication/replication_server.hpp"
-#include "storage/v2/replication/rpc.hpp"
-#include "storage/v2/storage_error.hpp"
+#include "storage/v2/vertex_accessor.hpp"
 
 namespace memgraph::storage {
 
diff --git a/src/storage/v2/inmemory/storage.hpp b/src/storage/v2/inmemory/storage.hpp
index 6299f4eeb..83cded036 100644
--- a/src/storage/v2/inmemory/storage.hpp
+++ b/src/storage/v2/inmemory/storage.hpp
@@ -11,47 +11,9 @@
 
 #pragma once
 
-#include <atomic>
-#include <cstdint>
-#include <filesystem>
-#include <optional>
-#include <shared_mutex>
-#include <span>
-#include <variant>
-
-#include "io/network/endpoint.hpp"
-#include "kvstore/kvstore.hpp"
-#include "storage/v2/commit_log.hpp"
-#include "storage/v2/config.hpp"
-#include "storage/v2/constraints.hpp"
-#include "storage/v2/durability/metadata.hpp"
-#include "storage/v2/durability/wal.hpp"
-#include "storage/v2/edge.hpp"
-#include "storage/v2/edge_accessor.hpp"
-#include "storage/v2/indices.hpp"
-#include "storage/v2/isolation_level.hpp"
-#include "storage/v2/mvcc.hpp"
-#include "storage/v2/name_id_mapper.hpp"
-#include "storage/v2/result.hpp"
-#include "storage/v2/storage.hpp"
-#include "storage/v2/transaction.hpp"
-#include "storage/v2/vertex.hpp"
-#include "storage/v2/vertex_accessor.hpp"
-#include "utils/file_locker.hpp"
-#include "utils/on_scope_exit.hpp"
-#include "utils/rw_lock.hpp"
-#include "utils/scheduler.hpp"
-#include "utils/skip_list.hpp"
-#include "utils/synchronized.hpp"
-#include "utils/uuid.hpp"
-
-/// REPLICATION ///
-#include "rpc/server.hpp"
 #include "storage/v2/replication/config.hpp"
 #include "storage/v2/replication/enums.hpp"
-#include "storage/v2/replication/rpc.hpp"
-#include "storage/v2/replication/serialization.hpp"
-#include "storage/v2/storage_error.hpp"
+#include "storage/v2/storage.hpp"
 
 namespace memgraph::storage {
 
diff --git a/src/storage/v2/replication/replication_server.cpp b/src/storage/v2/replication/replication_server.cpp
index 4066bad89..fc2cabf7c 100644
--- a/src/storage/v2/replication/replication_server.cpp
+++ b/src/storage/v2/replication/replication_server.cpp
@@ -9,7 +9,6 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-#include "storage/v2/replication/replication_server.hpp"
 #include <atomic>
 #include <filesystem>
 
@@ -20,7 +19,9 @@
 #include "storage/v2/durability/snapshot.hpp"
 #include "storage/v2/durability/version.hpp"
 #include "storage/v2/durability/wal.hpp"
+#include "storage/v2/edge_accessor.hpp"
 #include "storage/v2/replication/config.hpp"
+#include "storage/v2/replication/replication_server.hpp"
 #include "storage/v2/transaction.hpp"
 #include "utils/exceptions.hpp"
 
diff --git a/src/storage/v2/replication/replication_server.hpp b/src/storage/v2/replication/replication_server.hpp
index b6bbaeb1b..6be1ad23c 100644
--- a/src/storage/v2/replication/replication_server.hpp
+++ b/src/storage/v2/replication/replication_server.hpp
@@ -11,7 +11,10 @@
 
 #pragma once
 
+#include "rpc/server.hpp"
+#include "slk/streams.hpp"
 #include "storage/v2/inmemory/storage.hpp"
+#include "storage/v2/replication/replication_client.hpp"
 
 namespace memgraph::storage {
 
diff --git a/src/storage/v2/storage.hpp b/src/storage/v2/storage.hpp
index 7a914b237..d9ab19018 100644
--- a/src/storage/v2/storage.hpp
+++ b/src/storage/v2/storage.hpp
@@ -11,8 +11,6 @@
 
 #pragma once
 
-#include <deque>
-#include <set>
 #include <span>
 
 #include "io/network/endpoint.hpp"
@@ -22,19 +20,11 @@
 #include "storage/v2/durability/paths.hpp"
 #include "storage/v2/durability/wal.hpp"
 #include "storage/v2/indices.hpp"
-#include "storage/v2/name_id_mapper.hpp"
-#include "storage/v2/result.hpp"
-#include "storage/v2/storage_error.hpp"
-#include "storage/v2/storage_mode.hpp"
-#include "storage/v2/vertex_accessor.hpp"
-#include "storage/v2/view.hpp"
-
+#include "storage/v2/mvcc.hpp"
 #include "storage/v2/replication/config.hpp"
 #include "storage/v2/replication/enums.hpp"
-#include "utils/file.hpp"
-#include "utils/rw_lock.hpp"
+#include "storage/v2/storage_error.hpp"
 #include "utils/scheduler.hpp"
-#include "utils/synchronized.hpp"
 #include "utils/uuid.hpp"
 
 namespace memgraph::storage {