kyototycoon 0.5.0 → 0.5.1

data/Changes.md

@@ -0,0 +1,25 @@
+## v0.5.1
+
+* changing server dicision logic
+* added KT::Stream.run
+
+## v0.5.0
+
+* Always Keep-Alive connection
+* remove Tsvrpc::Nethttp, and KT#agent=
+* default KT#colenc = :B (Base64)
+* modified benchmark/*.rb
+
+## v0.1.2
+
+* added KT#configure, KT#create
+* added KT#incr, KT#decr, KT#decrement
+* rspec connect to localhost:19999 for safety
+
+## v0.1.1
+
+* fixed always xt=0
+
+## v0.1.0
+
+* first release

data/README.markdown

@@ -109,6 +109,25 @@ KyotoTycoon client for Ruby.
 
 - msgpack(optional)
 
+# Other case for `ktremotemgr slave | ...`
+
+    $ cat foo.rb
+    require "rubygems"
+    require "kyototycoon"
+
+    KyotoTycoon::Stream.run($stdin) do |line|
+      case line.cmd
+        when 'clear'
+          puts "all record cleared!"
+        when 'set'
+          puts "#{line.key} get #{line.value} value"
+        when 'remove'
+          puts "#{line.key} is removed at #{line.time.strftime('%Y-%m-%d %H:%M:%S')}"
+      end
+    end
+
+    $ ktremotemgr slave -uw | ruby foo.rb
+
 # Trap
 
 KyotoTycoon is based on HTTP so all variable types are become String.

data/kyototycoon.gemspec

@@ -5,36 +5,39 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kyototycoon}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["uu59"]
-  s.date = %q{2010-12-22}
+  s.date = %q{2010-12-23}
   s.description = %q{KyotoTycoon client for Ruby}
   s.email = %q{a@tt25.org}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
+    "Changes.md",
     "Gemfile",
     "Gemfile.lock",
     "MIT-LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
-    "benchmark/helper.rb",
     "benchmark/bulk.rb",
     "benchmark/bulk_bigdata.rb",
     "benchmark/getset.rb",
     "benchmark/getset_while_1sec.rb",
+    "benchmark/helper.rb",
     "kyototycoon.gemspec",
     "lib/kyototycoon.rb",
     "lib/kyototycoon/serializer.rb",
     "lib/kyototycoon/serializer/default.rb",
     "lib/kyototycoon/serializer/msgpack.rb",
+    "lib/kyototycoon/stream.rb",
     "lib/kyototycoon/tsvrpc.rb",
     "lib/kyototycoon/tsvrpc/skinny.rb",
-    "spec/helper.rb"
+    "spec/helper.rb",
+    "spec/ktslave.txt"
   ]
   s.homepage = %q{http://github.com/uu59/kyototycoon-ruby}
   s.licenses = ["MIT"]

data/lib/kyototycoon/stream.rb

@@ -0,0 +1,74 @@
+# -- coding: utf-8
+
+=begin
+$ cat foo.rb
+require "rubygems"
+require "kyototycoon"
+
+KyotoTycoon::Stream.run($stdin) do |line|
+  ... do some stuff ..
+end
+
+$ ktremotemgr slave -uw | ruby foo.rb
+=end
+
+class KyotoTycoon
+  module Stream
+    def self.run(io=$stdin, &block)
+      io.each_line{|line|
+        line = Line.new(*line.strip.split("\t", 5))
+        block.call(line)
+      }
+    end
+
+    class Line < Struct.new(:ts, :sid, :db, :cmd, :raw_args)
+      def args
+        @args ||= begin
+          return [] if raw_args.nil?
+          k,v = *raw_args.split("\t").map{|v| v.unpack('m').first}
+          return [k] unless v
+          xt = 0
+          v.unpack('C5').each{|num|
+            xt = (xt << 8) +  num
+          }
+          v = v[5, v.length]
+          [k, v, xt]
+        end
+      end
+
+      def key
+        @key ||= begin
+          args.first || nil
+        end
+      end
+
+      def value
+        @value ||= begin
+          args[1] || nil
+        end
+      end
+
+      def xt
+        @xt ||= begin
+          args[2] || nil
+        end
+      end
+
+      def xt_time
+        @xt_time ||= begin
+          if args[2]
+            # if not set xt:
+            # Time.at(1099511627775) # => 36812-02-20 09:36:15 +0900
+            Time.at(args[2].to_i) 
+          else
+            Time.at(0)
+          end
+        end
+      end
+      
+      def time
+        @time ||= Time.at(*[ts[0,10], ts[10, ts.length]].map(&:to_i))
+      end
+    end
+  end
+end

data/lib/kyototycoon.rb

@@ -10,9 +10,10 @@ require "kyototycoon/serializer/default.rb"
 require "kyototycoon/serializer/msgpack.rb"
 require "kyototycoon/tsvrpc.rb"
 require "kyototycoon/tsvrpc/skinny.rb"
+require "kyototycoon/stream.rb"
 
 class KyotoTycoon
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 
   attr_accessor :colenc, :connect_timeout, :servers
   attr_reader :serializer, :logger, :db
@@ -41,6 +42,7 @@ class KyotoTycoon
 
   def initialize(host=DEFAULT_HOST, port=DEFAULT_PORT)
     @servers = [[host, port]]
+    @checked_servers = nil
     @serializer = KyotoTycoon::Serializer::Default
     @logger = Logger.new(nil)
     @colenc = :B
@@ -266,26 +268,23 @@ class KyotoTycoon
   end
 
   def choice_server
-    current = @servers.first
-    if @servers.length > 1
-      @servers.each{|s|
-        host,port = *s
-        if ping(host, port)
-          @servers = [[host, port]]
-          break
-        end
-      }
+    if @checked_servers
+      return @checked_servers
     end
-    if @servers.length == 0
+
+    @servers.each{|s|
+      host,port = *s
+      if ping(host, port)
+        @checked_servers = [host, port]
+        break
+      end
+    }
+    if @checked_servers.nil?
       msg = "alived server not exists"
       @logger.crit(msg)
       raise msg
     end
-    result = @servers.first
-    if current != result
-      @client = nil
-    end
-    result
+    @checked_servers
   end
 
 end

data/spec/helper.rb

@@ -14,6 +14,7 @@ Be carefully for run, and run `ktserver -port 19999 '*'` before testing.
 $LOAD_PATH.unshift(File.dirname(__FILE__) + "/../lib")
 require "rubygems"
 require "kyototycoon.rb"
+require "kyototycoon/stream.rb"
 
 describe do
   before(:all) do
@@ -155,4 +156,35 @@ describe do
       kt.db.should == 'foobar'
     }
   end
+
+  it 'should handle `ktremotemgr slave`' do
+    io = File.open("#{File.dirname(__FILE__)}/ktslave.txt", "r")
+    current = 0
+    KyotoTycoon::Stream.run(io){|line|
+      case current
+        when 0 # clear command
+          line.cmd.should == 'clear'
+          line.xt_time.should == Time.at(0)
+          line.value.should be_nil
+          line.key.should be_nil
+          line.value.should be_nil
+        when 1 # set foo bar
+          line.cmd.should == 'set'
+          line.xt_time.should > Time.now
+          line.key.should == 'foo'
+          line.value.should == 'bar'
+        when 2 # set fooxt bar with xt(2010-12-23 22:09:49 +0900)
+          line.cmd.should == 'set'
+          line.key.should == 'fooxt'
+          line.value.should == 'bar'
+          line.xt_time.should > Time.at(1234567890)
+          line.xt_time.should < Time.at(1334567890)
+        when 3 # remove foo
+          line.cmd.should == 'remove'
+          line.key.should == 'foo'
+          line.value.should be_nil
+      end
+      current += 1
+    }
+  end
 end

data/spec/ktslave.txt

@@ -0,0 +1,4 @@
+1293108572805000000	1	0	clear
+1293108575130000000	1	0	set	Zm9v	//////9iYXI=
+1293108589068000000	1	0	set	Zm9veHQ=	AE0TSh1iYXI=
+1293108597399000000	1	0	remove	Zm9v

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - uu59
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +09:00
+date: 2010-12-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,25 +97,28 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- Changes.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION
-- benchmark/helper.rb
 - benchmark/bulk.rb
 - benchmark/bulk_bigdata.rb
 - benchmark/getset.rb
 - benchmark/getset_while_1sec.rb
+- benchmark/helper.rb
 - kyototycoon.gemspec
 - lib/kyototycoon.rb
 - lib/kyototycoon/serializer.rb
 - lib/kyototycoon/serializer/default.rb
 - lib/kyototycoon/serializer/msgpack.rb
+- lib/kyototycoon/stream.rb
 - lib/kyototycoon/tsvrpc.rb
 - lib/kyototycoon/tsvrpc/skinny.rb
 - spec/helper.rb
+- spec/ktslave.txt
 has_rdoc: true
 homepage: http://github.com/uu59/kyototycoon-ruby
 licenses: