vertica 0.8.1 → 0.9.0.beta1

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    vertica (0.8.1)
+      vertica
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  jeweler
+  vertica!

data/Rakefile

@@ -15,7 +15,10 @@ begin
     gem.files = FileList["[A-Z]*", 'lib/**/*.rb'].to_a
 
     gem.test_files = FileList['test/**/*.rb']
-
+    
+    gem.add_development_dependency 'jeweler'
+    gem.add_development_dependency 'rake'
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 
@@ -23,14 +26,14 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
-#
-# require 'rake/testtask'
-# Rake::TestTask.new(:test) do |test|
-#   test.libs << 'lib' << 'spec'
-#   test.pattern = 'spec/**/*_spec.rb'
-#   test.verbose = true
-# end
-#
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
 # begin
 #   require 'rcov/rcovtask'
 #   Rcov::RcovTask.new do |test|

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0.beta1

data/lib/vertica.rb

@@ -2,6 +2,7 @@ module Vertica
   class Error < StandardError
     class ConnectionError < Error; end
     class MessageError < Error; end
+    class QueryError < Error; end
   end
 
   PROTOCOL_VERSION = 3 << 16
@@ -20,12 +21,6 @@ end
   bigdecimal/util
   date
 
-  vertica/core_ext/numeric
-  vertica/core_ext/string
-
-  vertica/bit_helper
-  vertica/vertica_socket
-
   vertica/column
   vertica/result
   vertica/connection
@@ -39,9 +34,9 @@ end
   vertica/messages/backend_messages/command_complete
   vertica/messages/backend_messages/data_row
   vertica/messages/backend_messages/empty_query_response
+  vertica/messages/backend_messages/notice_response
   vertica/messages/backend_messages/error_response
   vertica/messages/backend_messages/no_data
-  vertica/messages/backend_messages/notice_response
   vertica/messages/backend_messages/notification_response
   vertica/messages/backend_messages/parameter_description
   vertica/messages/backend_messages/parameter_status

data/lib/vertica/connection.rb

@@ -1,37 +1,42 @@
 module Vertica
-
   class Connection
 
     STATUSES = {
-      ?I => :no_transaction,
-      ?T => :in_transaction,
-      ?E => :failed_transaction
+      'I' => :no_transaction,
+      'T' => :in_transaction,
+      'E' => :failed_transaction
     }
 
+    attr_reader :options, :notices, :transaction_status, :backend_pid, :backend_key, :notifications, :parameters
+
     def self.cancel(existing_conn)
       conn = self.new(existing_conn.options.merge(:skip_startup => true))
       conn.write Messages::CancelRequest.new(existing_conn.backend_pid, existing_conn.backend_key)
       conn.write Messages::Flush.new
-      conn.connection.close
+      conn.socket.close
     end
 
     def initialize(options = {})
       reset_values
 
       @options = options
+      @notices = []
 
       unless options[:skip_startup]
-        connection.write Messages::Startup.new(@options[:user], @options[:database]).to_bytes
+        write Messages::Startup.new(@options[:user], @options[:database])
         process
+        
+        query("SET SEARCH_PATH TO #{options[:search_path]}") if options[:search_path]
+        query("SET ROLE #{options[:role]}") if options[:role]
       end
     end
 
-    def connection
-      @connection ||= begin
-        conn = VerticaSocket.new(@options[:host], @options[:port].to_s)
+    def socket
+      @socket ||= begin
+        conn = TCPSocket.new(@options[:host], @options[:port].to_s)
         if @options[:ssl]
           conn.write Messages::SslRequest.new.to_bytes
-          if conn.read_byte == ?S
+          if conn.read(1) == 'S'
             conn = OpenSSL::SSL::SSLSocket.new(conn, OpenSSL::SSL::SSLContext.new)
             conn.sync = true
             conn.connect
@@ -39,12 +44,17 @@ module Vertica
             raise Error::ConnectionError.new("SSL requested but server doesn't support it.")
           end
         end
+        
         conn
       end
     end
 
+    def ssl?
+      socket.kind_of?(OpenSSL::SSL::SSLSocket)
+    end
+
     def opened?
-      @connection && @backend_pid && @transaction_status
+      @socket && @backend_pid && @transaction_status
     end
 
     def closed?
@@ -52,14 +62,15 @@ module Vertica
     end
 
     def write(message)
-      connection.write_message message
+      raise ArgumentError, "invalid message: (#{message.inspect})" unless message.respond_to?(:to_bytes)
+      socket.write message.to_bytes
     end
 
     def close
       write Messages::Terminate.new
-      connection.shutdown
-      @connection = nil
-    rescue Errno::ENOTCONN # the backend closed the connection already
+      socket.close
+      @socket = nil
+    rescue Errno::ENOTCONN # the backend closed the socket already
     ensure
       reset_values
     end
@@ -69,34 +80,6 @@ module Vertica
       reset_values
     end
 
-    def options
-      @options.dup
-    end
-
-    def transaction_status
-      @transaction_status
-    end
-
-    def backend_pid
-      @backend_pid
-    end
-
-    def backend_key
-      @backend_key
-    end
-
-    def notifications
-      @notifications
-    end
-
-    def parameters
-      @parameters.dup
-    end
-
-    def put_copy_data; raise NotImplementedError.new; end
-    def put_copy_end;  raise NotImplementedError.new; end
-    def get_copy_data; raise NotImplementedError.new; end
-
     def query(query_string, &block)
       raise ArgumentError.new("Query string cannot be blank or empty.") if query_string.nil? || query_string.empty?
       reset_result
@@ -141,10 +124,25 @@ module Vertica
 
     protected
 
+
+    def read_bytes(n)
+      bytes = socket.read(n)
+      raise Vertica::Error::ConnectionError.new("Couldn't read #{n} characters from socket.") if bytes.nil? || bytes.size != n
+      return bytes
+    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
+      Messages::BackendMessage.factory type, read_bytes(size - 4)
+    end
+
+
     def process(return_result = false)
       result = return_result ? Result.new : nil
       loop do
-        case message = connection.read_message
+        case message = read_message
         when Messages::Authentication
           if message.code != Messages::Authentication::OK
             write Messages::Password.new(@options[:password], message.code, {:user => @options[:user], :salt => message.salt})
@@ -159,12 +157,12 @@ module Vertica
           result.add_row(message) if result && !@process_row
 
         when Messages::ErrorResponse
-          raise Error::MessageError.new(message.error)
+          error_class = result ? Vertica::Error::QueryError : Vertica::Error::ConnectionError
+          raise error_class.new(message.error_message)
+  
 
         when Messages::NoticeResponse
-          message.notices.each do |notice|
-            @notices << Notice.new(notice[0], notice[1])
-          end
+          @notices << message.values
 
         when Messages::NotificationResponse
           @notifications << Notification.new(message.pid, message.condition, message.additional_info)
@@ -193,14 +191,6 @@ module Vertica
               Messages::ParseComplete,
               Messages::PortalSuspended
           break
-        # when Messages::CopyData
-        #   # nothing
-        # when Messages::CopyDone
-        #   # nothing
-        # when Messages::CopyInResponse
-        #   raise 'not done'
-        # when Messages::CopyOutResponse
-        #   raise 'not done'
         end
       end
 
@@ -214,7 +204,7 @@ module Vertica
       @backend_pid        = nil
       @backend_key        = nil
       @transaction_status = nil
-      @connection         = nil
+      @socket             = nil
       @process_row        = nil
     end
 

data/lib/vertica/messages/backend_messages/authentication.rb

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class Authentication < BackendMessage
-      message_id ?R
+      message_id 'R'
 
       OK                  = 0
       KERBEROS_V5         = 2
@@ -17,12 +17,11 @@ module Vertica
       attr_reader :salt
       attr_reader :auth_data
 
-      def initialize(stream, size)
-        super
-        case @code = stream.read_network_int32
-        when CRYPT_PASSWORD then @salt = stream.readn(2)
-        when MD5_PASSWORD   then @salt = stream.readn(4)
-        when GSS_CONTINUE   then @auth_data = stream.readn(size - 9)
+      def initialize(data)
+        @code, other = data.unpack('Na*')
+        case @code
+          when CRYPT_PASSWORD, MD5_PASSWORD then @salt = other
+          when GSS_CONTINUE then @auth_data = other
         end
       end
     end

data/lib/vertica/messages/backend_messages/backend_key_data.rb

@@ -1,15 +1,12 @@
 module Vertica
   module Messages
     class BackendKeyData < BackendMessage
-      message_id ?K
+      message_id 'K'
 
-      attr_reader :pid
-      attr_reader :key
+      attr_reader :pid, :key
 
-      def initialize(stream, size)
-        super
-        @pid = stream.read_network_int32
-        @key = stream.read_network_int32
+      def initialize(data)
+        @pid, @key = data.unpack('NN')
       end
     end
   end

data/lib/vertica/messages/backend_messages/bind_complete.rb

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class BindComplete < BackendMessage
-      message_id ?2
+      message_id '2'
     end
   end
 end

data/lib/vertica/messages/backend_messages/close_complete.rb

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class CloseComplete < BackendMessage
-      message_id ?3
+      message_id '3'
     end
   end
 end

data/lib/vertica/messages/backend_messages/command_complete.rb

@@ -1,16 +1,22 @@
 module Vertica
   module Messages
     class CommandComplete < BackendMessage
-      message_id ?C
+      message_id 'C'
 
-      attr_reader :tag
-      attr_reader :rows
+      attr_reader :tag, :rows, :oid
 
-      def initialize(stream, size)
-        @tag = stream.read_cstring
-        @rows = @tag.split[-1].to_i
+      def initialize(data)
+        case data = data.unpack('Z*').first
+          when /^INSERT /
+            @tag, oid, rows = data.split(' ', 3)
+            @oid, @rows = oid.to_i, rows.to_i
+          when /^DELETE /, /^UPDATE /, /^MOVE /, /^FETCH /, /^COPY /
+            @tag, @rows = data.split(' ', 2)
+            @rows = rows.to_i
+          else
+            @tag = data
+        end
       end
-
     end
   end
 end

data/lib/vertica/messages/backend_messages/data_row.rb

@@ -1,18 +1,18 @@
 module Vertica
   module Messages
     class DataRow < BackendMessage
-      message_id ?D
+      message_id 'D'
 
-      attr_reader :field_count
-      attr_reader :fields
+      attr_reader :values
 
-      def initialize(stream, size)
-        @fields = []
-
-        @field_count = stream.read_network_int16
-        @field_count.times do |field_index|
-          size = stream.read_network_int32
-          @fields << (size == -1 ? nil : stream.readn(size))
+      def initialize(data)
+        @values = []
+        field_count = data.unpack('n').first
+        pos = 2
+        field_count.times do |field_index|
+          size = data.unpack("@#{pos}N").first
+          @values << (size == -1 ? nil : data.unpack("@#{pos + 4}a#{size}").first)
+          pos += 4 + [size, 0].max
         end
       end
     end

data/lib/vertica/messages/backend_messages/empty_query_response.rb

@@ -1,7 +1,7 @@
 module Vertica
   module Messages
     class EmptyQueryResponse < BackendMessage
-      message_id ?I
+      message_id 'I'
     end
   end
 end

data/lib/vertica/messages/backend_messages/error_response.rb

@@ -1,35 +1,7 @@
 module Vertica
   module Messages
-    class ErrorResponse < BackendMessage
-      message_id ?E
-
-      ERRORS = {
-        ?q => [0, "Internal Query"],
-        ?S => [1, "Severity"],
-        ?M => [2, "Message"],
-        ?C => [3, "Sqlstate"],
-        ?D => [4, "Detail"],
-        ?H => [5, "Hint"],
-        ?P => [6, "Position"],
-        ?W => [7, "Where"],
-        ?p => [8, "Internal Position"],
-        ?R => [10, "Routine"],
-        ?F => [11, "File"],
-        ?L => [12, "Line"],
-      }
-
-      def initialize(stream, size)
-        super
-        @errors, type = {}, nil
-        @errors[type] = stream.read_cstring while (type = stream.read_byte) != 0
-      end
-
-      def error
-        @errors.map { |type, msg| [(ERRORS[type] || [ERRORS.size, type.to_s]), msg].flatten }.
-                sort_by { |e| e.first }.
-                map { |e| "#{e[1]}: #{e[2]}" }.
-                join(', ')
-      end
+    class ErrorResponse < NoticeResponse
+      message_id 'E'
     end
   end
 end