fixes and specs for balancer

lib/tokyo_tyrant/balancer.rb

@@ -1,5 +1,6 @@
-require 'fast_hash_ring'
 require 'tokyo_tyrant'
+# require 'hash_ring'
+require 'fast_hash_ring'
 
 module TokyoTyrant
   module Balancer
@@ -10,6 +11,7 @@ def initialize(servers = [], weights = {})
           klass.new(host, port.to_i)
         end
         @servers = servers
+        # @ring = HashRing.new(servers, weights)
         @ring = FastHashRing.new(servers, weights)
       end
 
@@ -46,7 +48,7 @@ def get_int(key)
 
       def add_double(key, i = 1.0)
         db = db_for_key(key)
-        db.add_int(key, i)
+        db.add_double(key, i)
       end
       alias :adddouble :add_double
 
@@ -98,6 +100,10 @@ def out(key)
       alias :delete :out
 
       # Aggregate Methods
+      def close
+        @servers.all?{ |server| server.close }
+      end
+
       def rnum
         @servers.collect{ |server| server.rnum }.inject(nil){ |sum,x| sum ? sum+x : x }
       end
@@ -110,16 +116,16 @@ def empty?
       end
 
       def vanish
-        @servers.each{ |server| server.vanish }
+        @servers.all?{ |server| server.vanish }
       end
       alias :clear :vanish
 
       def sync
         @servers.each{ |server| server.sync }
       end
 
-      def optimize
-        @servers.each{ |server| server.optimize }
+      def optimize(*args)
+        @servers.all?{ |server| server.optimize(*args) }
       end
 
       def check(key)
@@ -130,8 +136,17 @@ def check(key)
       alias :include? :check
       alias :member?  :check
 
+      def set_index(name, type)
+        @servers.all?{ |server| server.set_index(name, type) }
+      end
+
+      def fwmkeys(prefix, max = -1)
+        @servers.collect{ |server| server.fwmkeys(prefix, max) }.flatten
+      end
+
       def delete_keys_with_prefix(prefix, max = -1)
         @servers.each{ |server| server.delete_keys_with_prefix(prefix, max) }
+        nil
       end
       alias :dfwmkeys :delete_keys_with_prefix
 

spec/spec_base.rb

@@ -9,6 +9,7 @@
 require 'fileutils'
 require 'bacon'
 require 'tokyo_tyrant'
+require 'lib/tokyo_tyrant/balancer'
 
 $root.class.glob('spec/*_spec.rb').each {|l| load l}
 

spec/tokyo_tyrant_balancer_db_spec.rb

@@ -0,0 +1,160 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.join('spec_base') unless $root
+
+describe TokyoTyrant::Balancer::DB, "with an open database" do
+
+  before do
+    @db = TokyoTyrant::Balancer::DB.new(['127.0.0.1:45000'])
+    @db.clear
+  end
+
+  it "should not be nil" do
+    @db.should.not.be.nil
+  end
+
+  it "should close" do
+    @db.close.should.be.true
+    begin
+      @db.close
+    rescue => e
+      e.message.should == 'close error: invalid operation'
+    end
+  end
+
+  it "should optimize" do
+    @db.optimize.should.be.true
+  end
+
+  it "should save a value" do
+    @db['salad'] = 'bacon bits'
+    @db['salad'].should == 'bacon bits'
+  end
+
+  it "should return a value" do
+    @db['salad'] = 'bacon bits'
+    @db['salad'].should == 'bacon bits'
+  end
+
+  it "should accept binary data" do
+    s = "mango#{0.chr}salsa"
+    @db.put(s, s).should.be.true
+    @db[s].should.equal(s)
+  end
+
+  it "should out a value" do
+    k = 'tomato'
+    @db[k] = 'green'
+    @db.out(k).should.be.true
+    @db[k].should.be.nil
+    @db.out(k).should.be.false
+  end
+
+  it "should get a value size" do
+    k = 'cereal'
+    v = 'granola'
+    @db[k] = v
+    @db.vsiz(k).should == v.size
+  end
+
+  it "should check a key" do
+    k = 'fruit'
+    @db[k] = 'banana'
+    @db.check(k).should.be.true
+    @db.out(k)
+    @db.check(k).should.be.false
+  end
+
+  it "should get forward matching keys" do
+    @db['apples/royalgala'] = '4173'
+    @db['apples/grannysmith'] = '4139'
+    @db['bananas/yellow'] = '4011'
+    @db['oranges/shamouti'] = '3027'
+    @db['grapefruit/deepred'] = '4288'
+    @db.fwmkeys('apples').sort.should == ["apples/grannysmith", "apples/royalgala"]
+  end
+
+  it "should delete forward matching keys" do
+    @db['apples/royalgala'] = '4173'
+    @db['apples/grannysmith'] = '4139'
+    @db['bananas/yellow'] = '4011'
+    @db['oranges/shamouti'] = '3027'
+    @db['grapefruit/deepred'] = '4288'
+    @db.delete_keys_with_prefix('apples').should == nil
+    @db.fwmkeys('apples').should.be.empty
+    @db.keys.sort.should == ['bananas/yellow', 'grapefruit/deepred', 'oranges/shamouti']
+  end
+
+  it "should get all keys" do
+    keys = %w[appetizers entree dessert]
+    values = %w[chips chicken\ caeser\ salad ice\ cream]
+    keys.each_with_index do |k,i|
+      @db[k] = values[i]
+    end
+    @db.keys.should == keys
+  end
+
+  it "should get all values" do
+    keys = %w[appetizers entree dessert]
+    values = %w[chips chicken\ caeser\ salad ice\ cream]
+    keys.each_with_index do |k,i|
+      @db[k] = values[i]
+    end
+    @db.values.should == values
+  end
+
+  it "should vanish all records" do
+    @db['chocolate'] = 'dark'
+    @db['tea'] = 'earl grey'
+    @db.empty?.should.be.false
+    @db.vanish.should.be.true
+    @db.empty?.should.be.true
+  end
+
+  it "should count records" do
+    @db['hummus'] = 'chickpeas'
+    @db['falafel'] = 'chickpeas'
+    @db.rnum.should == 2
+  end
+
+  it "should fetch a record" do
+    @db.out('beer')
+    @db.fetch('beer'){ 'heineken' }.should == 'heineken'
+    @db['beer'].should == 'heineken'
+    @db.fetch('beer'){ 'becks' }.should == 'heineken'
+  end
+
+  it "should add serialized integer values" do
+    key = 'counter'
+    @db.out(key)
+    @db.add_int(key, 1).should == 1
+    @db.add_int(key, 1).should == 2
+    @db.get_int(key).should == 2
+  end
+
+  it "should increment integer values" do
+    key = 'counter'
+    @db.out(key)
+    @db.increment(key).should == 1
+    @db.increment(key, 2).should == 3
+    @db.get_int(key).should == 3
+  end
+
+  it "should add serialized double values" do
+    key = 'counter'
+    @db.out(key)
+    @db.add_double(key, 1.0).should.be.close?(1.0, 0.005)
+    @db.add_double(key, 1.0).should.be.close?(2.0, 0.005)
+    @db.get_double(key).should.be.close?(2.0, 0.005)
+  end
+
+  it "should serialize objects that respond to to_tokyo_tyrant" do
+    class Thing
+      def to_tokyo_tyrant
+        "success"
+      end
+    end
+
+    @db["to_tokyo_tyrant"] = Thing.new
+    @db["to_tokyo_tyrant"].should == "success"
+  end
+end