cql-rb 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88f9a36365441fa61492560764b32e62d390c77
-  data.tar.gz: 19a2ea3a083d33044364d7bed38fe7ba6edb8d28
+  metadata.gz: ad8c87f3d7ccc81d5b43765b4702882db21aab6f
+  data.tar.gz: c997140f2444a259a62c79a90118f7a1d634b3d1
 SHA512:
-  metadata.gz: bae2fb550cae96e4c2451f33a9637094365e351649555b95a09a683454ead2a49cb4d7f3f48b1082848b2647083de3743e3aa6874dc56e34ddddcdd78d7b7c9e
-  data.tar.gz: c81ce3639c98d94b6f294ff6e10316251f45b720f533af245f34b745d29f5b4905a34725fd8b378e2aea3ecfc763c011d3cdb38a9c727f52bc5a727f4104e131
+  metadata.gz: d409efa148092c538432f7d7ad0aa19dfd72370e1596415c5a69a8bb7a9918d0a5ca674f29a24115aa7cc62945c41ac8278f87540bd5e20becaabcf5039cfc44
+  data.tar.gz: ee05afbf07ba5453e50bdaffe3a3c761a4419285fb8132d2241b334e32c9f25ee4da2f527b100d6f58a0c3fcbd4f6b56de9de873d2a9bac54dc0486d5c1c4c6e

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/protocol/frame_decoder.rb

@@ -43,8 +43,13 @@ module Cql
           buffer = decompress(buffer, size)
           size = buffer.size
         end
-        extra_length = buffer.length - size 
-        trace_id = tracing == 2 ? buffer.read_uuid : nil
+        if tracing == 2
+          trace_id = buffer.read_uuid
+          size -= 16
+        else
+          trace_id = nil
+        end
+        extra_length = buffer.length - size
         response = Response.decode(opcode, protocol_version, buffer, size, trace_id)
         if buffer.length > extra_length
           buffer.discard(buffer.length - extra_length)

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.0.4'.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
 

data/spec/cql/protocol/frame_decoder_spec.rb

@@ -78,9 +78,14 @@ module Cql
 
           it 'extracts a trace ID' do
             buffer = CqlByteBuffer.new
-            buffer << "\x81\x02\x00\x08\x00\x00\x00\x14\a\xE4\xBE\x10?\x03\x11\xE3\x951\xFBr\xEF\xF0_\xBB\x00\x00\x00\x01"
+            buffer << "\x81\x02\x00\x08\x00\x00\x00\x52"
+            buffer << "\a\xE4\xBE\x10?\x03\x11\xE3\x951\xFBr\xEF\xF0_\xBB"
+            buffer << "\x00\x00\x00\x02\x00\x00\x00\x04phil\x00\x00\x00\x0dphil@heck.com\xff\xff\xff\xff\x00\x00\x00\x03sue\x00\x00\x00\x0dsue@inter.net\xff\xff\xff\xff"
+            buffer << "extra"
+            buffer << "bytes"
             frame = decoder.decode_frame(buffer)
             frame.body.trace_id.should == Uuid.new('07e4be10-3f03-11e3-9531-fb72eff05fbb')
+            buffer.to_s.should == 'bytes'
           end
 
           it 'complains when the frame is a request frame' do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 description: A pure Ruby CQL3 driver for Cassandra
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - README.md
 - lib/cql.rb
 - lib/cql/auth.rb
@@ -160,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Cassandra CQL3 driver