fluent-plugin-td 0.10.24 → 0.10.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46404732e76417f2f5110a8f97a219935c3c653c
-  data.tar.gz: ae4a4ba457f7c7bd5097fa37a9cc955bd02914bd
+  metadata.gz: a1db60dd2b0ce33a5752790d6f586c86ecf5d5d1
+  data.tar.gz: 860714c30461e7bd0904b91355eba1c35571e212
 SHA512:
-  metadata.gz: e9812f2997140c7470641d82666ec59ec4bae779fb435f24fca1a821e0bdcb67184a0151b93e92cd130045b1223a352e96fe4d553e2017a3ea787e963f91c1b6
-  data.tar.gz: e332f546b28efe2446b7d820fe1f1fd9e74dd32bf2661c80640677b963fa194acba041e3597b22ef38fd91c4b14e2e0811f0d280c498fd64c0dd860cd512dc60
+  metadata.gz: 0b7a4e3c95a2180751bde7ae165f4e278aeb961907c16081fc6fba460b92841810dc1c3f5f1fe4b8b1a3c82e71bfc82558eb78121c0c98bc63bdf397549f4a40
+  data.tar.gz: cc08c575896bc7eb8361ee283391ae71db9e1a6dc3b6820d0327098c2c0347ad0e977a0d5044c7ce428d1dfac0d9865c83aae7828535cbef70e9e1016243f662

data/.travis.yml

@@ -5,5 +5,6 @@ rvm:
 
 gemfile:
  - Gemfile
+ - Gemfile.msgpack.0.4
 
 script: bundle exec rake test

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.10.25 - 2015/02/06
+
+  * Improve tempfile handling
+  * Fix Bigint handling to prevent broken msgpack stream
+
+
 Release 0.10.24 - 2015/02/05
 
   * Change log level and message when a broken record is skipped to make it clear that it is skipped

data/Gemfile.msgpack.0.4

@@ -0,0 +1,5 @@
+source 'https://rubygems.org/'
+
+gem 'msgpack', '= 0.4.7'
+gem 'fluentd', '~> 0.10.55'
+gemspec

data/lib/fluent/plugin/out_tdlog.rb

@@ -216,6 +216,8 @@ module Fluent
         begin
           record.to_msgpack(out)
         rescue RangeError
+          # In msgpack v0.5, 'out' becomes String, not Buffer. This is not a problem because Buffer has a compatibility with String
+          out = out.to_s[0, off]
           TreasureData::API.normalized_msgpack(record, out)
         end
 
@@ -245,7 +247,7 @@ module Fluent
       database, table = chunk.key.split('.', 2)
 
       FileUtils.mkdir_p(@tmpdir) unless @tmpdir.nil?
-      f = Tempfile.new("tdlog-", @tmpdir)
+      f = Tempfile.new("tdlog-#{chunk.key}-", @tmpdir)
       w = Zlib::GzipWriter.new(f)
 
       chunk.write_to(w)
@@ -258,7 +260,7 @@ module Fluent
 
     ensure
       w.close if w
-      f.close if f
+      f.close(true) if f
     end
 
     def upload(database, table, io, size, unique_id)

data/lib/fluent/plugin/td_plugin_version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module TreasureDataPlugin
-    VERSION = '0.10.24'
+    VERSION = '0.10.25'
   end
 end

data/test/plugin/test_out_tdlog.rb

@@ -1,5 +1,6 @@
 require 'fluent/test'
 require 'fluent/plugin/out_tdlog'
+require 'test_helper.rb'
 
 class TreasureDataLogOutputTest < Test::Unit::TestCase
   # BufferedOutputTestDriver uses module_eval, not inheritance.
@@ -75,6 +76,25 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
     }, 'nil record should be skipped'
   end
 
+  def test_emit_with_bigint_record
+    n = 100000000000000000000000
+    d = create_driver
+    time, records = stub_seed_values
+    records[1]['k'] = ['hogehoge' * 1000]
+    records[1]['kk'] = n.to_s # bigint is converted to string
+    database, table = d.instance.instance_variable_get(:@key).split(".", 2)
+    stub_td_table_create_request(database, table)
+    stub_td_import_request(stub_request_body(records, time), database, table)
+
+    test_time, test_records = stub_seed_values
+    test_records[1]['k'] = ['hogehoge' * 1000]
+    test_records[1]['kk'] = n
+    test_records.each { |record|
+      d.emit(record, test_time)
+    }
+    d.run
+  end
+
   def test_emit_with_time_symbole
     d = create_driver
     time, records = stub_seed_values

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.24
+  version: 0.10.25
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -83,6 +83,7 @@ files:
 - AUTHORS
 - ChangeLog
 - Gemfile
+- Gemfile.msgpack.0.4
 - README.rdoc
 - Rakefile
 - example.conf