diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/zenremotestore/projectstore/remoteprojectstore.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/zenremotestore/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp index cfc08b97d..872ba510b 100644 --- a/src/zenremotestore/projectstore/remoteprojectstore.cpp +++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp @@ -281,7 +281,7 @@ namespace remotestore_impl { const IoBuffer& RawData, const std::filesystem::path& AttachmentPath, OodleCompressor Compressor, - OodleCompressionLevel ComressionLevel) + OodleCompressionLevel CompressionLevel) { ZEN_ASSERT(!IsFile(AttachmentPath)); BasicFile CompressedFile; @@ -302,7 +302,7 @@ namespace remotestore_impl { // StreamCompressedBytes += RangeBuffer.GetSize(); }, Compressor, - ComressionLevel); + CompressionLevel); if (CouldCompress) { #if ZEN_BUILD_DEBUG @@ -327,7 +327,7 @@ namespace remotestore_impl { CompressedBuffer::Compress(SharedBuffer(std::move(RawData)), OodleCompressor::Mermaid, OodleCompressionLevel::None); if (!CompressedBlob) { - throw std::runtime_error("Failed to compress blob {}"); + throw std::runtime_error(fmt::format("Failed to compress blob {}", RawHash)); } CompressedFile.SetFileSize(0); CompressedFile.Write(CompressedBlob.GetCompressed(), 0); @@ -1817,7 +1817,6 @@ BuildContainer(CidStore& ChunkStore, { std::string_view ServerPath = View["serverpath"sv].AsString(); std::filesystem::path FilePath = (Project.RootDir / ServerPath).make_preferred(); - ZEN_INFO("{}", FilePath); if (!IsFile(FilePath)) { remotestore_impl::ReportMessage( @@ -2832,7 +2831,7 @@ BuildContainer(CidStore& ChunkStore, for (size_t CurrentChunkIndex = 0; CurrentChunkIndex < CurrentOpRawHashes.size(); CurrentChunkIndex++) { uint64_t ChunkSize = CurrentOpChunkSizes[CurrentChunkIndex]; - if (PendingBlockSize + ChunkSize >= MaxBlockSize || PendingChunkHashes.size() >= MaxChunksPerBlock) + if (PendingBlockSize + ChunkSize > MaxBlockSize || PendingChunkHashes.size() > MaxChunksPerBlock) { break; } @@ -3353,10 +3352,11 @@ SaveOplog(CidStore& ChunkStore, try { IoBuffer BlockBuffer = WriteToTempFile(std::move(CompressedBlock).GetCompressed(), BlockPath); + const uint64_t BlockSize = BlockBuffer.GetSize(); RwLock::ExclusiveLockScope __(AttachmentsLock); CreatedBlocks.insert( {Block.BlockHash, {.Payload = CompositeBuffer(SharedBuffer(std::move(BlockBuffer))), .Block = std::move(Block)}}); - ZEN_DEBUG("Saved temp block to '{}', {}", AttachmentTempPath, NiceBytes(BlockBuffer.GetSize())); + ZEN_DEBUG("Saved temp block to '{}', {}", AttachmentTempPath, NiceBytes(BlockSize)); } catch (const std::exception& Ex) { |