diff options
Diffstat (limited to 'src/buildtool/execution_api/common')
| -rw-r--r-- | src/buildtool/execution_api/common/TARGETS | 21 | ||||
| -rw-r--r-- | src/buildtool/execution_api/common/blob_tree.cpp | 81 | ||||
| -rw-r--r-- | src/buildtool/execution_api/common/blob_tree.hpp | 59 | ||||
| -rw-r--r-- | src/buildtool/execution_api/common/common_api.hpp | 2 |
4 files changed, 161 insertions, 2 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 4cb4e4b2..0eac0c15 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -58,10 +58,10 @@ , "srcs": ["common_api.cpp"] , "deps": [ "common" + , "blob_tree" , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] - , ["src/buildtool/execution_api/bazel_msg", "blob_tree"] , ["src/buildtool/execution_api/bazel_msg", "directory_tree"] ] , "stage": ["src", "buildtool", "execution_api", "common"] @@ -71,6 +71,25 @@ , ["src/buildtool/logging", "log_level"] ] } +, "blob_tree": + { "type": ["@", "rules", "CC", "library"] + , "name": ["blob_tree"] + , "hdrs": ["blob_tree.hpp"] + , "srcs": ["blob_tree.cpp"] + , "deps": + [ "common" + , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["src/buildtool/execution_api/bazel_msg", "directory_tree"] + , ["@", "gsl", "", "gsl"] + , ["src/buildtool/compatibility", "compatibility"] + ] + , "private-deps": + [ ["src/buildtool/file_system", "git_repo"] + , ["src/buildtool/file_system", "object_type"] + , ["src/utils/cpp", "hex_string"] + ] + , "stage": ["src", "buildtool", "execution_api", "common"] + } , "content_blob_container": { "type": ["@", "rules", "CC", "library"] , "name": ["content_blob_container"] diff --git a/src/buildtool/execution_api/common/blob_tree.cpp b/src/buildtool/execution_api/common/blob_tree.cpp new file mode 100644 index 00000000..0954220e --- /dev/null +++ b/src/buildtool/execution_api/common/blob_tree.cpp @@ -0,0 +1,81 @@ +// Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include "src/buildtool/execution_api/common/blob_tree.hpp" + +#include <utility> +#include <variant> + +#include "src/buildtool/common/artifact.hpp" +#include "src/buildtool/common/bazel_types.hpp" +#include "src/buildtool/compatibility/native_support.hpp" +#include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/file_system/object_type.hpp" +#include "src/utils/cpp/hex_string.hpp" + +/// NOLINTNEXTLINE(misc-no-recursion) +auto BlobTree::FromDirectoryTree(DirectoryTreePtr const& tree, + std::filesystem::path const& parent) noexcept + -> std::optional<BlobTreePtr> { + GitRepo::tree_entries_t entries; + std::vector<BlobTreePtr> nodes; + try { + entries.reserve(tree->size()); + for (auto const& [name, node] : *tree) { + if (std::holds_alternative<DirectoryTreePtr>(node)) { + auto const& dir = std::get<DirectoryTreePtr>(node); + auto blob_tree = FromDirectoryTree(dir, parent / name); + if (not blob_tree) { + return std::nullopt; + } + auto raw_id = FromHexString(NativeSupport::Unprefix( + (*blob_tree)->Blob().digest.hash())); + if (not raw_id) { + return std::nullopt; + } + entries[std::move(*raw_id)].emplace_back(name, + ObjectType::Tree); + // Only add tree objects to the blob tree to be uploaded. + nodes.emplace_back((*blob_tree)); + } + else { + auto const& artifact = std::get<Artifact const*>(node); + auto const& object_info = artifact->Info(); + if (not object_info) { + return std::nullopt; + } + auto raw_id = FromHexString(object_info->digest.hash()); + if (not raw_id) { + return std::nullopt; + } + entries[std::move(*raw_id)].emplace_back(name, + object_info->type); + } + } + if (auto git_tree = GitRepo::CreateShallowTree(entries)) { + bazel_re::Digest digest{}; + digest.set_hash(NativeSupport::Prefix(ToHexString(git_tree->first), + /*is_tree=*/true)); + digest.set_size_bytes( + gsl::narrow<google::protobuf::int64>(git_tree->second.size())); + return std::make_shared<BlobTree>(BazelBlob{digest, + git_tree->second, + /*is_exec=*/false}, + nodes); + } + } catch (...) { + return std::nullopt; + } + return std::nullopt; +} diff --git a/src/buildtool/execution_api/common/blob_tree.hpp b/src/buildtool/execution_api/common/blob_tree.hpp new file mode 100644 index 00000000..59e58410 --- /dev/null +++ b/src/buildtool/execution_api/common/blob_tree.hpp @@ -0,0 +1,59 @@ +// Copyright 2022 Huawei Cloud Computing Technology Co., Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP +#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP + +#include <filesystem> +#include <memory> +#include <optional> +#include <utility> +#include <vector> + +#include "gsl/gsl" +#include "src/buildtool/compatibility/native_support.hpp" +#include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" +#include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" + +class BlobTree; +using BlobTreePtr = gsl::not_null<std::shared_ptr<BlobTree>>; + +/// \brief Tree-like blob container to enable tree-invariant satisfying blob +/// upload. +class BlobTree { + public: + BlobTree(BazelBlob blob, std::vector<BlobTreePtr> nodes) + : blob_{std::move(blob)}, nodes_{std::move(nodes)} {} + + [[nodiscard]] auto Blob() const noexcept -> BazelBlob { return blob_; } + [[nodiscard]] auto IsTree() const noexcept -> bool { + return NativeSupport::IsTree(blob_.digest.hash()); + } + + /// \brief Create a `BlobTree` from a `DirectoryTree`. + [[nodiscard]] static auto FromDirectoryTree( + DirectoryTreePtr const& tree, + std::filesystem::path const& parent = "") noexcept + -> std::optional<BlobTreePtr>; + + [[nodiscard]] auto begin() const noexcept { return nodes_.begin(); } + [[nodiscard]] auto end() const noexcept { return nodes_.end(); } + [[nodiscard]] auto size() const noexcept { return nodes_.size(); } + + private: + BazelBlob blob_; + std::vector<BlobTreePtr> nodes_; +}; + +#endif // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BLOB_TREE_HPP diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp index 312f97db..1a2914fb 100644 --- a/src/buildtool/execution_api/common/common_api.hpp +++ b/src/buildtool/execution_api/common/common_api.hpp @@ -27,8 +27,8 @@ #include "src/buildtool/common/artifact.hpp" #include "src/buildtool/common/artifact_digest.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" -#include "src/buildtool/execution_api/bazel_msg/blob_tree.hpp" #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" +#include "src/buildtool/execution_api/common/blob_tree.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" /// \brief Stores a list of missing artifact digests, as well as a back-mapping |