YUKI Hiroshi
null+****@clear*****
Wed Dec 4 14:21:53 JST 2013
YUKI Hiroshi 2013-12-04 14:21:53 +0900 (Wed, 04 Dec 2013) New Revision: 2ab46927c95295c98f8954735a19dfccd4ca3703 https://github.com/droonga/fluent-plugin-droonga/commit/2ab46927c95295c98f8954735a19dfccd4ca3703 Message: Use "unify" instead of "merge" about column values Modified files: lib/droonga/plugin/collector/basic.rb lib/droonga/plugin/distributor/search.rb test/unit/plugin/collector/test_basic.rb Modified: lib/droonga/plugin/collector/basic.rb (+2 -2) =================================================================== --- lib/droonga/plugin/collector/basic.rb 2013-12-04 14:20:31 +0900 (904f9da) +++ lib/droonga/plugin/collector/basic.rb 2013-12-04 14:21:53 +0900 (705ee42) @@ -97,7 +97,7 @@ module Droonga values[1][key], :operators => deal["operators"], :key_column => deal["key_column"], - :merge_columns => deal["merge_columns"]) + :unified_columns => deal["unified_columns"]) end reduced_values = apply_output_range(reduced_values, "limit" => deal["limit"]) @@ -165,7 +165,7 @@ module Droonga rest_unified_items.any? do |unified_item| if unified_item[key_column_index] == key base_item.each_with_index do |value, column| - if options[:merge_columns].include?(column) + if options[:unified_columns].include?(column) unified_item[column] += value else unified_item[column] ||= value Modified: lib/droonga/plugin/distributor/search.rb (+3 -3) =================================================================== --- lib/droonga/plugin/distributor/search.rb 2013-12-04 14:20:31 +0900 (72d2cb3) +++ lib/droonga/plugin/distributor/search.rb 2013-12-04 14:21:53 +0900 (483a33e) @@ -255,11 +255,11 @@ module Droonga sort_keys = sort_keys["keys"] || [] if sort_keys.is_a?(Hash) key_column_index = attributes.index("_key") - merge_columns = [] + unified_columns = [] attributes.each_with_index do |attribute, index| source = attribute source = attribute["source"] if attribute.is_a?(Hash) - merge_colums << index if MERGE_ATTRIBUTES.include?(source) + unified_columns << index if MERGE_ATTRIBUTES.include?(source) end operators = sort_keys.collect do |sort_key| @@ -279,7 +279,7 @@ module Droonga "operators" => operators, } reducer["key_column"] = key_column_index unless key_column_index.nil? - reducer["merge_columns"] = merge_columns unless merge_columns.empty? + reducer["unified_columns"] = unified_columns unless unified_columns.empty? reducer end end Modified: test/unit/plugin/collector/test_basic.rb (+1 -1) =================================================================== --- test/unit/plugin/collector/test_basic.rb 2013-12-04 14:20:31 +0900 (2141251) +++ test/unit/plugin/collector/test_basic.rb 2013-12-04 14:21:53 +0900 (833568d) @@ -605,7 +605,7 @@ class BasicCollectorTest < Test::Unit::TestCase { "column" => 1, "operator" => "<" }, ], "key_column" => 0, - "merge_columns" => [1, 2], + "unified_columns" => [1, 2], "limit" => -1, }, }, -------------- next part -------------- HTML����������������������������...Download