Skip to content

compressable: Handle zstd frames correctly #5094

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

Closed
wants to merge 1 commit into from
Closed

compressable: Handle zstd frames correctly #5094

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
23 changes: 19 additions & 4 deletions lib/fluent/plugin/compressable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,29 @@ def compress(data, type: :gzip, **kwargs)
io = output_io || StringIO.new
if type == :gzip
writer = Zlib::GzipWriter.new(io)
writer.write(data)
writer.finish
io.string
elsif type == :zstd
writer = Zstd::StreamWriter.new(io)
sc = Zstd::StreamingCompress.new(**kwargs)
chunk_size = kwargs[:chunk_size] || (256 * 1024)

if data.is_a?(String)
i = 0
while i < data.bytesize
io << sc.compress(data.byteslice(i, chunk_size))
i += chunk_size
end
else
data.each { |d| io << sc.compress(d) }
end

# Need to close frame to prevent unknown frame descriptor errors
io << sc.finish
io.string
else
raise ArgumentError, "Unknown compression type: #{type}"
end
writer.write(data)
writer.finish
output_io || io.string
end

# compressed_data is String like `compress(data1) + compress(data2) + ... + compress(dataN)`
Expand Down
Loading