Merge bc6e977 into 203c1cc

ydb-platform · Jun 4, 2024 · 2109a27 · 2109a27
2 parents 203c1cc + bc6e977
commit 2109a27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ydb/library/yql/providers/s3/compressors/zstd.cpp b/ydb/library/yql/providers/s3/compressors/zstd.cpp
@@ -14,20 +14,22 @@ TReadBuffer::TReadBuffer(NDB::ReadBuffer& source)
     InBuffer.resize(8_KB);
     OutBuffer.resize(64_KB);
     Offset_ = InBuffer.size();
+    Size_ = InBuffer.size();
 }
 
 TReadBuffer::~TReadBuffer() {
     ::ZSTD_freeDStream(ZCtx_);
 }
 
 bool TReadBuffer::nextImpl() {
-    ::ZSTD_inBuffer zIn{InBuffer.data(), InBuffer.size(), Offset_};
+    ::ZSTD_inBuffer zIn{InBuffer.data(), Size_, Offset_};
     ::ZSTD_outBuffer zOut{OutBuffer.data(), OutBuffer.size(), 0ULL};
 
     size_t returnCode = 0ULL;
     if (!Finished_) do {
         if (zIn.pos == zIn.size) {
             zIn.size = Source_.read(InBuffer.data(), InBuffer.size());
+            Size_ = zIn.size;
 
             zIn.pos = Offset_ = 0;
             if (!zIn.size) {

diff --git a/ydb/library/yql/providers/s3/compressors/zstd.h b/ydb/library/yql/providers/s3/compressors/zstd.h
@@ -19,7 +19,8 @@ class TReadBuffer : public NDB::ReadBuffer {
     NDB::ReadBuffer& Source_;
     std::vector<char> InBuffer, OutBuffer;
     ::ZSTD_DStream *const ZCtx_;
-    size_t  Offset_;
+    size_t Offset_;
+    size_t Size_;
     bool Finished_ = false;
 };