redis-cluster 1.0.0.pre.rc.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae1424cf66cf0843a3300a70bf4dd23ce9699c56
-  data.tar.gz: 898602e4c11a4267da6d7d427d57da29ae161eba
+  metadata.gz: 328dcd9bbc349a36b70a5f91bc16c69345bef62c
+  data.tar.gz: 32720a7f55ac9b912878eaf3a287bb940000f461
 SHA512:
-  metadata.gz: f2748d2afac09200212d8141f4c8ad8568e3038a8da78bc0d0128be05c99280c24e7ba7336daea7daf80a49cf2f942353c5432c0986c091b2f266e226d6a02ff
-  data.tar.gz: fa34f1114adc201170ee71c54f77c19624dc1bad37ad82cb83eed2500ed86bc0f42a6c086fd2b2281482dab94ac27656f886a29e6fced351d2215b0b68e784cb
+  metadata.gz: 7e35a19038dfac92f8c0968f44bf442a9eb225b324d2a066aed1aa83e110ea840582113cbda262e0c6323ccaac955eb6f8921b85585d8c91f602adba1913d863
+  data.tar.gz: 182e883b1fc704db0f1d8e2737fe9a1cc87209d37bf53dc2976f917d427d0ccf4cf400fcb7e7338119ec9e351aa8ed6aa7e62a909a5a209a4aa330a971e6bf98

data/lib/redis_cluster/cluster.rb

@@ -18,6 +18,7 @@ class RedisCluster
       @replicas = nil
       @client_creater = block
 
+      @buffer = []
       init_client(seeds)
     end
 
@@ -41,9 +42,9 @@ class RedisCluster
       when :master
         slots[slot].first
       when :slave
-        slots[slot][1..-1].select(&:healthy).sample || slots[slot].first
+        pick_client(slots[slot], skip: 1) || slots[slot].first
       when :master_slave
-        slots[slot].select(&:healthy).sample
+        pick_client(slots[slot])
       end
     end
 
@@ -81,6 +82,24 @@ class RedisCluster
 
     private
 
+    def pick_client(pool, skip: 0)
+      unhealthy_count = 0
+
+      (skip...pool.length).each do |i|
+        if pool[i].healthy
+          @buffer[i - skip] = pool[i]
+        else
+          unhealthy_count += 1
+        end
+      end
+
+      buffer_length = pool.length - skip - unhealthy_count
+      return nil if buffer_length.zero?
+
+      i = rand(buffer_length)
+      @buffer[i]
+    end
+
     def slots_and_clients(client)
       replicas = ::Hash.new{ |h, k| h[k] = [] }
 
@@ -107,6 +126,7 @@ class RedisCluster
         end
       end
 
+      @buffer = Array.new(clients.length) if clients.length > @buffer.length
       @replicas = replicas
     end
 

data/lib/redis_cluster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class RedisCluster
-  VERSION = '1.0.0-rc.4'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.rc.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Bukalapak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -61,9 +61,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1