fluent-plugin-memcached 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da645ae2f7d674fe83ee1c49746d5f27e391af15
-  data.tar.gz: ab6d4e05276efecf24f1d97f9e2169970e08bda2
+  metadata.gz: ecd435b2a7544144b0d4491bf27dcdbde3983616
+  data.tar.gz: 7ba5ef4be3af483784dbe95a09215bb85a2cad36
 SHA512:
-  metadata.gz: 7e44da1a22c1f1534934c57ee2595176b1607b2077862d4400530d7763f8302595437692cea143b91d9a8e816638f2d238db9aed4113fe82e00f05a8bbfcc7be
-  data.tar.gz: 037e6872ef6b7a42be7083a250161dde433daf8576e82f62099f302b14c9650d5234842461bddd05d4fb8a894c2373b3468f8f5b74d8d3a39108d4d62c17220d
+  metadata.gz: 1e45543bc50066e97449d032c5e40455471dda3c85fa4f3154e45ae25071f33a13548227282e5a916396568d28747a845cf124054d9edeb565146b57e8d2f5ec
+  data.tar.gz: 086c2879c5f2c9bcd366ed14c3483a7f8049a3985ff503a78fdf802d66feb6046b43ad55a985cf3c593fba2e499ce0dbd5d61f7578f237b4bf76b7eefe4f781b

data/README.md

@@ -20,11 +20,12 @@ Default values would look like this:
   type memcached
   host localhost
   port 11211
+  increment false
   # value_separater " "
 </match>
 ```
 
-To save json, like this:
+To store values as json, like this:
 
 ```
 <match dummy>

data/fluent-plugin-memcached.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-memcached"
-  gem.version       = "0.0.6"
+  gem.version       = "0.0.7"
   gem.authors       = ["innossh"]
   gem.email         = ["innossh@users.noreply.github.com"]
 

data/lib/fluent/plugin/out_memcached.rb

@@ -4,7 +4,9 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
   config_param :host, :string, :default => 'localhost'
   config_param :port, :integer, :default => 11211
 
+  config_param :increment, :bool, :default => false
   config_param :value_separater, :string, :default => ' '
+
   config_param :value_format, :string, :default => 'raw'
   config_param :param_names, :string, :default => nil # nil doesn't allowed for json
 
@@ -21,7 +23,7 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
     if @value_format == 'json' and @param_names.nil?
       raise Fluent::ConfigError, "param_names MUST be specified in the case of json format"
     end
-    @formatter = RecordValueFormatter.new(@value_separater, @value_format, @param_names)
+    @formatter = RecordValueFormatter.new(@increment, @value_separater, @value_format, @param_names)
   end
 
   def start
@@ -39,16 +41,29 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
 
   def write(chunk)
     chunk.msgpack_each { |tag, time, record|
-      @memcached.set @formatter.key(record), @formatter.value(record)
+      key = @formatter.key(record)
+      value = @formatter.value(record)
+      if @increment
+        if @memcached.get(key) == nil
+          # initialize increment value
+          @memcached.incr(key, 1, nil, 0)
+        end
+        @memcached.incr(key, amt=value)
+
+      else
+        @memcached.set(key, value)
+      end
     }
   end
 
   class RecordValueFormatter
+    attr_reader :increment
     attr_reader :value_separater
     attr_reader :value_format
     attr_reader :param_names
 
-    def initialize(value_separater, value_format, param_names)
+    def initialize(increment, value_separater, value_format, param_names)
+      @increment = increment
       @value_separater = value_separater
       @value_format = value_format
       @param_names = param_names
@@ -59,16 +74,18 @@ class Fluent::MemcachedOutput < Fluent::BufferedOutput
     end
 
     def value(record)
+      values = record.values.drop(1)
       case @value_format
         when 'json'
-          values = record.values.drop(1)
           hash = {}
           @param_names.split(/\s*,\s*/).each_with_index { |param_name, i|
             hash[param_name] = (i > values.size - 1) ? nil : values[i]
           }
           hash.to_json
         else
-          record.values.drop(1).join(@value_separater)
+          return values.first.to_i if @increment
+
+          values.join(@value_separater)
       end
     end
   end

data/test/plugin/test_out_memcached.rb

@@ -19,6 +19,12 @@ class MemcachedOutputTest < Test::Unit::TestCase
     param_names param1,param2
   ]
 
+  CONFIG_INCREMENT = %[
+    host 127.0.0.1
+    port 11211
+    increment true
+  ]
+
   CONFIG_MYSQL = %[
     host 127.0.0.1
     port 11211
@@ -33,6 +39,7 @@ class MemcachedOutputTest < Test::Unit::TestCase
     d = create_driver('')
     assert_equal 'localhost', d.instance.host
     assert_equal 11211, d.instance.port
+    assert_equal false, d.instance.increment
     assert_equal ' ', d.instance.value_separater
 
     d = create_driver
@@ -53,6 +60,11 @@ class MemcachedOutputTest < Test::Unit::TestCase
       ]
     }
 
+    d = create_driver(CONFIG_INCREMENT)
+    assert_equal '127.0.0.1', d.instance.host
+    assert_equal 11211, d.instance.port
+    assert_equal true, d.instance.increment
+
     d = create_driver(CONFIG_MYSQL)
     assert_equal '127.0.0.1', d.instance.host
     assert_equal 11211, d.instance.port
@@ -96,6 +108,23 @@ class MemcachedOutputTest < Test::Unit::TestCase
     assert_equal record2_value_json, d.instance.memcached.get('d')
   end
 
+  def test_write_increment
+    d = create_driver(CONFIG_INCREMENT)
+    time = Time.parse('2011-01-02 13:14:15 UTC').to_i
+    record1 = {'key' => 'count1', 'param1' => 1}
+    record2 = {'key' => 'count2', 'param1' => 2}
+    record3 = {'key' => 'count1', 'param1' => 3}
+    record4 = {'key' => 'count2', 'param1' => 4}
+    d.emit(record1, time)
+    d.emit(record2, time)
+    d.emit(record3, time)
+    d.emit(record4, time)
+    d.run
+
+    assert_equal (1 + 3), d.instance.memcached.get('count1').to_i
+    assert_equal (2 + 4), d.instance.memcached.get('count2').to_i
+  end
+
   def test_write_to_mysql
     d = create_driver(CONFIG_MYSQL)
     time = Time.parse('2011-01-02 13:14:15 UTC').to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-memcached
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - innossh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd