Skip to content

compressable: fix RuntimeError with large zstd compressed data #5006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daipom merged 1 commit into from
Jun 20, 2025
Merged

compressable: fix RuntimeError with large zstd compressed data #5006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fluent/plugin/compressable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ def string_decompress_gzip(compressed_data)

def string_decompress_zstd(compressed_data)
io = StringIO.new(compressed_data)
reader = Zstd::StreamReader.new(io)
out = ''
loop do
reader = Zstd::StreamReader.new(io)
# Zstd::StreamReader needs to specify the size of the buffer
out << reader.read(1024)
# Zstd::StreamReader doesn't provide unused data, so we have to manually adjust the position
Expand Down Expand Up @@ -117,8 +117,8 @@ def io_decompress_gzip(input, output)
end

def io_decompress_zstd(input, output)
reader = Zstd::StreamReader.new(input)
loop do
reader = Zstd::StreamReader.new(input)
# Zstd::StreamReader needs to specify the size of the buffer
v = reader.read(1024)
output.write(v)
Expand Down
24 changes: 24 additions & 0 deletions test/plugin/test_compressable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,29 @@ def compress_assert_equal(expected, actual)
assert_equal '', decompress('')
assert_equal '', decompress('', output_io: StringIO.new)
end

test 'decompress large zstd compressed data' do
src1 = SecureRandom.random_bytes(1024)
src2 = SecureRandom.random_bytes(1024)
src3 = SecureRandom.random_bytes(1024)

zstd_compressed_data = compress(src1, type: :zstd) + compress(src2, type: :zstd) + compress(src3, type: :zstd)
assert_equal src1 + src2 + src3, decompress(zstd_compressed_data, type: :zstd)
end

test 'decompress large zstd compressed data with input_io and output_io' do
src1 = SecureRandom.random_bytes(1024)
src2 = SecureRandom.random_bytes(1024)
src3 = SecureRandom.random_bytes(1024)

zstd_compressed_data = compress(src1, type: :zstd) + compress(src2, type: :zstd) + compress(src3, type: :zstd)

input_io = StringIO.new(zstd_compressed_data)
output_io = StringIO.new
output_io.set_encoding(src1.encoding)

decompress(input_io: input_io, output_io: output_io, type: :zstd)
assert_equal src1 + src2 + src3, output_io.string
end
end
end