cql-rb 2.1.0.pre0 → 2.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f408afa031a9e58aebb3be39e8d0c0d2b0ad33b
-  data.tar.gz: 7312ad424a8fd77f81af3cbb356018a7a5154d3a
+  metadata.gz: 2a2e1e800f2f73c9c9dd0c2beedaf55851174362
+  data.tar.gz: bf02fef5b52739fd1954f3ffcc4322a5c7ff1c01
 SHA512:
-  metadata.gz: 774a0d581565ad62dbb963e77811431aeb360ec54fea83ec0bba98fe3502e4de076db0bdf9b67494da0b624e5d773c58fd13ae6e0f62b733b749b5392043bf83
-  data.tar.gz: 012108242af73ebc3c32d17016e1fcd1667c4b1c16b25206ad6fa462e5c7e04d4848f24649881711089e6d9dcc40eb76d2639082966e64f6da5364bc29ef6ba1
+  metadata.gz: edfc218ddb4b1b5b1ca3f8d0a4fd0888e9bfa9bdc9b1ac974cf881e1dc9b853adc44d5b940fe3f953d6647beac297f99d8614fd36e1dc8ad1892fde752f2e9f1
+  data.tar.gz: f6ced79805a70ea44f4b3844480f56dbbd82bcbaaacbe86c2ad75725e9563d5c5f2d78a08d15bfd763ec4964251c1461eadb9f4cfde4112b0841729deba7bfc5

data/lib/cql/protocol/cql_protocol_handler.rb

@@ -203,7 +203,6 @@ module Cql
             complete_request(id, @current_frame.body)
           end
           @current_frame = @frame_decoder.decode_frame(@read_buffer)
-          flush_request_queue
         end
       end
 
@@ -233,6 +232,7 @@ module Cql
         if response.is_a?(Protocol::SetKeyspaceResultResponse)
           @keyspace = response.keyspace
         end
+        flush_request_queue
         unless promise.timed_out?
           promise.fulfill(response)
         end
@@ -256,7 +256,7 @@ module Cql
             if @request_queue_out.any? && (id = next_stream_id)
               promise = @request_queue_out.shift
               if promise.timed_out?
-                id = nil
+                next
               else
                 frame = promise.frame
                 @promises[id] = promise

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '2.1.0.pre0'.freeze
+  VERSION = '2.1.0.pre1'.freeze
 end

data/spec/cql/protocol/cql_protocol_handler_spec.rb

@@ -112,6 +112,16 @@ module Cql
           futures[128].should be_resolved
         end
 
+        it 'flushes the request queue before it resolves the future of the just completed request' do
+          connection.stub(:write)
+          futures = Array.new(130) { protocol_handler.send_request(request) }
+          f = futures[0].map do
+            connection.should have_received(:write).exactly(129).times
+          end
+          connection.data_listener.call([0x81, 0, 0, 2, 0].pack('C4N'))
+          f.value
+        end
+
         context 'when a compressor is specified' do
           let :protocol_handler do
             described_class.new(connection, scheduler, 1, compressor)
@@ -248,6 +258,27 @@ module Cql
             128.times { |i| connection.data_listener.call([0x81, 0, i, 2, 0].pack('C4N')) }
             write_count.should == 128
           end
+
+          it 'does not stop sending queued requests even when one has timed out' do
+            write_count = 0
+            connection.stub(:write) do |s, &h|
+              write_count += 1
+              if h
+                h.call(buffer)
+              else
+                buffer << s
+              end
+            end
+            128.times do
+              protocol_handler.send_request(request)
+            end
+            scheduler.stub(:schedule_timer).with(5).and_return(timer_promise.future)
+            f1 = protocol_handler.send_request(request, 5)
+            f2 = protocol_handler.send_request(request)
+            timer_promise.fulfill
+            connection.data_listener.call([0x81, 0, 0, 2, 0].pack('C4N'))
+            write_count.should == 129
+          end
         end
       end
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre0
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2014-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0.pre3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0.pre3
 description: A pure Ruby CQL3 driver for Cassandra