From b0f745b5c804e27623e3af4e54883f8759a78631 Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Thu, 28 Feb 2019 17:33:45 +0900 Subject: [PATCH 1/2] Pass chunk directly instead of chunk.metadata extract_placeholders should be passed chunk instance directly instead of chunk.metadata. Signed-off-by: Hiroshi Hatake --- lib/fluent/plugin/out_mysql_bulk.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fluent/plugin/out_mysql_bulk.rb b/lib/fluent/plugin/out_mysql_bulk.rb index 1539eda..bdb163a 100644 --- a/lib/fluent/plugin/out_mysql_bulk.rb +++ b/lib/fluent/plugin/out_mysql_bulk.rb @@ -153,14 +153,14 @@ def client(database) ) end - def expand_placeholders(metadata) - database = extract_placeholders(@database, metadata).gsub('.', '_') - table = extract_placeholders(@table, metadata).gsub('.', '_') + def expand_placeholders(chunk) + database = extract_placeholders(@database, chunk).gsub('.', '_') + table = extract_placeholders(@table, chunk).gsub('.', '_') return database, table end def write(chunk) - database, table = expand_placeholders(chunk.metadata) + database, table = expand_placeholders(chunk) max_lengths = check_table_schema(database: database, table: table) @handler = client(database) values = [] From c49aecfeca322ed22e29309971f4de698236e67f Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Thu, 28 Feb 2019 17:34:13 +0900 Subject: [PATCH 2/2] Depends on Fluentd v0.14.22 or later Signed-off-by: Hiroshi Hatake --- fluent-plugin-mysql.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluent-plugin-mysql.gemspec b/fluent-plugin-mysql.gemspec index 4738d0e..08fe5e8 100644 --- a/fluent-plugin-mysql.gemspec +++ b/fluent-plugin-mysql.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |gem| gem.test_files = gem.files.grep(%r{^(test|spec|features)/}) gem.require_paths = ["lib"] - gem.add_runtime_dependency "fluentd", ['>= 0.14.8', '< 2'] + gem.add_runtime_dependency "fluentd", ['>= 0.14.22', '< 2'] gem.add_runtime_dependency "mysql2-cs-bind" gem.add_runtime_dependency "jsonpath" gem.add_runtime_dependency "oj"