fluent-plugin-redis-multi-type-counter 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 936238a72c8d962c1069ee120d0ef01f18f284c8
-  data.tar.gz: f3ef9d5150a711d790b3cf995f5fdfd03384c82f
+  metadata.gz: 7575f5b2b303087dc3c5cd93e6fc29925fef2252
+  data.tar.gz: d2b6edb521e0f2a5c5454cd8baa9f725a1dbca32
 SHA512:
-  metadata.gz: ef17b10d2221df4eb2937473969fe941b707c41d29bd964474a7977e52445e66a44a301e6ba09805580f5d3763bd32e180b53f38dce7192ba7f3dcf67a2e04ac
-  data.tar.gz: 3bccb55ec9a19268492153a7978c75af64c44c85df74a5266e2937108fbc0b96de4e0e5e02e2b37b33d8d3c2cef27c46f163c7b8d7bad7df01338a72d580b9cf
+  metadata.gz: 5258c43359764c43b2e5348ae9348e007bd79ebf99869a99cfbb015de4d2f90b56493430d3b362be81e79c17aefdc77b6850934fa2cd1f7f4cc880469ec7a88c
+  data.tar.gz: 3edef69b27cf3f00c7d1b1de92316455d55745c0d1134df526aa6ec50396b4e3d41d4b70bf7a3f17017967486e2cd92de17464aa6eb647bc72a8be5933d0c083

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.3
+* introduce store_list (no incr)
+
 ## 0.1.2
 * bug fix (rename files to fit plugin name)
 

data/README.md

@@ -1,3 +1,4 @@
+[![Stories in Ready](https://badge.waffle.io/HeartSaVioR/fluent-plugin-redis-multi-type-counter.png?label=ready)](https://waffle.io/HeartSaVioR/fluent-plugin-redis-multi-type-counter)
 # Redis multi-type counter plugin for fluent [![Build Status](https://travis-ci.org/HeartSaVioR/fluent-plugin-redis-multi-type-counter.png)](https://travis-ci.org/HeartSaVioR/fluent-plugin-redis-multi-type-counter)
 
 fluent-plugin-redis-multi-type-counter is a fluent plugin to count-up/down redis keys, hash, sorted set.
@@ -50,6 +51,14 @@ fluent-plugin-redis-multi-type-counter is hosted by [RubyGems.org](https://rubyg
         count_key_format customer:%_{customer_id}:status2xx-%Y-%m-%d
       </pattern>
 
+      # you can just store value to list (not counting on, it's something awkward) by store_list to true
+      # note that you cannot use store_list with hash or zset
+      <pattern>
+        match_status ^2[0-9][0-9]$
+        count_key_format customer:%_{customer_id}:status2xx-%Y-%m-%d
+        store_list true
+      </pattern>
+
       # you can also sum up key in hash, by configuring count_hash_key_format
       # syntax is same to count_key_format
       # for example, {"custom_id": 123, "date": "20131219" ...}.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/fluent-plugin-redis-multi-type-counter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-redis-multi-type-counter"
-  s.version     = "0.1.2"
+  s.version     = "0.1.3"
   s.description = "fluent-plugin-redis-multi-type-counter is a fluent plugin to count-up/down redis keys, hash keys, zset keys"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jungtaek Lim"]

data/lib/fluent/plugin/out_redis_multi_type_counter.rb

@@ -59,9 +59,18 @@ module Fluent
               count_key = pattern.get_count_key(time, record)
               count_hash_key = pattern.get_count_hash_key(record)
               count_zset_key = pattern.get_count_zset_key(record)
-
-              key = RecordKey.new(count_key, count_hash_key, count_zset_key)
-              table[key] += pattern.get_count_value(record)
+              store_list = pattern.store_list
+
+              key = RecordKey.new(count_key, count_hash_key, count_zset_key, store_list)
+			  if store_list
+			    if table[key] == 0
+				  table[key] = []
+				end
+
+			    table[key] << pattern.get_count_value(record)
+			  else
+                table[key] += pattern.get_count_value(record)
+		      end
             }
           }
         rescue EOFError
@@ -79,7 +88,11 @@ module Fluent
             elsif key.count_zset_key != nil
               @redis.zincrby(key.count_key, value, key.count_zset_key)
             else
-              @redis.incrby(key.count_key, value)
+			  if key.store_list
+			    @redis.rpush(key.count_key, value)
+              else
+                @redis.incrby(key.count_key, value)
+		      end
             end
           end
         end
@@ -87,12 +100,13 @@ module Fluent
     end
 
     class RecordKey
-      attr_reader :count_key, :count_hash_key, :count_zset_key
+      attr_reader :count_key, :count_hash_key, :count_zset_key, :store_list
 
-      def initialize(count_key, count_hash_key, count_zset_key)
+      def initialize(count_key, count_hash_key, count_zset_key, store_list)
         @count_key = count_key
         @count_hash_key = count_hash_key
         @count_zset_key = count_zset_key
+        @store_list = store_list
       end
 
       def hash
@@ -133,7 +147,7 @@ module Fluent
     end
 
     class Pattern
-      attr_reader :matches, :count_value, :count_value_key
+      attr_reader :matches, :count_value, :count_value_key, :store_list
 
       def initialize(conf_element)
         if !conf_element.has_key?('count_key') && !conf_element.has_key?('count_key_format')
@@ -157,6 +171,16 @@ module Fluent
           @record_formatter_for_count_key = RecordValueFormatter.new(@count_key_format[0])
         end
 
+        @store_list = false
+        if conf_element.has_key?('store_list') && conf_element['store_list'].downcase == 'true'
+          @store_list = true
+        end
+
+        if @store_list && (conf_element.has_key?('count_hash_key_format') ||
+            conf_element.has_key?('count_zset_key_format'))
+          raise RedisMultiTypeCounterException, 'store_list is true, it should be normal type, not hash or zset'
+        end
+
         if conf_element.has_key?('count_hash_key_format') && conf_element.has_key?('count_zset_key_format')
           raise RedisMultiTypeCounterException, 'both "count_hash_key_format" "count_zset_key_format" are specified.'
         end

data/test/plugin/out_redis_multi_type_counter.rb

@@ -20,6 +20,7 @@ class RedisMultiTypeCounterTest < Test::Unit::TestCase
     redis.del("item_sum_count:200")
     redis.del("item_sum_count_by_hash:200")
     redis.del("item_sum_count_by_zset:200")
+    redis.del("item_list_count:200")
     redis.quit
   end
 
@@ -182,6 +183,36 @@ class RedisMultiTypeCounterTest < Test::Unit::TestCase
     end
   end
 
+  def test_configure_store_list_with_specified_hash_key
+    begin
+      create_driver %[
+        <pattern>
+          count_key_format %_{prefix}-foo-bar
+		  store_list true
+          count_hash_key_format %_{host}-hash-key
+        </pattern>
+      ]
+      flunk
+    rescue Fluent::ConfigError => e
+      assert_equal 'store_list is true, it should be normal type, not hash or zset', e.message
+    end
+  end
+
+  def test_configure_store_list_with_specified_zset_key
+    begin
+      create_driver %[
+        <pattern>
+          count_key_format %_{prefix}-foo-bar
+		  store_list true
+          count_zset_key_format %_{host}-zset-key
+        </pattern>
+      ]
+      flunk
+    rescue Fluent::ConfigError => e
+      assert_equal 'store_list is true, it should be normal type, not hash or zset', e.message
+    end
+  end
+
   def test_configure_invalid_count_value
     begin
       create_driver %[
@@ -330,7 +361,6 @@ class RedisMultiTypeCounterTest < Test::Unit::TestCase
     assert_equal 2, driver.instance.redis.zscore("item_sum_count_by_zset:200", "US")
   end
 
-
   def test_write_with_count_value_key
     driver = create_driver %[
       db_number 1
@@ -369,4 +399,25 @@ class RedisMultiTypeCounterTest < Test::Unit::TestCase
     assert_equal '123', driver.instance.redis.get("item_sum_count:200"), "it should be ignore when count_value_key is not number"
   end
 
+  def test_write_with_store_list
+    driver = create_driver %[
+      db_number 1
+      <pattern>
+        count_key_format item_list_count:%_{item_id}
+        count_value_key count
+		store_list true
+      </pattern>
+    ]
+
+    time = Time.parse('2012-06-21 03:01:00 UTC').to_i
+    driver.emit({"item_id" => 200, "count" => 123}, time)
+    driver.emit({"item_id" => 200, "count" => 456}, time)
+    driver.emit({"item_id" => 200, "count" => 789}, time)
+    driver.run
+
+    assert_equal 3, driver.instance.redis.llen("item_list_count:200")
+	assert_equal '123', driver.instance.redis.lindex("item_list_count:200", 0)
+	assert_equal '456', driver.instance.redis.lindex("item_list_count:200", 1)
+	assert_equal '789', driver.instance.redis.lindex("item_list_count:200", 2)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis-multi-type-counter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jungtaek Lim
@@ -14,28 +14,28 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
 description: fluent-plugin-redis-multi-type-counter is a fluent plugin to count-up/down
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -66,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Redis multi type counter plugin for fluent