diff options
Diffstat (limited to 'src')
19 files changed, 134 insertions, 46 deletions
diff --git a/src/buildtool/serve_api/remote/TARGETS b/src/buildtool/serve_api/remote/TARGETS index baf2b68c..2e587eaa 100644 --- a/src/buildtool/serve_api/remote/TARGETS +++ b/src/buildtool/serve_api/remote/TARGETS @@ -29,7 +29,9 @@ , "proto": [["src/buildtool/serve_api/serve_service", "just_serve_proto"]] , "stage": ["src", "buildtool", "serve_api", "remote"] , "private-deps": - [ ["src/buildtool/common", "artifact_digest_factory"] + [ ["@", "grpc", "", "grpc++"] + , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common/remote", "client_common"] , ["src/buildtool/logging", "log_level"] ] @@ -43,15 +45,16 @@ , "configuration_client" , "source_tree_client" , "target_client" - , ["src/buildtool/auth", "auth"] + , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] - , ["src/buildtool/common/remote", "port"] , ["src/buildtool/common/remote", "remote_common"] , ["src/buildtool/execution_api/common", "api_bundle"] , ["src/buildtool/execution_api/local", "context"] , ["src/buildtool/execution_api/remote", "context"] , ["src/buildtool/file_system", "git_types"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] + , ["src/buildtool/storage", "config"] + , ["src/buildtool/storage", "storage"] , ["src/utils/cpp", "expected"] ] , "stage": ["src", "buildtool", "serve_api", "remote"] @@ -64,7 +67,6 @@ , "deps": [ ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] - , ["src/buildtool/common/remote", "port"] , ["src/buildtool/common/remote", "remote_common"] , ["src/buildtool/execution_api/common", "api_bundle"] , ["src/buildtool/execution_api/remote", "config"] @@ -76,12 +78,17 @@ , "stage": ["src", "buildtool", "serve_api", "remote"] , "private-deps": [ ["@", "fmt", "", "fmt"] + , ["@", "grpc", "", "grpc++"] , ["@", "json", "", "json"] + , ["@", "protoc", "", "libprotobuf"] , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common/remote", "client_common"] , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/execution_api/common", "common"] + , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] + , ["src/utils/cpp", "expected"] ] } , "configuration_client": @@ -99,7 +106,8 @@ , "proto": [["src/buildtool/serve_api/serve_service", "just_serve_proto"]] , "stage": ["src", "buildtool", "serve_api", "remote"] , "private-deps": - [ ["@", "json", "", "json"] + [ ["@", "grpc", "", "grpc++"] + , ["@", "json", "", "json"] , ["src/buildtool/common/remote", "client_common"] , ["src/buildtool/logging", "log_level"] ] diff --git a/src/buildtool/serve_api/remote/config.hpp b/src/buildtool/serve_api/remote/config.hpp index 699f285a..582727e0 100644 --- a/src/buildtool/serve_api/remote/config.hpp +++ b/src/buildtool/serve_api/remote/config.hpp @@ -16,11 +16,12 @@ #define INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_CONFIG_HPP #include <chrono> +#include <compare> #include <cstddef> #include <exception> #include <filesystem> -#include <iterator> #include <optional> +#include <ratio> // needed by durations #include <string> #include <utility> #include <vector> diff --git a/src/buildtool/serve_api/remote/configuration_client.cpp b/src/buildtool/serve_api/remote/configuration_client.cpp index 90645538..56d057b9 100644 --- a/src/buildtool/serve_api/remote/configuration_client.cpp +++ b/src/buildtool/serve_api/remote/configuration_client.cpp @@ -18,7 +18,12 @@ #include <exception> #include <optional> +#include <string> +#include <utility> +#include <grpcpp/grpcpp.h> + +#include "justbuild/just_serve/just_serve.pb.h" #include "nlohmann/json.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/serve_api/remote/configuration_client.hpp b/src/buildtool/serve_api/remote/configuration_client.hpp index 92f8c2df..3ead1545 100644 --- a/src/buildtool/serve_api/remote/configuration_client.hpp +++ b/src/buildtool/serve_api/remote/configuration_client.hpp @@ -17,9 +17,6 @@ #include <memory> #include <optional> -#include <string> -#include <utility> -#include <vector> #include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" diff --git a/src/buildtool/serve_api/remote/serve_api.hpp b/src/buildtool/serve_api/remote/serve_api.hpp index 3a9443fa..0c301ee6 100644 --- a/src/buildtool/serve_api/remote/serve_api.hpp +++ b/src/buildtool/serve_api/remote/serve_api.hpp @@ -23,11 +23,10 @@ class ServeApi final {}; #include <optional> #include <string> #include <unordered_map> +#include <vector> -#include "src/buildtool/auth/authentication.hpp" -#include "src/buildtool/common/artifact.hpp" +#include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/local/context.hpp" @@ -38,6 +37,8 @@ class ServeApi final {}; #include "src/buildtool/serve_api/remote/configuration_client.hpp" #include "src/buildtool/serve_api/remote/source_tree_client.hpp" #include "src/buildtool/serve_api/remote/target_client.hpp" +#include "src/buildtool/storage/config.hpp" +#include "src/buildtool/storage/target_cache_key.hpp" #include "src/utils/cpp/expected.hpp" class ServeApi final { diff --git a/src/buildtool/serve_api/remote/source_tree_client.cpp b/src/buildtool/serve_api/remote/source_tree_client.cpp index d0053d47..73114350 100644 --- a/src/buildtool/serve_api/remote/source_tree_client.cpp +++ b/src/buildtool/serve_api/remote/source_tree_client.cpp @@ -16,7 +16,13 @@ #include "src/buildtool/serve_api/remote/source_tree_client.hpp" +#include <utility> + +#include <grpcpp/grpcpp.h> + +#include "justbuild/just_serve/just_serve.pb.h" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/serve_api/remote/target_client.cpp b/src/buildtool/serve_api/remote/target_client.cpp index 972b9708..d083b8fc 100644 --- a/src/buildtool/serve_api/remote/target_client.cpp +++ b/src/buildtool/serve_api/remote/target_client.cpp @@ -17,15 +17,23 @@ #include "src/buildtool/serve_api/remote/target_client.hpp" #include <exception> +#include <map> #include <utility> +#include <grpcpp/grpcpp.h> + #include "fmt/core.h" +#include "google/protobuf/repeated_ptr_field.h" +#include "justbuild/just_serve/just_serve.pb.h" #include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/common/execution_api.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/utils/cpp/expected.hpp" namespace { [[nodiscard]] auto GetTargetValue( diff --git a/src/buildtool/serve_api/remote/target_client.hpp b/src/buildtool/serve_api/remote/target_client.hpp index 7e0fb726..21059f2a 100644 --- a/src/buildtool/serve_api/remote/target_client.hpp +++ b/src/buildtool/serve_api/remote/target_client.hpp @@ -26,7 +26,6 @@ #include "justbuild/just_serve/just_serve.grpc.pb.h" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/common/remote/port.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/remote/config.hpp" diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS index 4e9e3909..7f74ef66 100644 --- a/src/buildtool/serve_api/serve_service/TARGETS +++ b/src/buildtool/serve_api/serve_service/TARGETS @@ -13,13 +13,12 @@ , "srcs": ["source_tree.cpp"] , "proto": ["just_serve_proto"] , "deps": - [ ["@", "gsl", "", "gsl"] - , ["src/buildtool/common/remote", "remote_common"] + [ ["@", "grpc", "", "grpc++"] + , ["@", "gsl", "", "gsl"] , ["src/buildtool/execution_api/common", "api_bundle"] - , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/local", "context"] - , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/file_system", "git_types"] + , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"] , ["src/buildtool/logging", "logging"] @@ -29,20 +28,31 @@ , "stage": ["src", "buildtool", "serve_api", "serve_service"] , "private-deps": [ ["@", "fmt", "", "fmt"] + , ["@", "json", "", "json"] + , ["@", "protoc", "", "libprotobuf"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common", "common"] + , ["src/buildtool/common", "config"] , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/serve", "mr_git_api"] , ["src/buildtool/execution_api/serve", "utils"] , ["src/buildtool/file_system", "file_system_manager"] + , ["src/buildtool/file_system", "git_cas"] , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/multithreading", "async_map_utils"] + , ["src/buildtool/multithreading", "task_system"] + , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "fs_utils"] , ["src/buildtool/storage", "repository_garbage_collector"] , ["src/buildtool/storage", "storage"] , ["src/utils/archive", "archive_ops"] + , ["src/utils/cpp", "file_locking"] + , ["src/utils/cpp", "hex_string"] + , ["src/utils/cpp", "tmp_dir"] ] } , "serve_server_implementation": @@ -55,7 +65,6 @@ , ["src/buildtool/execution_api/common", "api_bundle"] , ["src/buildtool/execution_api/local", "context"] , ["src/buildtool/execution_api/remote", "context"] - , ["src/buildtool/logging", "logging"] , ["src/buildtool/serve_api/remote", "config"] , ["src/buildtool/serve_api/remote", "serve_api"] ] @@ -67,8 +76,11 @@ , ["@", "fmt", "", "fmt"] , ["@", "grpc", "", "grpc++"] , ["@", "json", "", "json"] + , ["src/buildtool/auth", "auth"] , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/common/remote", "port"] + , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/execution_service", "ac_server"] , ["src/buildtool/execution_api/execution_service", "bytestream_server"] , ["src/buildtool/execution_api/execution_service", "capabilities_server"] @@ -80,8 +92,11 @@ , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/logging", "log_level"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "storage"] + , ["src/utils/cpp", "expected"] + , ["src/utils/cpp", "type_safe_arithmetic"] ] } , "target_service": @@ -91,11 +106,11 @@ , "srcs": ["target.cpp"] , "proto": ["just_serve_proto"] , "deps": - [ ["@", "gsl", "", "gsl"] + [ ["@", "grpc", "", "grpc++"] + , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] , ["src/buildtool/common/remote", "remote_common"] , ["src/buildtool/execution_api/common", "api_bundle"] - , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/local", "context"] , ["src/buildtool/execution_api/remote", "config"] , ["src/buildtool/execution_api/remote", "context"] @@ -109,6 +124,7 @@ [ "target_utils" , ["@", "fmt", "", "fmt"] , ["@", "json", "", "json"] + , ["@", "protoc", "", "libprotobuf"] , ["src/buildtool/build_engine/base_maps", "entity_name"] , ["src/buildtool/build_engine/base_maps", "entity_name_data"] , ["src/buildtool/build_engine/expression", "expression"] @@ -116,9 +132,11 @@ , ["src/buildtool/build_engine/target_map", "configured_target"] , ["src/buildtool/build_engine/target_map", "result_map"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "bazel_types"] + , ["src/buildtool/common", "cli"] , ["src/buildtool/common", "config"] - , ["src/buildtool/common/remote", "retry_config"] , ["src/buildtool/crypto", "hash_function"] + , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_engine/executor", "context"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] @@ -131,8 +149,10 @@ , ["src/buildtool/progress_reporting", "progress"] , ["src/buildtool/progress_reporting", "progress_reporter"] , ["src/buildtool/storage", "backend_description"] + , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "repository_garbage_collector"] , ["src/buildtool/storage", "storage"] + , ["src/utils/cpp", "tmp_dir"] ] } , "configuration_service": @@ -142,12 +162,16 @@ , "srcs": ["configuration.cpp"] , "proto": ["just_serve_proto"] , "deps": - [ ["@", "gsl", "", "gsl"] + [ ["@", "grpc", "", "grpc++"] + , ["@", "gsl", "", "gsl"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/remote", "config"] ] , "stage": ["src", "buildtool", "serve_api", "serve_service"] - , "private-deps": [["src/buildtool/common", "protocol_traits"]] + , "private-deps": + [ ["src/buildtool/common", "protocol_traits"] + , ["src/buildtool/common/remote", "remote_common"] + ] } , "target_utils": { "type": ["@", "rules", "CC", "library"] @@ -157,7 +181,6 @@ , "deps": [ ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "config"] - , ["src/buildtool/common/remote", "remote_common"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/serve_api/remote", "config"] , ["src/buildtool/storage", "config"] @@ -169,7 +192,6 @@ , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system", "git_cas"] , ["src/buildtool/file_system", "git_repo"] - , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "log_level"] ] } diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp index 86cf14a7..2c1a14e4 100644 --- a/src/buildtool/serve_api/serve_service/configuration.cpp +++ b/src/buildtool/serve_api/serve_service/configuration.cpp @@ -16,7 +16,11 @@ #include "src/buildtool/serve_api/serve_service/configuration.hpp" +#include <optional> +#include <string> + #include "src/buildtool/common/protocol_traits.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" auto ConfigurationService::RemoteExecutionEndpoint( ::grpc::ServerContext* /*context*/, diff --git a/src/buildtool/serve_api/serve_service/configuration.hpp b/src/buildtool/serve_api/serve_service/configuration.hpp index 90dceab2..35431b7f 100644 --- a/src/buildtool/serve_api/serve_service/configuration.hpp +++ b/src/buildtool/serve_api/serve_service/configuration.hpp @@ -15,8 +15,11 @@ #ifndef INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_CONFIGURATION_HPP #define INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_CONFIGURATION_HPP +#include <grpcpp/grpcpp.h> + #include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" +#include "justbuild/just_serve/just_serve.pb.h" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/remote/config.hpp" diff --git a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp index 88fad61a..985fa191 100644 --- a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp +++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp @@ -16,21 +16,28 @@ #include "src/buildtool/serve_api/serve_service/serve_server_implementation.hpp" -#include <iostream> -#include <memory> -#include <variant> - #ifdef __unix__ -#include <sys/types.h> +#include <unistd.h> #else #error "Non-unix is not supported yet" #endif +#include <filesystem> +#include <fstream> +#include <memory> +#include <utility> +#include <variant> +#include <vector> + +#include <grpcpp/grpcpp.h> + #include "fmt/core.h" -#include "grpcpp/grpcpp.h" #include "nlohmann/json.hpp" +#include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/port.hpp" +#include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/execution_service/ac_server.hpp" #include "src/buildtool/execution_api/execution_service/bytestream_server.hpp" #include "src/buildtool/execution_api/execution_service/capabilities_server.hpp" @@ -42,11 +49,14 @@ #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/serve_service/configuration.hpp" #include "src/buildtool/serve_api/serve_service/source_tree.hpp" #include "src/buildtool/serve_api/serve_service/target.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" +#include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/type_safe_arithmetic.hpp" namespace { template <typename T> diff --git a/src/buildtool/serve_api/serve_service/serve_server_implementation.hpp b/src/buildtool/serve_api/serve_service/serve_server_implementation.hpp index b272628a..d567c9a9 100644 --- a/src/buildtool/serve_api/serve_service/serve_server_implementation.hpp +++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.hpp @@ -23,7 +23,6 @@ #include "src/buildtool/execution_api/common/api_bundle.hpp" #include "src/buildtool/execution_api/local/context.hpp" #include "src/buildtool/execution_api/remote/context.hpp" -#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index 560d96d3..92480919 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -17,26 +17,39 @@ #include "src/buildtool/serve_api/serve_service/source_tree.hpp" #include <algorithm> +#include <functional> #include <shared_mutex> -#include <thread> +#include <vector> #include "fmt/core.h" +#include "google/protobuf/repeated_ptr_field.h" +#include "nlohmann/json.hpp" #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/common/protocol_traits.hpp" +#include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/serve/mr_git_api.hpp" #include "src/buildtool/execution_api/serve/utils.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/multithreading/async_map_utils.hpp" +#include "src/buildtool/multithreading/task_system.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/buildtool/storage/repository_garbage_collector.hpp" +#include "src/buildtool/storage/storage.hpp" #include "src/utils/archive/archive_ops.hpp" #include "src/utils/cpp/expected.hpp" +#include "src/utils/cpp/file_locking.hpp" +#include "src/utils/cpp/hex_string.hpp" +#include "src/utils/cpp/tmp_dir.hpp" namespace { diff --git a/src/buildtool/serve_api/serve_service/source_tree.hpp b/src/buildtool/serve_api/serve_service/source_tree.hpp index bf3cd9ef..670d190f 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.hpp +++ b/src/buildtool/serve_api/serve_service/source_tree.hpp @@ -17,22 +17,22 @@ #include <filesystem> #include <memory> -#include <mutex> #include <optional> +#include <shared_mutex> #include <string> #include <type_traits> #include <unordered_map> #include <utility> -#include <vector> + +#include <grpcpp/grpcpp.h> #include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" -#include "src/buildtool/common/remote/remote_common.hpp" +#include "justbuild/just_serve/just_serve.pb.h" #include "src/buildtool/execution_api/common/api_bundle.hpp" -#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/local/context.hpp" -#include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/file_system/git_types.hpp" +#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" #include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp index f96f70da..977d7ed7 100644 --- a/src/buildtool/serve_api/serve_service/target.cpp +++ b/src/buildtool/serve_api/serve_service/target.cpp @@ -16,7 +16,14 @@ #include "src/buildtool/serve_api/serve_service/target.hpp" +#include <exception> +#include <functional> +#include <optional> +#include <utility> + #include "fmt/core.h" +#include "google/protobuf/repeated_ptr_field.h" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/entity_name.hpp" #include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" @@ -27,10 +34,12 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/common/remote/retry_config.hpp" +#include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/cli.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/crypto/hash_function.hpp" +#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_engine/executor/context.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -45,9 +54,14 @@ #include "src/buildtool/progress_reporting/progress_reporter.hpp" #include "src/buildtool/serve_api/serve_service/target_utils.hpp" #include "src/buildtool/storage/backend_description.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/buildtool/storage/repository_garbage_collector.hpp" +#include "src/buildtool/storage/storage.hpp" +#include "src/buildtool/storage/target_cache.hpp" +#include "src/buildtool/storage/target_cache_entry.hpp" #include "src/buildtool/storage/target_cache_key.hpp" +#include "src/utils/cpp/tmp_dir.hpp" auto TargetService::GetDispatchList( ArtifactDigest const& dispatch_digest) noexcept diff --git a/src/buildtool/serve_api/serve_service/target.hpp b/src/buildtool/serve_api/serve_service/target.hpp index 04459d08..bc5dfd2c 100644 --- a/src/buildtool/serve_api/serve_service/target.hpp +++ b/src/buildtool/serve_api/serve_service/target.hpp @@ -16,20 +16,18 @@ #define INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_TARGET_HPP #include <filesystem> -#include <map> #include <memory> -#include <optional> #include <string> -#include <utility> #include <vector> +#include <grpcpp/grpcpp.h> + #include "gsl/gsl" #include "justbuild/just_serve/just_serve.grpc.pb.h" -#include "nlohmann/json.hpp" +#include "justbuild/just_serve/just_serve.pb.h" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/execution_api/common/api_bundle.hpp" -#include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/local/context.hpp" #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/execution_api/remote/context.hpp" diff --git a/src/buildtool/serve_api/serve_service/target_utils.cpp b/src/buildtool/serve_api/serve_service/target_utils.cpp index a6463c37..bf23a087 100644 --- a/src/buildtool/serve_api/serve_service/target_utils.cpp +++ b/src/buildtool/serve_api/serve_service/target_utils.cpp @@ -16,14 +16,15 @@ #include <exception> #include <fstream> +#include <map> #include <string> +#include <vector> #include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/file_system/git_repo.hpp" -#include "src/buildtool/file_system/object_type.hpp" #include "src/buildtool/logging/log_level.hpp" auto IsTreeInRepo(std::string const& tree_id, diff --git a/src/buildtool/serve_api/serve_service/target_utils.hpp b/src/buildtool/serve_api/serve_service/target_utils.hpp index e35e9142..731b67f5 100644 --- a/src/buildtool/serve_api/serve_service/target_utils.hpp +++ b/src/buildtool/serve_api/serve_service/target_utils.hpp @@ -22,7 +22,6 @@ #include <utility> #include "gsl/gsl" -#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" |