diff options
Diffstat (limited to 'src')
5 files changed, 17 insertions, 19 deletions
diff --git a/src/buildtool/execution_api/execution_service/capabilities_server.cpp b/src/buildtool/execution_api/execution_service/capabilities_server.cpp index 1f34b388..71a1361f 100644 --- a/src/buildtool/execution_api/execution_service/capabilities_server.cpp +++ b/src/buildtool/execution_api/execution_service/capabilities_server.cpp @@ -41,8 +41,7 @@ auto CapabilitiesServiceImpl::GetCapabilities( static_assert(kMaxBatchTransferSize < GRPC_DEFAULT_MAX_RECV_MESSAGE_LENGTH, "Max batch transfer size too large."); cache.add_supported_chunking_algorithms( - ::bazel_re::ChunkingAlgorithm_Value:: - ChunkingAlgorithm_Value_FASTCDC_MT0_8KB); + ::bazel_re::ChunkingAlgorithm_Value::ChunkingAlgorithm_Value_FASTCDC); *(response->mutable_cache_capabilities()) = cache; exec.set_digest_function( diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp index da585851..b9143daa 100644 --- a/src/buildtool/execution_api/execution_service/cas_server.cpp +++ b/src/buildtool/execution_api/execution_service/cas_server.cpp @@ -51,8 +51,8 @@ static auto ChunkingAlgorithmToString(::bazel_re::ChunkingAlgorithm_Value type) ChunkingAlgorithm_Value_RABINCDC_8KB: return "RABINCDC_8KB"; case ::bazel_re::ChunkingAlgorithm_Value:: - ChunkingAlgorithm_Value_FASTCDC_MT0_8KB: - return "FASTCDC_MT0_8KB"; + ChunkingAlgorithm_Value_FASTCDC: + return "FASTCDC"; default: return "[Unknown Chunking Algorithm Type]"; } @@ -254,16 +254,15 @@ auto CASServiceImpl::SplitBlob(::grpc::ServerContext* /*context*/, if (chunking_algorithm != ::bazel_re::ChunkingAlgorithm_Value:: ChunkingAlgorithm_Value_IDENTITY and chunking_algorithm != ::bazel_re::ChunkingAlgorithm_Value:: - ChunkingAlgorithm_Value_FASTCDC_MT0_8KB) { - logger_.Emit( - LogLevel::Warning, - fmt::format( - "SplitBlob: unsupported chunking algorithm {}, will use " - "default implementation {}", - ChunkingAlgorithmToString(chunking_algorithm), - ChunkingAlgorithmToString( - ::bazel_re::ChunkingAlgorithm_Value:: - ChunkingAlgorithm_Value_FASTCDC_MT0_8KB))); + ChunkingAlgorithm_Value_FASTCDC) { + logger_.Emit(LogLevel::Warning, + fmt::format("SplitBlob: unsupported chunking algorithm " + "{}, will use " + "default implementation {}", + ChunkingAlgorithmToString(chunking_algorithm), + ChunkingAlgorithmToString( + ::bazel_re::ChunkingAlgorithm_Value:: + ChunkingAlgorithm_Value_FASTCDC))); } // Acquire garbage collection lock. 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 e7dea224..748dee6f 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.cpp @@ -388,8 +388,8 @@ auto BazelCasClient::SplitBlob(std::string const& instance_name, bazel_re::SplitBlobRequest request{}; request.set_instance_name(instance_name); request.mutable_blob_digest()->CopyFrom(blob_digest); - request.set_chunking_algorithm(bazel_re::ChunkingAlgorithm_Value:: - ChunkingAlgorithm_Value_FASTCDC_MT0_8KB); + request.set_chunking_algorithm( + bazel_re::ChunkingAlgorithm_Value::ChunkingAlgorithm_Value_FASTCDC); bazel_re::SplitBlobResponse response{}; auto [ok, status] = WithRetry( [this, &response, &request]() { diff --git a/src/buildtool/storage/file_chunker.cpp b/src/buildtool/storage/file_chunker.cpp index 8e747900..b94f487a 100644 --- a/src/buildtool/storage/file_chunker.cpp +++ b/src/buildtool/storage/file_chunker.cpp @@ -23,8 +23,8 @@ namespace { // Mask values taken from algorithm 2 of the paper // https://ieeexplore.ieee.org/document/9055082. -constexpr std::uint64_t kMaskS{0x0000d9f003530000ULL}; // 15 '1' bits -constexpr std::uint64_t kMaskL{0x0000d90003530000ULL}; // 11 '1' bits +constexpr std::uint64_t kMaskS{0x4444d9f003530000ULL}; // 19 '1' bits +constexpr std::uint64_t kMaskL{0x4444d90003530000ULL}; // 15 '1' bits // Predefined array of 256 random 64-bit integers, needs to be initialized. constexpr std::uint32_t kRandomTableSize{256}; diff --git a/src/buildtool/storage/file_chunker.hpp b/src/buildtool/storage/file_chunker.hpp index f2aea001..914de3f0 100644 --- a/src/buildtool/storage/file_chunker.hpp +++ b/src/buildtool/storage/file_chunker.hpp @@ -32,7 +32,7 @@ /// A read buffer is used to progressively process the file content instead of /// reading the entire file content in memory. class FileChunker { - static constexpr std::uint32_t kAverageChunkSize{1024 * 8}; // 8 KB + static constexpr std::uint32_t kAverageChunkSize{1024 * 128}; // 128 KB static constexpr std::uint32_t kDefaultSeed{0}; public: |