ruby-kafka 0.3.13.beta2 → 0.3.13.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1680eaa22189f9b23bcbca4789e3fd1ae59f16
-  data.tar.gz: 4bac9d11016756832446f01977bc64eea2ed6c16
+  metadata.gz: 0185da2c30e9d614d899d9c64257ce6e4f3c3623
+  data.tar.gz: 88d010e2aa98c3177e1591db1b89a87603c7872d
 SHA512:
-  metadata.gz: b3fa4970596e7f62155769a63103cfac3410ab234baf4a539620408f2704bd4e29b2e0977cf507cb3972c0788306aabf339334a90218f130a64dbdac64378eae
-  data.tar.gz: 7fd63b898166156713276a8d792e29af19a1764c9c27e97651ee267a7f11e10e07fcdc8807dea79d664e2c4e6248e9250b2e3cb85b1c0d41b127e73c1e6d65e2
+  metadata.gz: a693bc3483e3e5d621b3f29ac59978fcdaa107dba84c601edbe46a2991158ec32180f88447e5f94ada737463f3fafbd572e4fbd5f0dd5e4e7afcb6d4e17612de
+  data.tar.gz: aeda8eb706dd0a96004f847c0ff6e5ae97a2973849f95b70b80c99f58fa049439fe2bbb51f0a0efcb80bf6526a0a1ca6b61761486304ca458a9101a47a65b4f4

data/lib/kafka/cluster.rb

@@ -119,10 +119,16 @@ module Kafka
       raise
     end
 
-    def resolve_offset(topic, partition, offset)
+    def resolve_offsets(topic, partitions, offset)
       add_target_topics([topic])
       refresh_metadata_if_necessary!
-      broker = get_leader(topic, partition)
+
+      partitions_by_broker = partitions.each_with_object({}) {|partition, hsh|
+        broker = get_leader(topic, partition)
+
+        hsh[broker] ||= []
+        hsh[broker] << partition
+      }
 
       if offset == :earliest
         offset = -2
@@ -130,19 +136,31 @@ module Kafka
         offset = -1
       end
 
-      response = broker.list_offsets(
-        topics: {
-          topic => [
-            {
-              partition: partition,
-              time: offset,
-              max_offsets: 1,
+      offsets = {}
+
+      partitions_by_broker.each do |broker, broker_partitions|
+        response = broker.list_offsets(
+          topics: {
+            topic => broker_partitions.map {|partition|
+              {
+                partition: partition,
+                time: offset,
+                max_offsets: 1,
+              }
             }
-          ]
-        }
-      )
+          }
+        )
 
-      response.offset_for(topic, partition)
+        broker_partitions.each do |partition|
+          offsets[partition] = response.offset_for(topic, partition)
+        end
+      end
+
+      offsets
+    end
+
+    def resolve_offset(topic, partition, offset)
+      resolve_offsets(topic, [partition], offset).fetch(partition)
     end
 
     def topics

data/lib/kafka/offset_manager.rb

@@ -11,6 +11,7 @@ module Kafka
       @processed_offsets = {}
       @default_offsets = {}
       @committed_offsets = nil
+      @resolved_offsets = {}
       @last_commit = Time.now
     end
 
@@ -33,8 +34,7 @@ module Kafka
       # A negative offset means that no offset has been committed, so we need to
       # resolve the default offset for the topic.
       if offset < 0
-        default_offset = @default_offsets.fetch(topic)
-        @cluster.resolve_offset(topic, partition, default_offset)
+        resolve_offset(topic, partition)
       else
         # The next offset is the last offset plus one.
         offset + 1
@@ -85,6 +85,18 @@ module Kafka
 
     private
 
+    def resolve_offset(topic, partition)
+      @resolved_offsets[topic] ||= fetch_resolved_offsets(topic)
+      @resolved_offsets[topic].fetch(partition)
+    end
+
+    def fetch_resolved_offsets(topic)
+      default_offset = @default_offsets.fetch(topic)
+      partitions = @group.assigned_partitions.fetch(topic)
+
+      @cluster.resolve_offsets(topic, partitions, default_offset)
+    end
+
     def seconds_since_last_commit
       Time.now - @last_commit
     end

data/lib/kafka/version.rb

@@ -1,3 +1,3 @@
 module Kafka
-  VERSION = "0.3.13.beta2"
+  VERSION = "0.3.13.beta3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-kafka
 version: !ruby/object:Gem::Version
-  version: 0.3.13.beta2
+  version: 0.3.13.beta3
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler