fluent-plugin-mysql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 341f3104d55640ff44ceb5440885ec8528a1ce70
-  data.tar.gz: 4f66da8fa968e4aa78d302e9c2039a2294c966e9
+  metadata.gz: 6779a8acd14cbc9c3506aad17847d6bf805b1ba5
+  data.tar.gz: b399a06594b6957f4ca308f7fb8c088bf5906835
 SHA512:
-  metadata.gz: 227fda4952a521d0529035eed4039d3bb85d1af41b8245d9cf5c5e065d11e982411b56bfacdbc01abd9471f88d9c21e71be70ef9157a820ef847a5088d4008ba
-  data.tar.gz: 553d05fcd64ffaf61959abe09e45e9f4d4e567ebc69120219c8ead56115281d73dd37121652d5ea3a51aff17e462dc562662fa522177f98ffae35340c63fe28a
+  metadata.gz: 53792258fcb40362c7cb913fdac21cd1c6e69db6141120c190b2eda54765542eb72259c062f5f9b10a4beff04a832715fb74e9a4cd4f2003f6931066bb763276
+  data.tar.gz: e02269391bf5bbf7ee5b3a27299583ad9b19bf08ef5f75e956567f48997c16f8cd5921a8bc7b8facb0dda24fa21418e2fe214bf6595d2d0116b13c448739563d

data/README.md

@@ -27,7 +27,7 @@ on_duplicate_update_keys|on duplicate key update column, comma separator
 
 ```
 <match mysql.input>
-  type mysql_bulk
+  @type mysql_bulk
   host localhost
   database test_app_development
   username root
@@ -68,7 +68,7 @@ INSERT INTO users (id,user_name,created_at,updated_at) VALUES (NULL,'toyama','20
 
 ```
 <match mysql.input>
-  type mysql_bulk
+  @type mysql_bulk
   host localhost
   database test_app_development
   username root
@@ -110,7 +110,7 @@ if duplicate id , update username and updated_at
 
 ```
 <match mysql.input>
-  type mysql_bulk
+  @type mysql_bulk
   host localhost
   database test_app_development
   username root

data/fluent-plugin-mysql.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-mysql"
-  gem.version       = "0.1.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi", "Toyama Hiroshi"]
   gem.email         = ["tagomoris@gmail.com", "toyama0919@gmail.com"]
   gem.description   = %q{fluent plugin to insert mysql as json(single column) or insert statement}
   gem.summary       = %q{fluent plugin to insert mysql}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-mysql"
-  gem.license       = "APLv2"
+  gem.license       = "Apache-2.0"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/plugin/out_mysql_bulk.rb

@@ -20,6 +20,8 @@ module Fluent
                  :desc => <<-DESC
 Value key names, ${time} is placeholder Time.at(time).strftime("%Y-%m-%d %H:%M:%S").
 DESC
+    config_param :json_key_names, :string, default: nil,
+                  :desc => "Key names which store data as json"
     config_param :table, :string,
                  :desc => "Bulk insert table."
 
@@ -63,6 +65,7 @@ DESC
 
       @column_names = @column_names.split(',')
       @key_names = @key_names.nil? ? @column_names : @key_names.split(',')
+      @json_key_names = @json_key_names.split(',') if @json_key_names
     end
 
     def start
@@ -129,6 +132,10 @@ DESC
             else
               value = record[key].slice(0, @max_lengths[i])
             end
+
+            if @json_key_names && @json_key_names.include?(key)
+              value = value.to_json
+            end
           end
           values << value
         end

data/test/plugin/test_out_mysql_bulk.rb

@@ -112,6 +112,18 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
         on_duplicate_update_keys user_name,updated_at
       ]
     end
+
+    assert_nothing_raised(Fluent::ConfigError) do
+      d = create_driver %[
+        database test_app_development
+        username root
+        password hogehoge
+        key_names id,url,request_headers,params,created_at,updated_at
+        column_names id,url,request_headers_json,params_json,created_date,updated_date
+        json_key_names request_headers,params
+        table access
+      ]
+    end
   end
 
   def test_variables
@@ -127,6 +139,7 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
 
     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 nil, d.instance.json_key_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 %[
@@ -139,6 +152,7 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
 
     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 nil, d.instance.json_key_names
     assert_nil d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
 
     d = create_driver %[
@@ -152,6 +166,22 @@ class MysqlBulkOutputTest < Test::Unit::TestCase
 
     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_equal nil, d.instance.json_key_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,url,request_headers,params,created_at,updated_at
+      column_names id,url,request_headers_json,params_json,created_date,updated_date
+      json_key_names request_headers,params
+      table access
+    ]
+
+    assert_equal ['id','url','request_headers','params','created_at','updated_at'], d.instance.key_names
+    assert_equal ['id','url','request_headers_json','params_json','created_date','updated_date'], d.instance.column_names
+    assert_equal ['request_headers','params'], d.instance.json_key_names
     assert_nil d.instance.instance_variable_get(:@on_duplicate_key_update_sql)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -103,7 +103,7 @@ files:
 - test/plugin/test_out_mysql_bulk.rb
 homepage: https://github.com/tagomoris/fluent-plugin-mysql
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: fluent plugin to insert mysql