diff options
Diffstat (limited to 'src')
44 files changed, 134 insertions, 125 deletions
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS index e20f2996..1f280d78 100644 --- a/src/buildtool/common/TARGETS +++ b/src/buildtool/common/TARGETS @@ -20,7 +20,7 @@ [ "clidefaults" , "retry_cli" , ["src/buildtool/build_engine/expression", "expression"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/main", "build_utils"] @@ -192,4 +192,10 @@ ] , "stage": ["src", "buildtool", "common"] } +, "protocol_traits": + { "type": ["@", "rules", "CC", "library"] + , "name": ["protocol_traits"] + , "hdrs": ["protocol_traits.hpp"] + , "stage": ["src", "buildtool", "common"] + } } diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp index 79beaadb..c388879e 100644 --- a/src/buildtool/common/cli.hpp +++ b/src/buildtool/common/cli.hpp @@ -32,8 +32,8 @@ #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" #include "src/buildtool/common/clidefaults.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/retry_cli.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/main/build_utils.hpp" #include "src/utils/cpp/path.hpp" @@ -686,7 +686,7 @@ static inline auto SetupCompatibilityArguments( gsl::not_null<CLI::App*> const& app) { app->add_flag_function( "--compatible", - [](auto /*unused*/) { Compatibility::SetCompatible(); }, + [](auto /*unused*/) { ProtocolTraits::Instance().SetCompatible(); }, "At increased computational effort, be compatible with the original " "remote build execution protocol. As the change affects identifiers, " "the flag must be used consistently for all related invocations."); diff --git a/src/buildtool/compatibility/compatibility.hpp b/src/buildtool/common/protocol_traits.hpp index 5e6b6703..49850233 100644 --- a/src/buildtool/compatibility/compatibility.hpp +++ b/src/buildtool/common/protocol_traits.hpp @@ -12,23 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef INCLUDED_SRC_BUILDTOOL_COMPATIBILITY_COMPATIBILITY_HPP -#define INCLUDED_SRC_BUILDTOOL_COMPATIBILITY_COMPATIBILITY_HPP +#ifndef INCLUDED_SRC_BUILDTOOL_COMMON_PROTOCOL_TRAITS_HPP +#define INCLUDED_SRC_BUILDTOOL_COMMON_PROTOCOL_TRAITS_HPP -class Compatibility final { +class ProtocolTraits final { public: - [[nodiscard]] static auto Instance() noexcept -> Compatibility& { - static Compatibility instance{}; + [[nodiscard]] static auto Instance() noexcept -> ProtocolTraits& { + static ProtocolTraits instance{}; return instance; } - [[nodiscard]] static auto IsCompatible() noexcept -> bool { - return Instance().compatible_; - } - static void SetCompatible(bool value = true) noexcept { - Instance().compatible_ = value; + [[nodiscard]] auto IsCompatible() const noexcept -> bool { + return compatible_; } + void SetCompatible(bool value = true) noexcept { compatible_ = value; } private: bool compatible_ = false; }; -#endif // INCLUDED_SRC_BUILDTOOL_COMPATIBILITY_COMPATIBILITY_HPP +#endif // INCLUDED_SRC_BUILDTOOL_COMMON_PROTOCOL_TRAITS_HPP diff --git a/src/buildtool/compatibility/TARGETS b/src/buildtool/compatibility/TARGETS deleted file mode 100644 index 1bb56609..00000000 --- a/src/buildtool/compatibility/TARGETS +++ /dev/null @@ -1,7 +0,0 @@ -{ "compatibility": - { "type": ["@", "rules", "CC", "library"] - , "name": ["compatibility"] - , "hdrs": ["compatibility.hpp"] - , "stage": ["src", "buildtool", "compatibility"] - } -} diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 4c9cfa81..b417e26a 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -15,6 +15,7 @@ [ "artifact_blob_container" , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/file_system", "file_system_manager"] diff --git a/src/buildtool/execution_api/common/stream_dumper.hpp b/src/buildtool/execution_api/common/stream_dumper.hpp index 81d3bf35..ea0a323d 100644 --- a/src/buildtool/execution_api/common/stream_dumper.hpp +++ b/src/buildtool/execution_api/common/stream_dumper.hpp @@ -22,7 +22,7 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -65,7 +65,7 @@ class StreamDumper final { [[nodiscard]] auto DumpTree( Artifact::ObjectInfo const& info, gsl::not_null<FILE*> const& stream) const noexcept -> bool { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { auto directory = impl_.ReadDirectory(info.digest); auto data = directory ? TreeReaderUtils::DirectoryToString(*directory) diff --git a/src/buildtool/execution_api/common/tree_reader.hpp b/src/buildtool/execution_api/common/tree_reader.hpp index d9048e1f..18e94fe8 100644 --- a/src/buildtool/execution_api/common/tree_reader.hpp +++ b/src/buildtool/execution_api/common/tree_reader.hpp @@ -23,6 +23,7 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -58,7 +59,7 @@ class TreeReader final { return true; }; - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { auto tree = impl_.ReadDirectory(digest); if (tree and not TreeReaderUtils::ReadObjectInfos(*tree, store_info)) { @@ -131,7 +132,7 @@ class TreeReader final { : store(parent / path, info); }; - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { if (auto tree = impl_.ReadDirectory(digest)) { if (include_trees and IsDirectoryEmpty(*tree)) { if (not store(parent, {digest, ObjectType::Tree})) { diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS index cfb845b3..97d70528 100644 --- a/src/buildtool/execution_api/execution_service/TARGETS +++ b/src/buildtool/execution_api/execution_service/TARGETS @@ -25,6 +25,7 @@ , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "protocol_traits"] ] , "private-ldflags": ["-pthread", "-Wl,--whole-archive,-lpthread,--no-whole-archive"] @@ -66,7 +67,7 @@ , ["src/buildtool/storage", "config"] ] , "private-deps": - [ ["src/buildtool/compatibility", "compatibility"] + [ ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/logging", "log_level"] @@ -97,7 +98,7 @@ , ["@", "json", "", "json"] , ["@", "grpc", "", "grpc++"] , ["@", "fmt", "", "fmt"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/common/remote", "port"] ] } @@ -138,7 +139,7 @@ , "private-deps": [ ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] ] } , "operation_cache": diff --git a/src/buildtool/execution_api/execution_service/capabilities_server.cpp b/src/buildtool/execution_api/execution_service/capabilities_server.cpp index d8ba4279..c4ec6b06 100644 --- a/src/buildtool/execution_api/execution_service/capabilities_server.cpp +++ b/src/buildtool/execution_api/execution_service/capabilities_server.cpp @@ -16,7 +16,7 @@ #include <cstddef> -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" @@ -25,7 +25,7 @@ auto CapabilitiesServiceImpl::GetCapabilities( const ::bazel_re::GetCapabilitiesRequest* /*request*/, ::bazel_re::ServerCapabilities* response) -> ::grpc::Status { - if (not Compatibility::IsCompatible()) { + if (not ProtocolTraits::Instance().IsCompatible()) { auto const* str = "GetCapabilities not implemented"; Logger::Log(LogLevel::Error, str); return ::grpc::Status{grpc::StatusCode::UNIMPLEMENTED, str}; diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp index 337eed84..5394b985 100644 --- a/src/buildtool/execution_api/execution_service/cas_server.cpp +++ b/src/buildtool/execution_api/execution_service/cas_server.cpp @@ -25,7 +25,7 @@ #include "fmt/core.h" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/execution_service/cas_utils.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/garbage_collector.hpp" @@ -54,7 +54,7 @@ namespace { bool valid = ref.hash() == computed.hash(); if (valid) { bool const check_sizes = - Compatibility::IsCompatible() or ref.size() != 0; + ProtocolTraits::Instance().IsCompatible() or ref.size() != 0; if (check_sizes) { valid = ref.size() == computed.size(); } diff --git a/src/buildtool/execution_api/execution_service/execution_server.cpp b/src/buildtool/execution_api/execution_service/execution_server.cpp index a213c552..6e3c77ab 100644 --- a/src/buildtool/execution_api/execution_service/execution_server.cpp +++ b/src/buildtool/execution_api/execution_service/execution_server.cpp @@ -276,7 +276,7 @@ namespace { ::bazel_re::OutputDirectory out_dir{}; *(out_dir.mutable_path()) = std::move(path); - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { // In compatible mode: Create a tree digest from directory // digest on the fly and set tree digest. LocalCasReader reader(&storage.CAS()); @@ -410,7 +410,7 @@ namespace { return unexpected{input_root_digest.error()}; } auto const input_root_path = - Compatibility::IsCompatible() + ProtocolTraits::Instance().IsCompatible() ? storage.CAS().BlobPath(*input_root_digest, /*is_executable=*/false) : storage.CAS().TreePath(*input_root_digest); diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp index 81eabe01..e6ad463c 100644 --- a/src/buildtool/execution_api/execution_service/server_implementation.cpp +++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp @@ -26,8 +26,8 @@ #include "fmt/core.h" #include "grpcpp/grpcpp.h" #include "nlohmann/json.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/port.hpp" -#include "src/buildtool/compatibility/compatibility.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" @@ -141,10 +141,12 @@ auto ServerImpl::Run(gsl::not_null<LocalContext const*> const& local_context, } auto const& info_str = nlohmann::to_string(info); - Logger::Log(LogLevel::Info, - fmt::format("{}execution service started: {}", - Compatibility::IsCompatible() ? "compatible " : "", - info_str)); + Logger::Log( + LogLevel::Info, + fmt::format( + "{}execution service started: {}", + ProtocolTraits::Instance().IsCompatible() ? "compatible " : "", + info_str)); if (not info_file_.empty()) { if (not TryWrite(info_file_, info_str)) { diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS index 32d04697..66a57f21 100644 --- a/src/buildtool/execution_api/local/TARGETS +++ b/src/buildtool/execution_api/local/TARGETS @@ -30,6 +30,7 @@ , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common", "config"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/storage", "storage"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/common", "artifact_blob_container"] @@ -37,7 +38,6 @@ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/execution_api/git", "git"] , ["src/buildtool/file_system", "file_system_manager"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp index 97507d35..701acea4 100644 --- a/src/buildtool/execution_api/local/local_action.cpp +++ b/src/buildtool/execution_api/local/local_action.cpp @@ -70,7 +70,7 @@ class BuildCleanupAnchor { [&cas](std::string const& content) -> std::optional<ArtifactDigest> { return cas.StoreBlob(content); }; - return Compatibility::IsCompatible() + return ProtocolTraits::Instance().IsCompatible() ? BazelMsgFactory::CreateDirectoryDigestFromLocalTree( dir_path, store_blob, store_tree, store_symlink) : BazelMsgFactory::CreateGitTreeDigestFromLocalTree( diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index b3e7808d..75f2d578 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -32,8 +32,8 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" #include "src/buildtool/execution_api/common/blob_tree.hpp" @@ -284,7 +284,7 @@ class LocalApi final : public IExecutionApi { return std::nullopt; } - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { return CommonUploadTreeCompatible( *this, *build_root, @@ -383,7 +383,8 @@ class LocalApi final : public IExecutionApi { [[nodiscard]] static auto CreateFallbackApi( RepositoryConfig const* repo_config) noexcept -> std::optional<GitApi> { - if (repo_config == nullptr or Compatibility::IsCompatible()) { + if (repo_config == nullptr or + ProtocolTraits::Instance().IsCompatible()) { return std::nullopt; } return GitApi{repo_config}; diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS index 41079f33..ae67146d 100644 --- a/src/buildtool/execution_api/remote/TARGETS +++ b/src/buildtool/execution_api/remote/TARGETS @@ -50,13 +50,12 @@ , "private-deps": [ ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common", "bazel_digest_factory"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/execution_api/common", "common_api"] , ["src/buildtool/execution_api/utils", "outputscheck"] - , ["src/buildtool/compatibility", "compatibility"] , ["@", "grpc", "", "grpc++"] , ["src/buildtool/common/remote", "retry"] , ["src/buildtool/execution_api/common", "message_limits"] @@ -84,7 +83,6 @@ [ "bazel_network" , ["@", "fmt", "", "fmt"] , ["src/buildtool/auth", "auth"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/common", "artifact_blob_container"] @@ -94,6 +92,7 @@ , ["src/buildtool/storage", "fs_utils"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "protocol_traits"] ] } , "config": diff --git a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp index e36bf942..d0e96292 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_api.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_api.cpp @@ -29,7 +29,7 @@ #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/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_common.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" @@ -527,7 +527,7 @@ auto BazelApi::CreateAction( return std::nullopt; } - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { return CommonUploadTreeCompatible( *this, *build_root, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp index 130012e7..3d08825e 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -24,10 +24,10 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/bazel_digest_factory.hpp" #include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/retry.hpp" #include "src/buildtool/common/remote/retry_config.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" @@ -54,7 +54,7 @@ namespace { stub) noexcept -> bool { // Create empty blob. std::string empty_str{}; - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; auto const digest = BazelDigestFactory::HashDataAs<ObjectType::File>( @@ -120,7 +120,7 @@ namespace { stub) noexcept -> bool { // Create empty blob. std::string empty_str{}; - HashFunction const hash_function{Compatibility::IsCompatible() + HashFunction const hash_function{ProtocolTraits::Instance().IsCompatible() ? HashFunction::Type::PlainSHA256 : HashFunction::Type::GitSHA1}; auto const digest = BazelDigestFactory::HashDataAs<ObjectType::File>( diff --git a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp index 02f189d0..4b411d91 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_network_reader.cpp @@ -40,7 +40,7 @@ BazelNetworkReader::BazelNetworkReader( : instance_name_{other.instance_name_}, cas_{other.cas_}, hash_function_{other.hash_function_} { - if (Compatibility::IsCompatible() and request_remote_tree) { + if (ProtocolTraits::Instance().IsCompatible() and request_remote_tree) { // Query full tree from remote CAS. Note that this is currently not // supported by Buildbarn revision c3c06bbe2a. auto full_tree = diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp index ec76061c..cb481e3e 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp @@ -135,7 +135,7 @@ void BazelResponse::Populate() noexcept { } } - if (not Compatibility::IsCompatible()) { + if (not ProtocolTraits::Instance().IsCompatible()) { // in native mode: just collect and store tree digests for (auto const& tree : action_result.output_directories()) { auto digest = diff --git a/src/buildtool/execution_api/utils/TARGETS b/src/buildtool/execution_api/utils/TARGETS index b202a9ea..cc30421d 100644 --- a/src/buildtool/execution_api/utils/TARGETS +++ b/src/buildtool/execution_api/utils/TARGETS @@ -8,7 +8,7 @@ , ["src/buildtool/execution_api/common", "common"] ] , "private-deps": - [ ["src/buildtool/compatibility", "compatibility"] + [ ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/crypto", "hash_function"] diff --git a/src/buildtool/execution_api/utils/subobject.cpp b/src/buildtool/execution_api/utils/subobject.cpp index 380fe65f..e2c6b256 100644 --- a/src/buildtool/execution_api/utils/subobject.cpp +++ b/src/buildtool/execution_api/utils/subobject.cpp @@ -15,7 +15,7 @@ #include "src/buildtool/execution_api/utils/subobject.hpp" #ifndef BOOTSTRAP_BUILD_TOOL -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/tree_reader_utils.hpp" @@ -43,7 +43,7 @@ auto RetrieveSubPathId(Artifact::ObjectInfo object_info, sofar.string()); return std::nullopt; } - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { auto directory = BazelMsgFactory::MessageFromString<bazel_re::Directory>(*data); if (not directory) { diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS index f24030b2..eabbb371 100644 --- a/src/buildtool/execution_engine/executor/TARGETS +++ b/src/buildtool/execution_engine/executor/TARGETS @@ -9,7 +9,7 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common", "tree"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/execution_engine/dag", "dag"] , ["src/buildtool/execution_api/common", "api_bundle"] diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp index 1d94d2ca..5a1eb857 100644 --- a/src/buildtool/execution_engine/executor/executor.hpp +++ b/src/buildtool/execution_engine/executor/executor.hpp @@ -31,9 +31,9 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/git_hashes_converter.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/common/tree.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/artifact_blob_container.hpp" #include "src/buildtool/execution_api/common/common_api.hpp" @@ -437,7 +437,7 @@ class ExecutorImpl { std::string const& repo, gsl::not_null<const RepositoryConfig*> const& repo_config, Artifact::ObjectInfo const& info) noexcept -> bool { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { auto opt = GitHashesConverter::Instance().GetGitEntry(info.digest.hash()); if (opt) { diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS index 9d5be7a3..47c5e249 100644 --- a/src/buildtool/file_system/TARGETS +++ b/src/buildtool/file_system/TARGETS @@ -171,8 +171,8 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_description"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/crypto", "hash_function"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["@", "gsl", "", "gsl"] diff --git a/src/buildtool/file_system/file_root.hpp b/src/buildtool/file_system/file_root.hpp index 381f5c23..798d8341 100644 --- a/src/buildtool/file_system/file_root.hpp +++ b/src/buildtool/file_system/file_root.hpp @@ -29,7 +29,7 @@ #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" #include "src/buildtool/common/git_hashes_converter.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/git_tree.hpp" @@ -224,7 +224,7 @@ class FileRoot { /// Only succeeds if no entries have to be ignored. [[nodiscard]] auto AsKnownTree(std::string const& repository) const noexcept -> std::optional<ArtifactDescription> { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { return std::nullopt; } if (std::holds_alternative<tree_t>(data_)) { @@ -584,7 +584,7 @@ class FileRoot { std::get<git_root_t>(root_).tree->LookupEntryByPath( file_path)) { if (entry->IsBlob()) { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { auto compatible_hash = GitHashesConverter::Instance().RegisterGitEntry( entry->Hash(), *entry->Blob(), repository); diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS index 03e9dd0f..d58ad86f 100644 --- a/src/buildtool/main/TARGETS +++ b/src/buildtool/main/TARGETS @@ -10,8 +10,8 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/common", "config"] , ["src/buildtool/common/remote", "remote_common"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/storage", "storage"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/graph_traverser", "graph_traverser"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] @@ -154,10 +154,10 @@ , ["src/buildtool/storage", "storage"] ] , "private-deps": - [ ["src/buildtool/compatibility", "compatibility"] + [ ["src/buildtool/common", "protocol_traits"] + , ["src/buildtool/common", "common"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/buildtool/execution_api/common", "common"] - , ["src/buildtool/common", "common"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] @@ -291,6 +291,7 @@ [ ["@", "json", "", "json"] , ["src/buildtool/build_engine/expression", "expression"] , ["src/buildtool/common", "location"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] diff --git a/src/buildtool/main/add_to_cas.cpp b/src/buildtool/main/add_to_cas.cpp index 2a7b2c0b..640c4621 100644 --- a/src/buildtool/main/add_to_cas.cpp +++ b/src/buildtool/main/add_to_cas.cpp @@ -22,7 +22,7 @@ #include <string> #include "src/buildtool/common/artifact_digest.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" @@ -71,7 +71,7 @@ auto AddArtifactsToCas(ToAddArguments const& clargs, digest = cas.StoreBlob(*content, /*is_executable=*/false); } break; case ObjectType::Tree: { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { Logger::Log(LogLevel::Error, "Storing of trees only supported in native mode"); return false; diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index ee118f4a..bb97fc44 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -34,10 +34,10 @@ #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" #include "src/buildtool/common/artifact_description.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/logging/log_config.hpp" @@ -765,7 +765,7 @@ auto main(int argc, char* argv[]) -> int { if (arguments.cmd == SubCommand::kGc) { // Set up storage for GC, as we have all the config args we need. auto const storage_config = CreateStorageConfig( - arguments.endpoint, Compatibility::IsCompatible()); + arguments.endpoint, ProtocolTraits::Instance().IsCompatible()); if (not storage_config) { return kExitFailure; } @@ -803,7 +803,8 @@ auto main(int argc, char* argv[]) -> int { // Set up storage for local execution. auto const storage_config = CreateStorageConfig( - arguments.endpoint, Compatibility::IsCompatible()); + arguments.endpoint, + ProtocolTraits::Instance().IsCompatible()); if (not storage_config) { return kExitFailure; } @@ -865,12 +866,12 @@ auto main(int argc, char* argv[]) -> int { } // Set up storage for serve operation. - auto const storage_config = - CreateStorageConfig(arguments.endpoint, - Compatibility::IsCompatible(), - remote_exec_config->remote_address, - remote_exec_config->platform_properties, - remote_exec_config->dispatch); + auto const storage_config = CreateStorageConfig( + arguments.endpoint, + ProtocolTraits::Instance().IsCompatible(), + remote_exec_config->remote_address, + remote_exec_config->platform_properties, + remote_exec_config->dispatch); if (not storage_config) { return kExitFailure; } @@ -942,7 +943,7 @@ auto main(int argc, char* argv[]) -> int { // correctly-sharded target cache. auto const storage_config = CreateStorageConfig(arguments.endpoint, - Compatibility::IsCompatible(), + ProtocolTraits::Instance().IsCompatible(), remote_exec_config->remote_address, remote_exec_config->platform_properties, remote_exec_config->dispatch); @@ -950,7 +951,7 @@ auto main(int argc, char* argv[]) -> int { // For bootstrapping the TargetCache sharding is not needed, so we can // default all execution arguments. auto const storage_config = CreateStorageConfig( - arguments.endpoint, Compatibility::IsCompatible()); + arguments.endpoint, ProtocolTraits::Instance().IsCompatible()); #endif // BOOTSTRAP_BUILD_TOOL if (not storage_config) { return kExitFailure; @@ -1041,7 +1042,7 @@ auto main(int argc, char* argv[]) -> int { if (arguments.cmd == SubCommand::kTraverse) { if (arguments.graph.git_cas) { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { Logger::Log(LogLevel::Error, "Command line options {} and {} cannot be used " "together.", diff --git a/src/buildtool/main/serve.cpp b/src/buildtool/main/serve.cpp index 622df15e..66787a6e 100644 --- a/src/buildtool/main/serve.cpp +++ b/src/buildtool/main/serve.cpp @@ -31,6 +31,7 @@ #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/common/location.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" @@ -390,7 +391,7 @@ void ReadJustServeConfig(gsl::not_null<CommandLineArguments*> const& clargs) { } // compatibility is set immediately if flag is true if (compatible->Bool()) { - Compatibility::SetCompatible(); + ProtocolTraits::Instance().SetCompatible(); } } // read the address diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS index 6135cd5a..b9b2ca57 100644 --- a/src/buildtool/serve_api/serve_service/TARGETS +++ b/src/buildtool/serve_api/serve_service/TARGETS @@ -34,7 +34,7 @@ [ ["@", "fmt", "", "fmt"] , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "git_repo"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/multithreading", "async_map_utils"] @@ -69,7 +69,7 @@ , ["@", "grpc", "", "grpc++"] , ["@", "json", "", "json"] , ["src/buildtool/common/remote", "port"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/logging", "log_level"] , ["src/buildtool/execution_api/execution_service", "execution_server"] , ["src/buildtool/execution_api/execution_service", "ac_server"] @@ -139,7 +139,7 @@ , "deps": [["@", "gsl", "", "gsl"], ["src/buildtool/execution_api/remote", "config"]] , "stage": ["src", "buildtool", "serve_api", "serve_service"] - , "private-deps": [["src/buildtool/compatibility", "compatibility"]] + , "private-deps": [["src/buildtool/common", "protocol_traits"]] } , "target_utils": { "type": ["@", "rules", "CC", "library"] diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp index a5bd7655..8b340e8c 100644 --- a/src/buildtool/serve_api/serve_service/configuration.cpp +++ b/src/buildtool/serve_api/serve_service/configuration.cpp @@ -16,7 +16,7 @@ #include "src/buildtool/serve_api/serve_service/configuration.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" auto ConfigurationService::RemoteExecutionEndpoint( ::grpc::ServerContext* /*context*/, @@ -33,7 +33,7 @@ auto ConfigurationService::Compatibility( const ::justbuild::just_serve::CompatibilityRequest* /*request*/, ::justbuild::just_serve::CompatibilityResponse* response) -> ::grpc::Status { - response->set_compatible(Compatibility::IsCompatible()); + response->set_compatible(ProtocolTraits::Instance().IsCompatible()); return ::grpc::Status::OK; } 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 7a398a1d..be307ba5 100644 --- a/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp +++ b/src/buildtool/serve_api/serve_service/serve_server_implementation.cpp @@ -29,8 +29,8 @@ #include "fmt/core.h" #include "grpcpp/grpcpp.h" #include "nlohmann/json.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/port.hpp" -#include "src/buildtool/compatibility/compatibility.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" @@ -185,12 +185,14 @@ auto ServeServerImpl::Run( } auto const& info_str = nlohmann::to_string(info); - Logger::Log(LogLevel::Info, - fmt::format("{}serve{} service{} started: {}", - Compatibility::IsCompatible() ? "compatible " : "", - with_execute ? " and execute" : "", - with_execute ? "s" : "", - info_str)); + Logger::Log( + LogLevel::Info, + fmt::format( + "{}serve{} service{} started: {}", + ProtocolTraits::Instance().IsCompatible() ? "compatible " : "", + with_execute ? " and execute" : "", + with_execute ? "s" : "", + info_str)); if (not info_file_.empty()) { if (not TryWrite(info_file_, info_str)) { diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index acc29ba9..ed6fcae0 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -24,7 +24,7 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" @@ -287,7 +287,7 @@ auto SourceTreeService::SyncGitEntryToCas( std::string const& object_hash, std::filesystem::path const& repo_path) const noexcept -> std::remove_cvref_t<decltype(TResponse::OK)> { - if (IsTreeObject(kType) and Compatibility::IsCompatible()) { + if (IsTreeObject(kType) and ProtocolTraits::Instance().IsCompatible()) { logger_->Emit(LogLevel::Error, "Cannot sync tree {} from repository {} with " "the remote in compatible mode", @@ -984,7 +984,7 @@ auto SourceTreeService::ServeDistdirTree( 0, /*is_tree=*/false); - if (not Compatibility::IsCompatible()) { + if (not ProtocolTraits::Instance().IsCompatible()) { blob_found = digest and cas.BlobPath(*digest, kv.executable()); } if (blob_found) { @@ -1054,8 +1054,8 @@ auto SourceTreeService::ServeDistdirTree( } if (not blob_found) { // check remote CAS - if (not Compatibility::IsCompatible() and digest and - apis_.remote->IsAvailable(*digest)) { + if (not ProtocolTraits::Instance().IsCompatible() and + digest and apis_.remote->IsAvailable(*digest)) { // retrieve content to local CAS if (not apis_.remote->RetrieveToCas( {Artifact::ObjectInfo{ @@ -1320,7 +1320,7 @@ auto SourceTreeService::ServeTree( storage_config_.hash_function.GetType(), tree_id, 0, /*is_tree=*/true); if (digest and apis_.local->IsAvailable(*digest)) { // upload tree to remote CAS; only possible in native mode - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { logger_->Emit(LogLevel::Error, "Cannot sync tree {} from local CAS with the remote " "in compatible mode", diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS index ce54901e..f94cdf8d 100644 --- a/src/buildtool/storage/TARGETS +++ b/src/buildtool/storage/TARGETS @@ -8,7 +8,7 @@ , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] , ["src/buildtool/common/remote", "remote_common"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/file_system", "object_type"] , ["src/buildtool/logging", "logging"] @@ -65,6 +65,8 @@ , "file_chunker" , ["src/buildtool/common", "common"] , ["src/buildtool/common", "artifact_digest_factory"] + , ["src/buildtool/common", "artifact_description"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_storage"] , ["src/buildtool/file_system", "object_cas"] , ["src/buildtool/execution_api/common", "common"] @@ -82,8 +84,6 @@ , ["src/buildtool/logging", "logging"] , ["src/buildtool/common", "bazel_types"] , ["src/buildtool/file_system", "git_repo"] - , ["src/buildtool/common", "artifact_description"] - , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/crypto", "hash_function"] ] , "stage": ["src", "buildtool", "storage"] diff --git a/src/buildtool/storage/config.hpp b/src/buildtool/storage/config.hpp index 81f14feb..da0e72d4 100644 --- a/src/buildtool/storage/config.hpp +++ b/src/buildtool/storage/config.hpp @@ -26,8 +26,8 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/remote_common.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" @@ -132,7 +132,7 @@ struct StorageConfig final { [[nodiscard]] auto CreateGenerationConfig( std::size_t generation) const noexcept -> GenerationConfig { - bool const compatible = Compatibility::IsCompatible(); + bool const compatible = ProtocolTraits::Instance().IsCompatible(); auto const cache_root = GenerationCacheRoot(generation); auto const cache_dir = UpdatePathForCompatibility(cache_root, compatible); diff --git a/src/buildtool/storage/garbage_collector.cpp b/src/buildtool/storage/garbage_collector.cpp index a108ae73..97a0f96c 100644 --- a/src/buildtool/storage/garbage_collector.cpp +++ b/src/buildtool/storage/garbage_collector.cpp @@ -22,7 +22,7 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/common/message_limits.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" @@ -215,13 +215,14 @@ auto GarbageCollector::TriggerGarbageCollection( auto GarbageCollector::Compactify(StorageConfig const& storage_config, size_t threshold) noexcept -> bool { // Return to the initial compatibility mode once done: - auto const guard = gsl::finally([mode = Compatibility::IsCompatible()] { - Compatibility::SetCompatible(mode); - }); + auto const guard = + gsl::finally([mode = ProtocolTraits::Instance().IsCompatible()] { + ProtocolTraits::Instance().SetCompatible(mode); + }); auto compactify = [threshold](StorageConfig const& config) -> bool { - Compatibility::SetCompatible(config.hash_function.GetType() == - HashFunction::Type::PlainSHA256); + ProtocolTraits::Instance().SetCompatible( + config.hash_function.GetType() == HashFunction::Type::PlainSHA256); auto const storage = ::Generation::Create(&config); return Compactifier::RemoveInvalid(storage.CAS()) and diff --git a/src/buildtool/storage/large_object_cas.tpp b/src/buildtool/storage/large_object_cas.tpp index 67a4ad75..b790140a 100644 --- a/src/buildtool/storage/large_object_cas.tpp +++ b/src/buildtool/storage/large_object_cas.tpp @@ -23,7 +23,7 @@ #include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/common/artifact_digest_factory.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/storage/file_chunker.hpp" @@ -47,10 +47,10 @@ auto LargeObjectCAS<kDoGlobalUplink, kType>::GetEntryPath( if constexpr (kDoGlobalUplink) { // To promote parts of the tree properly, regular uplinking logic for // trees is used: - bool uplinked = - IsTreeObject(kType) and not Compatibility::IsCompatible() - ? uplinker_.UplinkTree(digest) - : uplinker_.UplinkLargeBlob(digest); + bool uplinked = IsTreeObject(kType) and + not ProtocolTraits::Instance().IsCompatible() + ? uplinker_.UplinkTree(digest) + : uplinker_.UplinkLargeBlob(digest); if (uplinked and FileSystemManager::IsFile(file_path)) { return file_path; } diff --git a/src/buildtool/storage/local_cas.hpp b/src/buildtool/storage/local_cas.hpp index e7f5ce22..e6dc9ee4 100644 --- a/src/buildtool/storage/local_cas.hpp +++ b/src/buildtool/storage/local_cas.hpp @@ -23,6 +23,7 @@ #include "gsl/gsl" #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/file_system/object_cas.hpp" @@ -286,7 +287,7 @@ class LocalCAS { if constexpr (IsTreeObject(kType)) { // in non-compatible mode, do explicit deep tree uplink // in compatible mode, treat all trees as blobs - if (not Compatibility::IsCompatible()) { + if (not ProtocolTraits::Instance().IsCompatible()) { return uplinker->UplinkTree(digest); } } diff --git a/src/buildtool/storage/local_cas.tpp b/src/buildtool/storage/local_cas.tpp index 7ab29b08..39433b81 100644 --- a/src/buildtool/storage/local_cas.tpp +++ b/src/buildtool/storage/local_cas.tpp @@ -83,7 +83,7 @@ auto LocalCAS<kDoGlobalUplink>::LocalUplinkTree( LocalGenerationCAS const& latest, ArtifactDigest const& digest, bool splice_result) const noexcept -> bool { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { std::unordered_set<ArtifactDigest> seen{}; return LocalUplinkBazelDirectory(latest, digest, &seen, splice_result); } @@ -303,7 +303,7 @@ auto LocalCAS<kDoGlobalUplink>::CheckTreeInvariant( ArtifactDigest const& tree_digest, std::string const& tree_data) const noexcept -> std::optional<LargeObjectError> { - if (Compatibility::IsCompatible()) { + if (ProtocolTraits::Instance().IsCompatible()) { return std::nullopt; } @@ -399,7 +399,7 @@ auto LocalCAS<kDoGlobalUplink>::Splice(ArtifactDigest const& digest, // Check tree invariants: if constexpr (kIsTree) { - if (not Compatibility::IsCompatible()) { + if (not ProtocolTraits::Instance().IsCompatible()) { // Read tree entries: auto const tree_data = FileSystemManager::ReadFile(file_path); if (not tree_data) { diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS index ca433364..2587909a 100644 --- a/src/other_tools/just_mr/TARGETS +++ b/src/other_tools/just_mr/TARGETS @@ -9,7 +9,7 @@ , ["@", "json", "", "json"] , ["src/buildtool/build_engine/expression", "expression"] , ["src/buildtool/common", "retry_cli"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "git_context"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/logging", "log_level"] diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp index 24bf8ffd..43b615ce 100644 --- a/src/other_tools/just_mr/main.cpp +++ b/src/other_tools/just_mr/main.cpp @@ -26,8 +26,8 @@ #include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/retry_cli.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/git_context.hpp" #include "src/buildtool/logging/log_config.hpp" @@ -319,7 +319,7 @@ auto main(int argc, char* argv[]) -> int { // Setup LocalStorageConfig to store the local_build_root properly // and make the cas and git cache roots available auto storage_config = CreateStorageConfig( - arguments.common, Compatibility::IsCompatible()); + arguments.common, ProtocolTraits::Instance().IsCompatible()); if (not storage_config) { Logger::Log(LogLevel::Error, "Failed to configure local build root."); diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS index 9fa5dce7..5cd2d46f 100644 --- a/src/other_tools/ops_maps/TARGETS +++ b/src/other_tools/ops_maps/TARGETS @@ -124,7 +124,7 @@ [ ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/buildtool/common", "config"] , ["src/buildtool/common", "common"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/system", "system_command"] diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp index 7e6da1dd..1bfc25ad 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp @@ -20,8 +20,8 @@ #include "fmt/core.h" #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" |