impala 0.1.1 → 0.1.2

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.yardopts
 Gemfile.lock
 InstalledFiles
 _yardoc

data/Rakefile

@@ -1,5 +1,15 @@
 require "bundler/gem_tasks"
 
+task :default => [:test]
+
+task :test do
+  ret = true
+  Dir["test/**/*.rb"].each do |f|
+    ret = ret && ruby(f, '')
+  end
+  exit(ret)
+end
+
 THRIFT_FILES = FileList['./thrift/*.thrift']
 GENNED_FILES = FileList['./lib/impala/protocol/*']
 

data/impala.gemspec

@@ -18,6 +18,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('eden')
   gem.add_development_dependency('pry')
 
+  gem.add_development_dependency('test-unit')
+  gem.add_development_dependency('shoulda')
+  gem.add_development_dependency('mocha')
+
+  gem.add_development_dependency('yard')
+  gem.add_development_dependency('redcarpet')
+  gem.add_development_dependency('github-markup')
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/lib/impala.rb

@@ -14,16 +14,22 @@ require 'impala/connection'
 
 module Impala
   KNOWN_COMMANDS = ['select', 'show', 'describe', 'use']
+  DEFAULT_HOST = 'localhost'
+  DEFAULT_PORT = 21000
   class InvalidQueryError < StandardError; end
   class ConnectionError < StandardError; end
   class CursorError < StandardError; end
+  class ParsingError < StandardError; end
 
-  def self.connect(host='localhost', port=21000)
+  def self.connect(host=DEFAULT_HOST, port=DEFAULT_PORT)
     connection = Connection.new(host, port)
 
     if block_given?
-      ret = yield connection
-      connection.close
+      begin
+        ret = yield connection
+      ensure
+        connection.close
+      end
     else
       ret = connection
     end

data/lib/impala/connection.rb

@@ -2,7 +2,7 @@ module Impala
   class Connection
     SLEEP_INTERVAL = 0.1
 
-    def initialize(host='localhost', port=21000)
+    def initialize(host, port)
       @host = host
       @port = port
       @connected = false
@@ -38,13 +38,6 @@ module Impala
     def execute(raw_query)
       raise ConnectionError.new("Connection closed") unless open?
 
-      words = raw_query.split
-      if words.empty?
-        raise InvalidQueryError.new("Empty query")
-      elsif !KNOWN_COMMANDS.include?(words.first.downcase)
-        raise InvalidQueryError.new("Unrecognized command: '#{words.first}'")
-      end
-
       query = sanitize_query(raw_query)
       handle = send_query(query)
 
@@ -54,9 +47,16 @@ module Impala
 
     private
 
-    def sanitize_query(raw)
-      #TODO?
-      raw.downcase
+    def sanitize_query(raw_query)
+      words = raw_query.split
+      raise InvalidQueryError.new("Empty query") if words.empty?
+
+      command = words.first.downcase
+      if !KNOWN_COMMANDS.include?(command)
+        raise InvalidQueryError.new("Unrecognized command: '#{words.first}'")
+      end
+
+      ([command] + words[1..-1]).join(' ')
     end
 
     def send_query(sanitized_query)
@@ -67,23 +67,21 @@ module Impala
     end
 
     def wait_for_result(handle)
-      begin
-        #TODO select here, or something
-        while true
-          state = @service.get_state(handle)
-          if state == Protocol::Beeswax::QueryState::FINISHED
-            break
-          elsif state == Protocol::Beeswax::QueryState::EXCEPTION
-            close_handle(handle)
-            raise ConnectionError.new("The query was aborted")
-          end
-
-          sleep(SLEEP_INTERVAL)
+      #TODO select here, or something
+      while true
+        state = @service.get_state(handle)
+        if state == Protocol::Beeswax::QueryState::FINISHED
+          break
+        elsif state == Protocol::Beeswax::QueryState::EXCEPTION
+          close_handle(handle)
+          raise ConnectionError.new("The query was aborted")
         end
-      rescue Interrupt
-        close_handle(handle)
-        raise
+
+        sleep(SLEEP_INTERVAL)
       end
+    rescue
+      close_handle(handle)
+      raise
     end
 
     def close_handle(handle)

data/lib/impala/cursor.rb

@@ -84,14 +84,14 @@ module Impala
         elsif value == 'false'
           false
         else
-          raise "Invalid value for boolean: #{value}"
+          raise ParsingError.new("Invalid value for boolean: #{value}")
         end
       when 'tinyint', 'int', 'bigint'
         value.to_i
       when 'double'
         value.to_f
       else
-        raise "Unknown type: #{schema.type}" #TODO
+        raise ParsingError.new("Unknown type: #{schema.type}")
       end
     end
   end

data/lib/impala/version.rb

@@ -1,3 +1,3 @@
 module Impala
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/test_impala.rb

@@ -0,0 +1,34 @@
+require 'impala'
+require 'test-unit'
+require 'shoulda'
+require 'mocha'
+
+class TestImpala < Test::Unit::TestCase
+  include Mocha
+
+  context 'Impala.connect' do
+    setup do
+      Thrift::Socket.expects(:new).with('host', 12345)
+      Thrift::BufferedTransport.expects(:new).once.returns(stub(:open => nil))
+      Thrift::BinaryProtocol.expects(:new).once
+      Impala::Protocol::ImpalaService::Client.expects(:new).once
+    end
+
+    should 'return an open connection when passed a block' do
+      connection = Impala.connect('host', 12345)
+      assert_equal(Impala::Connection, connection.class)
+      assert_equal(true, connection.open?)
+    end
+
+    should 'return the results of the query when given a block with a query, and then close tho connection' do
+      Impala::Connection.any_instance.stubs(:query => 'result')
+      Impala::Connection.any_instance.expects(:close).once
+
+      ret = Impala.connect('host', 12345) do |conn|
+        conn.query('query')
+      end
+
+      assert_equal('result', ret)
+    end
+  end
+end

metadata

@@ -1,89 +1,183 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: impala
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Colin Marc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thrift
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: eden
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: eden
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A ruby client for Cloudera's Impala
-email: 
+email:
 - colinmarc@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -147,6 +241,7 @@ files:
 - lib/impala/protocol/types_constants.rb
 - lib/impala/protocol/types_types.rb
 - lib/impala/version.rb
+- test/test_impala.rb
 - thrift/Data.thrift
 - thrift/DataSinks.thrift
 - thrift/Descriptors.thrift
@@ -171,36 +266,28 @@ files:
 - thrift/hive_metastore.thrift
 homepage: https://github.com/colinmarc/impala-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A ruby client for Cloudera's Impala
-test_files: []
-
+test_files:
+- test/test_impala.rb
+has_rdoc: