rdkafka 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51ed7eebad223105fec15dadf53e133d90a57064
-  data.tar.gz: 56112be8287c2be5bd5a5b6d9e92308e78ddbdce
+SHA256:
+  metadata.gz: f2ca53e4caa266a4e9b4cd1fd5132626259629c1835c6923b8b5b252185884c5
+  data.tar.gz: d748f67df1abc442410de913a8b67b600264aeba55cef148ac01b0a7e863a7ce
 SHA512:
-  metadata.gz: 48c97055bcef83b22669f8fdff05f29b425ae784bbf9d3efdc1d1e050d2f12fd805a30eca495c0ed9d665e0186f3672fac012874d0c73b403932c9e2b3435fb5
-  data.tar.gz: 6ffcae7c68b5f27ff30230939049965d619b6ae044bbb713862d30f53ed3a3711b5a561fe4ec656be16b1f547fb513ed99aacb978f9716518d0c312499813c1a
+  metadata.gz: 65900548523763e0c448d8ceb8a08fdc96d8404fcef169db0724fc8ef50336a0bd4b50d622371eaf981ecc808d432c70b44b881a044903c7fa2f20bdacf23987
+  data.tar.gz: 8d157b0d6e3e82158c4c08c1bfed99e6ccb9c1d6ef287af81e20932c33adc82566a8df239fce2a227eea42b29f991b55499770ab85e87ca61b57afcc94b686d2

data/.travis.yml

@@ -4,15 +4,17 @@ sudo: false
 
 env:
   global:
-    - CC_TEST_REPORTER_ID=0af2487f1cc190d4a5e23cd76182514e5b62aac5d59b6208a02fd518487b9ed8
+    - CC_TEST_REPORTER_ID=9f7f740ac1b6e264e1189fa07a6687a87bcdb9f3c0f4199d4344ab3b538e187e
 
 rvm:
   - 2.1
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
 
 before_install:
+  - gem update --system
   - wget http://www.us.apache.org/dist/kafka/1.0.0/kafka_2.12-1.0.0.tgz -O kafka.tgz
   - mkdir -p kafka && tar xzf kafka.tgz -C kafka --strip-components 1
   - nohup bash -c "cd kafka && bin/zookeeper-server-start.sh config/zookeeper.properties &"
@@ -30,3 +32,4 @@ script:
 
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - killall -9 java

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.5
+* Fix crash when not waiting for delivery handles
+* Run specs on Ruby 2.5
+
 # 0.3.4
 * Bump librdkafka to 0.11.3
 

data/lib/rdkafka/bindings.rb

@@ -154,11 +154,13 @@ module Rdkafka
       :void, [:pointer, :pointer, :pointer]
     ) do |client_ptr, message_ptr, opaque_ptr|
       message = Message.new(message_ptr)
-      delivery_handle = Rdkafka::Producer::DeliveryHandle.new(message[:_private])
-      delivery_handle[:pending] = false
-      delivery_handle[:response] = message[:err]
-      delivery_handle[:partition] = message[:partition]
-      delivery_handle[:offset] = message[:offset]
+      delivery_handle_ptr_address = message[:_private].address
+      if delivery_handle = Rdkafka::Producer::DeliveryHandle.remove(delivery_handle_ptr_address)
+        delivery_handle[:pending] = false
+        delivery_handle[:response] = message[:err]
+        delivery_handle[:partition] = message[:partition]
+        delivery_handle[:offset] = message[:offset]
+      end
     end
   end
 end

data/lib/rdkafka/producer.rb

@@ -69,6 +69,7 @@ module Rdkafka
       delivery_handle[:response] = -1
       delivery_handle[:partition] = -1
       delivery_handle[:offset] = -1
+      DeliveryHandle.register(delivery_handle.to_ptr.address, delivery_handle)
 
       # Produce the message
       response = Rdkafka::Bindings.rd_kafka_producev(
@@ -85,6 +86,7 @@ module Rdkafka
 
       # Raise error if the produce call was not successfull
       if response != 0
+        DeliveryHandle.remove(delivery_handle.to_ptr.address)
         raise RdkafkaError.new(response)
       end
 

data/lib/rdkafka/producer/delivery_handle.rb

@@ -8,6 +8,16 @@ module Rdkafka
              :partition, :int,
              :offset, :int64
 
+      REGISTRY = {}
+
+      def self.register(address, handle)
+        REGISTRY[address] = handle
+      end
+
+      def self.remove(address)
+        REGISTRY.delete(address)
+      end
+
       # Whether the delivery handle is still pending.
       #
       # @return [Boolean]

data/lib/rdkafka/version.rb

@@ -1,4 +1,4 @@
 module Rdkafka
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
   LIBRDKAFKA_VERSION = "0.11.3"
 end

data/spec/rdkafka/producer/delivery_handle_spec.rb

@@ -2,18 +2,30 @@ require "spec_helper"
 
 describe Rdkafka::Producer::DeliveryHandle do
   let(:response) { 0 }
+
   subject do
     Rdkafka::Producer::DeliveryHandle.new.tap do |handle|
-      handle[:pending] = pending
+      handle[:pending] = pending_handle
       handle[:response] = response
       handle[:partition] = 2
       handle[:offset] = 100
     end
   end
 
+  describe ".register and .remove" do
+    let(:pending_handle) { true }
+
+    it "should register and remove a delivery handle" do
+      Rdkafka::Producer::DeliveryHandle.register(subject.to_ptr.address, subject)
+      removed = Rdkafka::Producer::DeliveryHandle.remove(subject.to_ptr.address)
+      expect(removed).to eq subject
+      expect(Rdkafka::Producer::DeliveryHandle::REGISTRY).to be_empty
+    end
+  end
+
   describe "#pending?" do
     context "when true" do
-      let(:pending) { true }
+      let(:pending_handle) { true }
 
       it "should be true" do
         expect(subject.pending?).to be true
@@ -21,7 +33,7 @@ describe Rdkafka::Producer::DeliveryHandle do
     end
 
     context "when not true" do
-      let(:pending) { false }
+      let(:pending_handle) { false }
 
       it "should be false" do
         expect(subject.pending?).to be false
@@ -30,7 +42,7 @@ describe Rdkafka::Producer::DeliveryHandle do
   end
 
   describe "#wait" do
-    let(:pending) { true }
+    let(:pending_handle) { true }
 
     it "should wait until the timeout and then raise an error" do
       expect {
@@ -39,7 +51,7 @@ describe Rdkafka::Producer::DeliveryHandle do
     end
 
     context "when not pending anymore and no error" do
-      let(:pending) { false }
+      let(:pending_handle) { false }
 
       it "should return a delivery report" do
         report = subject.wait
@@ -57,7 +69,7 @@ describe Rdkafka::Producer::DeliveryHandle do
     end
 
     context "when not pending anymore and there was an error" do
-      let(:pending) { false }
+      let(:pending_handle) { false }
       let(:response) { 20 }
 
       it "should raise an rdkafka error" do

data/spec/rdkafka/producer_spec.rb

@@ -3,6 +3,11 @@ require "spec_helper"
 describe Rdkafka::Producer do
   let(:producer) { rdkafka_config.producer }
 
+  after do
+    # Registry should always end up being empty
+    expect(Rdkafka::Producer::DeliveryHandle::REGISTRY).to be_empty
+  end
+
   it "should require a topic" do
     expect {
       producer.produce(
@@ -138,6 +143,27 @@ describe Rdkafka::Producer do
     expect(message.payload).to be_nil
   end
 
+  it "should produce message that aren't waited for and not crash" do
+    5.times do
+      200.times do
+        producer.produce(
+          topic:   "produce_test_topic",
+          payload: "payload not waiting",
+          key:     "key not waiting"
+        )
+      end
+
+      # Allow some time for a GC run
+      sleep 1
+    end
+
+    # Wait for the delivery notifications
+    10.times do
+      break if Rdkafka::Producer::DeliveryHandle::REGISTRY.empty?
+      sleep 1
+    end
+  end
+
   it "should raise an error when producing fails" do
     expect(Rdkafka::Bindings).to receive(:rd_kafka_producev).and_return(20)
 
@@ -158,5 +184,8 @@ describe Rdkafka::Producer do
     expect {
       handle.wait(0)
     }.to raise_error Rdkafka::Producer::DeliveryHandle::WaitTimeoutError
+
+    # Waiting a second time should work
+    handle.wait(5)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdkafka
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Thijs Cadier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Kafka client library wrapping librdkafka using the ffi gem and futures from