vertica 0.10.2 → 0.10.3

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/lib/vertica/connection.rb

@@ -50,7 +50,7 @@ class Vertica::Connection
   end
 
   def ssl?
-    Object.const_defined?('OpenSSL') && socket.kind_of?(OpenSSL::SSL::SSLSocket)
+    Object.const_defined?('OpenSSL') && @socket.kind_of?(OpenSSL::SSL::SSLSocket)
   end
 
   def opened?
@@ -69,17 +69,22 @@ class Vertica::Connection
     @current_job.nil?
   end
 
-  def write(message)
+  def write_message(message)
     raise ArgumentError, "invalid message: (#{message.inspect})" unless message.respond_to?(:to_bytes)
     puts "=> #{message.inspect}" if @debug
-    socket.write message.to_bytes
-  rescue SystemCallError => e
+    begin
+      socket.write_nonblock message.to_bytes
+    rescue IO::WaitReadable, IO::WaitWritable => wait_error
+      io_select(wait_error)
+      retry
+    end
+  rescue SystemCallError, IOError => e
     close_socket
     raise Vertica::Error::ConnectionError.new(e.message)
   end
 
   def close
-    write Vertica::Messages::Terminate.new
+    write_message Vertica::Messages::Terminate.new
   ensure
     close_socket
   end
@@ -87,7 +92,7 @@ class Vertica::Connection
   def close_socket
     socket.close
     @socket = nil
-  rescue SystemCallError
+  rescue SystemCallError, IOError
   ensure
     reset_values
   end
@@ -104,8 +109,8 @@ class Vertica::Connection
 
   def cancel
     conn = self.class.new(options.merge(:skip_startup => true))
-    conn.write Vertica::Messages::CancelRequest.new(backend_pid, backend_key)
-    conn.write Vertica::Messages::Flush.new
+    conn.write_message Vertica::Messages::CancelRequest.new(backend_pid, backend_key)
+    conn.write_message Vertica::Messages::Flush.new
     conn.socket.close
   end
 
@@ -122,19 +127,13 @@ class Vertica::Connection
   end
 
   def read_message
-    ready = IO.select([socket], nil, nil, @options[:read_timeout])
-    if ready
-      type = read_bytes(1)
-      size = read_bytes(4).unpack('N').first
-      raise Vertica::Error::MessageError.new("Bad message size: #{size}.") unless size >= 4
-      message = Vertica::Messages::BackendMessage.factory type, read_bytes(size - 4)
-      puts "<= #{message.inspect}" if @debug
-      return message
-    else
-      close
-      raise Vertica::Error::TimedOutError.new("Connection timed out.")
-    end
-  rescue SystemCallError => e
+    type = read_bytes(1)
+    size = read_bytes(4).unpack('N').first
+    raise Vertica::Error::MessageError.new("Bad message size: #{size}.") unless size >= 4
+    message = Vertica::Messages::BackendMessage.factory type, read_bytes(size - 4)
+    puts "<= #{message.inspect}" if @debug
+    return message
+  rescue SystemCallError, IOError => e
     close_socket
     raise Vertica::Error::ConnectionError.new(e.message)
   end
@@ -207,21 +206,30 @@ class Vertica::Connection
   end
 
   def read_bytes(n)
-    bytes = socket.read(n)
-
-    raise Errno::EIO if bytes.nil? || bytes.size != n
+    socket.read_nonblock(n)
+  rescue IO::WaitReadable, IO::WaitWritable => wait_error
+    io_select(wait_error)
+    retry
+  end
 
-    return bytes
+  def io_select(exception)
+    readers, writers = nil, nil
+    readers = [socket] if exception.is_a?(IO::WaitReadable)
+    writers = [socket] if exception.is_a?(IO::WaitWritable)
+    if IO.select(readers, writers, nil, @options[:read_timeout]).nil?
+      close
+      raise Vertica::Error::TimedOutError.new("Connection timed out.")
+    end
   end
 
   def startup_connection
-    write Vertica::Messages::Startup.new(@options[:user] || @options[:username], @options[:database])
+    write_message Vertica::Messages::Startup.new(@options[:user] || @options[:username], @options[:database])
     message = nil
     begin
       case message = read_message
       when Vertica::Messages::Authentication
         if message.code != Vertica::Messages::Authentication::OK
-          write Vertica::Messages::Password.new(@options[:password], message.code, {:user => @options[:user], :salt => message.salt})
+          write_message Vertica::Messages::Password.new(@options[:password], message.code, {:user => @options[:user], :salt => message.salt})
         end
       else
         process_message(message)

data/lib/vertica/query.rb

@@ -15,7 +15,7 @@ class Vertica::Query
   end
 
   def run
-    @connection.write Vertica::Messages::Query.new(sql)
+    @connection.write_message Vertica::Messages::Query.new(sql)
     
     begin
       process_message(message = @connection.read_message)
@@ -26,7 +26,7 @@ class Vertica::Query
   end
   
   def write(data)
-    @connection.write Vertica::Messages::CopyData.new(data)
+    @connection.write_message Vertica::Messages::CopyData.new(data)
     return self
   end
   
@@ -59,16 +59,16 @@ class Vertica::Query
   
   def handle_copy_from_stdin
     if copy_handler.nil?
-      @connection.write Vertica::Messages::CopyFail.new('no handler provided')
+      @connection.write_message Vertica::Messages::CopyFail.new('no handler provided')
     else
       begin
         if copy_handler.call(self) == :rollback
-          @connection.write Vertica::Messages::CopyFail.new("rollback")
+          @connection.write_message Vertica::Messages::CopyFail.new("rollback")
         else
-          @connection.write Vertica::Messages::CopyDone.new
+          @connection.write_message Vertica::Messages::CopyDone.new
         end
       rescue => e
-        @connection.write Vertica::Messages::CopyFail.new(e.message)
+        @connection.write_message Vertica::Messages::CopyFail.new(e.message)
         raise
       end
     end

data/test/functional/connection_test.rb

@@ -95,7 +95,7 @@ class ConnectionTest < Test::Unit::TestCase
   def test_socket_write_error
     connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
     class << connection.socket
-      def write(foo)
+      def write_nonblock(foo)
         raise Errno::ETIMEDOUT
       end
     end
@@ -107,7 +107,7 @@ class ConnectionTest < Test::Unit::TestCase
   def test_socket_read_error
     connection = Vertica::Connection.new(TEST_CONNECTION_HASH)
     class << connection.socket
-      def read(foo)
+      def read_nonblock(foo)
         raise Errno::ETIMEDOUT
       end
     end

data/test/functional/query_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'zlib'
 
 class QueryTest < Test::Unit::TestCase
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertica
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -119,9 +119,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2608349904200928087
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Pure ruby library for interacting with Vertica