promiscuous-poseidon_cluster 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fc0d8c24c41642e703279f9feeb80e10c788b8
-  data.tar.gz: 6c35c729adac40669cbb915542810ab107f7dd07
+  metadata.gz: f0a3206a576efca5e80710de7873bdf951b4fda0
+  data.tar.gz: 588e34330624b29fa6a127b67c24eaafb679a60f
 SHA512:
-  metadata.gz: 2b7f1477c8fe08586939a90af7a6b7ee4f03a97e59140afb5252d8442f0ad99926bd644848a40fc844116982460a20ded382c0a1ac1493d5c292acb70ca2979a
-  data.tar.gz: d7c875b13cce867d3f43e9969419efc6db74b6fd9e97e3e116c16a3e09b18445cd90564eb44224ca657ef773c5c264d97e95e72b44f4cf9c7777a3133d8bd5fb
+  metadata.gz: cccda6adc5aade31d9c90fbac1c175cd261848e44d15e2658fde60259ba334a67cfe1b60f2a38c00ba89dbe981b6d97b60bae3a3036260949e48f95530d0dbd2
+  data.tar.gz: 6ba006802533829e84ff1b2a25f175d4803af498e500dd1f0be4d9b0ff905e5b016b11ff09f301afb399af0c39d8a8aaba631e3842a94506b0a2f20f5f217166

data/lib/poseidon/consumer_group.rb

@@ -49,22 +49,25 @@ class Poseidon::ConsumerGroup
     end
   end
 
-  # @param [Integer] pnum number of partitions size
-  # @param [Array<String>] cids consumer IDs
-  # @param [String] id consumer ID
-  # @return [Range, NilClass] selectable range, if any
-  def self.pick(pnum, cids, id)
-    cids = cids.sort
-    pos  = cids.index(id)
-    return unless pos && pos < cids.size
-
-    step = pnum.fdiv(cids.size).ceil
-    frst = pos*step
-    last = (pos+1)*step-1
-    last = pnum-1 if last > pnum-1
-    return if last < 0 || last < frst
-
-    (frst..last)
+  # @param [Integer] partition_count number of partitions size
+  # @param [Array<String>] consumer_ids consumer IDs
+  # @param [String] consumer_id consumer ID
+  # @return [Array, NilClass] array of partitions the consumer is responsible for, if any
+  def self.pick(partition_count, consumer_ids, consumer_id)
+    consumer_ids = consumer_ids.sort
+    index = consumer_ids.index(consumer_id)
+    return unless index && index < consumer_ids.size
+
+    partitions_per_consumer = partition_count / consumer_ids.size
+    extra_partitions = partition_count % consumer_ids.size
+
+    partitions_for_me = partitions_per_consumer + (index+1 > extra_partitions ? 0 : 1)
+    return if partitions_for_me == 0
+
+    first = partitions_per_consumer * index + (index < extra_partitions ? index : extra_partitions)
+    last = first + partitions_for_me - 1
+
+    (first..last)
   end
 
   # @attr_reader [String] name Group name

data/spec/lib/poseidon/consumer_group_spec.rb

@@ -286,21 +286,29 @@ describe Poseidon::ConsumerGroup do
 
   describe "pick" do
 
-    { [3, ["N1", "N2", "N3"], "N1"]       => (0..0),
-      [3, ["N1", "N2", "N3"], "N2"]       => (1..1),
-      [3, ["N1", "N2", "N3"], "N3"]       => (2..2),
+    {
+      [1, ["N1"], "N1"] => (0..0),
+      [1, ["N1"], "N2"] => nil,
+
+      [1, ["N1", "N2"], "N1"] => (0..0),
+      [1, ["N1", "N2"], "N2"] => nil,
+
+      [2, ["N1", "N2"], "N1"] => (0..0),
+      [2, ["N1", "N2"], "N2"] => (1..1),
+
+      [3, ["N1", "N2", "N3"], "N1"] => (0..0),
+      [3, ["N1", "N2", "N3"], "N2"] => (1..1),
+      [3, ["N1", "N2", "N3"], "N3"] => (2..2),
+      [3, ["N1", "N2", "N3"], "N4"] => nil,
+
       [4, ["N2", "N4", "N3", "N1"], "N3"] => (2..2),
-      [3, ["N1", "N2", "N3"], "N4"]       => nil,
-      [5, ["N1", "N2", "N3"], "N1"]       => (0..1),
-      [5, ["N1", "N2", "N3"], "N2"]       => (2..3),
-      [5, ["N1", "N2", "N3"], "N3"]       => (4..4),
-      [5, ["N1", "N2", "N3"], "N4"]       => nil,
-      [2, ["N1", "N2"], "N9"]             => nil,
-      [1, ["N1", "N2", "N3"], "N1"]       => (0..0),
-      [1, ["N1", "N2", "N3"], "N2"]       => nil,
-      [1, ["N1", "N2", "N3"], "N3"]       => nil,
-      [5, ["N1", "N2"], "N1"]             => (0..2),
-      [5, ["N1", "N2"], "N2"]             => (3..4),
+
+      [5, ["N1", "N2"], "N1"] => (0..2),
+      [5, ["N1", "N2"], "N2"] => (3..4),
+
+      [5, ["N1", "N2", "N3"], "N1"] => (0..1),
+      [5, ["N1", "N2", "N3"], "N2"] => (2..3),
+      [5, ["N1", "N2", "N3"], "N3"] => (4..4),
     }.each do |args, expected|
       it "should pick #{expected.inspect} from #{args.inspect}" do
         described_class.pick(*args).should == expected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous-poseidon_cluster
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Black Square Media
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poseidon