YUKI Hiroshi
null+****@clear*****
Fri Nov 29 10:42:42 JST 2013
YUKI Hiroshi 2013-11-29 10:42:42 +0900 (Fri, 29 Nov 2013) New Revision: 338289e09a4dbfc5ddd7821635c625ef830efb6a https://github.com/droonga/fluent-plugin-droonga/commit/338289e09a4dbfc5ddd7821635c625ef830efb6a Message: Optimize gatherer about converting of output format Modified files: lib/droonga/plugin/collector/basic.rb Modified: lib/droonga/plugin/collector/basic.rb (+10 -16) =================================================================== --- lib/droonga/plugin/collector/basic.rb 2013-11-28 20:45:25 +0900 (770c62d) +++ lib/droonga/plugin/collector/basic.rb 2013-11-29 10:42:42 +0900 (de00911) @@ -30,8 +30,7 @@ module Droonga element = output["element"] if element result[element] = apply_output_range(result[element], output) - result[element] = apply_output_attributes(result[element], output) - result[element] = apply_output_format(result[element], output) + result[element] = apply_output_attributes_and_format(result[element], output) end output = output["output"] end @@ -53,28 +52,23 @@ module Droonga items end - def apply_output_attributes(items, output) + def apply_output_attribute_and_format(items, output) attributes = output["attributes"] if attributes - items.collect! do |item| - item[0...attributes.size] - end - end - items - end - - def apply_output_format(items, output) format = output["format"] - attributes = output["attributes"] - if format == "complex" && attributes + if format == "complex" items.collect! do |item| complex_item = {} - item.each_with_index do |value, index| - label = attributes[index] - complex_item[label] = value if label + attributes.each_with_index do |label, index| + complex_item[label] = item[index] end complex_item end + else + items.collect! do |item| + item[0...attributes.size] + end + end end items end -------------- next part -------------- HTML����������������������������...Download