cql-rb 1.0.0.pre3 → 1.0.0.pre4

data/lib/cql/io/io_reactor.rb

@@ -89,12 +89,12 @@ module Cql
           end
         end
         future.on_complete do
-          command_queue_push
+          command_queue_push(:connection_established, connection)
         end
         @lock.synchronize do
           @streams << connection
         end
-        command_queue_push
+        command_queue_push(:connection_added, connection)
         future
       end
 
@@ -131,6 +131,7 @@ module Cql
           readables && readables.each(&:handle_read)
           writables && writables.each(&:handle_write)
           @streams.each(&:ping)
+          @streams.reject!(&:closed?)
         end
       ensure
         stop
@@ -163,7 +164,7 @@ module Cql
         @read_buffer = ''
         @current_frame = Protocol::ResponseFrame.new(@read_buffer)
         @response_tasks = [nil] * 128
-        @event_listeners = []
+        @event_listeners = Hash.new { |h, k| h[k] = [] }
       end
 
       def open
@@ -191,7 +192,11 @@ module Cql
       end
 
       def on_event(&listener)
-        @event_listeners << listener
+        @event_listeners[:event] << listener
+      end
+
+      def on_close(&listener)
+        @event_listeners[:close] << listener
       end
 
       def ping
@@ -204,6 +209,10 @@ module Cql
         @io && !connecting?
       end
 
+      def closed?
+        @io.nil? && !connecting?
+      end
+
       def has_capacity?
         !!next_stream_id && connected?
       end
@@ -217,8 +226,15 @@ module Cql
         Protocol::RequestFrame.new(request, stream_id).write(@write_buffer)
         @response_tasks[stream_id] = future
       rescue => e
+        case e
+        when CqlError
+          error = e
+        else
+          error = IoError.new(e.message)
+          error.set_backtrace(e.backtrace)
+        end
         @response_tasks.delete(stream_id)
-        future.fail!(e)
+        future.fail!(error)
       end
 
       def handle_read
@@ -227,7 +243,7 @@ module Cql
         while @current_frame.complete?
           stream_id = @current_frame.stream_id
           if stream_id == EVENT_STREAM_ID
-            @event_listeners.each { |listener| listener.call(@current_frame.body) }
+            @event_listeners[:event].each { |listener| listener.call(@current_frame.body) }
           elsif @response_tasks[stream_id]
             @response_tasks[stream_id].complete!([@current_frame.body, connection_id])
             @response_tasks[stream_id] = nil
@@ -236,15 +252,33 @@ module Cql
           end
           @current_frame = Protocol::ResponseFrame.new(@read_buffer)
         end
+      rescue => e
+        force_close(e)
       end
 
       def handle_write
         if connecting?
           handle_connected
-        else
+        elsif connected?
           bytes_written = @io.write_nonblock(@write_buffer)
           @write_buffer.slice!(0, bytes_written)
         end
+      rescue => e
+        force_close(e)
+      end
+
+      def force_close(e)
+        case e
+        when CqlError
+          error = e
+        else
+          error = IoError.new(e.message)
+          error.set_backtrace(e.backtrace)
+        end
+        @response_tasks.each do |listener|
+          listener.fail!(error) if listener
+        end
+        close
       end
 
       def close
@@ -258,6 +292,7 @@ module Cql
           if connecting?
             succeed_connection!
           end
+          @event_listeners[:close].each { |listener| listener.call(self) }
         end
       end
 
@@ -328,6 +363,10 @@ module Cql
         true
       end
 
+      def closed?
+        false
+      end
+
       def has_capacity?
         false
       end
@@ -338,9 +377,13 @@ module Cql
 
       def on_event; end
 
+      def on_close; end
+
       def ping
         if can_deliver_command?
           deliver_commands
+        else
+          prune_directed_requests!
         end
       end
 
@@ -379,16 +422,20 @@ module Cql
       def deliver_commands
         while (command = next_command)
           case command.shift
+          when :connection_added
+          when :connection_established
+            connection = command.shift
+            connection.on_close(&method(:connection_closed))
           when :event_listener
             listener = command.shift
             @node_connections.each { |c| c.on_event(&listener) }
-          else
+          when :request
             request, future, connection_id = command
             if connection_id
               connection = @node_connections.find { |c| c.connection_id == connection_id }
-              if connection && connection.has_capacity?
+              if connection && connection.connected? && connection.has_capacity?
                 connection.perform_request(request, future)
-              elsif connection
+              elsif connection && connection.connected?
                 future.fail!(ConnectionBusyError.new("Connection ##{connection_id} is busy"))
               else
                 future.fail!(ConnectionNotFoundError.new("Connection ##{connection_id} does not exist"))
@@ -399,6 +446,28 @@ module Cql
           end
         end
       end
+
+      def prune_directed_requests!
+        failing_commands = []
+        @queue_lock.synchronize do
+          @command_queue.reject! do |command|
+            if command.first == :request && command.last && @node_connections.none? { |c| c.connection_id == command.last }
+              failing_commands << command
+              true
+            else
+              false
+            end
+          end
+        end
+        failing_commands.each do |command|
+          _, _, future, id = command
+          future.fail!(ConnectionNotFoundError.new("Connection ##{id} no longer exists"))
+        end
+      end
+
+      def connection_closed(connection)
+        prune_directed_requests!
+      end
     end
   end
 end

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '1.0.0.pre3'.freeze
+  VERSION = '1.0.0.pre4'.freeze
 end

data/spec/cql/io/io_reactor_spec.rb

@@ -281,6 +281,49 @@ module Cql
           event.should == Cql::Protocol::SchemaChangeEventResponse.new('DROPPED', 'keyspace01', 'users')
         end
       end
+
+      context 'with error conditions' do
+        context 'when receiving a bad frame' do
+          before do
+            io_reactor.queue_request(Cql::Protocol::StartupRequest.new)
+            io_reactor.start
+            @connection_id = io_reactor.add_connection(host, port).get
+            @request_future = io_reactor.queue_request(Cql::Protocol::OptionsRequest.new)
+            await { server.received_bytes.bytesize > 0 }
+            server.broadcast!("\x01\x00\x00\x02\x00\x00\x00\x16")
+            expect { @request_future.get }.to raise_error(Protocol::UnsupportedFrameTypeError)
+          end
+
+          it 'does not kill the reactor' do
+            io_reactor.should be_running
+          end
+
+          it 'cleans out failed connections' do
+            f = io_reactor.queue_request(Protocol::QueryRequest.new('USE system', :one), @connection_id)
+            expect { f.get }.to raise_error(ConnectionNotFoundError)
+          end
+        end
+
+        context 'when there is an error while sending a frame' do
+          before do
+            io_reactor.queue_request(Cql::Protocol::StartupRequest.new)
+            io_reactor.start
+            @connection_id = io_reactor.add_connection(host, port).get
+            @bad_request_future = io_reactor.queue_request(BadRequest.new)
+          end
+
+          it 'does not kill the reactor' do
+            @bad_request_future.get rescue nil
+            io_reactor.should be_running
+          end
+        end
+      end
+    end
+
+    class BadRequest < Protocol::OptionsRequest
+      def write(io)
+        raise 'Blurgh!'
+      end
     end
   end
 end

data/spec/integration/client_spec.rb

@@ -109,5 +109,10 @@ describe 'A CQL client' do
     it 'raises an error for bad consistency levels' do
       expect { client.execute('SELECT * FROM system.peers', :helloworld) }.to raise_error(Cql::CqlError)
     end
+
+    it 'fails gracefully when connecting to the Thrift port' do
+      client = Cql::Client.new(connection_options.merge(port: 9160))
+      expect { client.start! }.to raise_error(Cql::IoError)
+    end
   end
 end

data/spec/integration/protocol_spec.rb

@@ -80,7 +80,7 @@ describe 'Protocol parsing and communication' do
   context 'when setting up' do
     it 'sends OPTIONS and receives SUPPORTED' do
       response = execute_request(Cql::Protocol::OptionsRequest.new)
-      response.options.should include('CQL_VERSION' => ['3.0.0'])
+      response.options.should have_key('CQL_VERSION')
     end
 
     it 'sends STARTUP and receives READY' do

data/spec/integration/regression_spec.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+
+describe 'Regressions' do
+  let :connection_options do
+    {:host => ENV['CASSANDRA_HOST']}
+  end
+
+  context 'queries' do
+    let :client do
+      Cql::Client.new(connection_options)
+    end
+
+    before do
+      client.start!
+      client.execute(%(CREATE KEYSPACE cql_rb_client_spec WITH REPLICATION = {'CLASS': 'SimpleStrategy', 'replication_factor': 1}))
+      client.use('cql_rb_client_spec')
+    end
+
+    after do
+      client.execute('DROP KEYSPACE cql_rb_client_spec')
+      client.shutdown!
+    end
+
+    it 'handles multibyte characters in prepared statements' do
+      client.execute(%(CREATE TABLE users (user_id VARCHAR PRIMARY KEY, first VARCHAR, last VARCHAR, age INT)))
+      client.execute("INSERT INTO users (user_id, first, last, age) VALUES ('test', 'ümlaut', 'test', 1)") # ok
+      statement = client.prepare('INSERT INTO users (user_id, first, last, age) VALUES (?, ?, ?, ?)')
+      statement.execute('test2', 'test2', 'test2', 2)
+      statement.execute('test3', 'ümlaut', 'test3', 3)
+    end
+
+    it 'prepares and executes a statement with an append to a set' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails SET<VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute(['eve@gmail.com'])
+    end
+
+    it 'prepares and executes a statement with an append to a list' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails LIST<VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute(['eve@gmail.com', 'eve@yahoo.com'])
+    end
+
+    it 'prepares and executes a statement with an append to a map' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails MAP<VARCHAR, VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute({'home' => 'eve@yahoo.com'})
+    end
+
+    it 'prepares and executes a statement with a map assignment' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails MAP<VARCHAR, VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails['home'] = ? WHERE name = 'eve'))
+      statement.execute('eve@gmail.com')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-03-30 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -42,6 +42,7 @@ files:
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
 - spec/integration/protocol_spec.rb
+- spec/integration/regression_spec.rb
 - spec/spec_helper.rb
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb
@@ -83,6 +84,7 @@ test_files:
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
 - spec/integration/protocol_spec.rb
+- spec/integration/regression_spec.rb
 - spec/spec_helper.rb
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb