Move file_storage.hpp to file_system subdirectory

15 files changed, 34 insertions, 16 deletions

diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index ee65b3e3..702eaa3f 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -92,6 +92,7 @@
     , ["@", "json", "", "json"]
     , ["src/buildtool/common", "common"]
     , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/file_system", "file_storage"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/execution_api/common", "common"]
diff --git a/src/buildtool/build_engine/target_map/target_cache.hpp b/src/buildtool/build_engine/target_map/target_cache.hpp
index b6b54ce0..ef25c058 100644
--- a/src/buildtool/build_engine/target_map/target_cache.hpp
+++ b/src/buildtool/build_engine/target_map/target_cache.hpp
@@ -27,8 +27,8 @@
 #include "src/buildtool/build_engine/target_map/target_cache_entry.hpp"
 #include "src/buildtool/build_engine/target_map/target_cache_key.hpp"
 #include "src/buildtool/common/artifact.hpp"
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/buildtool/file_system/object_type.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #ifndef BOOTSTRAP_BUILD_TOOL
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index d6257f88..c7311e11 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -13,8 +13,7 @@
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["local"]
   , "hdrs":
-    [ "file_storage.hpp"
-    , "local_api.hpp"
+    [ "local_api.hpp"
     , "local_action.hpp"
     , "local_response.hpp"
     , "local_storage.hpp"
@@ -29,6 +28,7 @@
     , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
     , ["src/buildtool/execution_api/bazel_msg", "blob_tree"]
+    , ["src/buildtool/file_system", "file_storage"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/logging", "logging"]
diff --git a/src/buildtool/execution_api/local/local_ac.hpp b/src/buildtool/execution_api/local/local_ac.hpp
index 57909028..7800d16f 100644
--- a/src/buildtool/execution_api/local/local_ac.hpp
+++ b/src/buildtool/execution_api/local/local_ac.hpp
@@ -19,8 +19,8 @@
 #include "src/buildtool/common/bazel_types.hpp"
 #include "src/buildtool/execution_api/common/execution_common.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
diff --git a/src/buildtool/execution_api/local/local_cas.hpp b/src/buildtool/execution_api/local/local_cas.hpp
index 29607ad0..82716ffe 100644
--- a/src/buildtool/execution_api/local/local_cas.hpp
+++ b/src/buildtool/execution_api/local/local_cas.hpp
@@ -22,7 +22,7 @@
 #include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp"
 #include "src/buildtool/execution_api/common/execution_common.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
-#include "src/buildtool/execution_api/local/file_storage.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/buildtool/file_system/file_system_manager.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index bb1d3503..c453ec82 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -5,6 +5,16 @@
   , "deps": [["@", "gsl-lite", "", "gsl-lite"]]
   , "stage": ["src", "buildtool", "file_system"]
   }
+, "file_storage":
+  { "type": ["@", "rules", "CC", "library"]
+  , "name": ["file_storage"]
+  , "hdrs": ["file_storage.hpp"]
+  , "deps":
+    [ ["src/buildtool/execution_api/common", "common"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    ]
+  , "stage": ["src", "buildtool", "file_system"]
+  }
 , "file_system_manager":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["file_system_manager"]
diff --git a/src/buildtool/execution_api/local/file_storage.hpp b/src/buildtool/file_system/file_storage.hpp
index e562fdc8..f320375d 100644
--- a/src/buildtool/execution_api/local/file_storage.hpp
+++ b/src/buildtool/file_system/file_storage.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_FILE_STORAGE_HPP
-#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_FILE_STORAGE_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_FILE_STORAGE_HPP
+#define INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_FILE_STORAGE_HPP
 
 #include <filesystem>
 #include <string>
@@ -186,4 +186,4 @@ class FileStorage {
     }
 };
 
-#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_FILE_STORAGE_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_FILE_SYSTEM_FILE_STORAGE_HPP
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS
index 6706b780..e534d986 100644
--- a/src/other_tools/just_mr/TARGETS
+++ b/src/other_tools/just_mr/TARGETS
@@ -33,7 +33,10 @@
     ]
   , "stage": ["src", "other_tools", "just_mr"]
   , "private-deps":
-    [["src/utils/cpp", "path"], ["src/buildtool/execution_api/local", "local"]]
+    [ ["src/utils/cpp", "path"]
+    , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/file_system", "file_storage"]
+    ]
   }
 , "exit_codes":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/other_tools/just_mr/utils.cpp b/src/other_tools/just_mr/utils.cpp
index f0ca606c..f2272053 100644
--- a/src/other_tools/just_mr/utils.cpp
+++ b/src/other_tools/just_mr/utils.cpp
@@ -14,8 +14,8 @@
 
 #include "src/other_tools/just_mr/utils.hpp"
 
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/utils/cpp/path.hpp"
 
 namespace JustMR::Utils {
diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS
index b5f2fe16..72002975 100644
--- a/src/other_tools/ops_maps/TARGETS
+++ b/src/other_tools/ops_maps/TARGETS
@@ -62,6 +62,7 @@
     [ ["src/utils/cpp", "curl_easy_handle"]
     , ["src/buildtool/crypto", "hasher"]
     , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/file_system", "file_storage"]
     ]
   }
 , "repo_fetch_map":
@@ -74,6 +75,7 @@
   , "private-deps":
     [ ["src/other_tools/just_mr", "utils"]
     , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/file_system", "file_storage"]
     ]
   }
 }
diff --git a/src/other_tools/ops_maps/content_cas_map.cpp b/src/other_tools/ops_maps/content_cas_map.cpp
index 28b2e4bc..55aa78a7 100644
--- a/src/other_tools/ops_maps/content_cas_map.cpp
+++ b/src/other_tools/ops_maps/content_cas_map.cpp
@@ -15,8 +15,8 @@
 #include "src/other_tools/ops_maps/content_cas_map.hpp"
 
 #include "src/buildtool/crypto/hasher.hpp"
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/utils/cpp/curl_easy_handle.hpp"
 
 namespace {
@@ -124,4 +124,4 @@ auto CreateContentCASMap(JustMR::PathsPtr const& just_mr_paths,
         (*setter)(true);
     };
     return AsyncMapConsumer<ArchiveContent, bool>(ensure_in_cas, jobs);
-}
\ No newline at end of file
+}
diff --git a/src/other_tools/ops_maps/repo_fetch_map.cpp b/src/other_tools/ops_maps/repo_fetch_map.cpp
index e0ff438e..890e8518 100644
--- a/src/other_tools/ops_maps/repo_fetch_map.cpp
+++ b/src/other_tools/ops_maps/repo_fetch_map.cpp
@@ -14,8 +14,8 @@
 
 #include "src/other_tools/ops_maps/repo_fetch_map.hpp"
 
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/other_tools/just_mr/utils.hpp"
 
 auto CreateRepoFetchMap(gsl::not_null<ContentCASMap*> const& content_cas_map,
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index 64f44494..a17bdecd 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -16,6 +16,7 @@
     , ["src/buildtool/execution_api/local", "config"]
     , ["src/buildtool/execution_api/local", "local"]
     , ["src/utils/cpp", "tmp_dir"]
+    , ["src/buildtool/file_system", "file_storage"]
     ]
   }
 , "commit_git_map":
@@ -62,6 +63,7 @@
   , "private-deps":
     [ ["src/utils/cpp", "archive_ops"]
     , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/file_system", "file_storage"]
     ]
   }
 }
diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp
index 9b23c0f9..cab723b4 100644
--- a/src/other_tools/root_maps/content_git_map.cpp
+++ b/src/other_tools/root_maps/content_git_map.cpp
@@ -14,8 +14,8 @@
 
 #include "src/other_tools/root_maps/content_git_map.hpp"
 
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/utils/cpp/archive_ops.hpp"
 
 namespace {
diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp
index 4e75658e..36914118 100644
--- a/src/other_tools/root_maps/distdir_git_map.cpp
+++ b/src/other_tools/root_maps/distdir_git_map.cpp
@@ -18,8 +18,8 @@
 
 #include "src/buildtool/execution_api/common/execution_common.hpp"
 #include "src/buildtool/execution_api/local/config.hpp"
-#include "src/buildtool/execution_api/local/file_storage.hpp"
 #include "src/buildtool/execution_api/local/local_cas.hpp"
+#include "src/buildtool/file_system/file_storage.hpp"
 #include "src/other_tools/just_mr/utils.hpp"
 #include "src/other_tools/ops_maps/content_cas_map.hpp"
 #include "src/other_tools/ops_maps/critical_git_op_map.hpp"
@@ -197,4 +197,4 @@ auto CreateDistdirGitMap(
         }
     };
     return AsyncMapConsumer<DistdirInfo, nlohmann::json>(distdir_to_git, jobs);
-}
\ No newline at end of file
+}