fluent-plugin-datacalculator 0.0.2 → 0.0.3

data/fluent-plugin-datacalculator.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-datacalculator"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Muddy Dixon"]
   s.email       = ["muddydixon@gmail.com"]
   s.homepage    = "https://github.com/muddydixon/fluent-plugin-datacalculator"

data/lib/fluent/plugin/out_datacalculator.rb

@@ -5,6 +5,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
   config_param :count_interval, :time, :default => nil
   config_param :unit, :string, :default => 'minute'
   config_param :aggregate, :string, :default => 'tag'
+  config_param :aggregate_delimiter, :string, :default => '_$_'
   config_param :tag, :string, :default => 'datacalculate'
   config_param :input_tag_remove_prefix, :string, :default => nil
   config_param :formulas, :string
@@ -194,7 +195,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
 
       counts.keys.each do |pat|
         output = {}
-        pat_val = pat.split('_').map{|x| x.to_i }
+        pat_val = pat.split(@aggregate_delimiter).map{|x| x.to_s }
         counts[pat].each_with_index do |count, i|
           name = @_formulas[i][1]
           output[name] = count
@@ -280,7 +281,7 @@ class Fluent::DataCalculatorOutput < Fluent::Output
     cs = {}
     es.each do |time, record|
       matched = false
-      pat = @aggregate_keys.map{ |key| record[key] }.join('_')
+      pat = @aggregate_keys.map{ |key| record[key] }.join(@aggregate_delimiter)
       cs[pat] = [0] * @_formulas.length unless cs.has_key?(pat)
 
       if @_formulas.length > 0

data/test/plugin/test_out_datacalculator.rb

@@ -112,6 +112,7 @@ class DataCalculatorOutputTest < Test::Unit::TestCase
     d = create_driver
     r1 = d.instance.generate_output({'test.input' => [240,120,180], 'test.input2' => [600,0,0]}, 60)[0]
 
+
     assert_equal   240, r1['input_sum']
     assert_equal   120, r1['input_amounts']
     assert_equal   180, r1['input_record']
@@ -206,5 +207,37 @@ class DataCalculatorOutputTest < Test::Unit::TestCase
       assert_equal sums[pat], r['sum']
       assert_equal counts[pat], r['count']
     end
+
+    d4 = create_driver(%[
+      unit minute
+      aggregate keys area_id, mission_id
+      formulas sum = amount * price, count = 1
+      <unmatched>
+        type stdout
+      </unmatched>
+    ], 'test.input3')
+    
+    sums = {}
+    counts = {}
+    d4.run do
+      240.times do
+        area_id = 'area_'+rand(5).to_s
+        mission_id = 'mission_'+rand(5).to_s
+        amount = rand(10)
+        price = rand(5) * 100
+        pat = [area_id, mission_id].join('_$_')
+        d4.emit({'amount' => amount, 'price' => price, 'area_id' => area_id, 'mission_id' => mission_id})
+        sums[pat] = 0 unless sums.has_key?(pat)
+        counts[pat] = 0 unless counts.has_key?(pat)
+        sums[pat] += amount * price
+        counts[pat] += 1
+      end
+    end
+    r4 = d4.instance.flush(60)
+    r4.each do |r|
+      pat = [r['area_id'], r['mission_id']].join('_$_')
+      assert_equal sums[pat], r['sum']
+      assert_equal counts[pat], r['count']
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacalculator
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd