redis_cluster 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c41d685d5abe6bef5a4df7003ef79e2b38c14c3
-  data.tar.gz: 6b4394d762352ad8985b4d2d37b61a7085286758
+  metadata.gz: f73539f72f1afc171f22acfd295dbf491f745ec2
+  data.tar.gz: 25c3ede9fa06f5402d21d3aa5b3aff8df64f77a7
 SHA512:
-  metadata.gz: 4ce9f3781fc3b9cdd11fc0cb59940e3781f7ca6338dd922bf0738f238b3242b62fc2875b48a41ad3c0fe64a4ffc3be776887b41d4fe65581a48ce1f4b44e9c6d
-  data.tar.gz: d9127f2e680ab9481365aa3b831551294d57ee1e152ae3a9098af5baa7b5d81ce178f7fd0daccf0431ff07eac5220f5d3f09cfe5a51b56eb073d19a3339dba5a
+  metadata.gz: 10437f66a1ca4fe5190d388fddc2e1619ca0fdb1db0c12506ce7cdeb43cd7fe37dba92b70b0a5e98ae323bb96143ec10162c9ef4d13bddd094af56387f250df5
+  data.tar.gz: 66e1268bfbd524926b61474c13d98bfb249eb7a2bfd71b4c1e6bac0c1ce59bd8b84721ce5a3e520f55779cbcd216e200f37b0418d4eecd9458cccd048dcd690a

data/README.md

@@ -2,7 +2,7 @@
 
 RedisCluster for ruby is rewrited from [https://github.com/antirez/redis-rb-cluster](https://github.com/antirez/redis-rb-cluster)
 
-Now is developing, and not use in any production environments. Welcome to test and contribute codes!
+Now is developing, only support single node methods, and not use in any production environments.
 
 
 ## Installation
@@ -26,12 +26,39 @@ Or install it yourself as:
 Doing!
 
 ```ruby
-hosts = [{host: 127.0.0.1, port: 7000}, {host: 127.0.0.1, port: 7001}]
+hosts = [{host: '127.0.0.1', port: 7000}, {host: '127.0.0.1', port: 7001}]  # don't need all, gem can auto detect all nodes, and process failover if some master nodes down
 rs = RedisCluster.new hosts
 rs.set "test", 1
 rs.get "test"
 ```
 
+## Benchmark test
+
+A simple benchmark at my macbook, start 4 master nodes (and 4 cold slave nodes), running with one ruby process.
+This only testing redis_cluster can work, not for redis Performance. When I fork 8 ruby process same time and run get command，redis can run 80,000 - 110,000 times per second at my macbook.
+
+
+```ruby
+Benchmark.bm do |x|
+  x.report do
+    1.upto(100_000).each do |i|
+      redis.get "test#{i}"
+    end
+  end
+  x.report do
+    1.upto(100_000).each do |i|
+      redis.set "test#{i}", i
+    end
+  end
+  x.report do
+    1.upto(100_000).each do |i|
+      redis.del "test#{i}"
+    end
+  end
+end
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/redis_cluster.rb

@@ -23,3 +23,4 @@ require "redis_cluster/node"
 require "redis_cluster/pool"
 require "redis_cluster/slot"
 require "redis_cluster/crc16"
+require "redis_cluster/errors"

data/lib/redis_cluster/client.rb

@@ -1,3 +1,5 @@
+require "thread"
+
 module RedisCluster
 
   class Client
@@ -5,7 +7,7 @@ module RedisCluster
     def initialize(startup_hosts, global_configs = {})
       @startup_hosts = startup_hosts
       @pool = Pool.new
-      @locking = false
+      @mutex = Mutex.new
       reload_pool_nodes
     end
 
@@ -48,24 +50,23 @@ module RedisCluster
     private
 
     def reload_pool_nodes
-      return if @locking
-      @locking = true
-      @startup_hosts.each do |options|
-        begin
-          redis = Node.redis(options)
-          slots_mapping = redis.cluster("slots").group_by{|x| x[2]}
-          @pool.delete_except!(slots_mapping.keys)
-          slots_mapping.each do |host, infos|
-            slots_ranges = infos.map {|x| x[0]..x[1] }
-            @pool.add_node!({host: host[0], port: host[1]}, slots_ranges)
+      @mutex.synchronize do
+        @startup_hosts.each do |options|
+          begin
+            redis = Node.redis(options)
+            slots_mapping = redis.cluster("slots").group_by{|x| x[2]}
+            @pool.delete_except!(slots_mapping.keys)
+            slots_mapping.each do |host, infos|
+              slots_ranges = infos.map {|x| x[0]..x[1] }
+              @pool.add_node!({host: host[0], port: host[1]}, slots_ranges)
+            end
+          rescue
+            next
           end
-        rescue
-          next
+          break
         end
-        break
+        fresh_startup_nodes
       end
-      @locking = false
-      fresh_startup_nodes
     end
 
     def fresh_startup_nodes

data/lib/redis_cluster/configuration.rb

@@ -12,7 +12,7 @@ module RedisCluster
         hmset mapped_hmset hget hmget mapped_hmget hdel hexists hincrby hincrbyfloat hkeys hvals hgetall publish pfadd
       )
 
-    # TODO: methods for each node
+    SUPPORT_MULTI_NODE_METHODS = %w(keys)
   end
 
 end

data/lib/redis_cluster/errors.rb

@@ -0,0 +1,5 @@
+module RedisCluster
+
+  NotSupportError = Class.new StandardError
+
+end

data/lib/redis_cluster/pool.rb

@@ -24,14 +24,20 @@ module RedisCluster
     #   asking
     #   random_node
     def execute(method, args, other_options)
+      return keys(args.first) if Configuration::SUPPORT_MULTI_NODE_METHODS.include?(method.to_s)
+
       key = key_by_command(method, args)
-      raise "not usable" if key.nil?
+      raise NotSupportError if key.nil?
 
       node = other_options[:random_node] ? random_node : node_by(key)
       node.asking if other_options[:asking]
       node.execute(method, args)
     end
 
+    def keys(glob = "*")
+      on_each_node(:keys, glob).flatten
+    end
+
     private
 
     def node_by(key)
@@ -52,6 +58,12 @@ module RedisCluster
       end
     end
 
+    def on_each_node(method, *args)
+      @nodes.map do |node|
+        node.execute(method, args)
+      end
+    end
+
   end # end pool
 
 end

data/lib/redis_cluster/version.rb

@@ -1,3 +1,3 @@
 module RedisCluster
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - wangzc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -99,6 +99,7 @@ files:
 - lib/redis_cluster/client.rb
 - lib/redis_cluster/configuration.rb
 - lib/redis_cluster/crc16.rb
+- lib/redis_cluster/errors.rb
 - lib/redis_cluster/node.rb
 - lib/redis_cluster/pool.rb
 - lib/redis_cluster/slot.rb