redis_cluster 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10ed9adf21d43959b884dd43b59474b469c84cf
-  data.tar.gz: dfab801d69bf40c1d92fdb3f123ba980cc7aeade
+  metadata.gz: 8264917dc18e8ffb741b2038f6dcc5b607caab2a
+  data.tar.gz: a3e799c1a0887c327f7277ed210ea961b674e414
 SHA512:
-  metadata.gz: e0e96edb02ff52f9a4eda36d1e922288a4459669d645ac736a8856a35a4cdbc2ca10b0cc37ab6560b4302eabb2270fe1ead8d9fa4cfb4bea53360ffaab8cae8e
-  data.tar.gz: 80706f7728f362931760c1473bf7f01b68ee7e95953d85da47126170c43d30af0e138e5116179f8e11fd54544e451f8714351a5148b6c17cc071e4a70a42b741
+  metadata.gz: a894308b600b079667cb0dcd9ef2a9e4ca4ea7dc9d19d679a3af483122ae30fd11d981a7ed0e8a6f6483ff2438834e7ce538296a670d819add2c8cd65edaafa1
+  data.tar.gz: cd3eff23e5c40d3e3a901e8af38f78991e2973de198770df3e66c5f5a924ba171f0322653e94aba55d14cbd7fc7b03e6071ba1bd472979ec596df877dcf2cdb4

data/lib/redis_cluster/client.rb

@@ -118,6 +118,11 @@ module RedisCluster
       execute(method, args, &block)
     end
 
+    # Add default argument to keys to match redis client interface
+    def keys(glob = "*", &block)
+      execute("keys", [glob], &block)
+    end
+
     # Closes all open connections and reloads the client pool.
     #
     # Normally host information from the last time the node pool was reloaded

data/lib/redis_cluster/configuration.rb

@@ -16,7 +16,7 @@ module RedisCluster
       hincrby hincrbyfloat hkeys hvals hgetall publish pfadd
     ).freeze
 
-    SUPPORT_MULTI_NODE_METHODS = %w(keys script multi pipelined).freeze
+    SUPPORT_MULTI_NODE_METHODS = %w(keys script multi pipelined scan).freeze
 
     def self.method_names
       SUPPORT_SINGLE_NODE_METHODS + SUPPORT_MULTI_NODE_METHODS

data/lib/redis_cluster/node.rb

@@ -41,8 +41,8 @@ module RedisCluster
     end
 
     def self.redis(options)
-      extra_options = {timeout: Configuration::DEFAULT_TIMEOUT, driver: 'hiredis'.freeze}
-      ::Redis.new(options.merge(extra_options))
+      default_options = {timeout: Configuration::DEFAULT_TIMEOUT, driver: 'hiredis'.freeze}
+      ::Redis.new(default_options.merge(options))
     end
 
   end # end Node

data/lib/redis_cluster/pool.rb

@@ -54,8 +54,34 @@ module RedisCluster
       random_node.execute :pipelined, args, &block
     end
 
+    # Implements scan across all nodes in the pool.
+    # Cursors will behave strangely if the node list changes during iteration.
+    def scan(args)
+      scan_cursor = args.first
+      options = args[1] || {}
+      node_cursor, node_index = decode_scan_cursor(scan_cursor)
+      next_node_cursor, result = @nodes[node_index].execute("scan", [node_cursor, options])
+      [encode_next_scan_cursor(next_node_cursor, node_index), result]
+    end
+
     private
 
+    def encode_next_scan_cursor(next_node_cursor, node_index)
+      if next_node_cursor == '0'
+        # '0' indicates the end of iteration.  Advance the node index and
+        # start at the '0' position on the next node.  If this was the last node,
+        # loop around and return '0' to indicate iteration is done.
+        ((node_index + 1) % @nodes.size)
+      else
+        ((next_node_cursor.to_i * @nodes.size) + node_index)
+      end.to_s # Cursors are strings
+    end
+
+    def decode_scan_cursor(cursor)
+      node_cursor, node_index = cursor.to_i.divmod(@nodes.size)
+      [node_cursor.to_s, node_index] # Cursors are strings.
+    end
+
     def node_by(key)
       slot = Slot.slot_by(key)
       @nodes.find { |node| node.has_slot?(slot) }

data/lib/redis_cluster/version.rb

@@ -1,3 +1,3 @@
 module RedisCluster
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_cluster
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - wangzc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis