redi 0.0.4 → 0.0.5

data/ChangeLog.md

@@ -0,0 +1,4 @@
+0.0.5
+------
+* add del method
+* better mock handling for tests

data/README.md

@@ -6,26 +6,26 @@ Pooled redis puts a layer of indirection between server pool and key ring
 
 The idea comes from http://blog.zawodny.com/2011/02/26/redis-sharding-at-craigslist/
 
-  gem install redi
+    gem install redi
 
 Create a configuration file:
 
-  development:
-    - :host: 192.168.0.10
-      :port: 6379
-      :db: 0
-      :buckets: 0 - 64
-    - :host: 192.168.0.11
-      :port: 6380
-      :db: 0
-      :buckets: 65 - 127
+    development:
+      - :host: 192.168.0.10
+        :port: 6379
+        :db: 0
+        :buckets: 0 - 64
+      - :host: 192.168.0.11
+        :port: 6380
+        :db: 0
+        :buckets: 65 - 127
 
-The keyspace mapping is very important.  It helps you manage the exact mapping of buckets to servers and is how you can scale from 2 severs to 16.
-In the example, you have 16 buckets that map evenly to 2 servers.  If you decide you need more memory (more severs) you can choose a segment of your
-buckets to replicate to a new server.  
+The configuration should look like a normal redis configuration with the addition of a buckets key.  This tells redi how many buckets it should
+hash keys to before mapping them to the configured server.  In the example above, it would be possible to scale those 2 servers up to 128 servers without 
+rekeying, you can follow the 5 steps below to add a new server each time.
 
 1. create new server
 2. identify buckets to move to new server
 3. setup new server as slave to replicate
 4. update configuration to point buckets to new server
-5. prune old keys from old server freeing up more space on old server using a keys nsxx* query
+5. use bucket key prefixes to prune old keys from old server.

data/lib/redi.rb

@@ -15,16 +15,20 @@ class Redi
     pool.redis_by_key(key).set(key, val)
   end
 
+  def self.del(key)
+    pool.redis_by_key(key).del(key)
+  end
+
   def self.flushall
     pool.flushall
   end
 
   def self.mock!
-    pool.mock!
+    pool(true).mock!
   end
 
-  def self.pool
-    @pool ||= Pool.new(self.config)
+  def self.pool(mock=false)
+    @pool ||= Pool.new(self.config,mock)
   end
 
   def self.config=(config)
@@ -52,7 +56,7 @@ class Redi
   #
   class Pool
     attr_reader :keyspace, :servers
-    def initialize(config)
+    def initialize(config,mock=false)
       key_type = Struct.new(:id, :to_s)
 
       # build server pool
@@ -61,7 +65,11 @@ class Redi
       @servers = config.map {|cfg|
         bucket_range = cfg.delete(:buckets)
         s, e = bucket_range.split('-').map {|n| n.to_i }
-        conn = Redis.new(cfg)
+        if mock
+          conn = Mock.new
+        else
+          conn = Redis.new(cfg)
+        end
         (s..e).each do|i|
           bucket_name = "n#{i}"
           buckets << key_type.new(i, bucket_name)
@@ -74,6 +82,11 @@ class Redi
       @keyring  = Redis::HashRing.new(buckets)
     end
 
+    def qualified_key_for(key)
+      bucket = @keyring.get_node(key)
+      "#{bucket.to_s}:#{key}"
+    end
+
     def redis_by_key(key)
       bucket = @keyring.get_node(key)
       Redis::Namespace.new(bucket.to_s, :redis => @bucket2server[bucket.to_s])
@@ -85,6 +98,9 @@ class Redi
 
     def mock!
       @servers.map! {|s| Mock.new }
+      @bucket2server.keys.each_with_index do|k,i|
+        @bucket2server[k] = @servers[i % @servers.size]
+      end
     end
 
   end
@@ -98,6 +114,10 @@ class Redi
       @store[key]
     end
 
+    def del(key)
+      @store.delete(key)
+    end
+
     def set(key, val)
       @store[key] = val
     end

data/lib/redi/version.rb

@@ -1,3 +1,3 @@
 module RedisRing
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redi
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Todd Fisher
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -04:00
+date: 2011-10-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- ChangeLog.md
 - Gemfile
 - Gemfile.lock
 - README.md