vertica 0.9.4 → 0.9.5

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/lib/vertica/connection.rb

@@ -2,9 +2,9 @@ require 'socket'
 
 class Vertica::Connection
 
-  attr_reader :options, :notices, :transaction_status, :backend_pid, :backend_key, :parameters, :notice_handler, :session_id
+  attr_reader :notices, :transaction_status, :backend_pid, :backend_key, :parameters, :notice_handler, :session_id
 
-  attr_accessor :row_style, :debug
+  attr_accessor :row_style, :debug, :options
 
   def self.cancel(existing_conn)
     existing_conn.cancel
@@ -16,8 +16,11 @@ class Vertica::Connection
     reset_values
 
     @options = {}
-    options.each { |key, value| @options[key.to_s.to_sym] = value }
+
+    options.each { |key, value| @options[key.to_s.to_sym] = value if value}
+    
     @options[:port] ||= 5433
+    @options[:read_timeout] ||= 30
 
     @row_style = @options[:row_style] ? @options[:row_style] : :hash
     unless options[:skip_startup]
@@ -66,7 +69,7 @@ class Vertica::Connection
   end
 
   def ready_for_query?
-    @ready_for_query == true
+    @current_job.nil?
   end
 
   def write(message)
@@ -111,12 +114,17 @@ class Vertica::Connection
   end
 
   def read_message
-    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
+    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
+      raise Errno::ETIMEDOUT
+    end
   end
   
   def process_message(message)
@@ -132,38 +140,28 @@ class Vertica::Connection
       @parameters[message.name] = message.value
     when Vertica::Messages::ReadyForQuery
       @transaction_status = message.transaction_status
-      @ready_for_query = true
+      @current_job = nil
     else
       raise Vertica::Error::MessageError, "Unhandled message: #{message.inspect}"
     end
   end
   
-  def with_lock(&block)
-    raise Vertica::Error::SynchronizeError, "The connection is in use!" if busy?
-    @ready_for_query = false
-    yield
-  end
-
   def query(sql, options = {}, &block)
-    with_lock do
-      job = Vertica::Query.new(self, sql, { :row_style => @row_style }.merge(options))
-      job.row_handler = block if block_given?
-      job.run
-    end
+    job = Vertica::Query.new(self, sql, { :row_style => @row_style }.merge(options))
+    job.row_handler = block if block_given?
+    run_with_job_lock(job)
   end
   
   def copy(sql, source = nil, &block)
-    with_lock do
-      job = Vertica::Query.new(self, sql, :row_style => @row_style)
-      if block_given?
-        job.copy_handler = block
-      elsif source && File.exists?(source.to_s)
-        job.copy_handler = lambda { |data| file_copy_handler(source, data) }
-      elsif source.respond_to?(:read) && source.respond_to?(:eof?)
-        job.copy_handler = lambda { |data| io_copy_handler(source, data) }
-      end
-      job.run
+    job = Vertica::Query.new(self, sql, :row_style => @row_style)
+    if block_given?
+      job.copy_handler = block
+    elsif source && File.exists?(source.to_s)
+      job.copy_handler = lambda { |data| file_copy_handler(source, data) }
+    elsif source.respond_to?(:read) && source.respond_to?(:eof?)
+      job.copy_handler = lambda { |data| io_copy_handler(source, data) }
     end
+    run_with_job_lock(job)
   end
 
   def inspect
@@ -173,6 +171,12 @@ class Vertica::Connection
   
   protected
 
+  def run_with_job_lock(job)
+    raise Vertica::Error::SynchronizeError.new(@current_job, job) if busy?
+    @current_job = job
+    job.run
+  end
+
   COPY_FROM_IO_BLOCK_SIZE = 1024 * 4096
 
   def file_copy_handler(input_file, output)
@@ -223,7 +227,7 @@ class Vertica::Connection
     @backend_key        = nil
     @transaction_status = nil
     @socket             = nil
-    @ready_for_query    = false
+    @current_job        = '<initialization>'
   end
 end
 

data/lib/vertica/error.rb

@@ -5,9 +5,17 @@ class Vertica::Error < StandardError
   class SSLNotSupported < ConnectionError; end
   class InterruptImpossible < Vertica::Error; end
   class MessageError < Vertica::Error; end
-  class SynchronizeError < Vertica::Error; end
   class EmptyQueryError < Vertica::Error; end
     
+  class SynchronizeError < Vertica::Error
+    attr_reader :running_job, :requested_job
+
+    def initialize(running_job, requested_job)
+      @running_job, @requested_job = running_job, requested_job
+      super("Cannot execute #{running_job}, connection is in use for #{requested_job}!")
+    end
+  end
+
   class QueryError < Vertica::Error
     
     attr_reader :error_response, :sql

data/lib/vertica/query.rb

@@ -13,8 +13,7 @@ class Vertica::Query
     @error  = nil
     @result = Vertica::Result.new(row_style)
   end
-  
-  
+
   def run
     @connection.write Vertica::Messages::Query.new(sql)
     
@@ -32,6 +31,10 @@ class Vertica::Query
   end
   
   alias_method :<<, :write
+
+  def to_s
+    @sql
+  end
   
   protected
   

data/test/functional/query_test.rb

@@ -109,6 +109,13 @@ class QueryTest < Test::Unit::TestCase
     end
   end  
   
+  def test_read_timeout
+    assert_raises(Errno::ETIMEDOUT) do
+      @connection.options[:read_timeout] = 0.0001
+      @connection.query("SELECT * FROM test_ruby_vertica_table")
+    end
+  end
+
   def test_sql_error
     assert_raises Vertica::Error::MissingColumn do 
       @connection.query("SELECT asad FROM test_ruby_vertica_table")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vertica
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70135370266420 !ruby/object:Gem::Requirement
+  requirement: &70173422199940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135370266420
+  version_requirements: *70173422199940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70135370265940 !ruby/object:Gem::Requirement
+  requirement: &70173422199440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135370265940
+  version_requirements: *70173422199440
 description: Query Vertica with ruby
 email: sprsquish@gmail.com
 executables: []