hbase-stargate 1.6.0 → 1.6.1

data/lib/stargate/operation/scanner_operation.rb

@@ -11,7 +11,7 @@ module Stargate
       def open_scanner(table_name, options = {})
         raise ArgumentError, "options should be given as a Hash" unless options.instance_of? Hash
         columns = options.delete(:columns)
-        batch = options.delete(:batch) || "10"
+        batch = options.delete(:batch) || "1000"
         start_time = options.delete(:start_time)
         end_time = options.delete(:end_time)
 
@@ -48,27 +48,24 @@ module Stargate
         end
       end
 
-      def get_rows(scanner, limit = nil)
+      def each_row(scanner, &block)
         begin
           request = Request::ScannerRequest.new(scanner.table_name)
           request_url = request.get_rows(scanner) # The url to the scanner is the same for each batch
 
-          rows = []
           begin
             # Loop until we've reached the limit, or the scanner was exhausted (HTTP 204 returned)
-            until (limit && rows.size >= limit) || (response = get_response(request_url)).status == 204
-              rows.concat Response::ScannerResponse.new(response.body, :get_rows).parse
+            until (response = get_response(request_url)).status == 204
+              rows = Response::ScannerResponse.new(response.body, :get_rows).parse
 
               rows.each do |row|
                 row.table_name = scanner.table_name
+                block.call(row)
               end
             end
-          rescue Exception => e
-            raise Stargate::ScannerError, "Scanner failed while getting rows. #{e.message}"
+          rescue => e
+            raise Stargate::ScannerError, "Scanner iteration failed with the following error:\n#{e.message}"
           end
-
-          # Prune the last few rows if the limit was passed.
-          (limit) ? rows.slice(0, limit) : rows
         rescue => e
           if e.to_s.include?("TableNotFoundException")
             raise TableNotFoundError, "Table #{table_name} Not Found!"
@@ -78,6 +75,15 @@ module Stargate
         end
       end
 
+      def get_rows(scanner, limit = nil)
+        rows = []
+        each_row(scanner) do |row|
+          break if !limit.nil? && rows.size >= limit
+          rows << row
+        end
+        return rows
+      end
+
       def close_scanner(scanner)
         begin
           request = Request::ScannerRequest.new(scanner.table_name)

data/lib/stargate/response/scanner_response.rb

@@ -15,7 +15,7 @@ module Stargate
           when 201
             Stargate::Model::Scanner.new(:scanner_url => raw_data.headers["Location"])
           when 404
-            raise TableNotFoundError, "Table #{table_name} Not Found!"
+            raise TableNotFoundError, "Table Not Found: #{raw_data.to_s}"
           else
             raise StandardError, "Unable to open scanner. Received the following message: #{raw_data.status_line}"
           end

data/lib/stargate/version.rb

@@ -1,3 +1,3 @@
 module Stargate
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: hbase-stargate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors: 
 - Hopper
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 Z
+date: 2011-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -153,3 +153,4 @@ test_files:
 - spec/hbase-stargate/response/scanner_response_spec.rb
 - spec/hbase-stargate/response/table_response_spec.rb
 - spec/spec_helper.rb
+has_rdoc: