fluent-plugin-mysql-bulk 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886dbd4e7ef43697589ffcd1639220d1426a1149
-  data.tar.gz: 22a2b6378c7b48abfae9192ecdd5a92207db1ce0
+  metadata.gz: f6f577ec221a9e485356e48119e3c72df67d37f2
+  data.tar.gz: 025e392216bd66c322a2f7057356bd92482c9f45
 SHA512:
-  metadata.gz: 6f5f51c11861e46b7542e7ee9dc0538fae282a06c3cfcae23c865f04e40262f478bcea78d31d0e0fd45f5b0240b31d6ef4e8c50899c2e873c5ce530ce04636ef
-  data.tar.gz: 3c7ea8222b57c3fec34008e52915c66f49e712051954c94127272e010ccb19ca8e089c0f3daf5d04a8de6e8d185edef3f3a9e5f3afd9171038c6624d7d6907ef
+  metadata.gz: 0612ab3f00abc23d835c7213b29d412a752845a0a8d4e2a2663c46d55a3bbb8e278cb095ab628a2409e41645a9e90c054f6f8e2c6bf989e8fa060f7f6913f01c
+  data.tar.gz: b9a9a84b4172a2ccd48874621a6980443ecdec9b229ef5b4e422f50fc33dadadfaa8675a8d9e306aa6017d8235aa825512df805ab2a313394e524926d1e7c5bc

data/.gitignore

@@ -16,3 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 test.conf
+vendor/
+tmp/

data/.travis.yml

@@ -1,9 +1,10 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
 gemfile:
   - Gemfile
+before_install:
+  - gem update bundler
 script: "rake test"

data/fluent-plugin-mysql-bulk.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-mysql-bulk"
-  gem.version       = "0.0.7"
+  gem.version       = "0.0.8"
   gem.authors       = ["Hiroshi Toyama"]
   gem.email         = ["toyama0919@gmail.com"]
   gem.description   = %q{fluent plugin mysql bulk insert is high performance and on duplicate key update respond.}

data/lib/fluent/plugin/out_mysql_bulk.rb

@@ -39,7 +39,7 @@ module Fluent
         @on_duplicate_key_update_sql = ' ON DUPLICATE KEY UPDATE '
         updates = []
         @on_duplicate_update_keys.each do |update_column|
-          updates.push(" #{update_column} = VALUES(#{update_column})")
+          updates << "#{update_column} = VALUES(#{update_column})"
         end
         @on_duplicate_key_update_sql += updates.join(',')
       end
@@ -85,17 +85,16 @@ module Fluent
 
     def write(chunk)
       @handler = client
-      values_templates = []
       values = []
+      values_template = "(#{ @column_names.map { |key| '?' }.join(',') })"
       chunk.msgpack_each do |tag, time, data|
-        values_templates << "(#{ @column_names.map { |key| '?' }.join(',') })"
-        values.concat(data)
+        values << Mysql2::Client.pseudo_bind(values_template, data)
       end
-      sql = "INSERT INTO #{@table} (#{@column_names.join(',')}) VALUES #{values_templates.join(',')}"
+      sql = "INSERT INTO #{@table} (#{@column_names.join(',')}) VALUES #{values.join(',')}"
       sql += @on_duplicate_key_update_sql if @on_duplicate_key_update
 
-      $log.info "bulk insert values size => #{values_templates.size}"
-      @handler.xquery(sql, values)
+      $log.info "bulk insert values size => #{values.size}"
+      @handler.xquery(sql)
       @handler.close
     end
 

data/test/plugin/test_out_mysql_bulk.rb

@@ -7,7 +7,18 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
   end
 
   def create_driver(conf = CONFIG, tag = 'test')
-    Fluent::Test::BufferedOutputTestDriver.new(Fluent::MysqlBulkOutput, tag).configure(conf)
+    d = Fluent::Test::BufferedOutputTestDriver.new(Fluent::MysqlBulkOutput, tag).configure(conf)
+    d.instance.instance_eval {
+      def client
+        obj = Object.new
+        obj.instance_eval {
+          def xquery(*args); [1]; end
+          def close; true; end
+        }
+        obj
+      end
+    }
+    d
   end
 
   def test_configure_error
@@ -102,4 +113,45 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
       ]
     end
   end
+
+  def test_variables
+    d = create_driver %[
+      database test_app_development
+      username root
+      password hogehoge
+      column_names id,user_name,created_at,updated_at
+      table users
+      on_duplicate_key_update true
+      on_duplicate_update_keys user_name,updated_at
+    ]
+
+    assert_equal ['id','user_name','created_at','updated_at'], d.instance.key_names
+    assert_equal ['id','user_name','created_at','updated_at'], d.instance.column_names
+    assert_equal " ON DUPLICATE KEY UPDATE user_name = VALUES(user_name),updated_at = VALUES(updated_at)", d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
+
+    d = create_driver %[
+      database test_app_development
+      username root
+      password hogehoge
+      column_names id,user_name,created_at,updated_at
+      table users
+    ]
+
+    assert_equal ['id','user_name','created_at','updated_at'], d.instance.key_names
+    assert_equal ['id','user_name','created_at','updated_at'], d.instance.column_names
+    assert_nil d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
+
+    d = create_driver %[
+      database test_app_development
+      username root
+      password hogehoge
+      key_names id,user_name,created_at,updated_at
+      column_names id,user,created_date,updated_date
+      table users
+    ]
+
+    assert_equal ['id','user_name','created_at','updated_at'], d.instance.key_names
+    assert_equal ['id','user','created_date','updated_date'], d.instance.column_names
+    assert_nil d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-bulk
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Hiroshi Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd