impala 0.4.1 → 0.4.2

data/lib/impala/connection.rb

@@ -58,10 +58,7 @@ module Impala
     # @option query_options [String] :user the user runs the query
     # @return [Array<Hash>] an array of hashes, one for each row.
     def query(raw_query, query_options = {})
-      cursor = execute(raw_query, query_options)
-      cursor.fetch_all
-    ensure
-      cursor.close
+      execute(raw_query, query_options).fetch_all
     end
 
     # Perform a query and return a cursor for iterating over the results.

data/lib/impala/cursor.rb

@@ -33,8 +33,6 @@ module Impala
     #    left
     # @see #fetch_all
     def fetch_row
-      raise CursorError.new("Cursor has expired or been closed") unless @open
-
       if @row_buffer.empty?
         if @done
           return nil
@@ -85,18 +83,22 @@ module Impala
     end
 
     def fetch_batch
-      return if @done
+      raise CursorError.new("Cursor has expired or been closed") unless @open
 
       begin
         res = @service.fetch(@handle, false, BUFFER_SIZE)
       rescue Protocol::Beeswax::BeeswaxException => e
-        @closed = true
+        @open = false
         raise CursorError.new("Cursor has expired or been closed")
       end
 
       rows = res.data.map { |raw| parse_row(raw) }
       @row_buffer.concat(rows)
-      @done = true unless res.has_more
+
+      unless res.has_more
+        @done = true
+        close
+      end
     end
 
     def parse_row(raw)

data/lib/impala/version.rb

@@ -1,3 +1,3 @@
 module Impala
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/test_impala.rb

@@ -99,19 +99,4 @@ describe Impala::Connection do
       @connection.execute('query', opt)
     end
   end
-
-  describe '#query' do
-    before do
-      Impala::Cursor.any_instance.stubs(:fetch_more)
-      @cursor = Impala::Cursor.new(nil, nil)
-      Impala::Connection.any_instance.stubs(:open)
-      @connection = Impala::Connection.new('test', 1234)
-      @connection.stubs(:open? => true, :sanitize_query => 'sanitized_query', :check_result => nil, :execute => @cursor)
-    end
-
-    it 'should close the cursor after returning a value' do
-      @cursor.expects(:close).once
-      @connection.query('query')
-    end
-  end
 end

data/test/test_impala_connected.rb

@@ -159,6 +159,7 @@ describe 'connected tests' do
 
           assert_equal(false, cursor.has_more?, "has_more? should be false")
           assert_nil(cursor.fetch_row, "subsequent calls to fetch_row should be nil")
+          assert_equal(false, cursor.open?, "the cursor should be closed once it has returned all the rows")
         end
 
         it 'can use a cursor to deal with lots of data' do
@@ -184,6 +185,7 @@ describe 'connected tests' do
 
           assert_equal(false, cursor.has_more?, "has_more? should be false")
           assert_nil(cursor.fetch_row, "subsequent calls to fetch_row should be nil")
+          assert_equal(false, cursor.open?, "the cursor should be closed once it has returned all the rows")
         end
 
         it 'can handle interspersed NULL values' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: impala
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -228,18 +228,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -146128838497320562
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -146128838497320562
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23