redis_cluster 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b457f6ceafa44ab6ace3d09ad557fda6fec135
-  data.tar.gz: d92d1ad1c22b95dfa7f15c282bec660dd9f93072
+  metadata.gz: d5f4f4dd87bea457c22bcb596945c12e2cffad6b
+  data.tar.gz: 9cce133f24ba35be564f9a241513a8ae28a49254
 SHA512:
-  metadata.gz: df2c72b585d8f4c065abed593b3362c4f5bd0276f0e488151a9698fe5db8fe47e5db5b3ba688ff11e3f5f2c64792809be43b6f13511d75a9ab278188334de2a1
-  data.tar.gz: 5a4b84c9e6a6db6b4a685c9d329de132593d67744feccc315f27f9a10b8d8da23efd7f205bab22f5b6aa1fe2514a3ce4d461b7db83f686bb69fbac3d70d6852a
+  metadata.gz: 5d88d716725acf7b52ca0c99690b86d4203a3a725f5589a4af3f5020317b73139626105a5858336c559131c566d109a542b6a2f4dd1cfae05936deac3bb57ee4
+  data.tar.gz: 55428c277ba8d8a7accc20a4d5cdf572b7df74df550b73409570fe60fd5131f90cf1551133968f8cd4c387bcedc738f82330b13ed077f8582579198d6f1a9015

data/README.md

@@ -35,6 +35,11 @@ rs.set "test", 1
 rs.get "test"
 ```
 
+If masterauth & requirepass configed, you can initialize below:
+```ruby
+RedisCluster.new hosts, password: 'password'
+```
+
 now support keys command with scanning all nodes:
 ```ruby
 rs.keys 'test*'
@@ -51,6 +56,22 @@ rs.pipelined do
 end
 ```
 
+script, eval, evalsha
+```ruby
+# script commands will run on all nodes
+rs.script :load, "return redis.call('get', KEYS[1])"
+rs.script :exists, '4e6d8fc8bb01276962cce5371fa795a7763657ae'
+rs.script :flush
+
+# eval/evalsha must executed at one node with hash tag keys in same slot
+# and must use KEYS to fetch keys in lua script
+rs.eval "return redis.call('get', KEYS[1]) + ARGV[1]", [:test], [3]
+rs.evalsha '727fc2fb7c0f11ec134d998654e3dadaacf31a97', [:test], [5]
+
+# if lua script don't depend on any keys and argvs, you also need execute with a key
+rs.eval "return 'hello redis!'", [:foo]
+```
+
 ## Benchmark test
 
 A simple benchmark at my macbook, start 4 master nodes (and 4 cold slave nodes), running with one ruby process.

data/lib/redis_cluster/client.rb

@@ -1,4 +1,4 @@
-require "thread"
+require 'thread'
 
 module RedisCluster
 
@@ -27,8 +27,8 @@ module RedisCluster
           err_code = e.to_s.split.first
           raise e unless %w(MOVED ASK).include?(err_code)
 
-          if err_code == "ASK"
-             asking = true
+          if err_code == 'ASK'
+            asking = true
           else
             reload_pool_nodes
             sleep 0.1 if ttl < Configuration::REQUEST_TTL/2

data/lib/redis_cluster/configuration.rb

@@ -5,14 +5,19 @@ module RedisCluster
     REQUEST_TTL = 16
     DEFAULT_TIMEOUT = 1
 
-    SUPPORT_SINGLE_NODE_METHODS = %w(persist expire expireat ttl pexpire pexpireat pttl dump restore del exists move type decr decrby incr incrby
-        incrbyfloat set setex psetex setnx get setrange getrange setbit getbit append bitcount bitpos getset strlen [] []= llen lpush lpushx rpush
-        rpushx lpop rpop blpop brpop lindex linsert lrange lrem lset ltrim scard sadd srem spop srandmember sismember smembers zcard zadd zincrby 
-        zrem zscore zrange zrevrange zrank zrevrank zremrangebyrank zrangebyscore zrevrangebyscore zremrangebyscore zcount hlen hset hsetnx 
-        hmset mapped_hmset hget hmget mapped_hmget hdel hexists hincrby hincrbyfloat hkeys hvals hgetall publish pfadd
-      )
+    SUPPORT_SINGLE_NODE_METHODS = %w(
+      persist expire expireat ttl pexpire pexpireat pttl dump restore del exists
+      move type decr decrby incr incrby incrbyfloat set setex psetex setnx get
+      setrange getrange setbit getbit append bitcount bitpos getset strlen []
+      []= llen lpush lpushx rpush rpushx lpop rpop blpop brpop lindex linsert
+      lrange lrem lset ltrim scard sadd srem spop srandmember sismember smembers
+      zcard zadd zincrby zrem zscore zrange zrevrange zrank zrevrank
+      zremrangebyrank zrangebyscore zrevrangebyscore zremrangebyscore zcount
+      hlen hset hsetnx hmset mapped_hmset hget hmget mapped_hmget hdel hexists
+      hincrby hincrbyfloat hkeys hvals hgetall publish pfadd
+    ).freeze
 
-    SUPPORT_MULTI_NODE_METHODS = %w(keys multi pipelined)
+    SUPPORT_MULTI_NODE_METHODS = %w(keys script multi pipelined).freeze
   end
 
 end

data/lib/redis_cluster/errors.rb

@@ -1,5 +1,7 @@
 module RedisCluster
-
   NotSupportError = Class.new StandardError
 
+  KeysNotAtSameSlotError = Class.new StandardError
+
+  KeyNotAppointError = Class.new StandardError
 end

data/lib/redis_cluster/pool.rb

@@ -11,14 +11,14 @@ module RedisCluster
     # TODO: type check
     def add_node!(node_options, slots)
       new_node = Node.new(global_configs.merge(node_options))
-      node = @nodes.find {|n| n.name == new_node.name } || new_node
+      node = @nodes.find { |n| n.name == new_node.name } || new_node
       node.slots = slots
       @nodes.push(node).uniq!
     end
 
     def delete_except!(master_hosts)
-      names = master_hosts.map {|host, port| "#{host}:#{port}" }
-      @nodes.delete_if {|n| !names.include?(n.name) }
+      names = master_hosts.map { |host, port| "#{host}:#{port}" }
+      @nodes.delete_if { |n| !names.include?(n.name) }
     end
 
     # other_options:
@@ -40,6 +40,10 @@ module RedisCluster
       on_each_node(:keys, glob).flatten
     end
 
+    def script(args, &block)
+      on_each_node(:script, *args).flatten
+    end
+
     # Now mutli & pipelined conmand must control keys at same slot yourself
     # You can use hash tag: '{foo}1'
     def multi(args, &block)
@@ -54,7 +58,7 @@ module RedisCluster
 
     def node_by(key)
       slot = Slot.slot_by(key)
-      @nodes.find {|node| node.has_slot?(slot) }
+      @nodes.find { |node| node.has_slot?(slot) }
     end
 
     def random_node
@@ -65,6 +69,10 @@ module RedisCluster
       case method.to_s.downcase
       when 'info', 'exec', 'slaveof', 'config', 'shutdown'
         nil
+      when 'eval', 'evalsha'
+        raise KeyNotAppointError if args[1].nil? || args[1].empty?
+        raise KeysNotAtSameSlotError unless Slot.at_one?(args[1])
+        return args[1][0]
       else
         return args.first
       end

data/lib/redis_cluster/slot.rb

@@ -3,7 +3,7 @@ module RedisCluster
   class Slot
     KEY_PATTERN = /\{([^\}]*)\}/
 
-    # has tag key "{xxx}ooo" will calculate "xxx" for slot
+    # hash tag key "{xxx}ooo" will calculate "xxx" for slot
     # if key is "{}dddd", calculate "{}dddd" for slot
     def self.slot_by(key)
       key = key.to_s
@@ -12,6 +12,11 @@ module RedisCluster
       CRC16.crc16(key) % Configuration::HASH_SLOTS
     end
 
+    # check if keys at same slot
+    def self.at_one?(keys)
+      keys.map { |k| slot_by(k) }.uniq.size == 1
+    end
+
   end # end Slot
 
 end

data/lib/redis_cluster/version.rb

@@ -1,3 +1,3 @@
 module RedisCluster
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - wangzc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis