fluent-plugin-mysql 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test.conf

data/fluent-plugin-mysql.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-mysql"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{fluent plugin to insert mysql as json(single column) or insert statement}
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "fluentd"
-  gem.add_development_dependency "mysql2"
+  gem.add_development_dependency "mysql2-cs-bind"
   gem.add_runtime_dependency "fluentd"
-  gem.add_runtime_dependency "mysql2"
+  gem.add_runtime_dependency "mysql2-cs-bind"
 end

data/lib/fluent/plugin/out_mysql.rb

@@ -18,7 +18,7 @@ class Fluent::MysqlOutput < Fluent::BufferedOutput
 
   def initialize
     super
-    require 'mysql2'
+    require 'mysql2-cs-bind'
   end
 
   def configure(conf)
@@ -44,11 +44,10 @@ class Fluent::MysqlOutput < Fluent::BufferedOutput
 
     if @sql
       begin
-        # using nil to pass call of @handler.escape (@handler is set in #start)
         if @format == 'json'
-          pseudo_bind(@sql, [nil])
+          Mysql2::Client.pseudo_bind(@sql, [nil])
         else
-          pseudo_bind(@sql, @key_names.map{|n| nil})
+          Mysql2::Client.pseudo_bind(@sql, @key_names.map{|n| nil})
         end
       rescue ArgumentError => e
         raise Fluent::ConfigError, "mismatch between sql placeholders and key_names"
@@ -68,47 +67,10 @@ class Fluent::MysqlOutput < Fluent::BufferedOutput
 
   def start
     super
-    @handler ||= Mysql2::Client.new({:host => @host, :port => @port,
-                                      :username => @username, :password => @password,
-                                      :database => @database})
   end
 
   def shutdown
     super
-    @handler.close
-  end
-
-  def pseudo_bind(sql, values)
-    sql = sql.dup
-
-    placeholders = []
-    search_pos = 0
-    while pos = sql.index('?', search_pos)
-      placeholders.push(pos)
-      search_pos = pos + 1
-    end
-    raise ArgumentError, "mismatch between placeholders number and values arguments" if placeholders.length != values.length
-
-    while pos = placeholders.pop()
-      rawvalue = values.pop()
-      if rawvalue.nil?
-        sql[pos] = 'NULL'
-      elsif rawvalue.is_a?(Time)
-        val = rawvalue.strftime('%Y-%m-%d %H:%M:%S')
-        sql[pos] = "'" + val + "'"
-      else
-        val = @handler.escape(rawvalue.to_s)
-        sql[pos] = "'" + val + "'"
-      end
-    end
-    sql
-  end
-
-  def query(sql, *values)
-    values = values.flatten
-    # pseudo prepared statements
-    return @handler.query(sql) if values.length < 1
-    @handler.query(self.pseudo_bind(sql, values))
   end
 
   def format(tag, time, record)
@@ -116,8 +78,12 @@ class Fluent::MysqlOutput < Fluent::BufferedOutput
   end
 
   def write(chunk)
+    handler = Mysql2::Client.new({:host => @host, :port => @port,
+                                   :username => @username, :password => @password,
+                                   :database => @database})
     chunk.msgpack_each { |tag, time, data|
-      query(@sql, data)
+      handler.xquery(@sql, data)
     }
+    handler.close
   end
 end

data/test/plugin/test_out_mysql.rb

@@ -66,17 +66,6 @@ sql INSERT INTO baz (col1,col2,col3,col4) VALUES (?,?,?,?)
     }
   end
 
-  def test_pseudo_bind
-    d = create_driver
-    sql = 'INSERT INTO baz SET col1=?'
-    # assert_equal "INSERT INTO baz SET col1='HOGE'", d.instance.pseudo_bind(sql, ['HOGE'])
-    assert_equal "INSERT INTO baz SET col1=NULL", d.instance.pseudo_bind(sql, [nil])
-    assert_equal "INSERT INTO baz SET col1='2012-04-16 17:38:00'", d.instance.pseudo_bind(sql, [Time.local(2012, 4, 16, 17, 38, 0)])
-  end
-
-  def test_query
-  end
-
   def test_format
     d = create_driver
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: mysql2-cs-bind
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: mysql2-cs-bind
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: