remcached 0.3.1 → 0.4.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 3
-:patch: 1
+:minor: 4
+:patch: 0
 :major: 0

data/examples/fill.rb

@@ -3,9 +3,9 @@
 # Experimentally determine how many items fit in your memcached
 # instance. Adjust parameters below for your scenario.
 
-BATCH_SIZE = 1000
-KEY_SIZE = 20
-VALUE_SIZE = 20
+BATCH_SIZE = 10000
+KEY_SIZE = 26
+VALUE_SIZE = 0
 
 
 $: << File.dirname(__FILE__) + "/../lib"

data/lib/remcached/client.rb

@@ -28,27 +28,45 @@ module Memcached
       @recv_buf = ""
       @recv_state = :header
       @connected = false
+      @keepalive_timer = nil
     end
 
     def connection_completed
       @connected = true
       @connect_deferrable.succeed(self)
+
+      @last_receive = Time.now
+      @keepalive_timer = EventMachine::PeriodicTimer.new(1, &method(:keepalive))
     end
 
     RECONNECT_DELAY = 10
     RECONNECT_JITTER = 5
     def unbind
+      @keepalive_timer.cancel if @keepalive_timer
+
       @connected = false
       EventMachine::Timer.new(RECONNECT_DELAY + rand(RECONNECT_JITTER),
                               method(:reconnect))
     end
 
+    RECEIVE_TIMEOUT = 15
+    KEEPALIVE_INTERVAL = 5
+    def keepalive
+      if @last_receive + RECEIVE_TIMEOUT <= Time.now
+        p :timeout
+        close_connection
+      elsif @last_receive + KEEPALIVE_INTERVAL <= Time.now
+        send_keepalive
+      end
+    end
+
     def send_packet(pkt)
       send_data pkt.to_s
     end
 
     def receive_data(data)
       @recv_buf += data
+      @last_receive = Time.now
 
       done = false
       while not done
@@ -129,6 +147,10 @@ module Memcached
       end
     end
 
+    def send_keepalive
+      send_request Request::NoOp.new
+    end
+
     # Callback will be called multiple times
     def stats(contents={}, &callback)
       send_request Request::Stats.new(contents) do |result|

data/lib/remcached/const.rb

@@ -29,6 +29,7 @@ module Memcached
     SETQ = 0x11
     ADDQ = 0x12
     DELETEQ = 0x14
+    NOOP = 0x0a
 
 =begin
    Possible values of the one-byte field:

data/lib/remcached/packet.rb

@@ -235,6 +235,12 @@ module Memcached
         super({:opcode=>Commands::STAT}.merge(contents))
       end
     end
+
+    class NoOp < Request
+      def initialize
+        super(:opcode=>Commands::NOOP)
+      end
+    end
   end
 
   ##

data/remcached.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remcached}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephan Maka"]
-  s.date = %q{2009-10-12}
+  s.date = %q{2009-10-14}
   s.description = %q{Ruby EventMachine memcached client}
   s.email = %q{astro@spaceboyz.net}
   s.extra_rdoc_files = [
@@ -37,9 +37,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby EventMachine memcached client}
   s.test_files = [
-    "spec/client_spec.rb",
-     "spec/memcached_spec.rb",
+    "spec/memcached_spec.rb",
      "spec/packet_spec.rb",
+     "spec/client_spec.rb",
      "examples/fill.rb"
   ]
 

data/spec/client_spec.rb

@@ -33,4 +33,14 @@ describe Memcached::Client do
       @stats.should include(*%w(pid uptime time version curr_connections total_connections))
     end
   end
+
+=begin
+  it "should keep alive" do
+    run do
+      EM::Timer.new(30) do
+        stop
+      end
+    end
+  end
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remcached
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +02:00
+date: 2009-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -65,7 +65,7 @@ signing_key:
 specification_version: 3
 summary: Ruby EventMachine memcached client
 test_files: 
-- spec/client_spec.rb
 - spec/memcached_spec.rb
 - spec/packet_spec.rb
+- spec/client_spec.rb
 - examples/fill.rb