Kouhei Sutou
null+****@clear*****
Wed Feb 12 12:34:19 JST 2014
Kouhei Sutou 2014-02-12 12:34:19 +0900 (Wed, 12 Feb 2014) New Revision: e3b1164f7e60cdf500445d69e10a65a0741529f1 https://github.com/droonga/fluent-plugin-droonga/commit/e3b1164f7e60cdf500445d69e10a65a0741529f1 Message: collector: use more meaningful name reduce -> reduce_value ^^^^^^ Modified files: lib/droonga/plugin/collector/basic.rb lib/droonga/plugin/collector/search.rb test/unit/plugin/collector/test_basic.rb Modified: lib/droonga/plugin/collector/basic.rb (+2 -2) =================================================================== --- lib/droonga/plugin/collector/basic.rb 2014-02-12 12:31:38 +0900 (afa0916) +++ lib/droonga/plugin/collector/basic.rb 2014-02-12 12:34:19 +0900 (df072f0) @@ -37,12 +37,12 @@ module Droonga body[input_name].each do |output, deal| left_value = output_values[output] right_value = request - value = reduce(deal, left_value, right_value) + value = reduce_value(deal, left_value, right_value) emit(output, value) end end - def reduce(deal, left_value, right_value) + def reduce_value(deal, left_value, right_value) if left_value.nil? || right_value.nil? return right_value || left_value end Modified: lib/droonga/plugin/collector/search.rb (+1 -1) =================================================================== --- lib/droonga/plugin/collector/search.rb 2014-02-12 12:31:38 +0900 (3ad4060) +++ lib/droonga/plugin/collector/search.rb 2014-02-12 12:34:19 +0900 (ca57541) @@ -90,7 +90,7 @@ module Droonga def reduce_elements(elements, left_values, right_values) result = {} elements.each do |key, deal| - result[key] = reduce(deal, left_values[key], right_values[key]) + result[key] = reduce_value(deal, left_values[key], right_values[key]) end result end Modified: test/unit/plugin/collector/test_basic.rb (+41 -33) =================================================================== --- test/unit/plugin/collector/test_basic.rb 2014-02-12 12:31:38 +0900 (a22bf81) +++ test/unit/plugin/collector/test_basic.rb 2014-02-12 12:34:19 +0900 (3bbf97f) @@ -107,7 +107,11 @@ class BasicCollectorTest < Test::Unit::TestCase end end - class ReduceTest < self + class ReduceValueTest < self + def reduce_value(deal, left_value, right_value) + @plugin.reduce_value(deal, left_value, right_value) + end + data( :int => { :expected => 1.5, @@ -121,9 +125,9 @@ class BasicCollectorTest < Test::Unit::TestCase }, ) def test_average(data) - reduced =****@plugi*****({ "type" => "average" }, - data[:left], - data[:right]) + reduced = reduce_value({ "type" => "average" }, + data[:left], + data[:right]) assert_equal(data[:expected], reduced) end @@ -150,9 +154,9 @@ class BasicCollectorTest < Test::Unit::TestCase }, ) def test_and(data) - reduced =****@plugi*****({ "type" => "and" }, - data[:left], - data[:right]) + reduced = reduce_value({ "type" => "and" }, + data[:left], + data[:right]) assert_equal(data[:expected], reduced) end @@ -179,9 +183,9 @@ class BasicCollectorTest < Test::Unit::TestCase }, ) def test_or(data) - reduced =****@plugi*****({ "type" => "or" }, - data[:left], - data[:right]) + reduced = reduce_value({ "type" => "or" }, + data[:left], + data[:right]) assert_equal(data[:expected], reduced) end @@ -273,10 +277,10 @@ class BasicCollectorTest < Test::Unit::TestCase }, ) def test_sum(data) - reduced =****@plugi*****({ "type" => "sum", - "limit" => data[:limit] || -1 }, - data[:left], - data[:right]) + reduced = reduce_value({ "type" => "sum", + "limit" => data[:limit] || -1 }, + data[:left], + data[:right]) assert_equal(data[:expected], reduced) end @@ -357,20 +361,24 @@ class BasicCollectorTest < Test::Unit::TestCase }, ) def test_sort(data) - reduced =****@plugi*****({ - "type" => "sort", - "operators" => [ - { "column" => 0, "operator" => "<" }, - ], - "limit" => data[:limit] || -1, - }, - data[:left], - data[:right]) + reduced = reduce_value({ + "type" => "sort", + "operators" => [ + { "column" => 0, "operator" => "<" }, + ], + "limit" => data[:limit] || -1, + }, + data[:left], + data[:right]) assert_equal(data[:expected], reduced) end end class MergeTest < self + def reduce_value(deal, left_value, right_value) + @plugin.reduce_value(deal, left_value, right_value) + end + def test_grouped expected = [ [ @@ -476,16 +484,16 @@ class BasicCollectorTest < Test::Unit::TestCase ], ] - reduced =****@plugi*****({ - "type" => "sort", - "operators" => [ - { "column" => 1, "operator" => "<" }, - ], - "key_column" => 0, - "limit" => -1, - }, - left, - right) + reduced = reduce_value({ + "type" => "sort", + "operators" => [ + { "column" => 1, "operator" => "<" }, + ], + "key_column" => 0, + "limit" => -1, + }, + left, + right) assert_equal(expected, reduced) end end -------------- next part -------------- HTML����������������������������...Download