write_to uses #open

* change keyword argument `compress` -> `compressed`
fluent · Aug 30, 2016 · 71970b6 · 71970b6
1 parent 53e585f
commit 71970b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/lib/fluent/plugin/buffer/chunk.rb b/lib/fluent/plugin/buffer/chunk.rb
@@ -162,20 +162,22 @@ module Decompressable
           include Fluent::Plugin::Compressable
 
           def read(**kwargs)
-            return super if kwargs[:compress] == :gzip
-
-            # avoid creating duplicated IO
-            if @chunk.is_a?(IO)
-              # reset io(@chunk) to read
-              @chunk.seek(0, IO::SEEK_SET)
-              decompress('', io: @chunk) # not to call IO#read
+            if kwargs[:compressed] == :gzip
+              super
             else
               decompress(super)
             end
           end
 
           def write_to(io, **kwargs)
-            io.write(read(kwargs))
+            if kwargs[:compressed] == :gzip
+              super
+            else
+              open do |io_chunk|
+                # Avoid to load large String object when file_chunk
+                decompress(io_chunk.read, output_io: io)
+              end
+            end
           end
         end
       end

diff --git a/test/plugin/test_buffer_file_chunk.rb b/test/plugin/test_buffer_file_chunk.rb
@@ -780,7 +780,7 @@ def gen_chunk_path(prefix, unique_id)
     c.commit
 
     assert_equal str, c.read
-    assert_equal compressed_str, c.read(compress: :gzip)
+    assert_equal compressed_str, c.read(compressed: :gzip)
 
     io = StringIO.new
     c.write_to(io)
@@ -795,10 +795,10 @@ def gen_chunk_path(prefix, unique_id)
     c.commit
 
     assert_equal str, c.read
-    assert_equal compressed_str, c.read(compress: :gzip)
+    assert_equal compressed_str, c.read(compressed: :gzip)
 
     io = StringIO.new
-    c.write_to(io, compress: :gzip)
+    c.write_to(io, compressed: :gzip)
     assert_equal compressed_str, io.string
   end
 end
diff --git a/test/plugin/test_buffer_memory_chunk.rb b/test/plugin/test_buffer_memory_chunk.rb
@@ -274,7 +274,7 @@ class BufferMemoryChunkTest < Test::Unit::TestCase
     c.commit
 
     assert_equal str, c.read
-    assert_equal compressed_str, c.read(compress: :gzip)
+    assert_equal compressed_str, c.read(compressed: :gzip)
 
     io = StringIO.new
     c.write_to(io)
@@ -289,10 +289,10 @@ class BufferMemoryChunkTest < Test::Unit::TestCase
     c.commit
 
     assert_equal str, c.read
-    assert_equal compressed_str, c.read(compress: :gzip)
+    assert_equal compressed_str, c.read(compressed: :gzip)
 
     io = StringIO.new
-    c.write_to(io, compress: :gzip)
+    c.write_to(io, compressed: :gzip)
     assert_equal compressed_str, io.string
   end
 end