From 952c60a8ecc4318fbd20a01fe642b6629ddf42cc Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Wed, 29 Jan 2025 16:49:02 +0100
Subject: CommonApi: Remove template parameter from UploadAndUpdateContainer

...since it works with ArtifactBlobs only.
---
 src/buildtool/execution_api/common/common_api.hpp | 62 +++--------------------
 1 file changed, 6 insertions(+), 56 deletions(-)

(limited to 'src/buildtool/execution_api/common/common_api.hpp')

diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp
index 5060c086..04997b5f 100644
--- a/src/buildtool/execution_api/common/common_api.hpp
+++ b/src/buildtool/execution_api/common/common_api.hpp
@@ -15,9 +15,7 @@
 #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_COMMON_API_HPP
 #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_COMMON_API_HPP
 
-#include <cstddef>
 #include <cstdio>
-#include <exception>
 #include <functional>
 #include <iterator>
 #include <optional>
@@ -30,11 +28,9 @@
 #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/directory_tree.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
 #include "src/buildtool/execution_api/common/blob_tree.hpp"
-#include "src/buildtool/execution_api/common/content_blob_container.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
-#include "src/buildtool/execution_api/common/message_limits.hpp"
-#include "src/buildtool/logging/log_level.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
 /// \brief Stores a list of missing artifact digests, as well as a back-mapping
@@ -121,57 +117,11 @@ template <typename TValue, typename TIterator>
 /// \param logger Use this instance for any logging. If nullptr, use the default
 /// logger. This value is used only if exception_is_fatal==true.
 /// \returns Returns true on success, false otherwise (failures or exceptions).
-template <typename TDigest>
-auto UpdateContainerAndUpload(
-    gsl::not_null<std::unordered_set<ContentBlob<TDigest>>*> const& container,
-    ContentBlob<TDigest>&& blob,
+[[nodiscard]] auto UpdateContainerAndUpload(
+    gsl::not_null<std::unordered_set<ArtifactBlob>*> const& container,
+    ArtifactBlob&& blob,
     bool exception_is_fatal,
-    std::function<bool(std::unordered_set<ContentBlob<TDigest>>&&)> const&
-        uploader,
-    Logger const* logger = nullptr) noexcept -> bool {
-    // Optimize upload of blobs with respect to the maximum transfer limit, such
-    // that we never store unnecessarily more data in the container than we need
-    // per remote transfer.
-    try {
-        if (blob.data->size() > kMaxBatchTransferSize) {
-            // large blobs use individual stream upload
-            if (not uploader(std::unordered_set<ContentBlob<TDigest>>{
-                    {std::move(blob)}})) {
-                return false;
-            }
-        }
-        else {
-            if (not container->contains(blob)) {
-                std::size_t content_size = 0;
-                for (auto const& blob : *container) {
-                    content_size += blob.data->size();
-                }
-
-                if (content_size + blob.data->size() > kMaxBatchTransferSize) {
-                    // swap away from original container to allow move during
-                    // upload
-                    std::unordered_set<ContentBlob<TDigest>> tmp_container{};
-                    std::swap(*container, tmp_container);
-                    // if we would surpass the transfer limit, upload the
-                    // current container and clear it before adding more blobs
-                    if (not uploader(std::move(tmp_container))) {
-                        return false;
-                    }
-                }
-                // add current blob to container
-                container->emplace(std::move(blob));
-            }
-        }
-    } catch (std::exception const& ex) {
-        if (exception_is_fatal) {
-            Logger::Log(logger,
-                        LogLevel::Error,
-                        "failed to emplace blob with\n:{}",
-                        ex.what());
-        }
-        return false;
-    }
-    return true;  // success!
-}
+    std::function<bool(std::unordered_set<ArtifactBlob>&&)> const& uploader,
+    Logger const* logger = nullptr) noexcept -> bool;
 
 #endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_COMMON_API_HPP
-- 
cgit v1.2.3